Author: kwizart Update of /cvs/free/rpms/x264/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv26699/devel Modified Files: .cvsignore sources x264-nover.patch x264-snapshot.sh x264.spec Removed Files: x264-nostrip.patch x264-shared.patch Log Message: Update to today's snapshot from stable branch (ABI 115) Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/x264/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 27 Feb 2011 22:52:17 -0000 1.16 +++ .cvsignore 14 Jul 2011 18:11:35 -0000 1.17 @@ -1 +1 @@ -x264-20110227.tar.bz2 +x264-stable-20110714.tar.bz2 Index: sources =================================================================== RCS file: /cvs/free/rpms/x264/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 27 Feb 2011 22:52:17 -0000 1.16 +++ sources 14 Jul 2011 18:11:35 -0000 1.17 @@ -1 +1 @@ -784318733e4301d7c49c1317cdfe6baf x264-20110227.tar.bz2 +80191c61a9480435ef3b3219203a214b x264-stable-20110714.tar.bz2 x264-nover.patch: configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: x264-nover.patch =================================================================== RCS file: /cvs/free/rpms/x264/devel/x264-nover.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- x264-nover.patch 19 Jun 2010 22:17:30 -0000 1.3 +++ x264-nover.patch 14 Jul 2011 18:11:35 -0000 1.4 @@ -1,9 +1,9 @@ -diff -up x264-20100620/configure.nover x264-20100620/configure ---- x264-20100620/configure.nover 2010-06-20 00:07:41.000000000 +0200 -+++ x264-20100620/configure 2010-06-20 00:11:53.000000000 +0200 -@@ -689,7 +689,7 @@ if [ "$shared" = "yes" ]; then - echo 'default: $(SONAME)' >> config.mak - fi +diff -up x264-stable-20110714/configure.nover x264-stable-20110714/configure +--- x264-stable-20110714/configure.nover 2011-07-14 19:40:29.000000000 +0200 ++++ x264-stable-20110714/configure 2011-07-14 19:42:02.213802421 +0200 +@@ -1038,7 +1038,7 @@ fi + echo "LDFLAGSCLI = $LDFLAGSCLI" >> config.mak + echo "CLI_LIBX264 = $CLI_LIBX264" >> config.mak -./version.sh >> config.h +cat version.h >> config.h Index: x264-snapshot.sh =================================================================== RCS file: /cvs/free/rpms/x264/devel/x264-snapshot.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- x264-snapshot.sh 27 Feb 2011 22:52:17 -0000 1.2 +++ x264-snapshot.sh 14 Jul 2011 18:11:35 -0000 1.3 @@ -12,13 +12,15 @@ unset CDPATH pwd=$(pwd) -git=$(date +%Y%m%d) +date=$(date +%Y%m%d) +package=x264 +branch=stable pushd "$tmp" -git clone git://git.videolan.org/x264.git x264-$git -pushd x264-$git +git clone git://git.videolan.org/${package}.git -b ${branch} +cd ${package} ./version.sh > version.h -find . -type d -name .git -print0 | xargs -0r rm -rf -popd -tar jcf "$pwd"/x264-$git.tar.bz2 x264-$git +git add version.h +git commit version.h +git archive --prefix="${package}-${branch}-${date}/" --format=tar ${branch} | bzip2 > "$pwd"/${package}-${branch}-${date}.tar.bz2 popd >/dev/null Index: x264.spec =================================================================== RCS file: /cvs/free/rpms/x264/devel/x264.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- x264.spec 10 Mar 2011 22:34:46 -0000 1.25 +++ x264.spec 14 Jul 2011 18:11:35 -0000 1.26 @@ -1,22 +1,21 @@ -%global snapshot 20110227 +%global snapshot 20110714 +%global branch stable Summary: H264/AVC video streams encoder Name: x264 Version: 0.0.0 -Release: 0.29.%{snapshot}%{?dist} +Release: 0.30.%{snapshot}%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://developers.videolan.org/x264.html -Source0: %{name}-%{snapshot}.tar.bz2 +Source0: %{name}-%{branch}-%{snapshot}.tar.bz2 Source1: x264-snapshot.sh # don't remove config.h and don't re-run version.sh Patch0: x264-nover.patch -# link with shared libx264 -Patch1: x264-shared.patch -# don't strip if configured with --enable-debug -Patch2: x264-nostrip.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n) %{!?_without_gpac:BuildRequires: gpac-devel-static} +%{?_with_libavformat:BuildRequires: ffmpeg-devel} +%{?_with_ffmpegsource:BuildRequires: ffmpegsource-devel} %{?_with_visualize:BuildRequires: libX11-devel} %ifarch x86_64 i686 BuildRequires: yasm @@ -57,19 +56,16 @@ --includedir=%{_includedir} \\\ --extra-cflags="$RPM_OPT_FLAGS" \\\ %{?_with_visualize:--enable-visualize} \\\ + %{!?_with_libavformat:--disable-lavf} \\\ + %{!?_with_ffmpegsource:--disable-ffms} \\\ --enable-debug \\\ --enable-shared \\\ --enable-pic %prep -%setup -q -n %{name}-%{snapshot} +%setup -q -n %{name}-%{branch}-%{snapshot} %patch0 -p1 -b .nover -%patch1 -p1 -b .shared -%patch2 -p1 -b .nostrip -# AUTHORS file is in iso-8859-1 -iconv -f iso-8859-1 -t utf-8 -o AUTHORS.utf8 AUTHORS -mv -f AUTHORS.utf8 AUTHORS %ifarch i686 mkdir simd cp -a `ls -1|grep -v simd` simd/ @@ -104,6 +100,10 @@ popd %endif +#Fix timestamp on x264 generated headers +touch -r version.h %{buildroot}%{_includedir}/x264.h %{buildroot}%{_includedir}/x264_config.h + + %clean %{__rm} -rf %{buildroot} @@ -121,9 +121,7 @@ %{_libdir}/libx264.so.* %ifarch i686 %{_libdir}/sse2/libx264.so.* -%exclude %{_libdir}/sse2/libx264.a %endif -%exclude %{_libdir}/libx264.a %files devel %defattr(644, root, root, 0755) @@ -137,6 +135,13 @@ %endif %changelog +* 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 + * 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 ---