From 3d128f5b7eb4c0c4a3418e23a08369ad90eced6a Mon Sep 17 00:00:00 2001
From: Tristan Matthews <tmatth@videolan.org>
Date: Mon, 29 Mar 2021 12:48:11 -0400
Subject: [PATCH] contrib: vpx: update to 1.10.0
---
contrib/src/vpx/SHA512SUMS | 2 +-
contrib/src/vpx/libvpx-ios.patch | 18 +++++++++++-------
contrib/src/vpx/rules.mak | 2 +-
3 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/contrib/src/vpx/SHA512SUMS b/contrib/src/vpx/SHA512SUMS
index 42d55fbb6177..3b71357666ed 100644
--- a/contrib/src/vpx/SHA512SUMS
+++ b/contrib/src/vpx/SHA512SUMS
@@ -1 +1 @@
-8d544552b35000ea5712aec220b78bb5f7dc210704b2f609365214cb95a4f5a0e343b362723d829cb4a9ac203b10d5443700ba84b28fd6b2fefbabb40663e298 libvpx-1.9.0.tar.gz
+f88c588145b5164e98531b75215e119056cd806a9dbe6599bb9dab35c0af0ecd4b3daabee7d795e412a58aeb543d5c7dc0107457c4bd8f4d434e966e8e22a32d libvpx-1.10.0.tar.gz
diff --git a/contrib/src/vpx/libvpx-ios.patch b/contrib/src/vpx/libvpx-ios.patch
index 909d0be917c5..3ceb7cf1fbb4 100644
--- a/contrib/src/vpx/libvpx-ios.patch
+++ b/contrib/src/vpx/libvpx-ios.patch
@@ -1,7 +1,7 @@
-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
-@@ -832,96 +832,6 @@
+diff -ruw libvpx-1.10.0/build/make/configure.sh libvpx-1.10.0-new/build/make/configure.sh
+--- libvpx-1.10.0/build/make/configure.sh 2021-03-18 15:59:46.000000000 -0400
++++ libvpx-1.10.0-new/build/make/configure.sh 2021-03-29 15:17:36.125564531 -0400
+@@ -839,100 +839,6 @@
# PIC is probably what we want when building shared libs
enabled shared && soft_enable pic
@@ -18,7 +18,7 @@ diff -ruw libvpx-1.9.0.orig/build/make/configure.sh libvpx-1.9.0/build/make/conf
- # Handle darwin variants. Newer SDKs allow targeting older
- # platforms, so use the newest one available.
- case ${toolchain} in
-- arm*-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
@@ -26,7 +26,7 @@ diff -ruw libvpx-1.9.0.orig/build/make/configure.sh libvpx-1.9.0/build/make/conf
- add_ldflags "-isysroot ${iphoneos_sdk_dir}"
- fi
- ;;
-- x86*-darwin*)
+- *-darwin*)
- osx_sdk_dir="$(show_darwin_sdk_path macosx)"
- if [ -d "${osx_sdk_dir}" ]; then
- add_cflags "-isysroot ${osx_sdk_dir}"
@@ -84,6 +84,10 @@ diff -ruw libvpx-1.9.0.orig/build/make/configure.sh libvpx-1.9.0/build/make/conf
- add_cflags "-mmacosx-version-min=10.15"
- add_ldflags "-mmacosx-version-min=10.15"
- ;;
+- *-darwin20-*)
+- add_cflags "-mmacosx-version-min=10.16 -arch ${toolchain%%-*}"
+- add_ldflags "-mmacosx-version-min=10.16 -arch ${toolchain%%-*}"
+- ;;
- *-iphonesimulator-*)
- add_cflags "-miphoneos-version-min=${IOS_VERSION_MIN}"
- add_ldflags "-miphoneos-version-min=${IOS_VERSION_MIN}"
@@ -98,7 +102,7 @@ diff -ruw libvpx-1.9.0.orig/build/make/configure.sh libvpx-1.9.0/build/make/conf
# Handle Solaris variants. Solaris 10 needs -lposix4
case ${toolchain} in
sparc-solaris-*)
-@@ -1110,12 +1020,6 @@
+@@ -1121,12 +1027,6 @@
add_cflags -isysroot ${alt_libc}
fi
diff --git a/contrib/src/vpx/rules.mak b/contrib/src/vpx/rules.mak
index 30c72b14983c..3e7da64a597f 100644
--- a/contrib/src/vpx/rules.mak
+++ b/contrib/src/vpx/rules.mak
@@ -1,6 +1,6 @@
# libvpx
-VPX_VERSION := 1.9.0
+VPX_VERSION := 1.10.0
VPX_URL := http://github.com/webmproject/libvpx/archive/v${VPX_VERSION}.tar.gz
PKGS += vpx
--
GitLab