From 82b1d3f218c8f319adb03a2b02fe5e6bec6173a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio@serjux.com>
Date: Sat, 10 Jul 2021 18:34:03 +0100
Subject: [PATCH] x264-0.163-20210613git5db6aa6 soname bump gpac patch accepted
 upstream with modifications

---
 .gitignore      |  1 +
 sources         |  2 +-
 x264-gpac.patch | 13 -------------
 x264.spec       | 16 +++++++++-------
 4 files changed, 11 insertions(+), 21 deletions(-)
 delete mode 100644 x264-gpac.patch

diff --git a/.gitignore b/.gitignore
index 44cdbf7..df632f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ x264-0.148-20160118-5c65704.tar.bz2
 /x264-0.161-20200912gitd198931.tar.bz2
 /x264-0.161-20210124git544c61f.tar.bz2
 /x264-0.161-20210412git55d517b.tar.bz2
+/x264-0.163-20210613git5db6aa6.tar.bz2
diff --git a/sources b/sources
index 16d1c0a..7c2a0ab 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (x264-0.161-20210412git55d517b.tar.bz2) = 9f5ec5dfaa0334bee50433e0a83801657c67971aa76add2dd0c22225f1fbccfc81700a8659bb5b5389d1fce6f329d6fd3df33782f8ecc221a9739dbb1ed10eed
+SHA512 (x264-0.163-20210613git5db6aa6.tar.bz2) = 6707b99df2d7232083b3fe4c24d67b42a53c5a0bc7ee739cdc48e6a6442c720d408514ce34d321bb1bbf82b0372e01a878116846665561e59d648ee8ca545733
diff --git a/x264-gpac.patch b/x264-gpac.patch
deleted file mode 100644
index 21295fe..0000000
--- a/x264-gpac.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./configure.orig	2020-11-22 22:49:29.765327990 +0000
-+++ ./configure	2020-11-23 01:07:38.050590012 +0000
-@@ -1244,9 +1244,7 @@ fi
- 
- if [ "$gpac" = "auto" -a "$lsmash" != "yes" ] ; then
-     gpac="no"
--    GPAC_LIBS="-lgpac_static"
--    cc_check "" -lz && GPAC_LIBS="$GPAC_LIBS -lz"
--    cc_check "" -ldl && GPAC_LIBS="$GPAC_LIBS -ldl"
-+    GPAC_LIBS="$($PKGCONFIG  --static --libs gpac)"
-     if [ "$SYS" = "WINDOWS" ] ; then
-         cc_check "" -lws2_32 && GPAC_LIBS="$GPAC_LIBS -lws2_32"
-         cc_check "" -lwinmm && GPAC_LIBS="$GPAC_LIBS -lwinmm"
diff --git a/x264.spec b/x264.spec
index 4940306..61f5d05 100644
--- a/x264.spec
+++ b/x264.spec
@@ -1,7 +1,7 @@
-# globals for x264-0.161-20210412git55d517b.tar.bz2
-%global api 161
-%global gitdate 20210412
-%global gitversion 55d517b
+# globals for x264-0.163-20210613git5db6aa6.tar.bz2
+%global api 163
+%global gitdate 20210613
+%global gitversion 5db6aa6
 
 %global snapshot %{gitdate}git%{gitversion}
 %global gver .%{gitdate}git%{gitversion}
@@ -33,7 +33,7 @@
 Summary: H264/AVC video streams encoder
 Name: x264
 Version: 0.%{api}
-Release: 6%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist}
+Release: 1%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist}
 License: GPLv2+
 URL: https://www.videolan.org/developers/x264.html
 Source0: %{name}-0.%{api}-%{snapshot}.tar.bz2
@@ -43,7 +43,6 @@ Source1: x264-snapshot.sh
 Patch0: x264-nover.patch
 # add 10b suffix to high bit depth build
 Patch1: x264-10b.patch
-Patch10: x264-gpac.patch
 Patch11: x264-opencl.patch
 
 BuildRequires: gcc
@@ -106,7 +105,6 @@ This package contains the development files.
 pushd %{name}-0.%{api}-%{snapshot}
 %patch0 -p1 -b .nover
 %patch1 -p1 -b .10b
-%patch10 -p1 -b .gpac
 %patch11 -p1 -b .opencl
 popd
 
@@ -177,6 +175,10 @@ install -pm644 generic/{AUTHORS,COPYING} %{buildroot}%{_pkgdocdir}/
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Mon Jun 14 2021 Sérgio Basto <sergio@serjux.com> - 0.163-1.20210613git5db6aa6
+- x264-0.163-20210613git5db6aa6 soname bump
+- gpac patch accepted upstream with modifications
+
 * Tue Apr 13 2021 Sérgio Basto <sergio@serjux.com> - 0.161-6.20210412git55d517b
 - Update to x264-0.161-20210412git55d517b (stable branch)