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

[Tristan Matthews]

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

diff --git a/contrib/src/vpx/SHA512SUMS b/contrib/src/vpx/SHA512SUMS
index da99c86b11..6f45c87263 100644
--- a/contrib/src/vpx/SHA512SUMS
+++ b/contrib/src/vpx/SHA512SUMS
@@ -1 +1 @@
-1a4b009fe1737715c6563a79848126a5859394a5074b1e9cca9bc2e213df90890c15e708040d5f2c96c7c21e268f51e1352ac6911514bf891a4bf3eea154159d  libvpx-1.6.1.tar.bz2
+44453d22afc0a4be581e23580d15ac584f2263fa9ae720bdd119149f4b8262cb59935baa392c56556b9d5d7149bf61644c983f64ddc5c2663c8ac848c0a7ef95  libvpx-1.7.0.tar.gz
diff --git a/contrib/src/vpx/libvpx-ios.patch b/contrib/src/vpx/libvpx-ios.patch
index a24de723ed..f63c60a184 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/build/make/configure.sh.orig	2018-07-09 18:57:29.774826691 -0400
++++ libvpx/build/make/configure.sh	2018-07-09 19:00:34.427868074 -0400
+@@ -818,84 +818,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}"
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