commit 8ecc6a6074d3900377e73c0626b80b271477b8eb Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Tue Jul 7 02:53:47 2020 +0100 Update to 0.160-20200702gitcde9a93 (stable branch) .gitignore | 1 + 7c2004b58c26da661618262c9c06b73ad3a9ff6c.diff | 2 +- sources | 2 +- x264-gpac.patch | 2 +- x264.spec | 15 +++++++++------ 5 files changed, 13 insertions(+), 9 deletions(-) --- diff --git a/.gitignore b/.gitignore index f5ba5c6..238f5fc 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ x264-0.148-20160118-5c65704.tar.bz2 /x264-0.157-20190717-34c06d1.tar.bz2 /x264-0.159-20191127git1771b55.tar.bz2 /x264-0.159-20200409git296494a.tar.bz2 +/x264-0.160-20200702gitcde9a93.tar.bz2 diff --git a/7c2004b58c26da661618262c9c06b73ad3a9ff6c.diff b/7c2004b58c26da661618262c9c06b73ad3a9ff6c.diff index fd653bd..9455c0c 100644 --- a/7c2004b58c26da661618262c9c06b73ad3a9ff6c.diff +++ b/7c2004b58c26da661618262c9c06b73ad3a9ff6c.diff @@ -3,7 +3,7 @@ index 51c896e901c5d4bb3ac4408e005380f64fb8f230..78aa11404e414db6168aef920e7e6bda --- a/configure +++ b/configure @@ -1232,15 +1232,16 @@ if [ "$gpac" = "auto" -a "$lsmash" != "yes" ] ; then - for lib in -lz -lssl -lcrypto -lpng -ljpeg -ldl -llzma -lgpac -lGL -lGLU -lavdevice -lavfilter -lfaad -lmad -lxvidcore -la52 -lvorbis -ltheora -lopenjpeg; do + for lib in -lz -lssl -lcrypto -lpng -ljpeg -ldl -llzma -lgpac -lGL -lGLU -lavdevice -lavfilter -lfaad -lmad -lxvidcore -la52 -lvorbis -ltheora -lopenjp2; do cc_check "" $lib && GPAC_LIBS="$GPAC_LIBS $lib" done + cc_check "" -ldl && GPAC_LIBS="$GPAC_LIBS -ldl" diff --git a/sources b/sources index 49ff700..0129c97 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (x264-0.159-20200409git296494a.tar.bz2) = fd7f4b532973c76f2b3f37dec49420285a01918cc7fffadecacdc7cf8debb4b87c13b40c3b9e0e842d6233800bbf33e5d2346d4a9d475ec16cd6db57abe98335 +SHA512 (x264-0.160-20200702gitcde9a93.tar.bz2) = e5bb02aa7c20b939e1a949268acc56a34980c8793221e9c1fcde26d0905305bf9753b1c05218b44ed186777e0578bf38438eaf22535bc7b2e7ab1fffd9ab983e diff --git a/x264-gpac.patch b/x264-gpac.patch index e43bff0..97f4cd9 100644 --- a/x264-gpac.patch +++ b/x264-gpac.patch @@ -5,7 +5,7 @@ gpac="no" GPAC_LIBS="-lgpac_static" - cc_check "" -lz && GPAC_LIBS="$GPAC_LIBS -lz" -+ for lib in -lz -lssl -lcrypto -lpng -ljpeg -ldl -llzma -lgpac -lGL -lGLU -lavdevice -lavfilter -lfaad -lmad -lxvidcore -la52 -lvorbis -ltheora -lopenjpeg; do ++ for lib in -lz -lssl -lcrypto -lpng -ljpeg -ldl -llzma -lgpac -lGL -lGLU -lavdevice -lavfilter -lfaad -lmad -lxvidcore -la52 -lvorbis -ltheora -lopenjp2; do + cc_check "" $lib && GPAC_LIBS="$GPAC_LIBS $lib" + done if [ "$SYS" = "WINDOWS" ] ; then diff --git a/x264.spec b/x264.spec index 4a14974..23b897b 100644 --- a/x264.spec +++ b/x264.spec @@ -1,7 +1,7 @@ -# globals for x264-0.159-20200409git296494a.tar.bz2 -%global api 159 -%global gitdate 20200409 -%global gitversion 296494a +# globals for x264-0.160-20200702gitcde9a93.tar.bz2 +%global api 160 +%global gitdate 20200702 +%global gitversion cde9a93 %global snapshot %{gitdate}git%{gitversion} %global gver .%{gitdate}git%{gitversion} @@ -41,7 +41,7 @@ Summary: H264/AVC video streams encoder Name: x264 Version: 0.%{api} -Release: 11%{?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 @@ -56,7 +56,7 @@ Patch11: x264-opencl.patch Patch12: 7c2004b58c26da661618262c9c06b73ad3a9ff6c.diff BuildRequires: gcc -%{!?_without_gpac:BuildRequires: gpac-devel-static zlib-devel openssl-devel libpng-devel libjpeg-devel xz-devel} +%{!?_without_gpac:BuildRequires: gpac-devel-static zlib-devel openssl-devel libpng-devel libjpeg-devel xz-devel libglvnd-devel mesa-libGLU-devel faad2-devel libmad-devel xvidcore-devel a52dec-devel libvorbis-devel libtheora-devel openjpeg2-devel } %{!?_without_libavformat:BuildRequires: ffmpeg-devel} %{?_with_ffmpegsource:BuildRequires: ffmpegsource-devel} # https://bugzilla.rpmfusion.org/show_bug.cgi?id=3975 @@ -219,6 +219,9 @@ install -pm644 generic/{AUTHORS,COPYING} %{buildroot}%{_pkgdocdir}/ %endif %changelog +* Mon Jul 06 2020 Sérgio Basto <sergio(a)serjux.com&gt; - 0.160-1.20200702gitcde9a93 +- Update to 0.160-20200702gitcde9a93 (stable branch) + * Mon Jul 06 2020 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 0.159-11.20200409git296494a - Bump