From a97530e4719e2b733ba3ace1e4cee07115c9a5dc Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sat, 9 Feb 2019 22:46:58 +0100
Subject: [PATCH] libvpx: Update from 1.7.0 to 1.8.0

---
 packages/ffmpeg/build.sh                      |  2 +-
 packages/gst-plugins-good/build.sh            |  1 +
 packages/libvpx/build-make-configure.sh.patch | 19 +++++++++++++++++++
 packages/libvpx/build.sh                      |  5 ++---
 packages/libvpx/configure.patch               | 19 -------------------
 5 files changed, 23 insertions(+), 23 deletions(-)
 create mode 100644 packages/libvpx/build-make-configure.sh.patch

diff --git a/packages/ffmpeg/build.sh b/packages/ffmpeg/build.sh
index c2a001c13..41c24f103 100644
--- a/packages/ffmpeg/build.sh
+++ b/packages/ffmpeg/build.sh
@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Tools and libraries to manipulate a wide range of multim
 TERMUX_PKG_LICENSE="GPL-3.0"
 # NOTE: mpv has to be rebuilt and version bumped after updating ffmpeg.
 TERMUX_PKG_VERSION=4.1
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_SHA256=a38ec4d026efb58506a99ad5cd23d5a9793b4bf415f2c4c2e9c1bb444acd1994
 TERMUX_PKG_SRCURL=https://www.ffmpeg.org/releases/ffmpeg-${TERMUX_PKG_VERSION}.tar.xz
 # libbz2 is used by matroska decoder:
diff --git a/packages/gst-plugins-good/build.sh b/packages/gst-plugins-good/build.sh
index 85aac18a4..63ea8be70 100644
--- a/packages/gst-plugins-good/build.sh
+++ b/packages/gst-plugins-good/build.sh
@@ -2,6 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://gstreamer.freedesktop.org/
 TERMUX_PKG_DESCRIPTION="GStreamer Good Plug-ins"
 TERMUX_PKG_LICENSE="LGPL-2.0"
 TERMUX_PKG_VERSION=1.14.4
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=5f8b553260cb0aac56890053d8511db1528d53cae10f0287cfce2cb2acc70979
 TERMUX_PKG_SRCURL=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_BUILD_IN_SRC=yes
diff --git a/packages/libvpx/build-make-configure.sh.patch b/packages/libvpx/build-make-configure.sh.patch
new file mode 100644
index 000000000..834235309
--- /dev/null
+++ b/packages/libvpx/build-make-configure.sh.patch
@@ -0,0 +1,19 @@
+diff -u -r ../libvpx-1.8.0/build/make/configure.sh ./build/make/configure.sh
+--- ../libvpx-1.8.0/build/make/configure.sh	2019-02-04 17:02:33.000000000 +0000
++++ ./build/make/configure.sh	2019-02-09 21:10:52.112075640 +0000
+@@ -1017,7 +1017,6 @@
+               enable_feature thumb
+               ;;
+             *)
+-              check_add_asflags --defsym ARCHITECTURE=${arch_int}
+               ;;
+           esac
+ 
+@@ -1147,7 +1146,6 @@
+           else
+             echo "Assuming standalone build with NDK toolchain."
+             echo "See build/make/Android.mk for details."
+-            check_add_ldflags -static
+             soft_enable unit_tests
+           fi
+           ;;
diff --git a/packages/libvpx/build.sh b/packages/libvpx/build.sh
index 11d76fb83..309b58d6c 100644
--- a/packages/libvpx/build.sh
+++ b/packages/libvpx/build.sh
@@ -1,9 +1,8 @@
 TERMUX_PKG_HOMEPAGE=https://www.webmproject.org
 TERMUX_PKG_DESCRIPTION="VP8 & VP9 Codec SDK"
 TERMUX_PKG_LICENSE="BSD 3-Clause"
-TERMUX_PKG_VERSION=1.7.0
-TERMUX_PKG_REVISION=1
-TERMUX_PKG_SHA256=1fec931eb5c94279ad219a5b6e0202358e94a93a90cfb1603578c326abfc1238
+TERMUX_PKG_VERSION=1.8.0
+TERMUX_PKG_SHA256=86df18c694e1c06cc8f83d2d816e9270747a0ce6abe316e93a4f4095689373f6
 TERMUX_PKG_SRCURL=https://github.com/webmproject/libvpx/archive/v${TERMUX_PKG_VERSION}.tar.gz
 
 termux_step_configure() {
diff --git a/packages/libvpx/configure.patch b/packages/libvpx/configure.patch
index f81d9d092..fdf41fa1c 100644
--- a/packages/libvpx/configure.patch
+++ b/packages/libvpx/configure.patch
@@ -1,22 +1,3 @@
-diff -u -r ../libvpx-1.6.1/build/make/configure.sh ./build/make/configure.sh
---- ../libvpx-1.6.1/build/make/configure.sh	2017-01-12 20:27:27.000000000 +0000
-+++ ./build/make/configure.sh	2017-07-27 01:11:03.641678047 +0000
-@@ -891,7 +891,6 @@
-           setup_gnu_toolchain
-           arch_int=${tgt_isa##armv}
-           arch_int=${arch_int%%te}
--          check_add_asflags --defsym ARCHITECTURE=${arch_int}
-           tune_cflags="-mtune="
-           if [ ${tgt_isa} = "armv7" ] || [ ${tgt_isa} = "armv7s" ]; then
-             if [ -z "${float_abi}" ]; then
-@@ -1021,7 +1020,6 @@
-           else
-             echo "Assuming standalone build with NDK toolchain."
-             echo "See build/make/Android.mk for details."
--            check_add_ldflags -static
-             soft_enable unit_tests
-           fi
-           ;;
 diff -u -r ../libvpx-1.6.1/configure ./configure
 --- ../libvpx-1.6.1/configure	2017-01-12 20:27:27.000000000 +0000
 +++ ./configure	2017-07-27 01:09:43.590546540 +0000