[vlc-commits] Contribs: update libvpx to 1.6.0
Jean-Baptiste Kempf
git at videolan.org
Sun Aug 7 11:48:22 CEST 2016
vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Aug 7 11:47:09 2016 +0200| [a57d650ccba1d0ee2ca58a517977347782176535] | committer: Jean-Baptiste Kempf
Contribs: update libvpx to 1.6.0
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a57d650ccba1d0ee2ca58a517977347782176535
---
contrib/src/vpx/SHA512SUMS | 2 +-
contrib/src/vpx/libvpx-ios.patch | 34 ++++++++++++++++++++++++++--------
contrib/src/vpx/libvpx-no-cross.patch | 10 ----------
contrib/src/vpx/libvpx-sysroot.patch | 26 --------------------------
contrib/src/vpx/rules.mak | 4 +---
5 files changed, 28 insertions(+), 48 deletions(-)
diff --git a/contrib/src/vpx/SHA512SUMS b/contrib/src/vpx/SHA512SUMS
index 7923cbc..459f309 100644
--- a/contrib/src/vpx/SHA512SUMS
+++ b/contrib/src/vpx/SHA512SUMS
@@ -1 +1 @@
-70234220e0ed64db000689ec8bea02dadef938a4f4dea96e5781d361c15245456212c1b6aec2b698d32ed423e73917d2303009e49224a2237669cab416dd6984 libvpx-1.4.0.tar.bz2
+dd753372a156bbf7ceb4090276e5fb32b4c8581c93925dded93efee74153b5eb24ee8c3d8ee6339a6878482f0ecf178a2befeeb36e17eada6c440b48c60e9162 libvpx-1.6.0.tar.bz2
diff --git a/contrib/src/vpx/libvpx-ios.patch b/contrib/src/vpx/libvpx-ios.patch
index 5b293b1..a24de72 100644
--- a/contrib/src/vpx/libvpx-ios.patch
+++ b/contrib/src/vpx/libvpx-ios.patch
@@ -1,17 +1,31 @@
-diff -ru libvpx/build/make/configure.sh libvpx-fixed/build/make/configure.sh
---- libvpx/build/make/configure.sh 2015-05-27 14:40:33.000000000 +0200
-+++ libvpx-fixed/build/make/configure.sh 2015-05-27 14:40:09.000000000 +0200
-@@ -742,61 +742,6 @@
+--- libvpx-1.6.0/build/make/configure.sh.orig 2016-08-07 11:44:05.793613059 +0200
++++ libvpx-1.6.0/build/make/configure.sh 2016-08-07 11:45:57.893608065 +0200
+@@ -789,80 +789,6 @@
# PIC is probably what we want when building shared libs
enabled shared && soft_enable pic
- # Minimum iOS version for all target platforms (darwin and iphonesimulator).
-- IOS_VERSION_MIN="6.0"
+- # Shared library framework builds are only possible on iOS 8 and later.
+- if enabled shared; then
+- IOS_VERSION_OPTIONS="--enable-shared"
+- IOS_VERSION_MIN="8.0"
+- else
+- IOS_VERSION_OPTIONS=""
+- IOS_VERSION_MIN="6.0"
+- fi
-
- # Handle darwin variants. Newer SDKs allow targeting older
- # platforms, so use the newest one available.
- case ${toolchain} in
-- *-darwin*)
+- arm*-darwin*)
+- add_cflags "-miphoneos-version-min=${IOS_VERSION_MIN}"
+- iphoneos_sdk_dir="$(show_darwin_sdk_path iphoneos)"
+- if [ -d "${iphoneos_sdk_dir}" ]; then
+- add_cflags "-isysroot ${iphoneos_sdk_dir}"
+- add_ldflags "-isysroot ${iphoneos_sdk_dir}"
+- fi
+- ;;
+- x86*-darwin*)
- osx_sdk_dir="$(show_darwin_sdk_path macosx)"
- if [ -d "${osx_sdk_dir}" ]; then
- add_cflags "-isysroot ${osx_sdk_dir}"
@@ -49,6 +63,10 @@ diff -ru libvpx/build/make/configure.sh libvpx-fixed/build/make/configure.sh
- add_cflags "-mmacosx-version-min=10.10"
- add_ldflags "-mmacosx-version-min=10.10"
- ;;
+- *-darwin15-*)
+- add_cflags "-mmacosx-version-min=10.11"
+- add_ldflags "-mmacosx-version-min=10.11"
+- ;;
- *-iphonesimulator-*)
- add_cflags "-miphoneos-version-min=${IOS_VERSION_MIN}"
- add_ldflags "-miphoneos-version-min=${IOS_VERSION_MIN}"
@@ -63,7 +81,7 @@ diff -ru libvpx/build/make/configure.sh libvpx-fixed/build/make/configure.sh
# Handle Solaris variants. Solaris 10 needs -lposix4
case ${toolchain} in
sparc-solaris-*)
-@@ -1002,12 +947,6 @@
+@@ -1086,12 +1012,6 @@
add_cflags -isysroot ${alt_libc}
fi
@@ -76,7 +94,7 @@ diff -ru libvpx/build/make/configure.sh libvpx-fixed/build/make/configure.sh
for d in lib usr/lib usr/lib/system; do
try_dir="${alt_libc}/${d}"
[ -d "${try_dir}" ] && add_ldflags -L"${try_dir}"
-@@ -1149,6 +1088,13 @@
+@@ -1264,6 +1184,13 @@
case ${tgt_cc} in
gcc*)
add_cflags -m${bits}
diff --git a/contrib/src/vpx/libvpx-no-cross.patch b/contrib/src/vpx/libvpx-no-cross.patch
deleted file mode 100644
index 9881624..0000000
--- a/contrib/src/vpx/libvpx-no-cross.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- libvpx-1.4.0/build/make/configure.sh.orig 2015-05-05 16:00:58.682380921 +0200
-+++ libvpx-1.4.0/build/make/configure.sh 2015-05-05 16:02:13.537147158 +0200
-@@ -831,7 +831,6 @@
-
- case ${tgt_cc} in
- gcc)
-- CROSS=${CROSS:-arm-none-linux-gnueabi-}
- link_with_cc=gcc
- setup_gnu_toolchain
- arch_int=${tgt_isa##armv}
diff --git a/contrib/src/vpx/libvpx-sysroot.patch b/contrib/src/vpx/libvpx-sysroot.patch
deleted file mode 100644
index 0ba43dc..0000000
--- a/contrib/src/vpx/libvpx-sysroot.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Our contrib system already passes the correct sysroot to the compiler, so there
-is no need to set an alternate libc path. If that path is empty the script will
-try to look for it in some fashion, but since the SDKROOT may be in a
-non standard location the look up may fail.
-
-This patch avoids that case and relies on the user configuration for the
-correct sysroot.
-
-See also https://code.google.com/p/webm/issues/detail?id=809
-
---- libvpx-1.4.0/build/make/configure.sh.orig 2015-05-05 15:57:26.568321902 +0200
-+++ libvpx-1.4.0/build/make/configure.sh 2015-05-05 15:59:04.860202562 +0200
-@@ -941,8 +941,11 @@
- awk '{ print $1 }' | tail -1`
- fi
-
-- add_cflags "--sysroot=${alt_libc}"
-- add_ldflags "--sysroot=${alt_libc}"
-+ # this may happen if toolchain binaries are outside the ndk dir
-+ if [ "${alt_libc}" ]; then
-+ add_cflags "--sysroot=${alt_libc}"
-+ add_ldflags "--sysroot=${alt_libc}"
-+ fi
-
- # linker flag that routes around a CPU bug in some
- # Cortex-A8 implementations (NDK Dev Guide)
diff --git a/contrib/src/vpx/rules.mak b/contrib/src/vpx/rules.mak
index d501c52..b74461d 100644
--- a/contrib/src/vpx/rules.mak
+++ b/contrib/src/vpx/rules.mak
@@ -1,6 +1,6 @@
# libvpx
-VPX_VERSION := 1.4.0
+VPX_VERSION := 1.6.0
VPX_URL := http://storage.googleapis.com/downloads.webmproject.org/releases/webm/libvpx-$(VPX_VERSION).tar.bz2
PKGS += vpx
@@ -15,8 +15,6 @@ $(TARBALLS)/libvpx-$(VPX_VERSION).tar.bz2:
libvpx: libvpx-$(VPX_VERSION).tar.bz2 .sum-vpx
$(UNPACK)
- $(APPLY) $(SRC)/vpx/libvpx-sysroot.patch
- $(APPLY) $(SRC)/vpx/libvpx-no-cross.patch
$(APPLY) $(SRC)/vpx/libvpx-mac.patch
$(APPLY) $(SRC)/vpx/libvpx-ios.patch
$(APPLY) $(SRC)/vpx/libvpx-arm.patch
More information about the vlc-commits
mailing list