diff --git a/.gitignore b/.gitignore index ac7b99c..4daf641 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -x264-stable-20121006-68dfb7b.tar.bz2 +x264-stable-20121118-f6a8615.tar.bz2 diff --git a/sources b/sources index cbabb79..460a366 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bf71d1de57328c53e42af7d0429eeb0e x264-stable-20121006-68dfb7b.tar.bz2 +17211481fbf0873ad8ad7e44c08296a6 x264-stable-20121118-f6a8615.tar.bz2 diff --git a/x264-nover.patch b/x264-nover.patch index 5963b99..286bda2 100644 --- a/x264-nover.patch +++ b/x264-nover.patch @@ -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 diff --git a/x264.spec b/x264.spec index d444880..ac42de5 100644 --- a/x264.spec +++ b/x264.spec @@ -1,5 +1,5 @@ -%global gitdate 20121006 -%global gitversion 68dfb7b +%global gitdate 20121118 +%global gitversion f6a8615 %global snapshot %{gitdate}-%{gitversion} %global gver .%{gitdate}git%{gitversion} %global branch stable @@ -22,8 +22,8 @@ Summary: H264/AVC video streams encoder Name: x264 -Version: 0.125 -Release: 5%{?gver}%{?dist} +Version: 0.128 +Release: 1%{?gver}%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://developers.videolan.org/x264.html @@ -189,6 +189,9 @@ touch -r generic/version.h %{buildroot}%{_includedir}/x264.h %{buildroot}%{_incl %{_libdir}/libx26410b.so %changelog +* Mon Nov 19 2012 Sérgio Basto - 0.128-1.20121118gitf6a8615 +- Update to f6a8615ab0c922ac2cb5c82c9824f6f4742b1725. + * Sat Oct 06 2012 Sérgio Basto - 0.125-4.20121006git68dfb7b - Note: no source update. - Just add git tag to package name, for faster check upstream.