rpms/x264/devel .cvsignore, 1.17, 1.18 sources, 1.17, 1.18 x264-nover.patch, 1.4, 1.5 x264-snapshot.sh, 1.3, 1.4 x264.spec, 1.26, 1.27

[Dominik Mierzejewski]

Author: rathann

Update of /cvs/free/rpms/x264/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3264

Modified Files:
	.cvsignore sources x264-nover.patch x264-snapshot.sh x264.spec 
Log Message:
* Mon Aug 22 2011 Dominik Mierzejewski <rpm at 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



Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/x264/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	14 Jul 2011 18:11:35 -0000	1.17
+++ .cvsignore	24 Aug 2011 15:32:19 -0000	1.18
@@ -1 +1 @@
-x264-stable-20110714.tar.bz2
+x264-stable-20110811.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/free/rpms/x264/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	14 Jul 2011 18:11:35 -0000	1.17
+++ sources	24 Aug 2011 15:32:19 -0000	1.18
@@ -1 +1 @@
-80191c61a9480435ef3b3219203a214b  x264-stable-20110714.tar.bz2
+86529759b0153927f8bd82197283ea82  x264-stable-20110811.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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- x264-nover.patch	14 Jul 2011 18:11:35 -0000	1.4
+++ x264-nover.patch	24 Aug 2011 15:32:19 -0000	1.5
@@ -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"
  


Index: x264-snapshot.sh
===================================================================
RCS file: /cvs/free/rpms/x264/devel/x264-snapshot.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- x264-snapshot.sh	14 Jul 2011 18:11:35 -0000	1.3
+++ x264-snapshot.sh	24 Aug 2011 15:32:19 -0000	1.4
@@ -15,12 +15,15 @@
 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


Index: x264.spec
===================================================================
RCS file: /cvs/free/rpms/x264/devel/x264.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- x264.spec	14 Jul 2011 18:11:35 -0000	1.26
+++ x264.spec	24 Aug 2011 15:32:19 -0000	1.27
@@ -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 @@
 	%{!?_with_ffmpegsource:--disable-ffms} \\\
 	--enable-debug \\\
 	--enable-shared \\\
+	--system-libx264 \\\
 	--enable-pic
 
 
@@ -135,6 +136,11 @@
 %endif
 
 %changelog
+* Mon Aug 22 2011 Dominik Mierzejewski <rpm at 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 at gmail.com> - 0.0.0-0.30.20110714
 - Update to 20110714 stable branch (ABI 115)
 - Convert x264-snapshot to git (based on ffmpeg script).