Skip to content

Commit f4f8498

Browse files
committed
compatible with clang15
1 parent 6697ee0 commit f4f8498

File tree

4 files changed

+22
-12
lines changed

4 files changed

+22
-12
lines changed

apple/do-compile/ffmpeg.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,9 @@ CFG_FLAGS="$CFG_FLAGS --enable-neon"
5757
CFG_FLAGS="$CFG_FLAGS --enable-asm"
5858

5959
C_FLAGS=
60-
C_FLAGS="$C_FLAGS -fno-stack-check -arch $XC_ARCH"
60+
# https://gitlab.gnome.org/GNOME/gimp/-/issues/8649
61+
# from clang 15 int <-> pointer conversions now defaults as an error
62+
C_FLAGS="$C_FLAGS -Wno-int-conversion -fno-stack-check -arch $XC_ARCH"
6163
C_FLAGS="$C_FLAGS $XC_DEPLOYMENT_TARGET $XC_OTHER_CFLAGS"
6264

6365
if [[ "$XC_OPTS" == "debug" ]]; then

apple/do-compile/libyuv.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ echo "----------------------"
5858
echo "[*] compile libyuv"
5959
echo "----------------------"
6060

61-
make -f linux.mk CC="$XCRUN_CC" CXX="$XCRUN_CXX" CFLAGS="$CFLAGS" CXXFLAGS="$CFLAGS" -j$THREAD_COUNT >/dev/null
61+
CC="$XCRUN_CC" CXX="$XCRUN_CXX" CFLAGS="$CFLAGS" CXXFLAGS="$CFLAGS" make -f linux.mk libyuv.a -j$THREAD_COUNT >/dev/null
6262

6363
mkdir -p "${XC_BUILD_PREFIX}/lib"
6464
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
@@ -81,5 +81,6 @@ echo "----------------------"
8181
echo "[*] compile $LIB_NAME"
8282
echo "----------------------"
8383
set +e
84-
make -j$THREAD_COUNT >/dev/null
85-
make install_sw >/dev/null
84+
85+
make build_libs -j$THREAD_COUNT >/dev/null
86+
make install_dev >/dev/null

tools/sync-lastest-private.sh

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ set -e
1212

1313
THIS_DIR=$(DIRNAME=$(dirname "$0"); cd "$DIRNAME"; pwd)
1414
cd "$THIS_DIR"
15-
cd ../build/extra
15+
16+
lib=$1
1617

1718
function update()
1819
{
@@ -27,13 +28,13 @@ function update()
2728
echo "$repo"
2829
git remote add github "$repo"
2930
fi
30-
31+
3132
echo '=== will pull all from github ==='
3233
git reset --hard
3334
git checkout master -B master
3435
git pull origin master
3536
git fetch github --tags
36-
37+
3738
echo '=== will push all branch to private ==='
3839
git push origin --tags
3940
git push origin --all
@@ -42,9 +43,15 @@ function update()
4243
cd -
4344
}
4445

45-
for i in $(ls);
46-
do
47-
update "$i"
48-
done;
46+
cd ../build/extra
47+
if [[ -z "$lib" ]];then
48+
for lib in $(ls);
49+
do
50+
update "$lib"
51+
done;
52+
else
53+
update "$lib"
54+
fi
55+
56+
4957

50-
# update bluray

0 commit comments

Comments
 (0)