From c8b68196701dae88b6f4dacb157ae723135519bd Mon Sep 17 00:00:00 2001
From: Kang Lin <kl222@126.com>
Date: Sat, 24 Jun 2023 06:42:58 +0800
Subject: [PATCH] Rename tag.sh to deploy.sh

---
 CMakeLists.txt      | 27 ++++++++++++++++++---------
 ChangeLog.md        |  1 +
 ChangeLog_zh_CN.md  |  1 +
 tag.sh => deploy.sh |  0
 4 files changed, 20 insertions(+), 9 deletions(-)
 rename tag.sh => deploy.sh (100%)
 mode change 100755 => 100644

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7a9dc60..0e16817 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -138,21 +138,30 @@ if(NOT RabbitCommon_DIR)
         set(RabbitCommon_DIR ${CMAKE_SOURCE_DIR}/../RabbitCommon)
     endif()
 endif()
-if(DEFINED RabbitCommon_DIR AND EXISTS ${RabbitCommon_DIR}/Src)
+if(RabbitCommon_DIR AND EXISTS ${RabbitCommon_DIR}/Src)
+    message("Use RabbitCommon source code")
     add_subdirectory(${RabbitCommon_DIR}/Src ${CMAKE_BINARY_DIR}/RabbitCommon)
-    include(${RabbitCommon_DIR}/cmake/Translations.cmake)
 else()
-    message("1. Please download RabbitCommon source code from https://github.com/KangLin/RabbitCommon")
-    message("   ag:")
-    message("       git clone https://github.com/KangLin/RabbitCommon.git")
-    message("2. Then set cmake value or environment variable RabbitCommon_DIR to download root dirctory.")
-    message("   ag:")
-    message(FATAL_ERROR "       cmake -DRabbitCommon_DIR= ")
+    find_package(RabbitCommon)
+    if(NOT RabbitCommon_FOUND)
+        message("RabbitCommon_DIR is not found. Please use one of the following ways to set it:")
+        message("1. Set RabbitCommon_DIR to the install prefix of RabbitCommon.")
+        message("2. Set RabbitCommon_DIR to source code root of RabbitCommon.")
+        message("2.1 Please download the source code of RabbitCommon from https://github.com/KangLin/RabbitCommon")
+        message("   ag:")
+        message("       git clone https://github.com/KangLin/RabbitCommon.git")
+        message("2.2 Then set cmake variable or environment variable RabbitCommon_DIR to download root directory.")
+        message("   ag:")
+        message("       cmake -DRabbitCommon_DIR= ")
+        message(FATAL_ERROR "RabbitCommon_DIR isn't set.")
+    endif()
 endif()
 
-SET(FaceRecognizer_VERSION "v0.0.4")
 GET_VERSION(OUT_VERSION FaceRecognizer_VERSION
     OUT_REVISION FaceRecognizer_REVISION)
+if(NOT FaceRecognizer_VERSION)
+    SET(FaceRecognizer_VERSION "v0.0.4")
+endif()
 message("FaceRecognizer_VERSION:${FaceRecognizer_VERSION};FaceRecognizer_REVISION:${FaceRecognizer_REVISION}")
 set(VERSION ${FaceRecognizer_VERSION})
 
diff --git a/ChangeLog.md b/ChangeLog.md
index bf27b03..4a7cd69 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -7,6 +7,7 @@
   + Add ncnn face
   + FIX: divide by 0 crash. Affects all previous releases.
     See RabbitCommon: 7ed300a206d8a36c30003b6c19ad181682d0ff5f
+  + FFmpeg: update API avpicture_* to av_image_*
   
 - v0.0.4
   + Add opencv face
diff --git a/ChangeLog_zh_CN.md b/ChangeLog_zh_CN.md
index 740e2bd..2c2793f 100644
--- a/ChangeLog_zh_CN.md
+++ b/ChangeLog_zh_CN.md
@@ -7,6 +7,7 @@
   + 增加 ncnn 实现人脸接口
   + 修复除 0 引起的崩溃。影响前面所有发行版本。此错误是 RabbitCommon 引起的。
     详见：RabbitCommon: 7ed300a206d8a36c30003b6c19ad181682d0ff5f
+  + FFmpeg: 兼容 API avpicture_* to av_image_*
 
 - v0.0.4
   + 增加 opencv 实现人脸接口
diff --git a/tag.sh b/deploy.sh
old mode 100755
new mode 100644
similarity index 100%
rename from tag.sh
rename to deploy.sh
-- 
GitLab