Skip to content

Commit ab1bff4

Browse files
committed
update freetype fribidi harfbuzz ass
1 parent ab53507 commit ab1bff4

File tree

6 files changed

+27
-6
lines changed

6 files changed

+27
-6
lines changed

apple/compile-any.sh

Lines changed: 1 addition & 1 deletion
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|ffmpeg|libyuv|openssl|opus|bluray|dav1d|dvdread] [arm64|x86_64|all] [opts...]"
33+
echo " $0 [ios|macos] [build|rebuild|lipo|clean] [all|ffmpeg|libyuv|openssl|opus|bluray|dav1d|dvdread|freetype|fribidi|harfbuzz|ass|ffmpeg] [arm64|x86_64|all] [opts...]"
3434
}
3535

3636
if [[ "$PLAT" != 'ios' && "$PLAT" != 'macos' ]]; then

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 dvdread ffmpeg
1+
libyuv openssl opus bluray dav1d dvdread freetype fribidi harfbuzz ass ffmpeg

apple/do-compile/ass.sh

Lines changed: 20 additions & 1 deletion
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

@@ -56,6 +57,8 @@ else
5657
./autogen.sh 1>/dev/null
5758
fi
5859

60+
echo
61+
5962
MY_PKG_CONFIG_LIBDIR=''
6063
# with freetype
6164
if [[ -f "${XC_PRODUCT_ROOT}/freetype-$XC_ARCH/lib/pkgconfig/freetype2.pc" || -f "${XC_PRODUCT_ROOT}/universal/freetype/lib/pkgconfig/freetype2.pc" ]]; then
@@ -105,6 +108,22 @@ else
105108
echo "[*] --disable-harfbuzz"
106109
fi
107110

111+
# with unibreak
112+
if [[ -f "${XC_PRODUCT_ROOT}/unibreak-$XC_ARCH/lib/pkgconfig/libunibreak.pc" || -f "${XC_PRODUCT_ROOT}/universal/unibreak/lib/pkgconfig/libunibreak.pc" ]]; then
113+
echo "[*] --enable-unibreak"
114+
if [[ -n "$MY_PKG_CONFIG_LIBDIR" ]]; then
115+
MY_PKG_CONFIG_LIBDIR="$MY_PKG_CONFIG_LIBDIR:"
116+
fi
117+
118+
if [[ -f "${XC_PRODUCT_ROOT}/unibreak-$XC_ARCH/lib/pkgconfig/libunibreak.pc" ]]; then
119+
MY_PKG_CONFIG_LIBDIR="${MY_PKG_CONFIG_LIBDIR}${XC_PRODUCT_ROOT}/unibreak-$XC_ARCH/lib/pkgconfig"
120+
else
121+
MY_PKG_CONFIG_LIBDIR="${MY_PKG_CONFIG_LIBDIR}${XC_PRODUCT_ROOT}/universal/unibreak/lib/pkgconfig"
122+
fi
123+
else
124+
echo "[*] --disable-unibreak"
125+
fi
126+
108127
if [[ -n "$MY_PKG_CONFIG_LIBDIR" ]]; then
109128
export PKG_CONFIG_LIBDIR="$MY_PKG_CONFIG_LIBDIR"
110129
fi
@@ -126,4 +145,4 @@ echo "----------------------"
126145
echo "[*] compile $LIB_NAME"
127146
echo "----------------------"
128147

129-
make install -j8 1>/dev/null
148+
make install -j$THREAD_COUNT 1>/dev/null

apple/do-compile/freetype.sh

Lines changed: 2 additions & 1 deletion
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

@@ -69,4 +70,4 @@ echo "----------------------"
6970
echo "[*] compile $LIB_NAME"
7071
echo "----------------------"
7172

72-
make -j8 install 1>/dev/null
73+
make -j$THREAD_COUNT install 1>/dev/null

apple/do-compile/unibreak.sh

Lines changed: 2 additions & 1 deletion
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

@@ -68,4 +69,4 @@ echo "----------------------"
6869
echo "[*] compile $LIB_NAME"
6970
echo "----------------------"
7071

71-
make -j8 install 1>/dev/null
72+
make -j$THREAD_COUNT install 1>/dev/null

init-any.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ cd "$THIS_DIR"
3535
function usage()
3636
{
3737
echo " useage:"
38-
echo " $0 [ios,macos,all] [all|ffmpeg|libyuv|openssl|opus|bluray|dvdread|dav1d] [all,arm64,x86_64]"
38+
echo " $0 [ios,macos,all] [all|ffmpeg|libyuv|openssl|opus|bluray|dvdread|dav1d|freetype|fribidi|harfbuzz|ass|ffmpeg] [all,arm64,x86_64]"
3939
}
4040

4141
if [[ "$SKIP_PULL_BASE" ]];then

0 commit comments

Comments
 (0)