Skip to content

Commit c53bca7

Browse files
debuglydebugly
committed
fix CFLAGS
1 parent 1f7d716 commit c53bca7

File tree

17 files changed

+70
-145
lines changed

17 files changed

+70
-145
lines changed

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

Lines changed: 41 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -24,38 +24,38 @@
2424

2525
THIRD_CFG_FLAGS=
2626

27-
echo "----------------------"
27+
# echo "----------------------"
2828

29-
pkg-config --libs x264 --silence-errors >/dev/null && enable_x264=1
29+
# pkg-config --libs x264 --silence-errors >/dev/null && enable_x264=1
3030

31-
if [[ $enable_x264 ]];then
32-
echo "[✅] --enable-libx264 : $(pkg-config --modversion x264)"
33-
THIRD_CFG_FLAGS="$THIRD_CFG_FLAGS --enable-gpl --enable-libx264"
34-
else
35-
echo "[❌] --disable-libx264"
36-
fi
31+
# if [[ $enable_x264 ]];then
32+
# echo "[✅] --enable-libx264 : $(pkg-config --modversion x264)"
33+
# THIRD_CFG_FLAGS="$THIRD_CFG_FLAGS --enable-gpl --enable-libx264"
34+
# else
35+
# echo "[❌] --disable-libx264"
36+
# fi
3737

38-
echo "----------------------"
38+
# echo "----------------------"
3939

40-
pkg-config --libs fdk-aac --silence-errors >/dev/null && enable_aac=1
40+
# pkg-config --libs fdk-aac --silence-errors >/dev/null && enable_aac=1
4141

42-
if [[ $enable_aac ]];then
43-
echo "[✅] --enable-libfdk-aac : $(pkg-config --modversion fdk-aac)"
44-
THIRD_CFG_FLAGS="$THIRD_CFG_FLAGS --enable-nonfree --enable-libfdk-aac"
45-
else
46-
echo "[❌] --disable-libfdk-aac"
47-
fi
42+
# if [[ $enable_aac ]];then
43+
# echo "[✅] --enable-libfdk-aac : $(pkg-config --modversion fdk-aac)"
44+
# THIRD_CFG_FLAGS="$THIRD_CFG_FLAGS --enable-nonfree --enable-libfdk-aac"
45+
# else
46+
# echo "[❌] --disable-libfdk-aac"
47+
# fi
4848

49-
echo "----------------------"
49+
# echo "----------------------"
5050

51-
pkg-config --libs mp3lame --silence-errors >/dev/null && enable_lame=1
51+
# pkg-config --libs mp3lame --silence-errors >/dev/null && enable_lame=1
5252

53-
if [[ $enable_lame ]];then
54-
echo "[✅] --enable-libmp3lame : $(pkg-config --modversion mp3lame)"
55-
THIRD_CFG_FLAGS="$THIRD_CFG_FLAGS --enable-gpl --enable-libmp3lame"
56-
else
57-
echo "[❌] --disable-libmp3lame"
58-
fi
53+
# if [[ $enable_lame ]];then
54+
# echo "[✅] --enable-libmp3lame : $(pkg-config --modversion mp3lame)"
55+
# THIRD_CFG_FLAGS="$THIRD_CFG_FLAGS --enable-gpl --enable-libmp3lame"
56+
# else
57+
# echo "[❌] --disable-libmp3lame"
58+
# fi
5959

6060
echo "----------------------"
6161
# use pkg-config fix ff4.0--ijk0.8.8--20210426--001 use openssl 1_1_1m occur can't find openssl error.
@@ -77,7 +77,7 @@ if [[ $enable_opus ]];then
7777
echo "[✅] --enable-libopus : $(pkg-config --modversion opus)"
7878
THIRD_CFG_FLAGS="$THIRD_CFG_FLAGS --enable-libopus --enable-decoder=opus"
7979
else
80-
echo "[❌] --disable-libopus"
80+
echo "[❌] --disable-libopus --disable-decoder=opus"
8181
fi
8282

8383
echo "----------------------"
@@ -92,7 +92,7 @@ if [[ $enable_dav1d ]];then
9292
echo "[✅] --enable-libdav1d : $(pkg-config --modversion dav1d)"
9393
THIRD_CFG_FLAGS="$THIRD_CFG_FLAGS --enable-libdav1d --enable-decoder=libdav1d"
9494
else
95-
echo "[❌] --disable-libdav1d"
95+
echo "[❌] --disable-libdav1d --disable-decoder=libdav1d"
9696
fi
9797

9898
echo "----------------------"
@@ -103,7 +103,7 @@ if [[ $enable_smb2 ]];then
103103
echo "[✅] --enable-libsmb2 : $(pkg-config --modversion libsmb2)"
104104
THIRD_CFG_FLAGS="$THIRD_CFG_FLAGS --enable-libsmb2 --enable-protocol=libsmb2"
105105
else
106-
echo "[❌] --disable-libsmb2"
106+
echo "[❌] --disable-libsmb2 --disable-protocol=libsmb2"
107107
fi
108108

109109
echo "----------------------"
@@ -114,7 +114,7 @@ if [[ $enable_bluray ]];then
114114
echo "[✅] --enable-libbluray : $(pkg-config --modversion libbluray)"
115115
THIRD_CFG_FLAGS="$THIRD_CFG_FLAGS --enable-libbluray --enable-protocol=bluray"
116116
else
117-
echo "[❌] --disable-libbluray"
117+
echo "[❌] --disable-libbluray --disable-protocol=bluray"
118118
fi
119119
echo "----------------------"
120120

@@ -124,7 +124,7 @@ if [[ $enable_dvdread ]];then
124124
echo "[✅] --enable-libdvdread : $(pkg-config --modversion dvdread)"
125125
THIRD_CFG_FLAGS="$THIRD_CFG_FLAGS --enable-libdvdread --enable-protocol=dvd"
126126
else
127-
echo "[❌] --disable-libdvdread"
127+
echo "[❌] --disable-libdvdread --disable-protocol=dvd"
128128
fi
129129

130130
echo "----------------------"
@@ -135,7 +135,18 @@ if [[ $enable_uavs3d ]];then
135135
echo "[✅] --enable-libuavs3d : $(pkg-config --modversion uavs3d)"
136136
THIRD_CFG_FLAGS="$THIRD_CFG_FLAGS --enable-libuavs3d --enable-decoder=libuavs3d"
137137
else
138-
echo "[❌] --disable-libuavs3d"
138+
echo "[❌] --disable-libuavs3d --disable-decoder=libuavs3d"
139+
fi
140+
141+
echo "----------------------"
142+
143+
pkg-config --libs libxml-2.0 --silence-errors >/dev/null && enable_xml2=1
144+
145+
if [[ $enable_xml2 ]];then
146+
echo "[✅] --enable-libxml2 : $(pkg-config --modversion libxml-2.0)"
147+
THIRD_CFG_FLAGS="$THIRD_CFG_FLAGS --enable-demuxer=dash --enable-libxml2"
148+
else
149+
echo "[❌] --disable-demuxer=dash --disable-libxml2"
139150
fi
140151

141152
echo "----------------------"

‎do-compile/android/bluray.sh‎

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -20,29 +20,9 @@ set -e
2020
THIS_DIR=$(DIRNAME=$(dirname "$0"); cd "$DIRNAME"; pwd)
2121
cd "$THIS_DIR"
2222

23-
echo "=== [$0] check env begin==="
24-
env_assert "MR_ARCH"
25-
env_assert "MR_PLAT"
26-
env_assert "MR_BUILD_NAME"
27-
env_assert "MR_CC"
28-
env_assert "MR_BUILD_SOURCE"
29-
env_assert "MR_BUILD_PREFIX"
30-
env_assert "MR_SYS_ROOT"
31-
env_assert "MR_HOST_NPROC"
32-
echo "MR_DEBUG:$MR_DEBUG"
33-
echo "MR_FORCE_CROSS:$MR_FORCE_CROSS"
34-
echo "MR_OTHER_CFLAGS:$MR_OTHER_CFLAGS"
35-
echo "===check env end==="
36-
37-
if [[ "$MR_DEBUG" == "debug" ]];then
38-
export MR_OTHER_CFLAGS="${MR_OTHER_CFLAGS} -g"
39-
else
40-
export MR_OTHER_CFLAGS="${MR_OTHER_CFLAGS} -Os"
41-
fi
42-
4323
# prepare build config
4424
CFG_FLAGS="--prefix=$MR_BUILD_PREFIX --with-pic --disable-shared --disable-dependency-tracking --disable-silent-rules --disable-bdjava-jar --without-freetype --without-fontconfig --disable-doxygen-doc --disable-examples"
45-
CFLAGS="$MR_OTHER_CFLAGS"
25+
CFLAGS="$MR_DEFAULT_CFLAGS"
4626

4727
if [[ "$MR_DEBUG" == "debug" ]];then
4828
CFG_FLAGS="${CFG_FLAGS} use_examples=yes --disable-optimizations"

‎do-compile/android/dvdread.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ cd "$THIS_DIR"
2222

2323
# prepare build config
2424
CFG_FLAGS="--prefix=$MR_BUILD_PREFIX --disable-dependency-tracking --disable-silent-rules --disable-apidoc --enable-static --disable-shared"
25-
CFLAGS="$MR_OTHER_CFLAGS"
25+
CFLAGS="$MR_DEFAULT_CFLAGS"
2626

2727
if [[ "$MR_DEBUG" == "debug" ]];then
2828
CFG_FLAGS="${CFG_FLAGS} use_examples=yes"

‎do-compile/android/ffmpeg.sh‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,12 @@ source $MR_SHELL_CONFIGS_DIR/ffconfig/auto-detect-third-libs.sh
3737
CFG_FLAGS=
3838
CFG_FLAGS="$CFG_FLAGS $COMMON_FF_CFG_FLAGS"
3939
CFG_FLAGS="$CFG_FLAGS $THIRD_CFG_FLAGS"
40-
# CFG_FLAGS="$CFG_FLAGS --enable-demuxer=dash --enable-libxml2"
41-
# # use system xml2 lib
42-
# XML_CFLAGS=
43-
# C_FLAGS="$C_FLAGS $XML_CFLAGS"
44-
# LDFLAGS="$XML_CFLAGS -L${MR_TOOLCHAIN_ROOT}/lib -lxml2"
40+
CFG_FLAGS="$CFG_FLAGS --enable-demuxer=dash --enable-libxml2"
4541

4642
# Android 15 with 16 kb page size support
4743
# https://developer.android.com/guide/practices/page-sizes#compile-r27
4844
EXTRA_LDFLAGS="-Wl,-z,max-page-size=16384"
49-
C_FLAGS="$C_FLAGS $MR_OTHER_CFLAGS"
45+
C_FLAGS="$C_FLAGS $MR_DEFAULT_CFLAGS"
5046
LDFLAGS="$C_FLAGS $EXTRA_LDFLAGS"
5147

5248

‎do-compile/android/openssl.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ CFG_FLAGS="no-threads enable-tls1_3 no-comp no-zlib no-zlib-dynamic no-deprecate
5454
$target"
5555

5656
# -arch $MR_ARCH
57-
C_FLAGS="$MR_OTHER_CFLAGS"
57+
C_FLAGS="$MR_DEFAULT_CFLAGS"
5858

5959
cd $MR_BUILD_SOURCE
6060
if [ -f "./Makefile" ]; then

‎do-compile/android/unibreak.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ THIS_DIR=$(DIRNAME=$(dirname "$0"); cd "$DIRNAME"; pwd)
2121
cd "$THIS_DIR"
2222

2323
CFG_FLAGS="--prefix=$MR_BUILD_PREFIX --enable-static --disable-shared --silent"
24-
CFLAGS="$MR_OTHER_CFLAGS"
24+
CFLAGS="$MR_DEFAULT_CFLAGS"
2525

2626
# for cross compile
2727
if [[ $(uname -m) != "$MR_ARCH" || "$MR_FORCE_CROSS" ]];then

‎do-compile/android/xml2.sh‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,7 @@
1919
# ./cmake-compatible.sh "-DBUILD_SHARED_LIBS=0 -DLIBXML2_WITH_PROGRAMS=0 -DLIBXML2_WITH_ZLIB=1 -DLIBXML2_WITH_PYTHON=0 -DLIBXML2_WITH_ICONV=1"
2020

2121

22-
if [[ "$MR_DEBUG" == "debug" ]];then
23-
export MR_OTHER_CFLAGS="${MR_OTHER_CFLAGS} -g"
24-
else
25-
export MR_OTHER_CFLAGS="${MR_OTHER_CFLAGS} -Os"
26-
fi
27-
28-
CFLAGS="$MR_OTHER_CFLAGS"
22+
CFLAGS="$MR_DEFAULT_CFLAGS"
2923

3024
# prepare build config
3125
CFG_FLAGS="--prefix=$MR_BUILD_PREFIX"

‎do-compile/apple/any.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,6 @@ function main() {
191191
source $MR_SHELL_TOOLS_DIR/export-apple-build-env.sh
192192
do_clean $arch
193193
done
194-
195194
rm -rf $MR_UNI_PROD_DIR/$LIB_NAME
196195
;;
197196
'lipo')

‎do-compile/apple/bluray.sh‎

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -20,29 +20,9 @@ set -e
2020
THIS_DIR=$(DIRNAME=$(dirname "$0"); cd "$DIRNAME"; pwd)
2121
cd "$THIS_DIR"
2222

23-
echo "=== [$0] check env begin==="
24-
env_assert "MR_ARCH"
25-
env_assert "MR_PLAT"
26-
env_assert "MR_BUILD_NAME"
27-
env_assert "MR_CC"
28-
env_assert "MR_BUILD_SOURCE"
29-
env_assert "MR_BUILD_PREFIX"
30-
env_assert "MR_SYS_ROOT"
31-
env_assert "MR_HOST_NPROC"
32-
echo "MR_DEBUG:$MR_DEBUG"
33-
echo "MR_FORCE_CROSS:$MR_FORCE_CROSS"
34-
echo "MR_OTHER_CFLAGS:$MR_OTHER_CFLAGS"
35-
echo "===check env end==="
36-
37-
if [[ "$MR_DEBUG" == "debug" ]];then
38-
export MR_OTHER_CFLAGS="${MR_OTHER_CFLAGS} -g"
39-
else
40-
export MR_OTHER_CFLAGS="${MR_OTHER_CFLAGS} -Os"
41-
fi
42-
4323
# prepare build config
4424
CFG_FLAGS="--prefix=$MR_BUILD_PREFIX --disable-shared --disable-dependency-tracking --disable-silent-rules --disable-bdjava-jar --without-freetype --without-fontconfig --disable-doxygen-doc --disable-examples"
45-
CFLAGS="-arch $MR_ARCH $MR_OTHER_CFLAGS"
25+
CFLAGS="$MR_DEFAULT_CFLAGS"
4626

4727
if [[ "$MR_DEBUG" == "debug" ]];then
4828
CFG_FLAGS="${CFG_FLAGS} use_examples=yes --disable-optimizations"

‎do-compile/apple/dvdread.sh‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,9 @@ set -e
2020
THIS_DIR=$(DIRNAME=$(dirname "$0"); cd "$DIRNAME"; pwd)
2121
cd "$THIS_DIR"
2222

23-
echo "=== [$0] check env begin==="
24-
env_assert "MR_ARCH"
25-
env_assert "MR_BUILD_NAME"
26-
env_assert "MR_CC"
27-
env_assert "MR_BUILD_SOURCE"
28-
env_assert "MR_BUILD_PREFIX"
29-
env_assert "MR_SYS_ROOT"
30-
env_assert "MR_HOST_NPROC"
31-
echo "MR_DEBUG:$MR_DEBUG"
32-
echo "===check env end==="
33-
3423
# prepare build config
3524
CFG_FLAGS="--prefix=$MR_BUILD_PREFIX --disable-dependency-tracking --disable-silent-rules --disable-apidoc --enable-static --disable-shared"
36-
CFLAGS="-arch $MR_ARCH $MR_OTHER_CFLAGS"
25+
CFLAGS="$MR_DEFAULT_CFLAGS"
3726

3827
if [[ "$MR_DEBUG" == "debug" ]];then
3928
CFG_FLAGS="${CFG_FLAGS} use_examples=yes"

0 commit comments

Comments
 (0)