From b49218d274385a5b130cdf33197ef50d99436d54 Mon Sep 17 00:00:00 2001 From: Taner Sener Date: Thu, 13 Jan 2022 20:37:06 +0000 Subject: [PATCH 1/2] do not link against the system libexpat library, fixes #316 --- scripts/apple/ffmpeg.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/apple/ffmpeg.sh b/scripts/apple/ffmpeg.sh index 7142f69..990e922 100755 --- a/scripts/apple/ffmpeg.sh +++ b/scripts/apple/ffmpeg.sh @@ -99,6 +99,7 @@ x86-64-mac-catalyst) esac CONFIGURE_POSTFIX="" +HIGH_PRIORITY_LDFLAGS="" # SET CONFIGURE OPTIONS for library in {0..61}; do @@ -294,6 +295,7 @@ for library in {0..61}; do expat) FFMPEG_CFLAGS+=" $(pkg-config --cflags expat 2>>"${BASEDIR}"/build.log)" FFMPEG_LDFLAGS+=" $(pkg-config --libs --static expat 2>>"${BASEDIR}"/build.log)" + HIGH_PRIORITY_LDFLAGS+=" $(pkg-config --libs --static expat 2>>"${BASEDIR}"/build.log)" ;; libogg) FFMPEG_CFLAGS+=" $(pkg-config --cflags ogg 2>>"${BASEDIR}"/build.log)" @@ -449,7 +451,7 @@ COMMON_LDFLAGS=$(get_common_ldflags) # UPDATE BUILD FLAGS export CFLAGS="${ARCH_CFLAGS} ${APP_CFLAGS} ${COMMON_CFLAGS} ${OPTIMIZATION_CFLAGS} ${MIN_VERSION_CFLAGS}${FFMPEG_CFLAGS} ${COMMON_INCLUDES}" export CXXFLAGS=$(get_cxxflags "${LIB_NAME}") -export LDFLAGS="${ARCH_LDFLAGS}${FFMPEG_LDFLAGS} ${LINKED_LIBRARIES} ${COMMON_LDFLAGS} ${BITCODE_FLAGS} ${OPTIMIZATION_FLAGS}" +export LDFLAGS="${ARCH_LDFLAGS}${HIGH_PRIORITY_LDFLAGS}${FFMPEG_LDFLAGS} ${LINKED_LIBRARIES} ${COMMON_LDFLAGS} ${BITCODE_FLAGS} ${OPTIMIZATION_FLAGS}" echo -n -e "\n${LIB_NAME}: " From 0eec6baa15de3a67b105c5fd91b41f7de53f6e60 Mon Sep 17 00:00:00 2001 From: Taner Sener Date: Fri, 14 Jan 2022 18:33:14 +0000 Subject: [PATCH 2/2] update the release date of 4.5.1 for Apple --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8949e56..76c6454 100644 --- a/README.md +++ b/README.md @@ -123,7 +123,7 @@ indicates that `FFmpeg` source code is cloned from the `FFmpeg` `master` branch. | Flutter | [4.5.1](https://github.com/tanersener/ffmpeg-kit/releases/tag/flutter.v4.5.1) | 4.5-dev-3393 | Jan 02, 2022 | | React Native | [4.5.1](https://github.com/tanersener/ffmpeg-kit/releases/tag/react.native.v4.5.1) | 4.5-dev-3393 | Jan 02, 2022 | | Android | [4.5.1](https://github.com/tanersener/ffmpeg-kit/releases/tag/v4.5.1) | 4.5-dev-3393 | Jan 01, 2022 | -| Apple | [4.5.1](https://github.com/tanersener/ffmpeg-kit/releases/tag/v4.5.1) | 4.5-dev-3393 | Dec 30, 2021 | +| Apple | [4.5.1](https://github.com/tanersener/ffmpeg-kit/releases/tag/v4.5.1) | 4.5-dev-3393 | Jan 14, 2022 | | Flutter | [4.5.0](https://github.com/tanersener/ffmpeg-kit/releases/tag/flutter.v4.5.0) | 4.5-dev-2008 | Oct 05, 2021 | | React Native | [4.5.0](https://github.com/tanersener/ffmpeg-kit/releases/tag/react.native.v4.5.0) | 4.5-dev-2008 | Oct 01, 2021 | | Android
Apple | [4.5](https://github.com/tanersener/ffmpeg-kit/releases/tag/v4.5) | 4.5-dev-2008 | Sep 18, 2021 |