diff --git a/.gitignore b/.gitignore index 8b6d9fb..f5ba5c6 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ x264-0.148-20160118-5c65704.tar.bz2 /x264-0.157-20190303-72db437.tar.bz2 /x264-0.157-20190717-34c06d1.tar.bz2 /x264-0.159-20191127git1771b55.tar.bz2 +/x264-0.159-20200409git296494a.tar.bz2 diff --git a/sources b/sources index 1071ce7..49ff700 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (x264-0.159-20191127git1771b55.tar.bz2) = b7e78eae1dc5c0a44a4fa3748b34858b3ba6d33aa1e917ba70800c1fcf175fb023fd935aac3f8f780400636b499ba05c6cf17bfdc1e6bb522c08e2b1e0b0040a +SHA512 (x264-0.159-20200409git296494a.tar.bz2) = fd7f4b532973c76f2b3f37dec49420285a01918cc7fffadecacdc7cf8debb4b87c13b40c3b9e0e842d6233800bbf33e5d2346d4a9d475ec16cd6db57abe98335 diff --git a/x264.spec b/x264.spec index db36407..cfec720 100644 --- a/x264.spec +++ b/x264.spec @@ -1,7 +1,7 @@ -# globals for x264-0.159-20191127git1771b55.tar.bz2 +# globals for x264-0.159-20200409git296494a.tar.bz2 %global api 159 -%global gitdate 20191127 -%global gitversion 1771b55 +%global gitdate 20200409 +%global gitversion 296494a %global snapshot %{gitdate}git%{gitversion} %global gver .%{gitdate}git%{gitversion} @@ -31,7 +31,7 @@ Summary: H264/AVC video streams encoder Name: x264 Version: 0.%{api} -Release: 7%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist} +Release: 8%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist} License: GPLv2+ URL: https://www.videolan.org/developers/x264.html Source0: %{name}-0.%{api}-%{snapshot}.tar.bz2 @@ -117,7 +117,7 @@ pushd generic %{x_configure}\ %{?_without_asm:--disable-asm} -%{__make} %{?_smp_mflags} +%make_build popd pushd generic10 @@ -127,7 +127,7 @@ pushd generic10 --disable-opencl \ --bit-depth=10 -%{__make} %{?_smp_mflags} +%make_build popd %ifarch %{simdarch} @@ -135,7 +135,7 @@ pushd simd %{x_configure}\ --libdir=%{slibdir} -%{__make} %{?_smp_mflags} +%make_build popd pushd simd10 @@ -145,7 +145,7 @@ pushd simd10 --disable-opencl \ --bit-depth=10 -%{__make} %{?_smp_mflags} +%make_build popd %endif @@ -207,6 +207,10 @@ install -pm644 generic/{AUTHORS,COPYING} %{buildroot}%{_pkgdocdir}/ %endif %changelog +* Wed Jun 10 2020 Sérgio Basto - 0.159-8.20200409git296494a +- Update to 0.159-20200409git296494a (stable branch) +- Replace all __make _smp_mflags by make_build macro + * Thu Mar 12 2020 Leigh Scott - 0.159-7.20191127git1771b55 - Rebuilt for i686