[vlc-devel] [PATCH v2 14/17] contrib: vpx: allow compiling without bitcode

[Alexandre Janniaux]

-fembed-bitcode might not be supported and we enable it through the
--extra-cflags parameters like every other contribs.
---
 contrib/src/vpx/libvpx-remove-bitcode.patch | 17 +++++++++++++++++
 contrib/src/vpx/rules.mak                   |  1 +
 2 files changed, 18 insertions(+)
 create mode 100644 contrib/src/vpx/libvpx-remove-bitcode.patch

diff --git a/contrib/src/vpx/libvpx-remove-bitcode.patch b/contrib/src/vpx/libvpx-remove-bitcode.patch
new file mode 100644
index 00000000000..80de6e5700b
--- /dev/null
+++ b/contrib/src/vpx/libvpx-remove-bitcode.patch
@@ -0,0 +1,17 @@
+diff --git a/build/make/configure.sh b/build/make/configure.sh
+index d05d0fa12..0ebf74039 100644
+--- a/build/make/configure.sh
++++ b/build/make/configure.sh
+@@ -1129,12 +1129,6 @@ EOF
+                 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 8576e27c6eb..439ee6ad372 100644
--- a/contrib/src/vpx/rules.mak
+++ b/contrib/src/vpx/rules.mak
@@ -21,6 +21,7 @@ ifdef HAVE_ANDROID
 	cp "${ANDROID_NDK}"/sources/android/cpufeatures/cpu-features.c $(UNPACK_DIR)/vpx_ports
 	cp "${ANDROID_NDK}"/sources/android/cpufeatures/cpu-features.h $(UNPACK_DIR)
 endif
+	$(APPLY) $(SRC)/vpx/libvpx-remove-bitcode.patch
 	$(MOVE)
 
 DEPS_vpx =
-- 
2.26.2