From 1cc04dc41b047042fd5375e8313131176c85a2ff Mon Sep 17 00:00:00 2001
From: Tristan Matthews <tmatth@videolan.org>
Date: Wed, 29 Jun 2022 17:58:33 -0400
Subject: [PATCH] contrib: vpx: update to 1.12.0
Notable changes:
- This release adds optimizations for Loongarch, adds support for vp8 in the
real-time rate control library, upgrades GoogleTest to v1.11.0, updates
libwebm to libwebm-1.0.0.28-20-g206d268, and includes numerous bug fixes.
Bug fixes:
- Fix to a crash related to {vp8/vp9}_set_roi_map.
- Fix to compiling failure with -Wformat-nonliteral.
- Fix to integer overflow with vp9 with high resolution content.
- Fix to AddNoiseTest failure with ARMv7.
- Fix to libvpx Null-dereference READ in vp8.
---
contrib/src/vpx/SHA512SUMS | 2 +-
contrib/src/vpx/libvpx-ios.patch | 17 +++++++++--------
contrib/src/vpx/rules.mak | 2 +-
3 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/contrib/src/vpx/SHA512SUMS b/contrib/src/vpx/SHA512SUMS
index 27b74a368509..4e66f3237b22 100644
--- a/contrib/src/vpx/SHA512SUMS
+++ b/contrib/src/vpx/SHA512SUMS
@@ -1 +1 @@
-7aa5d30afa956dccda60917fd82f6f9992944ca893437c8cd53a04d1b7a94e0210431954aa136594dc400340123cc166dcc855753e493c8d929667f4c42b65a5 libvpx-1.11.0.tar.gz
+dc059bc3102b75524ae29989372334b3e0f2acf1520e5a4daa4073831bb55949d82897c498fb9d2d38b59f1a66bb0ad24407d0d086b1e3a8394a4933f04f2ed0 libvpx-1.12.0.tar.gz
diff --git a/contrib/src/vpx/libvpx-ios.patch b/contrib/src/vpx/libvpx-ios.patch
index 3ceb7cf1fbb4..dfc3a0d1553f 100644
--- a/contrib/src/vpx/libvpx-ios.patch
+++ b/contrib/src/vpx/libvpx-ios.patch
@@ -1,7 +1,8 @@
-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 @@
+diff --git a/build/make/configure.sh b/build/make/configure.sh
+index 581042e38..5b282d666 100644
+--- a/build/make/configure.sh
++++ b/build/make/configure.sh
+@@ -861,100 +861,6 @@ process_common_toolchain() {
# PIC is probably what we want when building shared libs
enabled shared && soft_enable pic
@@ -84,9 +85,9 @@ diff -ruw libvpx-1.10.0/build/make/configure.sh libvpx-1.10.0-new/build/make/con
- 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%%-*}"
+- *-darwin2[0-1]-*)
+- add_cflags "-arch ${toolchain%%-*}"
+- add_ldflags "-arch ${toolchain%%-*}"
- ;;
- *-iphonesimulator-*)
- add_cflags "-miphoneos-version-min=${IOS_VERSION_MIN}"
@@ -102,7 +103,7 @@ diff -ruw libvpx-1.10.0/build/make/configure.sh libvpx-1.10.0-new/build/make/con
# Handle Solaris variants. Solaris 10 needs -lposix4
case ${toolchain} in
sparc-solaris-*)
-@@ -1121,12 +1027,6 @@
+@@ -1143,12 +1049,6 @@ EOF
add_cflags -isysroot ${alt_libc}
fi
diff --git a/contrib/src/vpx/rules.mak b/contrib/src/vpx/rules.mak
index 9c12c052f40a..1a73439e8ac5 100644
--- a/contrib/src/vpx/rules.mak
+++ b/contrib/src/vpx/rules.mak
@@ -1,6 +1,6 @@
# libvpx
-VPX_VERSION := 1.11.0
+VPX_VERSION := 1.12.0
VPX_URL := http://github.com/webmproject/libvpx/archive/v${VPX_VERSION}.tar.gz
PKGS += vpx
--
GitLab