search pc files from universal lib folder when compile ffmpeg

Author: debugly

apple/compile-any.sh

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# 
+#
 
 PLAT=$1
 CMD=$2
@@ -45,7 +45,7 @@ if [[ -z "$LIBS" || "$LIBS" == "all" ]]; then
     list='compile-cfgs/list.txt'
     #use plat list
     if [[ -f "compile-cfgs/list_${PLAT}.txt" ]]; then
-        list="compile-cfgs/list_${PLAT}.txt"   
+        list="compile-cfgs/list_${PLAT}.txt"
     fi
     LIBS=$(cat $list)
 fi
@@ -60,9 +60,11 @@ if [[ -z "$CMD" ]]; then
     exit 1
 fi
 
-export XC_SRC_ROOT="${THIS_DIR}/../build/src/${PLAT}"
-export XC_PRODUCT_ROOT="${THIS_DIR}/../build/product/${PLAT}"
-export XC_UNI_PROD_DIR="${XC_PRODUCT_ROOT}/universal"
+
+
+export XC_SRC_ROOT=$(cd "${THIS_DIR}/../build/src/${PLAT}";pwd)
+export XC_PRODUCT_ROOT=$(cd "${THIS_DIR}/../build/product/${PLAT}";pwd)
+export XC_UNI_PROD_DIR=$(cd "${XC_PRODUCT_ROOT}/universal";pwd)
 
 export XC_PLAT="$PLAT"
 export XC_CMD="$CMD"
@@ -71,7 +73,7 @@ export XC_OPTS="$OPTS"
 export XC_VENDOR_LIBS="$LIBS"
 
 if [[ "$PLAT" == 'ios' ]]; then
-export XC_FORCE_CROSS=true
+    export XC_FORCE_CROSS=true
 fi
 
 echo '------------------------------------------'

apple/do-compile/ffmpeg.sh

@@ -100,6 +100,14 @@ if [[ -f "${XC_PRODUCT_ROOT}/openssl-$XC_ARCH/lib/pkgconfig/openssl.pc" ]]; then
     MY_PKG_CONFIG_PATH="${MY_PKG_CONFIG_PATH}${XC_PRODUCT_ROOT}/openssl-$XC_ARCH/lib/pkgconfig"
 
     echo "[*] --enable-openssl"
+elif [[ -f "${XC_PRODUCT_ROOT}/universal/openssl/lib/pkgconfig/openssl.pc" ]]; then
+    FFMPEG_CFG_FLAGS="$FFMPEG_CFG_FLAGS --enable-nonfree --enable-openssl"
+    if [[ -n "$MY_PKG_CONFIG_PATH" ]]; then
+        MY_PKG_CONFIG_PATH="$MY_PKG_CONFIG_PATH:"
+    fi
+    MY_PKG_CONFIG_PATH="${MY_PKG_CONFIG_PATH}${XC_PRODUCT_ROOT}/universal/openssl/lib/pkgconfig"
+
+    echo "[*] --enable-openssl"   
 else
     echo "[*] --disable-openssl"
 fi
@@ -171,6 +179,16 @@ if [[ -f "${XC_PRODUCT_ROOT}/opus-$XC_ARCH/lib/pkgconfig/opus.pc" ]]; then
     fi
     MY_PKG_CONFIG_PATH="${MY_PKG_CONFIG_PATH}${XC_PRODUCT_ROOT}/opus-$XC_ARCH/lib/pkgconfig"
 
+    echo "[*] --enable-libopus --enable-decoder=opus"
+elif [[ -f "${XC_PRODUCT_ROOT}/universal/opus/lib/pkgconfig/opus.pc" ]]; then
+
+    FFMPEG_CFG_FLAGS="$FFMPEG_CFG_FLAGS --enable-libopus --enable-decoder=opus"
+
+    if [[ -n "$MY_PKG_CONFIG_PATH" ]]; then
+        MY_PKG_CONFIG_PATH="$MY_PKG_CONFIG_PATH:"
+    fi
+    MY_PKG_CONFIG_PATH="${MY_PKG_CONFIG_PATH}${XC_PRODUCT_ROOT}/universal/opus/lib/pkgconfig"
+
     echo "[*] --enable-libopus --enable-decoder=opus"
 else
     echo "[*] --disable-libopus"
@@ -189,6 +207,16 @@ if [[ -f "${XC_PRODUCT_ROOT}/bluray-$XC_ARCH/lib/pkgconfig/libbluray.pc" ]]; the
     fi
     MY_PKG_CONFIG_PATH="${MY_PKG_CONFIG_PATH}${XC_PRODUCT_ROOT}/bluray-$XC_ARCH/lib/pkgconfig"
 
+    echo "[*] --enable-libbluray --enable-protocol=bluray"
+elif [[ -f "${XC_PRODUCT_ROOT}/universal/bluray/lib/pkgconfig/libbluray.pc" ]]; then
+
+    FFMPEG_CFG_FLAGS="$FFMPEG_CFG_FLAGS --enable-libbluray --enable-protocol=bluray"
+
+    if [[ -n "$MY_PKG_CONFIG_PATH" ]]; then
+        MY_PKG_CONFIG_PATH="$MY_PKG_CONFIG_PATH:"
+    fi
+    MY_PKG_CONFIG_PATH="${MY_PKG_CONFIG_PATH}${XC_PRODUCT_ROOT}/universal/bluray/lib/pkgconfig"
+
     echo "[*] --enable-libbluray --enable-protocol=bluray"
 else
     echo "[*] --disable-libbluray --disable-protocol=bluray"
@@ -208,6 +236,16 @@ if [[ -f "${XC_PRODUCT_ROOT}/dav1d-$XC_ARCH/lib/pkgconfig/dav1d.pc" ]]; then
     fi
     MY_PKG_CONFIG_PATH="${MY_PKG_CONFIG_PATH}${XC_PRODUCT_ROOT}/dav1d-$XC_ARCH/lib/pkgconfig"
 
+    echo "[*] --enable-libdav1d --enable-decoder=libdav1d"
+elif [[ -f "${XC_PRODUCT_ROOT}/universal/dav1d/lib/pkgconfig/dav1d.pc" ]]; then
+
+    FFMPEG_CFG_FLAGS="$FFMPEG_CFG_FLAGS --enable-libdav1d --enable-decoder=libdav1d"
+
+    if [[ -n "$MY_PKG_CONFIG_PATH" ]]; then
+        MY_PKG_CONFIG_PATH="$MY_PKG_CONFIG_PATH:"
+    fi
+    MY_PKG_CONFIG_PATH="${MY_PKG_CONFIG_PATH}${XC_PRODUCT_ROOT}/universal/dav1d/lib/pkgconfig"
+
     echo "[*] --enable-libdav1d --enable-decoder=libdav1d"
 else
     echo "[*] --disable-libdav1d --disable-decoder=libdav1d"