Skip to content

Commit 75b2144

Browse files
committed
fix can't install tvos plat bug
1 parent 7e52d35 commit 75b2144

File tree

2 files changed

+11
-15
lines changed

2 files changed

+11
-15
lines changed

install-pre-any.sh

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424
# 当发布新版本库时,修改对应的 TAG 值
2525
#----------------------------------------------------------
2626
LIBYUV_TAG='libyuv-main-231127113441'
27-
OPUS_TAG='opus-1.4-231127183709'
28-
MAC_BLURAY_TAG='bluray-1.3.4-240528173418'
29-
DAV1D_TAG='dav1d-1.3.0-231127183948'
30-
OPENSSL_TAG='openssl-1.1.1w-231127183927'
31-
DVDREAD_TAG='dvdread-6.1.3-240108102425'
27+
OPUS_TAG='opus-1.4-240605102127'
28+
MAC_BLURAY_TAG='bluray-1.3.4-240605103055'
29+
DAV1D_TAG='dav1d-1.3.0-240605103034'
30+
OPENSSL_TAG='openssl-1.1.1w-240605103006'
31+
DVDREAD_TAG='dvdread-6.1.3-240605103023'
3232
FREETYPE_TAG='freetype-2.13.2-240320173506'
3333
UNIBREAK_TAG='unibreak-5.1-240604145913'
3434
FRIBIDI_TAG='fribidi-1.0.13-240320172504'
@@ -48,13 +48,7 @@ cd "$THIS_DIR"
4848
function install_lib ()
4949
{
5050
local plat=$1
51-
52-
if [[ "$plat" == 'ios' || "$plat" == 'macos' ]]; then
53-
./tools/install-pre-lib.sh "$plat" "$TAG"
54-
else
55-
./tools/install-pre-lib.sh 'ios' "$TAG"
56-
./tools/install-pre-lib.sh 'macos' "$TAG"
57-
fi
51+
./tools/install-pre-lib.sh "$plat" "$TAG"
5852
}
5953

6054
function usage() {
@@ -68,7 +62,7 @@ if [[ -z "$LIBS" || "$LIBS" == "all" ]]; then
6862
LIBS=$(ls init-cfgs)
6963
fi
7064

71-
if [[ "$PLAT" == 'ios' || "$PLAT" == 'macos' || "$PLAT" == 'all' ]]; then
65+
if [[ "$PLAT" == 'ios' || "$PLAT" == 'macos' || "$PLAT" == 'tvos'|| "$PLAT" == 'all' ]]; then
7266
for lib in $LIBS
7367
do
7468
plat=$PLAT

tools/install-pre-lib.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,13 @@ function install() {
100100
fix_prefix "$plat"
101101
else
102102
download_arch "$plat"
103+
extract "$plat"
104+
fix_prefix "$plat"
103105
fi
104106
}
105107

106-
if [[ "$PLAT" != 'ios' && "$PLAT" != 'macos' && "$PLAT" != 'all' ]]; then
107-
echo 'plat must use ios or macos'
108+
if [[ "$PLAT" != 'ios' && "$PLAT" != 'macos' && "$PLAT" != 'tvos' && "$PLAT" != 'all' ]]; then
109+
echo 'plat must use ios or macos or tvos'
108110
usage
109111
exit
110112
fi

0 commit comments

Comments
 (0)