commit 6c6c5078381df8b8a12a34c641e847975b39618c Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Tue Mar 12 01:47:03 2019 +0000 Update to 0.157 (stable branch) Rebase patches .gitignore | 1 + sources | 2 +- x264-10b.patch | 14 ++++----- x264-gpac.patch | 6 ++-- ...-b63c73dc5c37e5405bf032c9113c1daced3e45a4.patch | 34 ---------------------- x264.spec | 16 +++++----- 6 files changed, 21 insertions(+), 52 deletions(-) --- diff --git a/.gitignore b/.gitignore index 6dd4ef1..69b000f 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ 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 diff --git a/sources b/sources index 4ca7a53..67ea432 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -38666b9a1b712f3d0c1073105af2e6a5 x264-0.155-20180806-0a84d98.tar.bz2 +fc5fb1afb4a87a0e65ad966e1d8ea28d x264-0.157-20190303-72db437.tar.bz2 diff --git a/x264-10b.patch b/x264-10b.patch index eb062ca..dc819db 100644 --- a/x264-10b.patch +++ b/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),) diff --git a/x264-gpac.patch b/x264-gpac.patch index 19d1a4e..3979342 100644 --- a/x264-gpac.patch +++ b/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" diff --git a/x264.spec b/x264.spec index 9073ca9..cecdb12 100644 --- a/x264.spec +++ b/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-20190303-72db437.tar.bz2 +%global api 157 +%global gitdate 20190303 +%global gitversion 72db437 %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: 3%{?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 @@ -42,7 +42,6 @@ Patch0: x264-nover.patch # add 10b suffix to high bit depth build Patch1: x264-10b.patch Patch10: x264-gpac.patch -Patch20: x264-sandbox.git-b63c73dc5c37e5405bf032c9113c1daced3e45a4.patch BuildRequires: gcc %{!?_without_gpac:BuildRequires: gpac-devel-static zlib-devel openssl-devel libpng-devel libjpeg-devel} @@ -99,7 +98,6 @@ pushd %{name}-0.%{api}-%{snapshot} %patch0 -p1 -b .nover %patch1 -p1 -b .10b %patch10 -p1 -b .gpac -%patch20 -p1 -b .stack_align popd variants="generic generic10" @@ -205,6 +203,10 @@ install -pm644 generic/{AUTHORS,COPYING} %{buildroot}%{_pkgdocdir}/ %endif %changelog +* Tue Mar 12 2019 Sérgio Basto <sergio(a)serjux.com&gt; - 0.157-1.20190303git72db437 +- Update to 0.157 (stable branch) +- Rebase patches + * Tue Mar 05 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com&gt; - 0.155-3.20180806git0a84d98 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild