bluray needn't fix pc file

Author: debugly

configs/ffconfig/auto-detect-third-libs.sh

@@ -174,10 +174,6 @@ THIRD_CFG_FLAGS="--prefix=$MR_BUILD_PREFIX $THIRD_CFG_FLAGS"
 # Developer options (useful when working on FFmpeg itself):
 # THIRD_CFG_FLAGS="$THIRD_CFG_FLAGS --disable-stripping"
 
-##
-THIRD_CFG_FLAGS="$THIRD_CFG_FLAGS --arch=$MR_FF_ARCH"
-THIRD_CFG_FLAGS="$THIRD_CFG_FLAGS --target-os=$MR_TAGET_OS"
-
 # x86_64, arm64
 THIRD_CFG_FLAGS="$THIRD_CFG_FLAGS --enable-pic"
 THIRD_CFG_FLAGS="$THIRD_CFG_FLAGS --enable-neon"
@@ -194,6 +190,10 @@ else
     THIRD_CFG_FLAGS="$THIRD_CFG_FLAGS --enable-small"
 fi
 
+##
+THIRD_CFG_FLAGS="$THIRD_CFG_FLAGS --arch=$MR_FF_ARCH"
+THIRD_CFG_FLAGS="$THIRD_CFG_FLAGS --target-os=$MR_TAGET_OS"
+
 # for cross compile
 if [[ $(uname -m) != "$MR_ARCH" || "$MR_FORCE_CROSS" ]]; then
     echo "[*] cross compile, on $(uname -m) compile $MR_PLAT $MR_ARCH."

do-compile/android/bluray.sh

@@ -61,10 +61,6 @@ echo "----------------------"
 echo "[*] configurate $LIB_NAME"
 echo "----------------------"
 
-# # use system xml2 lib
-# export LIBXML2_CFLAGS=$(xml2-config --prefix=${MR_SYS_ROOT}/usr --cflags)
-# export LIBXML2_LIBS=$(xml2-config --prefix=${MR_SYS_ROOT}/usr --libs)
-
 cd $MR_BUILD_SOURCE
 
 if [[ -f 'configure' ]]; then

do-compile/android/ffmpeg.sh

@@ -45,8 +45,7 @@ CFG_FLAGS="$CFG_FLAGS $THIRD_CFG_FLAGS"
 
 # Android 15 with 16 kb page size support
 # https://developer.android.com/guide/practices/page-sizes#compile-r27
-# EXTRA_LDFLAGS="-Wl,-z,max-page-size=16384 -fuse-ld=lld"
-EXTRA_LDFLAGS=
+EXTRA_LDFLAGS="-Wl,-z,max-page-size=16384"
 C_FLAGS="$C_FLAGS $MR_OTHER_CFLAGS"
 LDFLAGS="$C_FLAGS $EXTRA_LDFLAGS"
 

do-compile/apple/bluray.sh

@@ -93,13 +93,13 @@ echo "----------------------"
 
 make install -j$MR_HOST_NPROC
 # system xml2 lib has no pc file,when compile ffmepg, pkg-config can't find the private xml2 lib
-echo "mv private xml lib to system"
-
-pc_file="$MR_BUILD_PREFIX/lib/pkgconfig/libbluray.pc"
+# echo "mv private xml lib to system"
+# 
+# pc_file="$MR_BUILD_PREFIX/lib/pkgconfig/libbluray.pc"
 # rm line 'Requires.private'
-sed -i "" '/Requires.private/d' "$pc_file"
-# find line number
-n=$(grep -n 'Libs.private' "$pc_file" | cut -d: -f1)
-xml_lib=$(echo $(xml2-config --libs) | awk '{len=split($0,a," "); for(n=2;n<=len;n++)printf " %s",a[n]}')
-# line n append " -lxml2 -lz -lpthread -licucore -lm"
-sed -i "" "$n s/$/&$xml_lib/" "$pc_file"
+# sed -i "" '/Requires.private/d' "$pc_file"
+# # find line number
+# n=$(grep -n 'Libs.private' "$pc_file" | cut -d: -f1)
+# xml_lib=$(echo $(xml2-config --libs) | awk '{len=split($0,a," "); for(n=2;n<=len;n++)printf " %s",a[n]}')
+# # line n append " -lxml2 -lz -lpthread -licucore -lm"
+# sed -i "" "$n s/$/&$xml_lib/" "$pc_file"

do-compile/apple/ffmpeg.sh

@@ -42,8 +42,8 @@ CFG_FLAGS="$CFG_FLAGS --enable-demuxer=dash --enable-libxml2"
 C_FLAGS="$MR_OTHER_CFLAGS -arch $MR_FF_ARCH"
 # C_FLAGS="$C_FLAGS -I/Users/matt/GitWorkspace/MoltenVK/Package/Release/MoltenVK/include"
 # use system xml2 lib
-C_FLAGS="$C_FLAGS $(xml2-config --prefix=${MR_SYS_ROOT}/usr --cflags)"
-LDFLAGS="$C_FLAGS $(xml2-config --prefix=${MR_SYS_ROOT}/usr --libs)"
+# C_FLAGS="$C_FLAGS $(xml2-config --prefix=${MR_SYS_ROOT}/usr --cflags)"
+# LDFLAGS="$C_FLAGS $(xml2-config --prefix=${MR_SYS_ROOT}/usr --libs)"
 
 # LDFLAGS="$LDFLAGS -framework IOKit -framework Metal -framework IOSurface -framework CoreGraphics -framework QuartzCore -framework AppKit -framework Foundation -lc++ /Users/matt/GitWorkspace/MoltenVK/Package/Release/MoltenVK/static/MoltenVK.xcframework/macos-arm64_x86_64/libMoltenVK.a"
 echo "----------------------"