From a2219f8356bde49c73dd33b883ae7bca8647259a Mon Sep 17 00:00:00 2001
From: Dominik Mierzejewski <dominik@greysector.net>
Date: Wed, 24 Aug 2011 15:32:19 +0000
Subject: [PATCH] * Mon Aug 22 2011 Dominik Mierzejewski <rpm@greysector.net>
 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

---
 .gitignore       |  2 +-
 sources          |  2 +-
 x264-nover.patch | 12 ++++++------
 x264-snapshot.sh |  7 +++++--
 x264.spec        | 10 ++++++++--
 5 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 005e686..e3a5d21 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-x264-stable-20110714.tar.bz2
+x264-stable-20110811.tar.bz2
diff --git a/sources b/sources
index 66fe7f5..cfe1ea9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-80191c61a9480435ef3b3219203a214b  x264-stable-20110714.tar.bz2
+86529759b0153927f8bd82197283ea82  x264-stable-20110811.tar.bz2
diff --git a/x264-nover.patch b/x264-nover.patch
index 3d4fe51..24a9535 100644
--- a/x264-nover.patch
+++ b/x264-nover.patch
@@ -1,12 +1,12 @@
-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
+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
+-./version.sh >> x264_config.h
++cat version.h >> x264_config.h
  
  pclibs="-L$libdir -lx264 $libpthread"
  
diff --git a/x264-snapshot.sh b/x264-snapshot.sh
index fba68fa..8493b76 100755
--- a/x264-snapshot.sh
+++ b/x264-snapshot.sh
@@ -15,12 +15,15 @@ pwd=$(pwd)
 date=$(date +%Y%m%d)
 package=x264
 branch=stable
+commit=HEAD
 
 pushd "$tmp"
 git clone git://git.videolan.org/${package}.git -b ${branch}
 cd ${package}
+git checkout ${commit}
+git checkout -b rpmfusion
 ./version.sh > version.h
 git add version.h
-git commit version.h
-git archive --prefix="${package}-${branch}-${date}/" --format=tar ${branch} | bzip2 > "$pwd"/${package}-${branch}-${date}.tar.bz2
+git commit -m "generated version.h" version.h
+git archive --prefix="${package}-${branch}-${date}/" --format=tar rpmfusion | bzip2 > "$pwd"/${package}-${branch}-${date}.tar.bz2
 popd >/dev/null
diff --git a/x264.spec b/x264.spec
index 9a8b679..4c5051a 100644
--- a/x264.spec
+++ b/x264.spec
@@ -1,10 +1,10 @@
-%global snapshot 20110714
+%global snapshot 20110811
 %global branch   stable
 
 Summary: H264/AVC video streams encoder
 Name: x264
 Version: 0.0.0
-Release: 0.30.%{snapshot}%{?dist}
+Release: 0.31.%{snapshot}%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://developers.videolan.org/x264.html
@@ -60,6 +60,7 @@ This package contains the development files.
 	%{!?_with_ffmpegsource:--disable-ffms} \\\
 	--enable-debug \\\
 	--enable-shared \\\
+	--system-libx264 \\\
 	--enable-pic
 
 
@@ -135,6 +136,11 @@ touch -r version.h %{buildroot}%{_includedir}/x264.h %{buildroot}%{_includedir}/
 %endif
 
 %changelog
+* Mon Aug 22 2011 Dominik Mierzejewski <rpm@greysector.net> 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@gmail.com> - 0.0.0-0.30.20110714
 - Update to 20110714 stable branch (ABI 115)
 - Convert x264-snapshot to git (based on ffmpeg script).