From f3694eb6d319f7ce98d6d6014ef7ae9259ce3135 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio@serjux.com>
Date: Tue, 17 Dec 2019 02:59:57 +0000
Subject: [PATCH] Update to 0.159-20191127-git1771b55 (stable branch)

---
 .gitignore       |  1 +
 sources          |  2 +-
 x264-nover.patch | 10 +++++-----
 x264-snapshot.sh |  4 ++--
 x264.spec        | 15 +++++++++------
 5 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4a0df74..8b6d9fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ x264-0.148-20160118-5c65704.tar.bz2
 /x264-0.155-20180806-0a84d98.tar.bz2
 /x264-0.157-20190303-72db437.tar.bz2
 /x264-0.157-20190717-34c06d1.tar.bz2
+/x264-0.159-20191127git1771b55.tar.bz2
diff --git a/sources b/sources
index bc45139..1071ce7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-95f0dcc097601cfd0f86c8e007022b2e  x264-0.157-20190717-34c06d1.tar.bz2
+SHA512 (x264-0.159-20191127git1771b55.tar.bz2) = b7e78eae1dc5c0a44a4fa3748b34858b3ba6d33aa1e917ba70800c1fcf175fb023fd935aac3f8f780400636b499ba05c6cf17bfdc1e6bb522c08e2b1e0b0040a
diff --git a/x264-nover.patch b/x264-nover.patch
index f0a3806..139fd89 100644
--- a/x264-nover.patch
+++ b/x264-nover.patch
@@ -1,11 +1,11 @@
---- ./configure.orig	2015-10-21 19:24:34.933238254 +0100
-+++ ./configure	2015-10-21 19:25:53.907124640 +0100
-@@ -1236,7 +1236,7 @@ cat > x264_config.h << EOF
+--- ./configure.orig	2019-12-17 02:19:30.000000000 +0000
++++ ./configure	2019-12-17 02:31:06.483935577 +0000
+@@ -1390,7 +1390,7 @@ cat > x264_config.h << EOF
  #define X264_CHROMA_FORMAT $config_chroma_format
  EOF
  
 -${SRCPATH}/version.sh >> x264_config.h
 +cat ${SRCPATH}/version.h >> ${SRCPATH}/x264_config.h
  
- if [ "$cli_libx264" = "system" ] ; then
-     if [ "$shared" = "yes" ]; then
+ if [ "$shared" = "yes" ]; then
+     CFLAGSSO="$CFLAGSSO -DX264_API_EXPORTS"
diff --git a/x264-snapshot.sh b/x264-snapshot.sh
index cbd9521..c247fc0 100755
--- a/x264-snapshot.sh
+++ b/x264-snapshot.sh
@@ -28,10 +28,10 @@ API="$(grep '#define X264_BUILD' < x264.h | sed 's/^.* \([1-9][0-9]*\).*$/\1/')"
 date=$(git log -1 --format=%cd --date=short | tr -d \-)
 git add version.h
 git commit -m "generated version.h" version.h
-git archive --prefix="${package}-0.$API-${date}-${tag}/" --format=tar rpmfusion | bzip2 > "$pwd"/${package}-0.$API-${date}-${tag}.tar.bz2
+git archive --prefix="${package}-0.$API-${date}git${tag}/" --format=tar rpmfusion | bzip2 > "$pwd"/${package}-0.$API-${date}git${tag}.tar.bz2
 popd >/dev/null
 
-echo \# globals for x264-0.$API-$date-$tag.tar.bz2
+echo \# globals for x264-0.$API-${date}git${tag}.tar.bz2
 echo %global api $API
 echo %global gitdate ${date}
 echo %global gitversion ${tag}
diff --git a/x264.spec b/x264.spec
index a66337c..6875050 100644
--- a/x264.spec
+++ b/x264.spec
@@ -1,9 +1,9 @@
-# globals for x264-0.157-20190717-34c06d1.tar.bz2
-%global api 157
-%global gitdate 20190717
-%global gitversion 34c06d1
+# globals for x264-0.159-20191127git1771b55.tar.bz2
+%global api 159
+%global gitdate 20191127
+%global gitversion 1771b55
 
-%global snapshot %{gitdate}-%{gitversion}
+%global snapshot %{gitdate}git%{gitversion}
 %global gver .%{gitdate}git%{gitversion}
 %global branch stable
 
@@ -31,7 +31,7 @@
 Summary: H264/AVC video streams encoder
 Name: x264
 Version: 0.%{api}
-Release: 12%{?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
@@ -207,6 +207,9 @@ install -pm644 generic/{AUTHORS,COPYING} %{buildroot}%{_pkgdocdir}/
 %endif
 
 %changelog
+* Mon Dec 16 2019 Sérgio Monteiro Basto <sergio@serjux.com> - 0.159-1.20191127git1771b55
+- Update to 0.159-20191127-git1771b55 (stable branch)
+
 * Fri Oct 04 2019 Dominik Mierzejewski <rpm@greysector.net> - 0.157-12.20190717git34c06d1
 - don't overwrite generic headers with 10bit on simdarch (rfbz#5071)