contrib: Update to x264 build 161 r3043 59c06095.

3 files changed, 11 insertions, 87 deletions

diff --git a/contrib/x264/A00-version-string.patch b/contrib/x264/A00-version-string.patch
index c61a50c00..739117a9d 100644
--- a/contrib/x264/A00-version-string.patch
+++ b/contrib/x264/A00-version-string.patch
@@ -1,10 +1,10 @@
---- a/x264.h.orig	2018-11-20 06:39:30.000000000 -0500
-+++ b/x264.h	2018-11-20 06:39:07.000000000 -0500
-@@ -45,7 +45,24 @@
+--- a/x264.h
++++ b/x264.h
+@@ -45,7 +45,24 @@ extern "C" {
  
  #include "x264_config.h"
  
--#define X264_BUILD 157
+-#define X264_BUILD 161
 +/*
 + * Define the full version explicitly so that it survives a git --archive.
 + *
@@ -20,9 +20,9 @@
 +#ifdef  X264_POINTVER
 +#undef  X264_POINTVER
 +#endif
-+#define X264_BUILD    157
-+#define X264_VERSION " r2935 545de2f"
-+#define X264_POINTVER "0.157.2935 545de2f"
++#define X264_BUILD    161
++#define X264_VERSION " r3043 59c06095"
++#define X264_POINTVER "0.161.3043 59c06095"
  
- /* Application developers planning to link against a shared library version of
-  * libx264 from a Microsoft Visual Studio or similar development environment
+ #ifdef _WIN32
+ #   define X264_DLL_IMPORT __declspec(dllimport)
diff --git a/contrib/x264/P00-darwin-applesi.patch b/contrib/x264/P00-darwin-applesi.patch
deleted file mode 100644
index e5cb47bc1..000000000
--- a/contrib/x264/P00-darwin-applesi.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From ff750fd9797ee200daf5915c84c88dce5074498e Mon Sep 17 00:00:00 2001
-Date: Mon, 1 Jun 2020 09:36:04 -0700
-Subject: [PATCH] arm64-config
-
----
- config.sub |  4 ++--
- configure  | 24 ++++++++++++------------
- 2 files changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/config.sub b/config.sub
-index 8df5511..72e9265 100755
---- a/config.sub
-+++ b/config.sub
-@@ -255,7 +255,7 @@ case $basic_machine in
- 	# Some are omitted here because they have special meanings below.
- 	1750a | 580 \
- 	| a29k \
--	| aarch64 | aarch64_be \
-+	| aarch64 | aarch64_be | arm64 \
- 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
- 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
- 	| am33_2.0 \
-@@ -369,7 +369,7 @@ case $basic_machine in
- 	# Recognize the basic CPU types with company name.
- 	580-* \
- 	| a29k-* \
--	| aarch64-* | aarch64_be-* \
-+	| aarch64-* | aarch64_be-* | arm64*-* \
- 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
- 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-diff --git a/configure b/configure
-index 07ba449..d47de9a 100755
---- a/configure
-+++ b/configure
-@@ -788,6 +788,18 @@ case $host_cpu in
-         AS="${AS-${CC}}"
-         AS_EXT=".c"
-         ;;
-+    aarch64|arm64*)
-+        ARCH="AARCH64"
-+        stack_alignment=16
-+        if [ "$SYS" = MACOSX ] ; then
-+            AS="${AS-${CC}}"
-+            ASFLAGS="$ASFLAGS -DPREFIX -DPIC"
-+        elif [ "$SYS" = WINDOWS ] && [ "$compiler" = CL ] ; then
-+            AS="${AS-${SRCPATH}/tools/gas-preprocessor.pl -arch aarch64 -as-type armasm -- armasm64 -nologo}"
-+        else
-+            AS="${AS-${CC}}"
-+        fi
-+        ;;
-     arm*)
-         ARCH="ARM"
-         if [ "$SYS" = MACOSX ] ; then
-@@ -806,18 +818,6 @@ case $host_cpu in
-             AS="${AS-${CC}}"
-         fi
-         ;;
--    aarch64)
--        ARCH="AARCH64"
--        stack_alignment=16
--        if [ "$SYS" = MACOSX ] ; then
--            AS="${AS-${CC}}"
--            ASFLAGS="$ASFLAGS -DPREFIX -DPIC"
--        elif [ "$SYS" = WINDOWS ] && [ "$compiler" = CL ] ; then
--            AS="${AS-${SRCPATH}/tools/gas-preprocessor.pl -arch aarch64 -as-type armasm -- armasm64 -nologo}"
--        else
--            AS="${AS-${CC}}"
--        fi
--        ;;
-     s390|s390x)
-         ARCH="S390"
-         ;;
--- 
-2.24.2 (Apple Git-127)
diff --git a/contrib/x264/module.defs b/contrib/x264/module.defs
index b2f349225..6a4d39734 100644
--- a/contrib/x264/module.defs
+++ b/contrib/x264/module.defs
@@ -1,9 +1,8 @@
 $(eval $(call import.MODULE.defs,X264,x264))
 $(eval $(call import.CONTRIB.defs,X264))
 
-X264.FETCH.url     = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/x264-snapshot-20180925-2245.tar.bz2
-X264.FETCH.url    += https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20180925-2245.tar.bz2
-X264.FETCH.sha256  = 207c668e5b149dae04648b74f1008ab457e57ea89ea96712eebe52a79884ca7c
+X264.FETCH.url     = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/x264-snapshot-20210203-3043.tar.gz
+X264.FETCH.sha256  = 7ac3319de98a27c0e1e5d4014a8ae82cb09049e9f1a1c619d404b379d60ef828
 
 X264.GCC.args.c_std =