Merge branch 'f29' into el8

This reverts commit 67dda12f04.

.gitignore

@@ -8,3 +8,5 @@ x264-0.148-20160118-5c65704.tar.bz2
 /x264-0.148-20170521-aaa9aa8.tar.bz2
 /x264-0.152-20171224-e9a5903.tar.bz2
 /x264-0.155-20180806-0a84d98.tar.bz2
+/x264-0.157-20190303-72db437.tar.bz2
+/x264-0.157-20190717-34c06d1.tar.bz2

sources

@@ -1 +1 @@
-38666b9a1b712f3d0c1073105af2e6a5  x264-0.155-20180806-0a84d98.tar.bz2
+95f0dcc097601cfd0f86c8e007022b2e  x264-0.157-20190717-34c06d1.tar.bz2

x264-10b.patch

@@ -1,7 +1,7 @@
 diff -up generic10/configure.10b generic10/configure
---- generic10/configure.10b	2016-08-26 19:48:41.447839506 +0200
-+++ generic10/configure	2016-08-26 19:49:26.902033893 +0200
-@@ -1466,6 +1466,12 @@ PROF_USE_LD=$PROF_USE_LD
+--- generic10/configure.10b    2016-08-26 19:48:41.447839506 +0200
++++ generic10/configure    2016-08-26 19:49:26.902033893 +0200
+@@ -1473,6 +1473,12 @@ PROF_USE_LD=$PROF_USE_LD
  HAVE_OPENCL=$opencl
  EOF
  
@@ -14,7 +14,7 @@ diff -up generic10/configure.10b generic10/configure
  if [ $compiler_style = MS ]; then
      echo 'CC_O=-Fo$@' >> config.mak
  else
-@@ -1505,7 +1511,7 @@ if [ "$shared" = "yes" ]; then
+@@ -1512,7 +1518,7 @@ if [ "$shared" = "yes" ]; then
          echo "SOFLAGS=-shared -Wl,-h,\$(SONAME) $SOFLAGS" >> config.mak
      else
          echo "SOSUFFIX=so" >> config.mak
@@ -24,9 +24,9 @@ diff -up generic10/configure.10b generic10/configure
      fi
      echo 'default: lib-shared' >> config.mak
 diff -up generic10/Makefile.10b generic10/Makefile
---- generic10/Makefile.10b	2016-06-14 14:04:37.000000000 +0200
-+++ generic10/Makefile	2016-08-26 19:48:41.449839514 +0200
-@@ -405,7 +405,7 @@ ifneq ($(IMPLIBNAME),)
+--- generic10/Makefile.10b 2016-06-14 14:04:37.000000000 +0200
++++ generic10/Makefile 2016-08-26 19:48:41.449839514 +0200
+@@ -398,7 +398,7 @@ ifneq ($(IMPLIBNAME),)
  	$(INSTALL) -m 755 $(SONAME) $(DESTDIR)$(bindir)
  	$(INSTALL) -m 644 $(IMPLIBNAME) $(DESTDIR)$(libdir)
  else ifneq ($(SONAME),)

x264-gpac.patch

@@ -1,6 +1,6 @@
---- x264-0.140-20140122-de0bc36/configure.orig	2014-01-22 23:26:55.922650888 +0000
-+++ x264-0.140-20140122-de0bc36/configure	2014-02-24 02:35:19.263127505 +0000
-@@ -941,7 +941,9 @@
+--- ./configure.orig	2019-03-12 00:41:42.000000000 +0000
++++ ./configure	2019-03-12 01:10:12.603640526 +0000
+@@ -1207,7 +1207,9 @@ fi
  if [ "$gpac" = "auto" -a "$lsmash" != "yes" ] ; then
      gpac="no"
      GPAC_LIBS="-lgpac_static"

x264-sandbox.git-b63c73dc5c37e5405bf032c9113c1daced3e45a4.patch

@@ -1,34 +0,0 @@
-From b63c73dc5c37e5405bf032c9113c1daced3e45a4 Mon Sep 17 00:00:00 2001
-From: Henrik Gramner <henrik@gramner.com>
-Date: Tue, 7 Aug 2018 22:42:22 +0200
-Subject: [PATCH] cli: Fix linking with --system-libx264 on x86
-
----
- common/x86/cpu-a.asm | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/common/x86/cpu-a.asm b/common/x86/cpu-a.asm
-index d94f7d54..a41d67f8 100644
---- a/common/x86/cpu-a.asm
-+++ b/common/x86/cpu-a.asm
-@@ -83,7 +83,7 @@ cglobal cpu_sfence
- ;-----------------------------------------------------------------------------
- ; intptr_t stack_align( void (*func)(void*), ... ); (up to 5 args)
- ;-----------------------------------------------------------------------------
--cglobal stack_align
-+cvisible stack_align
-     mov      rax, r0mp
-     mov       r0, r1mp
-     mov       r1, r2mp
-@@ -131,7 +131,7 @@ cglobal cpu_cpuid_test
-     popfd
-     ret
- 
--cglobal stack_align
-+cvisible stack_align
-     push      ebp
-     mov       ebp, esp
-     sub       esp, 20
--- 
-2.11.0
-

x264-snapshot.sh

@@ -17,7 +17,8 @@ branch=stable
 commit=HEAD
 
 pushd "$tmp"
-git clone git://git.videolan.org/${package}.git -b ${branch}
+git clone https://code.videolan.org/videolan/x264.git -b ${branch}
+
 cd ${package}
 tag=$(git rev-list HEAD -n 1 | cut -c 1-7)
 git checkout ${commit}

x264.spec

@@ -1,7 +1,7 @@
-# globals for x264-0.155-20180806-0a84d98.tar.bz2
-%global api 155
-%global gitdate 20180806
-%global gitversion 0a84d98
+# globals for x264-0.157-20190717-34c06d1.tar.bz2
+%global api 157
+%global gitdate 20190717
+%global gitversion 34c06d1
 
 %global snapshot %{gitdate}-%{gitversion}
 %global gver .%{gitdate}git%{gitversion}
@@ -31,7 +31,7 @@
 Summary: H264/AVC video streams encoder
 Name: x264
 Version: 0.%{api}
-Release: 6%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist}
+Release: 12%{?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 @@ Patch0: x264-nover.patch
 Patch1: x264-10b.patch
 Patch10: x264-gpac.patch
 Patch11: x264-opencl.patch
-Patch20: x264-sandbox.git-b63c73dc5c37e5405bf032c9113c1daced3e45a4.patch
 
 BuildRequires: gcc
 %{!?_without_gpac:BuildRequires: gpac-devel-static zlib-devel openssl-devel libpng-devel libjpeg-devel}
@@ -101,7 +100,6 @@ pushd %{name}-0.%{api}-%{snapshot}
 %patch1 -p1 -b .10b
 %patch10 -p1 -b .gpac
 %patch11 -p1 -b .opencl
-%patch20 -p1 -b .stack_align
 popd
 
 variants="generic generic10"
@@ -209,20 +207,48 @@ install -pm644 generic/{AUTHORS,COPYING} %{buildroot}%{_pkgdocdir}/
 %endif
 
 %changelog
-* Fri Oct 04 2019 Dominik Mierzejewski <rpm@greysector.net> - 0.155-6.20180806git0a84d98
+* Fri Oct 04 2019 Dominik Mierzejewski <rpm@greysector.net> - 0.157-12.20190717git34c06d1
 - don't overwrite generic headers with 10bit on simdarch (rfbz#5071)
 
-* Tue May 07 2019 Sérgio Basto <sergio@serjux.com> - 0.155-5.20180806git0a84d98
+* Mon Aug 26 2019 Nicolas Chauvet <kwizart@gmail.com> - 0.157-11.20190717git34c06d1
+- Drop hack for arm builders
+
+* Tue Aug 06 2019 Leigh Scott <leigh123linux@gmail.com> - 0.157-10.20190717git34c06d1
+- Rebuild for new ffmpeg version
+
+* Wed Jul 17 2019 Sérgio Basto <sergio@serjux.com> - 0.157-9.20190717git34c06d1
+- 0.157 update, date 2019-07-17 (stable branch)
+
+* Tue May 07 2019 Sérgio Basto <sergio@serjux.com> - 0.157-8.20190303git72db437
 - Revert "Build /usr/bin/x264 with gpac shared lib instead static lib."
 
-* Mon May 06 2019 Sérgio Basto <sergio@serjux.com> - 0.155-4.20180806git0a84d98
+* Wed May 01 2019 Leigh Scott <leigh123linux@gmail.com> - 0.157-7.20190303git72db437
+- Fix ARM rpm mangle issue
+
+* Tue Apr 30 2019 Sérgio Basto <sergio@serjux.com> - 0.157-6.20190303git72db437_bootstrap
+- Bootstrap to fix arm builds
+
+* Mon Apr 29 2019 Sérgio Basto <sergio@serjux.com> - 0.157-5.20190303git72db437
 - Enable opencl (which is default) only exist --disable-opencl option
 - Disable opencl on 10bit seems that is just prepared for 8bit.
 - Build /usr/bin/x264 with gpac shared lib instead static lib.
 
-* Sun Apr 28 2019 Leigh Scott <leigh123linux@gmail.com> - 0.155-3.20180806git0a84d98
+* Sun Apr 28 2019 Leigh Scott <leigh123linux@gmail.com> - 0.157-4.20190303git72db437
 - Fix opencl dlopen (rfbz#5185)
 
+* Tue Mar 12 2019 Leigh Scott <leigh123linux@googlemail.com> - 0.157-3.20190303git72db437
+- Disable bootstrap build
+
+* Tue Mar 12 2019 Leigh Scott <leigh123linux@googlemail.com> - 0.157-2.20190303git72db437_bootstrap
+- Do the forgotten bootstrap build
+
+* Tue Mar 12 2019 Sérgio Basto <sergio@serjux.com> - 0.157-1.20190303git72db437
+- Update to 0.157 (stable branch)
+- Rebase patches
+
+* Tue Mar 05 2019 RPM Fusion Release Engineering <leigh123linux@gmail.com> - 0.155-3.20180806git0a84d98
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
 * Wed Nov 07 2018 Stefan Becker <chemobejk@gmail.com> - 0.155-2.20180806git0a84d98
 - reverse order of generic/generic10 install to fix -devel contents (rfbz #5071)