install multiple pre compile lib, pc file prefix maybe not right

Author: debugly

apple/do-compile/any.sh

@@ -85,11 +85,11 @@ do_lipo_all() {
             local uni_dir="$XC_UNI_PROD_DIR"
         fi
 
-        local inc_dst_dir="$uni_dir/$LIB_NAME/include"
+        local inc_dst_dir="$uni_dir/$LIB_NAME"
 
         if [[ -d "$inc_src_dir" ]]; then
             echo "copy include dir to $inc_dst_dir"
-            cp -R "$inc_src_dir" "$inc_dst_dir"
+            cp -Rf "$inc_src_dir" "$inc_dst_dir"
 
             local pc_src_dir="$XC_PRODUCT_ROOT/$LIB_NAME-$arch/lib/pkgconfig"
             if ls ${pc_src_dir}/*.pc >/dev/null 2>&1;then

apple/do-compile/ffmpeg.sh

@@ -191,7 +191,7 @@ pkg-config --libs dvdread --silence-errors >/dev/null && enable_dvdread=1
 
 if [[ $enable_dvdread ]];then
     echo "[*] --enable-libdvdread"
-    CFG_FLAGS="$CFG_FLAGS --enable-libdvdread"
+    CFG_FLAGS="$CFG_FLAGS --enable-libdvdread --enable-protocol=dvd"
 else
     echo "[*] --disable-libdvdread"
 fi

apple/init-env.sh

@@ -63,14 +63,14 @@ function init_plat_env() {
     if [[ "$XC_PLAT" == 'ios' ]]; then
         export XC_OTHER_CFLAGS="-fembed-bitcode"
         ALL_ARCHS="arm64 arm64_simulator x86_64_simulator"
-    elif [[ "$XC_PLAT" == 'macos' ]]; then
+        elif [[ "$XC_PLAT" == 'macos' ]]; then
         export XC_OTHER_CFLAGS=""
         ALL_ARCHS="x86_64 arm64"
-    elif [[ "$XC_PLAT" == 'tvos' ]]; then
+        elif [[ "$XC_PLAT" == 'tvos' ]]; then
         export XC_OTHER_CFLAGS=''
         ALL_ARCHS="arm64 arm64_simulator x86_64_simulator"
     fi
-
+    
     if [[ -z "$XC_ALL_ARCHS" ]];then
         export XC_ALL_ARCHS=$ALL_ARCHS
     else
@@ -94,12 +94,12 @@ function init_plat_env() {
     export XC_PRODUCT_ROOT="${THIS_DIR}/../build/product/${XC_PLAT}"
     export XC_UNI_PROD_DIR="${XC_PRODUCT_ROOT}/universal"
     export XC_UNI_SIM_PROD_DIR="${XC_PRODUCT_ROOT}/universal-simulator"
-
+    
     export XC_IOS_PRODUCT_ROOT="${THIS_DIR}/../build/product/ios"
     export XC_MACOS_PRODUCT_ROOT="${THIS_DIR}/../build/product/macos"
     export XC_TVOS_PRODUCT_ROOT="${THIS_DIR}/../build/product/tvos"
     export XC_XCFRMK_DIR="${THIS_DIR}/../build/product/xcframework"
-
+    
     #common xcode configuration
     export XC_TAGET_OS="darwin"
     export DEBUG_INFORMATION_FORMAT=dwarf-with-dsym
@@ -115,14 +115,27 @@ function init_libs_pkg_config_path() {
     fi
 
     pkg_cfg_dir=
-    for lib in $(ls "$universal_dir"); do
+    
+    for dir in `find "${XC_PRODUCT_ROOT}" -type f -name "*.pc" | xargs dirname | uniq` ;
+    do
+        if [[ "$dir" =~ "$_XC_ARCH" ]];then
+            if [[ $pkg_cfg_dir ]];then
+                pkg_cfg_dir="${pkg_cfg_dir}:${dir}"
+            else
+                pkg_cfg_dir="${dir}"
+            fi
+        fi
+    done
+    
+    for dir in `find "${universal_dir}" -type f -name "*.pc" | xargs dirname | uniq` ;
+    do
         if [[ $pkg_cfg_dir ]];then
-            pkg_cfg_dir="${pkg_cfg_dir}:${universal_dir}/${lib}/lib/pkgconfig"
+            pkg_cfg_dir="${pkg_cfg_dir}:${dir}"
         else
-            pkg_cfg_dir="${universal_dir}/${lib}/lib/pkgconfig"
+            pkg_cfg_dir="${dir}"
         fi
     done
-
+    
     # disabling pkg-config-path
     # https://gstreamer-devel.narkive.com/TeNagSKN/gst-devel-disabling-pkg-config-path
     # export PKG_CONFIG_LIBDIR=${sysroot}/lib/pkgconfig
@@ -138,7 +151,7 @@ function init_arch_env () {
     fi
 
     export _XC_ARCH="$1"
-
+    
     if [[ "$XC_PLAT" == 'ios' ]]; then
         case $_XC_ARCH in
             *_simulator)
@@ -155,11 +168,11 @@ function init_arch_env () {
                 exit 1
             ;;
         esac
-    elif [[ "$XC_PLAT" == 'macos' ]]; then
+        elif [[ "$XC_PLAT" == 'macos' ]]; then
         export XCRUN_PLATFORM='MacOSX'
         export MACOSX_DEPLOYMENT_TARGET=10.11
         export XC_DEPLOYMENT_TARGET="-mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET"
-    elif [[ "$XC_PLAT" == 'tvos' ]]; then
+        elif [[ "$XC_PLAT" == 'tvos' ]]; then
         case $_XC_ARCH in
             *_simulator)
                 export XCRUN_PLATFORM='AppleTVSimulator'
@@ -188,7 +201,7 @@ function init_arch_env () {
     # xcrun -sdk macosx --show-sdk-path
     # /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.3.sdk
     export XCRUN_SDK_PATH=`xcrun -sdk $XCRUN_SDK --show-sdk-path`
-
+    
     # x86_64
     export XC_ARCH="${_XC_ARCH/_simulator/}"
     # ffmpeg-x86_64

install-pre-any.sh

@@ -44,6 +44,61 @@ LIBS=$2
 THIS_DIR=$(DIRNAME=$(dirname "$0"); cd "$DIRNAME"; pwd)
 cd "$THIS_DIR"
 
+function fix_prefix(){
+    local plat=$1
+    local dir=${PWD}
+    
+    echo "fix $plat platform pc files prefix"
+    
+    if [[ "$plat" == 'all' ]];then
+        cd "build/product"
+    else
+        cd "build/product/$plat"
+    fi
+    
+    for pc in `find . -type f -name "*.pc"` ;
+    do
+        echo "$pc"
+        local pc_dir=$(dirname "$pc")
+        local lib_dir=$(dirname "$pc_dir")
+        local base_dir=$(dirname "$lib_dir")
+
+        base_dir=$(cd "$base_dir";pwd)        
+        local escaped_base_dir=$(echo $base_dir | sed 's/\//\\\//g')
+        local escaped_lib_dir=$(echo "${base_dir}/lib" | sed 's/\//\\\//g')
+        local escaped_include_dir=$(echo "${base_dir}/include" | sed 's/\//\\\//g')
+
+        sed -i "" "s/^prefix=.*/prefix=$escaped_base_dir/" "$pc"
+        sed -i "" "s/^libdir=.*/libdir=$escaped_lib_dir/" "$pc"
+        sed -i "" "s/^includedir=.*/includedir=$escaped_include_dir/" "$pc"
+        
+        # filte Libs using -L/ absolute path
+        local str=
+        for t in `cat "$pc" | grep "Libs: " | grep "\-L/"` ;
+        do
+            if [[ "$t" != -L/* ]];then
+                if [[ $str ]];then
+                    str="${str} $t"
+                else
+                    str="$t"
+                fi
+            fi
+        done
+        [[ ! -z $str ]] && sed -i "" "s/^Libs:.*/$str/" "$pc"
+    done
+    
+    if command -v tree >/dev/null 2>&1; then
+        
+        if [[ "$plat" == 'all' ]];then
+            tree -L 3 ./
+        else
+            tree -L 2 ./
+        fi
+        
+    fi
+    cd "$dir"
+}
+
 function install_lib ()
 {
     local plat=$1
@@ -128,6 +183,8 @@ if [[ "$PLAT" == 'ios' || "$PLAT" == 'macos' || "$PLAT" == 'tvos'|| "$PLAT" == '
         fi
         echo "===================================="
     done
+    
+    fix_prefix $plat
 else
     usage
 fi

tools/install-pre-lib.sh

@@ -27,7 +27,7 @@ cd ../
 function usage() {
     echo "=== useage ===================="
     echo "Download precompiled libs from github,The usage is as follows:"
-    echo "$0 [ios|macos|all] [<release tag>]"
+    echo "$0 [ios|macos|tvos|all] [<release tag>]"
 }
 
 function download_arch() {
@@ -67,41 +67,22 @@ function extract(){
         mkdir -p "$PRODUCT_DIR"
         unzip -oq "$ONAME" -d "$PRODUCT_DIR"
         echo "extract zip file"
-        if command -v tree >/dev/null 2>&1; then
-            tree -L 2 "$PRODUCT_DIR"
-        fi
     else
         echo "you need download ${ONAME} firstly."
         exit 1
     fi
 }
 
-function fix_prefix(){
-    local plat=$1
-    local pc_dir="$PRODUCT_DIR/$LIB_NAME/lib/pkgconfig"
-    if [[ -d "$pc_dir" ]];then
-        if ls ${pc_dir}/*.pc >/dev/null 2>&1;then
-            echo "fix $plat $LIB_NAME pc file prefix"
-            p=$(cd "$PRODUCT_DIR/$LIB_NAME";pwd)
-            escaped_p=$(echo $p | sed 's/\//\\\//g')
-            sed -i "" "s/^prefix=.*/prefix=$escaped_p/" "$pc_dir/"*.pc
-        fi
-    fi
-}
-
 function install() {
     local plat=$1
     if [[ "$plat" == 'ios' || "$plat" == 'tvos' ]];then
         download_arch "$plat"
         extract "$plat"
-        fix_prefix "$plat"
         download_arch "$plat" "simulator"
         extract "$plat"
-        fix_prefix "$plat"
     else
         download_arch "$plat"
         extract "$plat"
-        fix_prefix "$plat"
     fi
 }