[x264/el7] Rebuild for ffmpeg-3.* on el7

commit c2b353c78044d167c2f59fc4f9cc6a5b2d4d3782 Author: sagitter <sagitter(a)fedoraproject.org&gt; Date: Thu Dec 6 14:11:52 2018 +0100 Rebuild for ffmpeg-3.* on el7 .gitignore | 1 + sources | 2 +- x264-snapshot.sh | 9 ++++-- x264.spec | 84 +++++++++++++++++++++++++++++++++++++++++++------------- 4 files changed, 74 insertions(+), 22 deletions(-) --- diff --git a/.gitignore b/.gitignore index a40918d..64d4363 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ x264-0.144-20150225-c8a773e.tar.bz2 x264-0.148-20160118-5c65704.tar.bz2 /x264-0.148-20160614-a5e06b9.tar.bz2 +/x264-0.148-20170521-aaa9aa8.tar.bz2 diff --git a/sources b/sources index ebb5a07..7123f7e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -504515ba14fed322ad89cf39f05e78ee x264-0.148-20160614-a5e06b9.tar.bz2 +4fcea0ce575c7955486bc4ae3867f62c x264-0.148-20170521-aaa9aa8.tar.bz2 diff --git a/x264-snapshot.sh b/x264-snapshot.sh index 3f29af0..5eefc22 100755 --- a/x264-snapshot.sh +++ b/x264-snapshot.sh @@ -12,7 +12,6 @@ cleanup() { unset CDPATH pwd=$(pwd) -date=$(date +%Y%m%d) package=x264 branch=stable commit=HEAD @@ -24,8 +23,14 @@ tag=$(git rev-list HEAD -n 1 | cut -c 1-7) git checkout ${commit} git checkout -b rpmfusion ./version.sh > version.h -API=`grep '#define X264_BUILD' < x264.h | sed -e 's/.* \([1-9][0-9]*\).*/\1/'` +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 popd >/dev/null + +echo \# globals for x264-0.$API-$date-$tag.tar.bz2 +echo %global api $API +echo %global gitdate ${date} +echo %global gitversion ${tag} diff --git a/x264.spec b/x264.spec index 3f60dfa..c7b1bab 100644 --- a/x264.spec +++ b/x264.spec @@ -1,12 +1,13 @@ -# globals for x264-0.148-20160614-a5e06b9.tar.bz2 +# globals for x264-0.148-20170521-aaa9aa8.tar.bz2 %global api 148 -%global gitdate 20160614 -%global gitversion a5e06b9 +%global gitdate 20170521 +%global gitversion aaa9aa8 + %global snapshot %{gitdate}-%{gitversion} %global gver .%{gitdate}git%{gitversion} %global branch stable -#global _with_bootstrap 1 +%global _with_bootstrap 1 %{?_with_bootstrap: %global _without_gpac 1 @@ -30,7 +31,7 @@ Summary: H264/AVC video streams encoder Name: x264 Version: 0.%{api} -Release: 11%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist} +Release: 23%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist} License: GPLv2+ URL: https://www.videolan.org/developers/x264.html Source0: %{name}-0.%{api}-%{snapshot}.tar.bz2 @@ -42,7 +43,7 @@ Patch0: x264-nover.patch Patch1: x264-10b.patch Patch10: x264-gpac.patch -%{!?_without_gpac:BuildRequires: gpac-devel-static zlib-devel openssl-devel libpng-devel libjpeg-devel} +%{!?_without_gpac:BuildRequires: gpac-devel zlib-devel openssl-devel libpng-devel libjpeg-devel} %{!?_without_libavformat:BuildRequires: ffmpeg-devel} %{?_with_ffmpegsource:BuildRequires: ffmpegsource-devel} # https://bugzilla.rpmfusion.org/show_bug.cgi?id=3975 @@ -52,6 +53,7 @@ BuildRequires: execstack %ifarch %{asmarch} %{simdarch} BuildRequires: yasm >= 1.0.0 %endif +BuildRequires: gcc # we need to enforce the exact EVR for an ISA - not only the same ABI Requires: %{name}-libs%{?_isa} = %{version}-%{release} @@ -62,6 +64,7 @@ scratch. This package contains the frontend. %package libs +%{?el7:BuildRequires: epel-rpm-macros} Summary: Library for encoding H264/AVC video streams %description libs @@ -85,7 +88,7 @@ This package contains the development files. %{?_without_libswscale:--disable-swscale} \\\ %{!?_with_ffmpegsource:--disable-ffms} \\\ --disable-opencl \\\ - --enable-debug \\\ + --disable-debug \\\ --enable-shared \\\ --system-libx264 \\\ --enable-pic @@ -113,7 +116,7 @@ pushd generic %{x_configure}\ %{?_without_asm:--disable-asm} -%{__make} %{?_smp_mflags} +%make_build popd pushd generic10 @@ -122,7 +125,7 @@ pushd generic10 --disable-cli\ --bit-depth=10 -%{__make} %{?_smp_mflags} +%make_build popd %ifarch %{simdarch} @@ -130,7 +133,7 @@ pushd simd %{x_configure}\ --libdir=%{slibdir} -%{__make} %{?_smp_mflags} +%make_build popd pushd simd10 @@ -139,7 +142,7 @@ pushd simd10 --libdir=%{slibdir}\ --bit-depth=10 -%{__make} %{?_smp_mflags} +%make_build popd %endif @@ -153,7 +156,7 @@ done for variant in simd simd10 ; do pushd ${variant} %make_install -rm %{buildroot}%{slibdir}/pkgconfig/x264.pc +rm -f %{buildroot}%{slibdir}/pkgconfig/x264.pc popd done %endif @@ -167,19 +170,20 @@ execstack -c %{buildroot}%{_libdir}/libx264{,10b}.so.%{api} %endif install -dm755 %{buildroot}%{_pkgdocdir} -install -pm644 generic/{AUTHORS,COPYING} %{buildroot}%{_pkgdocdir}/ +install -pm644 generic/AUTHORS %{buildroot}%{_pkgdocdir}/ +cp -a generic/doc %{buildroot}%{_pkgdocdir}/ + -%post libs -p /sbin/ldconfig +%ldconfig_scriptlets libs -%postun libs -p /sbin/ldconfig %files %{_bindir}/x264 %files libs -%dir %{_pkgdocdir} -%{_pkgdocdir}/AUTHORS -%license %{_pkgdocdir}/COPYING +%{_pkgdocdir}/ +%exclude %{_pkgdocdir}/doc +%license generic/COPYING %{_libdir}/libx264.so.%{api} %{_libdir}/libx26410b.so.%{api} %ifarch %{simdarch} @@ -188,7 +192,7 @@ install -pm644 generic/{AUTHORS,COPYING} %{buildroot}%{_pkgdocdir}/ %endif %files devel -%doc generic/doc/* +%{_pkgdocdir}/doc/ %{_includedir}/x264.h %{_includedir}/x264_config.h %{_libdir}/libx264.so @@ -200,6 +204,48 @@ install -pm644 generic/{AUTHORS,COPYING} %{buildroot}%{_pkgdocdir}/ %endif %changelog +* Thu Nov 22 2018 Antonio Trande <sagitter(a)fedoraproject.org&gt; - 0.148-23.20170521gitaaa9aa8 +- Rebuild for ffmpeg-3.* on el7 +- Rebuild for x265-2.9 on el7 +- Set Make macros +- Disable debug builds +- Avoid mixed use of documentation macros + +* Thu Aug 31 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org&gt; - 0.148-22.20170521gitaaa9aa8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Mon Jun 26 2017 Sérgio Basto <sergio(a)serjux.com&gt; - 0.148-21.20170521gitaaa9aa8 +- Update x264 to x264-0.148-20170521-aaa9aa8 + +* Mon May 22 2017 Sérgio Basto <sergio(a)serjux.com&gt; - 0.148-20.20170519gitd32d7bf +- Update x264 to x264-0.148-20170519-d32d7bf + +* Sat Apr 29 2017 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 0.148-19.20170121git97eaef2 +- Rebuild for ffmpeg update + +* Wed Mar 22 2017 Sérgio Basto <sergio(a)serjux.com&gt; - 0.148-18.20170121git97eaef2 +- Unbootstrap + +* Mon Mar 20 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org&gt; - 0.148-17.20170121git97eaef2_bootstrap +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Sat Mar 18 2017 Sérgio Basto <sergio(a)serjux.com&gt; - 0.148-16.20170121git97eaef2_bootstrap +- Bootstrap for ppc64, ppc64le and aarch64 + +* Wed Jan 25 2017 Sérgio Basto <sergio(a)serjux.com&gt; - 0.148-15.20170121git97eaef2 +- Update x264 to git stable snapshot of 20170121 + +* Sat Dec 03 2016 Sérgio Basto <sergio(a)serjux.com&gt; - 0.148-14.20161201git4d5c8b0 +- Update to x264-0.148-20161201-4d5c8b0 stable branch +- Improve x264-snapshot.sh to use date from last commit and print the headers to + include in x264.spec + +* Sat Nov 05 2016 Sérgio Basto <sergio(a)serjux.com&gt; - 0.148-13.20160924git86b7198 +- Rebuilt for new ffmpeg + +* Tue Sep 27 2016 Sérgio Basto <sergio(a)serjux.com&gt; - 0.148-12.20160924git86b7198 +- Update to 0.148-20160924-86b7198 version + * Fri Aug 26 2016 Dominik Mierzejewski <rpm(a)greysector.net&gt; - 0.148-11.20160614gita5e06b9 - rework asm treatment on i686 and ppc64 - fix adding the 10b suffix to the library name