Skip to content

Commit 22f9291

Browse files
debuglydebugly
committed
restore ijk http hook and dns cache
1 parent 268f4cf commit 22f9291

30 files changed

+3997
-47
lines changed

‎README.md‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,13 @@ At present MRFFToolChain contained OpenSSL、FFmpeg 、libyuv、libopus、libblu
3030
│   └── module.sh -> module-full.sh
3131
├── init-any.sh #初始化源码仓库
3232
├── init-cfgs #三方库的配置，包括库名，git仓库地址等信息
33-
│   ├── ass
3433
│   ├── bluray
3534
│   ├── dav1d
35+
│   ├── dvdread
3636
│   ├── ffmpeg
37-
│   ├── freetype
38-
│   ├── fribidi
39-
│   ├── harfbuzz
4037
│   ├── libyuv
4138
│   ├── openssl
42-
│   ├── opus
43-
│   └── unibreak
39+
│   └── opus
4440
├── install-pre-any.sh #直接从github下载预编译好的lib
4541
├── ios #ios 平台编译脚本
4642
│   └── compile-any.sh

‎apple/compile-any.sh‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ cd "$THIS_DIR"
3030

3131
function usage() {
3232
echo " useage:"
33-
echo " $0 [ios|macos] [build|rebuild|lipo|clean] [all|fdk-aac|ffmpeg|lame|libyuv|openssl|opus|x264|bluray|ass|freetype|fribidi|harfbuzz|unibreak|dvdread] [arm64|x86_64|all] [opts...]"
33+
echo " $0 [ios|macos] [build|rebuild|lipo|clean] [all|ffmpeg|libyuv|openssl|opus|bluray|dav1d|dvdread] [arm64|x86_64|all] [opts...]"
3434
}
3535

3636
if [[ "$PLAT" != 'ios' && "$PLAT" != 'macos' ]]; then
@@ -83,6 +83,7 @@ echo "XC_OPTS : [$XC_OPTS]"
8383
echo "XC_FORCE_CROSS : [$XC_FORCE_CROSS]"
8484
echo '------------------------------------------'
8585

86+
START_STMP=$(date +%s)
8687
# 循环编译所有的库
8788
for lib in $LIBS
8889
do
@@ -96,4 +97,10 @@ do
9697
echo
9798
fi
9899
echo "===================================="
99-
done
100+
done
101+
102+
END_STMP=$(date +%s)
103+
take=$(( END_STMP - START_STMP ))
104+
echo time elapsed ${take} s.
105+
106+
echo "===================================="

‎apple/compile-cfgs/list.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
libyuv openssl opus bluray dav1d freetype harfbuzz fribidi unibreak ass dvdread ffmpeg
1+
libyuv openssl opus bluray dav1d dvdread ffmpeg

‎apple/do-compile/any.sh‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@ do_lipo_lib() {
4848
}
4949

5050
do_lipo_all() {
51+
echo '----------------------'
52+
echo '[*] lipo'
53+
5154
local archs="$1"
5255
rm -rf $XC_UNI_PROD_DIR/$LIB_NAME
5356
mkdir -p $XC_UNI_PROD_DIR/$LIB_NAME/lib
@@ -154,7 +157,7 @@ function main() {
154157
'rebuild')
155158
echo '---clean for rebuild-----------------'
156159
XC_CMD='clean'
157-
main 1>/dev/null
160+
main >/dev/null
158161
echo '---build for rebuild-----------------'
159162
XC_CMD='build'
160163
main

‎apple/do-compile/bluray.sh‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ env_assert "XC_BUILD_NAME"
2929
env_assert "XC_DEPLOYMENT_TARGET"
3030
env_assert "XCRUN_SDK_PATH"
3131
env_assert "XCRUN_CC"
32+
env_assert "THREAD_COUNT"
3233
echo "XC_OPTS:$XC_OPTS"
3334
echo "===check env end==="
3435

@@ -62,7 +63,7 @@ if [[ -f 'configure' ]]; then
6263
echo "reuse configure"
6364
else
6465
echo "auto generate configure"
65-
./bootstrap 1>/dev/null
66+
./bootstrap >/dev/null
6667
fi
6768

6869

@@ -76,14 +77,14 @@ echo
7677
CC="$XCRUN_CC" \
7778
CFLAGS="$CFLAGS" \
7879
LDFLAGS="$CFLAGS" \
79-
1>/dev/null
80+
>/dev/null
8081

8182
#----------------------
8283
echo "----------------------"
8384
echo "[*] compile $LIB_NAME"
8485
echo "----------------------"
8586

86-
make install -j8 1>/dev/null
87+
make install -j$THREAD_COUNT >/dev/null
8788
# system xml2 lib has no pc file,when compile ffmepg, pkg-config can't find the private xml2 lib
8889
echo "mv private xml lib to system"
8990

‎apple/do-compile/dvdread.sh‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ env_assert "XC_BUILD_NAME"
2929
env_assert "XC_DEPLOYMENT_TARGET"
3030
env_assert "XCRUN_SDK_PATH"
3131
env_assert "XCRUN_CC"
32+
env_assert "THREAD_COUNT"
3233
echo "XC_OPTS:$XC_OPTS"
3334
echo "===check env end==="
3435

@@ -58,7 +59,7 @@ if [[ -f 'configure' ]]; then
5859
echo "reuse configure"
5960
else
6061
echo "auto generate configure"
61-
autoreconf -if 1>/dev/null
62+
autoreconf -if >/dev/null
6263
fi
6364

6465

@@ -72,11 +73,11 @@ echo
7273
CC="$XCRUN_CC" \
7374
CFLAGS="$CFLAGS" \
7475
LDFLAGS="$CFLAGS" \
75-
1>/dev/null
76+
>/dev/null
7677

7778
#----------------------
7879
echo "----------------------"
7980
echo "[*] compile $LIB_NAME"
8081
echo "----------------------"
8182

82-
make install -j8 1>/dev/null
83+
make install -j$THREAD_COUNT >/dev/null

‎apple/do-compile/ffmpeg.sh‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ env_assert "XC_BUILD_SOURCE"
3232
env_assert "XC_BUILD_PREFIX"
3333
env_assert "XC_DEPLOYMENT_TARGET"
3434
env_assert "XCRUN_CC"
35+
env_assert "THREAD_COUNT"
3536
echo "XC_OPTS:$XC_OPTS"
3637
echo "===check env end==="
3738

@@ -329,13 +330,13 @@ fi
329330
echo "----------------------"
330331
echo "[*] compile"
331332

332-
make
333+
make -j$THREAD_COUNT >/dev/null
333334

334335
echo "----------------------"
335336
echo "[*] install"
336337

337338
cp config.* $XC_BUILD_PREFIX
338-
make install -j8 1>/dev/null
339+
make install >/dev/null
339340
mkdir -p $XC_BUILD_PREFIX/include/libffmpeg
340341
cp -f config.h $XC_BUILD_PREFIX/include/libffmpeg/config.h
341342
# copy private header.

‎apple/do-compile/libyuv.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ env_assert "XC_BUILD_NAME"
2727
env_assert "XC_DEPLOYMENT_TARGET"
2828
env_assert "XCRUN_SDK_PATH"
2929
env_assert "XC_BUILD_PREFIX"
30+
env_assert "THREAD_COUNT"
3031
echo "XC_OPTS:$XC_OPTS"
3132
echo "===check env end==="
3233

@@ -57,7 +58,7 @@ echo "----------------------"
5758
echo "[*] compile libyuv"
5859
echo "----------------------"
5960

60-
make -f linux.mk CC="$XCRUN_CC" CXX="$XCRUN_CXX" CFLAGS="$CFLAGS" CXXFLAGS="$CFLAGS" 1>/dev/null
61+
make -f linux.mk CC="$XCRUN_CC" CXX="$XCRUN_CXX" CFLAGS="$CFLAGS" CXXFLAGS="$CFLAGS" -j$THREAD_COUNT >/dev/null
6162

6263
mkdir -p "${XC_BUILD_PREFIX}/lib"
6364
cp libyuv.a "${XC_BUILD_PREFIX}/lib"

‎apple/do-compile/openssl.sh‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ env_assert "XC_BUILD_PREFIX"
3131
env_assert "XC_BUILD_NAME"
3232
env_assert "XC_DEPLOYMENT_TARGET"
3333
env_assert "XCRUN_SDK_PATH"
34+
env_assert "THREAD_COUNT"
3435
echo "XC_OPTS:$XC_OPTS"
3536
echo "===check env end==="
3637

@@ -80,5 +81,5 @@ echo "----------------------"
8081
echo "[*] compile $LIB_NAME"
8182
echo "----------------------"
8283
set +e
83-
make 1>/dev/null
84-
make install_sw 1>/dev/null
84+
make -j$THREAD_COUNT >/dev/null
85+
make install_sw >/dev/null

‎apple/do-compile/opus.sh‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ env_assert "XC_BUILD_NAME"
2828
env_assert "XC_DEPLOYMENT_TARGET"
2929
env_assert "XCRUN_SDK_PATH"
3030
env_assert "XCRUN_CC"
31+
env_assert "THREAD_COUNT"
3132
echo "XC_OPTS:$XC_OPTS"
3233
echo "===check env end==="
3334

@@ -53,7 +54,7 @@ if [[ -f 'configure' ]]; then
5354
echo "reuse configure"
5455
else
5556
echo "auto generate configure"
56-
./autogen.sh 1>/dev/null
57+
./autogen.sh >/dev/null
5758
fi
5859

5960

@@ -67,11 +68,11 @@ echo
6768
CC="$XCRUN_CC" \
6869
CFLAGS="$CFLAGS" \
6970
LDFLAGS="$CFLAGS" \
70-
1>/dev/null
71+
>/dev/null
7172

7273
#----------------------
7374
echo "----------------------"
7475
echo "[*] compile $LIB_NAME"
7576
echo "----------------------"
7677

77-
make install -j8 1>/dev/null
78+
make install -j$THREAD_COUNT >/dev/null

0 commit comments

Comments
 (0)