[vlc-devel] [PATCH] contrib: libvpx: bump to 1.7.0

[Tristan Matthews]

Martin, Thomas: let me know if you have any issues with this change.

Best,
Tristan

---
 contrib/src/vpx/SHA512SUMS       |  2 +-
 contrib/src/vpx/libvpx-ios.patch | 37 ++++++--------------------------
 contrib/src/vpx/rules.mak        | 14 ++++++------
 3 files changed, 16 insertions(+), 37 deletions(-)

diff --git a/contrib/src/vpx/SHA512SUMS b/contrib/src/vpx/SHA512SUMS
index da99c86b11..5c470baebf 100644
--- a/contrib/src/vpx/SHA512SUMS
+++ b/contrib/src/vpx/SHA512SUMS
@@ -1 +1 @@
-1a4b009fe1737715c6563a79848126a5859394a5074b1e9cca9bc2e213df90890c15e708040d5f2c96c7c21e268f51e1352ac6911514bf891a4bf3eea154159d  libvpx-1.6.1.tar.bz2
+113a0a703f7f8ed609ae305b61563ffbb145e7f8afacc88b59ddc9f701be2a2b57dd3bdbc1b302380f288e819689f9c72e0a5e0eb2c4e2f0b40edf6d9aa85686  libvpx-1.7.0.tar.gz
diff --git a/contrib/src/vpx/libvpx-ios.patch b/contrib/src/vpx/libvpx-ios.patch
index a24de723ed..a7063c7277 100644
--- a/contrib/src/vpx/libvpx-ios.patch
+++ b/contrib/src/vpx/libvpx-ios.patch
@@ -1,6 +1,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 @@
+--- libvpx-1.7.0/build/make/configure.sh.orig	2018-07-09 09:20:18.836954386 -0400
++++ libvpx-1.7.0/build/make/configure.sh	2018-07-09 09:20:37.433090697 -0400
+@@ -824,84 +824,6 @@
    # PIC is probably what we want when building shared libs
    enabled shared && soft_enable pic
  
@@ -67,6 +67,10 @@
 -      add_cflags  "-mmacosx-version-min=10.11"
 -      add_ldflags "-mmacosx-version-min=10.11"
 -      ;;
+-    *-darwin16-*)
+-      add_cflags  "-mmacosx-version-min=10.12"
+-      add_ldflags "-mmacosx-version-min=10.12"
+-      ;;
 -    *-iphonesimulator-*)
 -      add_cflags  "-miphoneos-version-min=${IOS_VERSION_MIN}"
 -      add_ldflags "-miphoneos-version-min=${IOS_VERSION_MIN}"
@@ -81,30 +85,3 @@
    # Handle Solaris variants. Solaris 10 needs -lposix4
    case ${toolchain} in
      sparc-solaris-*)
-@@ -1086,12 +1012,6 @@
-             add_cflags -isysroot ${alt_libc}
-           fi
- 
--          if [ "${LD}" = "${CXX}" ]; then
--            add_ldflags -miphoneos-version-min="${IOS_VERSION_MIN}"
--          else
--            add_ldflags -ios_version_min "${IOS_VERSION_MIN}"
--          fi
--
-           for d in lib usr/lib usr/lib/system; do
-             try_dir="${alt_libc}/${d}"
-             [ -d "${try_dir}" ] && add_ldflags -L"${try_dir}"
-@@ -1264,6 +1184,13 @@
-       case ${tgt_cc} in
-         gcc*)
-           add_cflags -m${bits}
-+          case ${tgt_os} in
-+              darwin*)
-+              ;;
-+              *)
-+              add_ldflags -m${bits}
-+              ;;
-+          esac
-           add_ldflags -m${bits}
-           ;;
-       esac
diff --git a/contrib/src/vpx/rules.mak b/contrib/src/vpx/rules.mak
index 9b441d7f4e..ca61fe9a4f 100644
--- a/contrib/src/vpx/rules.mak
+++ b/contrib/src/vpx/rules.mak
@@ -1,20 +1,22 @@
 # libvpx
 
-VPX_VERSION := 1.6.1
-VPX_URL := http://storage.googleapis.com/downloads.webmproject.org/releases/webm/libvpx-$(VPX_VERSION).tar.bz2
+VPX_VERSION := 1.7.0
+VPX_URL := http://chromium.googlesource.com/webm/libvpx/+archive/v${VPX_VERSION}.tar.gz
 
 PKGS += vpx
 ifeq ($(call need_pkg,"vpx >= 1.5.0"),)
 PKGS_FOUND += vpx
 endif
 
-$(TARBALLS)/libvpx-$(VPX_VERSION).tar.bz2:
+$(TARBALLS)/libvpx-$(VPX_VERSION).tar.gz:
 	$(call download_pkg,$(VPX_URL),vpx)
 
-.sum-vpx: libvpx-$(VPX_VERSION).tar.bz2
+.sum-vpx: libvpx-$(VPX_VERSION).tar.gz
 
-libvpx: libvpx-$(VPX_VERSION).tar.bz2 .sum-vpx
-	$(UNPACK)
+libvpx: libvpx-$(VPX_VERSION).tar.gz .sum-vpx
+	rm -Rf $@-$(VPX_VERSION) $@
+	mkdir -p $@-$(VPX_VERSION)
+	tar xvzf "$<" -C $@-$(VPX_VERSION)
 	$(APPLY) $(SRC)/vpx/libvpx-mac.patch
 	$(APPLY) $(SRC)/vpx/libvpx-ios.patch
 ifdef HAVE_ANDROID
-- 
2.18.0