Author: kwizart Update of /cvs/free/rpms/x264/EL-6 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25135/EL-6 Modified Files: .cvsignore sources x264-nover.patch x264-snapshot.sh x264.spec Removed Files: x264-nostrip.patch x264-shared.patch Log Message: Boostrap a new libx264 Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/x264/EL-6/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 20 Nov 2011 22:07:05 -0000 1.17 +++ .cvsignore 1 May 2012 09:11:39 -0000 1.18 @@ -1 +1 @@ -x264-stable-20110620.tar.bz2 +x264-stable-20120303.tar.bz2 Index: sources =================================================================== RCS file: /cvs/free/rpms/x264/EL-6/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 20 Nov 2011 22:07:05 -0000 1.17 +++ sources 1 May 2012 09:11:39 -0000 1.18 @@ -1 +1 @@ -b048113f0148b2325fd35b9cd4d32674 x264-stable-20110620.tar.bz2 +096fcd4708acc6e01b8944df73499e59 x264-stable-20120303.tar.bz2 x264-nover.patch: configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: x264-nover.patch =================================================================== RCS file: /cvs/free/rpms/x264/EL-6/x264-nover.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- x264-nover.patch 20 Nov 2011 22:07:05 -0000 1.4 +++ x264-nover.patch 1 May 2012 09:11:39 -0000 1.5 @@ -1,12 +1,12 @@ -diff -up x264-stable-20110620/configure.nover x264-stable-20110620/configure ---- x264-stable-20110620/configure.nover 2011-08-12 02:04:14.000000000 +0200 -+++ x264-stable-20110620/configure 2011-08-12 02:07:28.000000000 +0200 -@@ -1038,7 +1038,7 @@ fi +diff -up x264-stable-20110811/configure.nover x264-stable-20110811/configure +--- x264-stable-20110811/configure.nover 2011-08-11 20:21:38.000000000 +0200 ++++ x264-stable-20110811/configure 2011-08-11 20:27:39.000000000 +0200 +@@ -1057,7 +1057,7 @@ fi echo "LDFLAGSCLI = $LDFLAGSCLI" >> config.mak echo "CLI_LIBX264 = $CLI_LIBX264" >> config.mak --./version.sh >> config.h -+cat version.h >> config.h +-${SRCPATH}/version.sh "${SRCPATH}" >> x264_config.h ++cat ${SRCPATH}/version.h >> ${SRCPATH}/x264_config.h pclibs="-L$libdir -lx264 $libpthread" Index: x264-snapshot.sh =================================================================== RCS file: /cvs/free/rpms/x264/EL-6/x264-snapshot.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- x264-snapshot.sh 20 Nov 2011 22:07:03 -0000 1.3 +++ x264-snapshot.sh 1 May 2012 09:11:39 -0000 1.4 @@ -12,10 +12,10 @@ unset CDPATH pwd=$(pwd) -date=20110620 +date=$(date +%Y%m%d) package=x264 branch=stable -commit=2809cb6ce63817a58c5639642fe05bc50747e126 +commit=HEAD pushd "$tmp" git clone git://git.videolan.org/${package}.git -b ${branch} Index: x264.spec =================================================================== RCS file: /cvs/free/rpms/x264/EL-6/x264.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- x264.spec 4 Jan 2012 22:35:01 -0000 1.29 +++ x264.spec 1 May 2012 09:11:39 -0000 1.30 @@ -1,12 +1,23 @@ -%global snapshot 20110620 +%global snapshot 20120303 %global branch stable -#Defined to bootstrap for EL-6 -%global _without_asm 1 +%global _with_bootstrap 1 +%{?_with_bootstrap: +%global _without_gpac 1 +%global _without_libavformat 1 +} +#Whitelist of arches with dedicated ASM code +%ifnarch x86_64 i686 %{arm} ppc ppc64 %{sparc} +%global _without_asm 1 +%endif + +%if 0%{?rhel} +%global _without_asm 1 +%endif Summary: H264/AVC video streams encoder Name: x264 -Version: 0.0.0 -Release: 0.30.%{snapshot}%{?dist}.2 +Version: 0.120 +Release: 4.%{snapshot}%{?dist}_bootstrap License: GPLv2+ Group: System Environment/Libraries URL: http://developers.videolan.org/x264.html @@ -14,16 +25,11 @@ Source1: x264-snapshot.sh # don't remove config.h and don't re-run version.sh Patch0: x264-nover.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n) -%{!?_without_gpac:BuildRequires: gpac-devel-static} -%{?_with_libavformat:BuildRequires: ffmpeg-devel} +%{!?_without_gpac:BuildRequires: gpac-devel-static zlib-devel} +%{!?_without_libavformat:BuildRequires: ffmpeg-devel} %{?_with_ffmpegsource:BuildRequires: ffmpegsource-devel} %{?_with_visualize:BuildRequires: libX11-devel} -%{!?_without_asm: -%ifarch x86_64 i686 -BuildRequires: yasm -%endif -} +%{!?_without_asm:BuildRequires: yasm >= 1.0.0} Requires: %{name}-libs = %{version}-%{release} %description @@ -43,7 +49,7 @@ %package devel Summary: Development files for the x264 library Group: Development/Libraries -Requires: %{name}-libs = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: pkgconfig %description devel @@ -60,13 +66,13 @@ --includedir=%{_includedir} \\\ --extra-cflags="$RPM_OPT_FLAGS" \\\ %{?_with_visualize:--enable-visualize} \\\ - %{!?_with_libavformat:--disable-lavf} \\\ + %{?_without_libavformat:--disable-lavf} \\\ %{!?_with_ffmpegsource:--disable-ffms} \\\ + %{?_without_asm:--disable-asm} \\\ --enable-debug \\\ --enable-shared \\\ --system-libx264 \\\ - --enable-pic \\\ - --disable-asm + --enable-pic %prep @@ -81,7 +87,7 @@ %{x_configure}\ --host=%{_target_platform} \ --libdir=%{_libdir} \ -%ifarch i686 +%ifarch i686 armv5tel armv6l --disable-asm \ %endif @@ -110,9 +116,6 @@ touch -r version.h %{buildroot}%{_includedir}/x264.h %{buildroot}%{_includedir}/x264_config.h -%clean -%{__rm} -rf %{buildroot} - %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig @@ -141,17 +144,43 @@ %endif %changelog -* Wed Jan 04 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 0.0.0-0.30.20110620.2 -- Rebuild for i686 -- Boostrap x264 for EL-6 +* Tue May 01 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 0.120-5.20120303 +- Forward rhel patch +- Disable ASM on armv5tel armv6l +- Add --with bootstrap conditional +- Use %%{_isa} for devel requires + +* Tue Mar 6 2012 Sérgio Basto <sergio(a)serjux.com&gt; - 0.120-2.20120303 +- Enable libavformat , after compile ffmeg with 0.120-1 + +* Sat Mar 3 2012 Sérgio Basto <sergio(a)serjux.com&gt; - 0.120-1.20120303 +- Change release number, upstream have release numbers at least on stable branch and as ffmpeg + reported. +- Update to 20120303 +- Update x264-nover.patch, as suggest by Joseph D. Wagner <joe(a)josephdwagner.info&gt; +- Dropped obsolete Buildroot and Clean. +- add BuildRequires: zlib-devel to enable gpac. + +* Wed Feb 22 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 0.0.0-0.34.20120125 +- Rebuilt for F-17 inter branch + +* Wed Feb 08 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 0.0.0-0.33.20120125 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Wed Jan 25 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 0.0.0-0.32.20120125 +- Update to 20120125 -* Fri Aug 12 2011 Dominik Mierzejewski <rpm(a)greysector.net&gt; - 0.0.0-0.30.20110620 -- Update to 20110620 stable branch (ABI 115) +* Mon Aug 22 2011 Dominik Mierzejewski <rpm(a)greysector.net&gt; 0.0.0-0.31.20110811 +- 20110811 snapshot (ABI 116) +- fix snapshot script to include version.h properly +- link x264 binary to the shared library + +* Thu Jul 14 2011 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 0.0.0-0.30.20110714 +- Update to 20110714 stable branch (ABI 115) - Convert x264-snapshot to git (based on ffmpeg script). - New Build Conditionals --with ffmpegsource libavformat - Remove shared and strip patches - undeeded anymore - Remove uneeded convertion of AUTHORS -- fix snapshot script to include version.h properly * Mon Jan 10 2011 Dominik Mierzejewski <rpm(a)greysector.net&gt; 0.0.0-0.29.20110227 - 20110227 snapshot (ABI bump) --- x264-nostrip.patch DELETED --- --- x264-shared.patch DELETED ---