vlc/vlc-3.0 | branch: master | Felix Paul Kühne <fe...@feepk.net> | Mon Nov 30 18:17:00 2020 +0100| [7a5400bcb5031cd1f0b9298116f55bd0fe5540c3] | committer: Felix Paul Kühne
contrib/vpx: update iOS patch to manually toggle bitcode support Slightly change build rules to fix cross-compilation on macOS > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=7a5400bcb5031cd1f0b9298116f55bd0fe5540c3 --- contrib/src/vpx/libvpx-ios.patch | 19 ++++++++++++++++--- contrib/src/vpx/rules.mak | 13 +++---------- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/contrib/src/vpx/libvpx-ios.patch b/contrib/src/vpx/libvpx-ios.patch index 909d0be917..f24f2b9edb 100644 --- a/contrib/src/vpx/libvpx-ios.patch +++ b/contrib/src/vpx/libvpx-ios.patch @@ -1,6 +1,6 @@ -diff -ruw libvpx-1.9.0.orig/build/make/configure.sh libvpx-1.9.0/build/make/configure.sh ---- libvpx-1.9.0.orig/build/make/configure.sh 2020-07-30 15:59:15.000000000 -0400 -+++ libvpx-1.9.0/build/make/configure.sh 2020-09-01 09:32:08.722717206 -0400 +diff -ru libvpx-1.9.0/build/make/configure.sh libvpx-1.9.0/build/make/configure.sh +--- libvpx-1.9.0/build/make/configure.sh 2020-07-30 21:59:15.000000000 +0200 ++++ libvpx-1.9.0/build/make/configure.sh 2020-11-29 18:05:12.000000000 +0100 @@ -832,96 +832,6 @@ # PIC is probably what we want when building shared libs enabled shared && soft_enable pic @@ -111,3 +111,16 @@ diff -ruw libvpx-1.9.0.orig/build/make/configure.sh libvpx-1.9.0/build/make/conf for d in lib usr/lib usr/lib/system; do try_dir="${alt_libc}/${d}" [ -d "${try_dir}" ] && add_ldflags -L"${try_dir}" +@@ -1133,12 +1037,6 @@ + fi + ;; + esac +- +- if [ "$(show_darwin_sdk_major_version iphoneos)" -gt 8 ]; then +- check_add_cflags -fembed-bitcode +- check_add_asflags -fembed-bitcode +- check_add_ldflags -fembed-bitcode +- fi + fi + + asm_conversion_cmd="${source_path}/build/make/ads2gas_apple.pl" diff --git a/contrib/src/vpx/rules.mak b/contrib/src/vpx/rules.mak index c1db45ffb7..0dc62d7610 100644 --- a/contrib/src/vpx/rules.mak +++ b/contrib/src/vpx/rules.mak @@ -127,24 +127,17 @@ VPX_CONF += --enable-pic else VPX_CONF += --extra-cflags="-mstackrealign" endif -ifdef HAVE_MACOSX -VPX_CONF += --extra-cflags="$(CFLAGS) $(EXTRA_CFLAGS)" -endif -ifdef HAVE_IOS +ifdef HAVE_DARWIN_OS VPX_CONF += --enable-vp8-decoder --disable-tools VPX_CONF += --extra-cflags="$(CFLAGS) $(EXTRA_CFLAGS)" +ifdef HAVE_IOS ifdef HAVE_TVOS VPX_LDFLAGS := -L$(IOS_SDK)/usr/lib -isysroot $(IOS_SDK) -mtvos-version-min=9.0 else VPX_LDFLAGS := -L$(IOS_SDK)/usr/lib -isysroot $(IOS_SDK) -miphoneos-version-min=8.4 endif -ifeq ($(ARCH),aarch64) -VPX_LDFLAGS += -arch arm64 -else -ifndef HAVE_IOS -VPX_LDFLAGS += -arch $(ARCH) -endif endif +VPX_LDFLAGS += -arch $(PLATFORM_SHORT_ARCH) endif ifneq ($(filter i386 x86_64,$(ARCH)),) _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
