Author: rathann Update of /cvs/free/rpms/x264/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv27708 Modified Files: .cvsignore sources x264-nover.patch x264-shared.patch x264.spec Log Message: * Sun Jun 20 2010 Dominik Mierzejewski <rpm(a)greysector.net&gt; 0.0.0-0.28.20100620git20cbe10 - 20100620 snapshot (ABI bump) Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/x264/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 29 Apr 2010 18:46:25 -0000 1.12 +++ .cvsignore 19 Jun 2010 22:17:30 -0000 1.13 @@ -1 +1 @@ -x264-20100429.tar.bz2 +x264-20100620.tar.bz2 Index: sources =================================================================== RCS file: /cvs/free/rpms/x264/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 29 Apr 2010 18:46:25 -0000 1.12 +++ sources 19 Jun 2010 22:17:30 -0000 1.13 @@ -1 +1 @@ -13601402b1e247e65d886f77903c14f7 x264-20100429.tar.bz2 +eef8675f3f7e3d318fc1a5fbfd8c154a x264-20100620.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.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- x264-nover.patch 29 Apr 2010 22:30:05 -0000 1.2 +++ x264-nover.patch 19 Jun 2010 22:17:30 -0000 1.3 @@ -1,21 +1,12 @@ -diff -up x264-20100209/configure.nover x264-20100209/configure ---- x264-20100209/configure.nover 2010-02-09 21:33:25.000000000 +0100 -+++ x264-20100209/configure 2010-02-09 22:20:35.000000000 +0100 -@@ -103,7 +103,7 @@ die() { - exit 1 - } - --rm -f config.h config.mak config.log x264.pc conftest* -+rm -f config.mak config.log x264.pc conftest* - - prefix='/usr/local' - exec_prefix='${prefix}' -@@ -667,8 +667,6 @@ if [ "$shared" = "yes" ]; then +diff -up x264-20100620/configure.nover x264-20100620/configure +--- x264-20100620/configure.nover 2010-06-20 00:07:41.000000000 +0200 ++++ x264-20100620/configure 2010-06-20 00:11:53.000000000 +0200 +@@ -689,7 +689,7 @@ if [ "$shared" = "yes" ]; then echo 'default: $(SONAME)' >> config.mak fi --./version.sh -- +-./version.sh >> config.h ++cat version.h >> config.h + pclibs="-L$libdir -lx264 $libpthread" - cat > x264.pc << EOF x264-shared.patch: Makefile | 5 ++++- configure | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) Index: x264-shared.patch =================================================================== RCS file: /cvs/free/rpms/x264/devel/x264-shared.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- x264-shared.patch 16 Jan 2010 14:55:48 -0000 1.1 +++ x264-shared.patch 19 Jun 2010 22:17:30 -0000 1.2 @@ -1,7 +1,7 @@ -diff -up x264-20100116/configure.shared x264-20100116/configure ---- x264-20100116/configure.shared 2010-01-16 13:48:11.000000000 +0100 -+++ x264-20100116/configure 2010-01-16 13:53:15.000000000 +0100 -@@ -559,7 +559,7 @@ if [ "$shared" = "yes" ]; then +diff -up x264-20100620/configure.shared x264-20100620/configure +--- x264-20100620/configure.shared 2010-06-20 00:13:02.000000000 +0200 ++++ x264-20100620/configure 2010-06-20 00:13:31.000000000 +0200 +@@ -686,7 +686,7 @@ if [ "$shared" = "yes" ]; then echo "SONAME=libx264.so.$API" >> config.mak echo 'SOFLAGS=-Wl,-soname,$(SONAME)' >> config.mak fi @@ -9,11 +9,11 @@ + echo 'default: libx264.a $(SONAME)' >> config.mak fi - pclibs="-L$libdir -lx264 $libpthread" -diff -up x264-20100116/Makefile.shared x264-20100116/Makefile ---- x264-20100116/Makefile.shared 2010-01-16 13:45:48.000000000 +0100 -+++ x264-20100116/Makefile 2010-01-16 13:52:55.000000000 +0100 -@@ -105,6 +105,9 @@ ifneq ($(SONAME),) + cat version.h >> config.h +diff -up x264-20100620/Makefile.shared x264-20100620/Makefile +--- x264-20100620/Makefile.shared 2010-06-20 00:12:43.000000000 +0200 ++++ x264-20100620/Makefile 2010-06-20 00:13:02.000000000 +0200 +@@ -109,6 +109,9 @@ ifneq ($(SONAME),) ifeq ($(SYS),MINGW) SRCSO += x264dll.c endif @@ -23,7 +23,7 @@ endif OBJS = $(SRCS:%.c=%.o) -@@ -123,7 +126,7 @@ libx264.a: .depend $(OBJS) $(OBJASM) +@@ -127,7 +130,7 @@ libx264.a: .depend $(OBJS) $(OBJASM) $(SONAME): .depend $(OBJS) $(OBJASM) $(OBJSO) $(CC) -shared -o $@ $(OBJS) $(OBJASM) $(OBJSO) $(SOFLAGS) $(LDFLAGS) Index: x264.spec =================================================================== RCS file: /cvs/free/rpms/x264/devel/x264.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- x264.spec 29 Apr 2010 18:46:55 -0000 1.19 +++ x264.spec 19 Jun 2010 22:17:30 -0000 1.20 @@ -1,10 +1,10 @@ -%global snapshot 20100429 -%global git d9db8b3 +%global snapshot 20100620 +%global git 20cbe10 Summary: H264/AVC video streams encoder Name: x264 Version: 0.0.0 -Release: 0.27.%{snapshot}git%{git}%{?dist} +Release: 0.28.%{snapshot}git%{git}%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://developers.videolan.org/x264.html @@ -141,6 +141,9 @@ %endif %changelog +* Sun Jun 20 2010 Dominik Mierzejewski <rpm(a)greysector.net&gt; 0.0.0-0.28.20100620git20cbe10 +- 20100620 snapshot (ABI bump) + * Thu Apr 29 2010 Dominik Mierzejewski <rpm(a)greysector.net&gt; 0.0.0-0.27.20100429gitd9db8b3 - 20100429 snapshot - s/%%{ix86}/i686 (rfbz #1075)