Author: sergiomb Update of /cvs/free/rpms/x264/F-18 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv1091 Modified Files: .cvsignore sources x264-nover.patch x264-snapshot.sh x264.spec Log Message: * Mon Nov 19 2012 Sérgio Basto <sergio(a)serjux.com&gt; - 0.128-1.20121118gitf6a8615 - Update to f6a8615ab0c922ac2cb5c82c9824f6f4742b1725. Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/x264/F-18/.cvsignore,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- .cvsignore 9 Sep 2012 16:00:32 -0000 1.22 +++ .cvsignore 23 Nov 2012 21:08:41 -0000 1.23 @@ -1 +1 @@ -x264-stable-20120909.tar.bz2 +x264-stable-20121118-f6a8615.tar.bz2 Index: sources =================================================================== RCS file: /cvs/free/rpms/x264/F-18/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 9 Sep 2012 16:00:32 -0000 1.22 +++ sources 23 Nov 2012 21:08:41 -0000 1.23 @@ -1 +1 @@ -c8cf985a5c6dc213d01a26af79153156 x264-stable-20120909.tar.bz2 +17211481fbf0873ad8ad7e44c08296a6 x264-stable-20121118-f6a8615.tar.bz2 x264-nover.patch: configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: x264-nover.patch =================================================================== RCS file: /cvs/free/rpms/x264/F-18/x264-nover.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- x264-nover.patch 12 Mar 2012 00:59:40 -0000 1.6 +++ x264-nover.patch 23 Nov 2012 21:08:41 -0000 1.7 @@ -1,12 +1,11 @@ -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 +--- ./configure.nover 2012-11-18 05:31:06.000000000 +0000 ++++ ./configure 2012-11-19 01:44:23.790190057 +0000 +@@ -1147,7 +1147,7 @@ fi echo "LDFLAGSCLI = $LDFLAGSCLI" >> config.mak echo "CLI_LIBX264 = $CLI_LIBX264" >> config.mak -${SRCPATH}/version.sh "${SRCPATH}" >> x264_config.h +cat ${SRCPATH}/version.h >> ${SRCPATH}/x264_config.h - pclibs="-L$libdir -lx264 $libpthread" - + cat > x264.pc << EOF + prefix=$prefix Index: x264-snapshot.sh =================================================================== RCS file: /cvs/free/rpms/x264/F-18/x264-snapshot.sh,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- x264-snapshot.sh 24 Aug 2011 15:32:19 -0000 1.4 +++ x264-snapshot.sh 23 Nov 2012 21:08:41 -0000 1.5 @@ -20,10 +20,11 @@ pushd "$tmp" git clone git://git.videolan.org/${package}.git -b ${branch} cd ${package} +tag=$(git rev-list HEAD -n 1 | cut -c 1-7) git checkout ${commit} git checkout -b rpmfusion ./version.sh > version.h git add version.h git commit -m "generated version.h" version.h -git archive --prefix="${package}-${branch}-${date}/" --format=tar rpmfusion | bzip2 > "$pwd"/${package}-${branch}-${date}.tar.bz2 +git archive --prefix="${package}-${branch}-${date}-${tag}/" --format=tar rpmfusion | bzip2 > "$pwd"/${package}-${branch}-${date}-${tag}.tar.bz2 popd >/dev/null Index: x264.spec =================================================================== RCS file: /cvs/free/rpms/x264/F-18/x264.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- x264.spec 9 Sep 2012 18:16:06 -0000 1.44 +++ x264.spec 23 Nov 2012 21:08:41 -0000 1.45 @@ -1,5 +1,8 @@ -%global snapshot 20120909 -%global branch stable +%global gitdate 20121118 +%global gitversion f6a8615 +%global snapshot %{gitdate}-%{gitversion} +%global gver .%{gitdate}git%{gitversion} +%global branch stable #global _with_bootstrap 1 @@ -19,8 +22,8 @@ Summary: H264/AVC video streams encoder Name: x264 -Version: 0.125 -Release: 4.%{snapshot}%{?dist} +Version: 0.128 +Release: 1%{?gver}%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://developers.videolan.org/x264.html @@ -65,7 +68,7 @@ This package contains the development files. -%define x_configure \ +%global x_configure \ ./configure \\\ --prefix=%{_prefix} \\\ --exec-prefix=%{_exec_prefix} \\\ @@ -186,6 +189,15 @@ %{_libdir}/libx26410b.so %changelog +* Mon Nov 19 2012 Sérgio Basto <sergio(a)serjux.com&gt; - 0.128-1.20121118gitf6a8615 +- Update to f6a8615ab0c922ac2cb5c82c9824f6f4742b1725. + +* Sat Oct 06 2012 Sérgio Basto <sergio(a)serjux.com&gt; - 0.125-4.20121006git68dfb7b +- Note: no source update. +- Just add git tag to package name, for faster check upstream. +- Add git tag in x264-snapshot.sh . +- Convert all defines in global. + * Sun Sep 09 2012 Sérgio Basto <sergio(a)serjux.com&gt; - 0.125-4.20120909 - unbootstrap on F18.