commit f55d54d65ba0e4fe377e6a4f5eb502da205935dc Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Sat Dec 3 16:39:54 2016 +0000 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 .gitignore | 1 + sources | 2 +- x264-snapshot.sh | 9 +++++++-- x264.spec | 14 ++++++++++---- 4 files changed, 19 insertions(+), 7 deletions(-) --- diff --git a/.gitignore b/.gitignore index 227b5de..703a550 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,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-20160924-86b7198.tar.bz2 +/x264-0.148-20161201-4d5c8b0.tar.bz2 diff --git a/sources b/sources index 46ab657..68cda48 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5d3470475b238807a57d22d39c58277c x264-0.148-20160924-86b7198.tar.bz2 +a6829f012ec1a16dc216e480c82ca277 x264-0.148-20161201-4d5c8b0.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 518a3ea..c4d4b75 100644 --- a/x264.spec +++ b/x264.spec @@ -1,7 +1,8 @@ -# globals for x264-0.148-20160924-86b7198.tar.bz2 +# globals for x264-0.148-20161201-4d5c8b0.tar.bz2 %global api 148 -%global gitdate 20160924 -%global gitversion 86b7198 +%global gitdate 20161201 +%global gitversion 4d5c8b0 + %global snapshot %{gitdate}-%{gitversion} %global gver .%{gitdate}git%{gitversion} %global branch stable @@ -30,7 +31,7 @@ Summary: H264/AVC video streams encoder Name: x264 Version: 0.%{api} -Release: 13%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist} +Release: 14%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist} License: GPLv2+ URL: https://www.videolan.org/developers/x264.html Source0: %{name}-0.%{api}-%{snapshot}.tar.bz2 @@ -200,6 +201,11 @@ install -pm644 generic/{AUTHORS,COPYING} %{buildroot}%{_pkgdocdir}/ %endif %changelog +* 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