From da878492cbdd8b10d6fc9dc3c893c3eb7807b113 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sat, 20 Oct 2018 22:21:56 +0200
Subject: [PATCH] libx265: Update from 2.8 to 2.9

---
 packages/ffmpeg/build.sh                      |  1 +
 packages/gst-plugins-bad/build.sh             |  1 +
 packages/libx265/build.sh                     |  4 +--
 packages/libx265/enable512.patch              | 29 +++++++++++++++++++
 .../libx265/source-common-param.cpp.patch     | 14 ---------
 5 files changed, 33 insertions(+), 16 deletions(-)
 create mode 100644 packages/libx265/enable512.patch
 delete mode 100644 packages/libx265/source-common-param.cpp.patch

diff --git a/packages/ffmpeg/build.sh b/packages/ffmpeg/build.sh
index 75d2ed5be..1d348496c 100644
--- a/packages/ffmpeg/build.sh
+++ b/packages/ffmpeg/build.sh
@@ -2,6 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://ffmpeg.org
 TERMUX_PKG_DESCRIPTION="Tools and libraries to manipulate a wide range of multimedia formats and protocols"
 # NOTE: mpv has to be rebuilt and version bumped after updating ffmpeg.
 TERMUX_PKG_VERSION=4.0.2
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=a95c0cc9eb990e94031d2183f2e6e444cc61c99f6f182d1575c433d62afb2f97
 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-bad/build.sh b/packages/gst-plugins-bad/build.sh
index 2fca3d216..45a1c86c9 100644
--- a/packages/gst-plugins-bad/build.sh
+++ b/packages/gst-plugins-bad/build.sh
@@ -1,6 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://gstreamer.freedesktop.org/
 TERMUX_PKG_DESCRIPTION="GStreamer Bad Plug-ins"
 TERMUX_PKG_VERSION=1.14.4
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=910b4e0e2e897e8b6d06767af1779d70057c309f67292f485ff988d087aa0de5
 TERMUX_PKG_SRCURL=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_BUILD_IN_SRC=yes
diff --git a/packages/libx265/build.sh b/packages/libx265/build.sh
index 02be38c66..91fcf01f7 100644
--- a/packages/libx265/build.sh
+++ b/packages/libx265/build.sh
@@ -1,7 +1,7 @@
 TERMUX_PKG_HOMEPAGE=http://x265.org/
 TERMUX_PKG_DESCRIPTION="H.265/HEVC video stream encoder library"
-TERMUX_PKG_VERSION=2.8
-TERMUX_PKG_SHA256=6e59f9afc0c2b87a46f98e33b5159d56ffb3558a49d8e3d79cb7fdc6b7aaa863
+TERMUX_PKG_VERSION=2.9
+TERMUX_PKG_SHA256=ebae687c84a39f54b995417c52a2fdde65a4e2e7ebac5730d251471304b91024
 TERMUX_PKG_SRCURL=http://ftp.videolan.org/pub/videolan/x265/x265_${TERMUX_PKG_VERSION}.tar.gz
 
 termux_step_pre_configure () {
diff --git a/packages/libx265/enable512.patch b/packages/libx265/enable512.patch
new file mode 100644
index 000000000..59906a163
--- /dev/null
+++ b/packages/libx265/enable512.patch
@@ -0,0 +1,29 @@
+https://bitbucket.org/multicoreware/x265/issues/442/detect512-is-needed-on-all-architectures
+
+This function is used on all architectures, not just X86.
+
+--- x265-2.9/source/common/cpu.cpp
++++ x265-2.9/source/common/cpu.cpp
+@@ -110,6 +110,11 @@
+     { "", 0 },
+ };
+ 
++bool detect512()
++{
++    return(enable512);
++}
++
+ #if X265_ARCH_X86
+ 
+ extern "C" {
+@@ -123,10 +128,6 @@
+ #pragma warning(disable: 4309) // truncation of constant value
+ #endif
+ 
+-bool detect512()
+-{
+-    return(enable512);
+-}
+ uint32_t cpu_detect(bool benableavx512 )
+ {
+ 
diff --git a/packages/libx265/source-common-param.cpp.patch b/packages/libx265/source-common-param.cpp.patch
deleted file mode 100644
index faf9ab5dc..000000000
--- a/packages/libx265/source-common-param.cpp.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://bitbucket.org/multicoreware/x265/commits/4504219210793536d921ee4e0b3058698c630bf4
-
-diff -u -r ../x265_2.8/source/common/param.cpp ./source/common/param.cpp
---- ../x265_2.8/source/common/param.cpp	2018-05-21 08:33:10.000000000 +0000
-+++ ./source/common/param.cpp	2018-06-26 03:48:16.649067505 +0000
-@@ -633,7 +633,7 @@
-         if (bValueWasNull)
-             p->cpuid = atobool(value);
-         else
--            p->cpuid = parseCpuName(value, bError);
-+            p->cpuid = parseCpuName(value, bError, false);
- #endif
-     }
-     OPT("fps")