rpms/x264/devel x264-nostrip.patch, NONE, 1.1 x264-nover.patch, NONE, 1.1 x264-shared.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 sources, 1.10, 1.11 x264.spec, 1.16, 1.17

[Dominik Mierzejewski]

Author: rathann

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

Modified Files:
	.cvsignore sources x264.spec 
Added Files:
	x264-nostrip.patch x264-nover.patch x264-shared.patch 
Log Message:
* Sat Jan 16 2010 Dominik Mierzejewski <rpm at greysector.net> 0.0.0-0.26.20100116git3d0f110
- 20100116 snapshot (SO version bump)
- don't remove config.h and don't re-run version.sh
- link x264 binary to the shared library
- really don't strip if debug is enabled


x264-nostrip.patch:
 configure |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE x264-nostrip.patch ---
diff -up x264-20100116/configure.nostrip x264-20100116/configure
--- x264-20100116/configure.nostrip	2010-01-16 13:19:59.000000000 +0100
+++ x264-20100116/configure	2010-01-16 13:40:39.000000000 +0100
@@ -491,6 +491,8 @@ fi
 if [ "$debug" != "yes" -a "$gprof" != "yes" ]; then
     CFLAGS="$CFLAGS -s -fomit-frame-pointer"
     LDFLAGS="$LDFLAGS -s"
+else
+    STRIP="/bin/true"
 fi
 
 if [ "$debug" = "yes" ]; then

x264-nover.patch:
 configure |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE x264-nover.patch ---
diff -up x264-20100116/configure.nover x264-20100116/configure
--- x264-20100116/configure.nover	2010-01-16 13:45:48.000000000 +0100
+++ x264-20100116/configure	2010-01-16 13:46:41.000000000 +0100
@@ -44,7 +44,7 @@ die() {
     exit 1
 }
 
-rm -f config.h config.mak x264.pc conftest*
+rm -f config.mak x264.pc conftest*
 
 prefix='/usr/local'
 exec_prefix='${prefix}'
@@ -560,8 +562,6 @@ if [ "$shared" = "yes" ]; then
     echo 'default: $(SONAME)' >> config.mak
 fi
 
-./version.sh
-
 pclibs="-L$libdir -lx264 $libpthread"
 
 cat > x264.pc << EOF

x264-shared.patch:
 Makefile  |    5 ++++-
 configure |    2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

--- NEW FILE x264-shared.patch ---
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
         echo "SONAME=libx264.so.$API" >> config.mak
         echo 'SOFLAGS=-Wl,-soname,$(SONAME)' >> config.mak
     fi
-    echo 'default: $(SONAME)' >> config.mak
+    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),)
 ifeq ($(SYS),MINGW)
 SRCSO += x264dll.c
 endif
+LIB=$(SONAME)
+else
+LIB=libx264.a
 endif
 
 OBJS = $(SRCS:%.c=%.o)
@@ -123,7 +126,7 @@ libx264.a: .depend $(OBJS) $(OBJASM)
 $(SONAME): .depend $(OBJS) $(OBJASM) $(OBJSO)
 	$(CC) -shared -o $@ $(OBJS) $(OBJASM) $(OBJSO) $(SOFLAGS) $(LDFLAGS)
 
-x264$(EXE): $(OBJCLI) libx264.a
+x264$(EXE): $(OBJCLI) $(LIB)
 	$(CC) -o $@ $+ $(LDFLAGS) $(LDFLAGSCLI)
 
 checkasm: tools/checkasm.o libx264.a


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/x264/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	27 Oct 2009 00:38:53 -0000	1.10
+++ .cvsignore	16 Jan 2010 14:55:48 -0000	1.11
@@ -1 +1 @@
-x264-20091026.tar.bz2
+x264-20100116.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/free/rpms/x264/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	27 Oct 2009 00:38:53 -0000	1.10
+++ sources	16 Jan 2010 14:55:48 -0000	1.11
@@ -1 +1 @@
-1a2a758b237859391d802e9b9ffe2ce9  x264-20091026.tar.bz2
+e3e2f2150f240dfaf5abfb1832bb23d7  x264-20100116.tar.bz2


Index: x264.spec
===================================================================
RCS file: /cvs/free/rpms/x264/devel/x264.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- x264.spec	26 Oct 2009 14:23:34 -0000	1.16
+++ x264.spec	16 Jan 2010 14:55:48 -0000	1.17
@@ -1,15 +1,21 @@
-%global snapshot 20091026
-%global git ec46ace7
+%global snapshot 20100116
+%global git 3d0f110
 
 Summary: H264/AVC video streams encoder
 Name: x264
 Version: 0.0.0
-Release: 0.26.%{snapshot}git%{git}%{?dist}
+Release: 0.27.%{snapshot}git%{git}%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://developers.videolan.org/x264.html
 Source0: http://rpm.greysector.net/livna/%{name}-%{snapshot}.tar.bz2
 Source1: x264-snapshot.sh
+# don't remove config.h and don't re-run version.sh
+Patch0: x264-nover.patch
+# link with shared libx264
+Patch1: x264-shared.patch
+# don't strip if configured with --enable-debug
+Patch2: x264-nostrip.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
 %{!?_without_gpac:BuildRequires: gpac-devel-static}
 %{?_with_visualize:BuildRequires: libX11-devel}
@@ -63,6 +69,9 @@
 
 %prep
 %setup -q -n %{name}-%{snapshot}
+%patch0 -p1 -b .nover
+%patch1 -p1 -b .shared
+%patch2 -p1 -b .nostrip
 # AUTHORS file is in iso-8859-1
 iconv -f iso-8859-1 -t utf-8 -o AUTHORS.utf8 AUTHORS
 mv -f AUTHORS.utf8 AUTHORS
@@ -132,6 +141,12 @@
 %endif
 
 %changelog
+* Sat Jan 16 2010 Dominik Mierzejewski <rpm at greysector.net> 0.0.0-0.26.20100116git3d0f110
+- 20100116 snapshot (SO version bump)
+- don't remove config.h and don't re-run version.sh
+- link x264 binary to the shared library
+- really don't strip if debug is enabled
+
 * Mon Oct 26 2009 Dominik Mierzejewski <rpm at greysector.net> 0.0.0-0.26.20091026gitec46ace7
 - 20091026 snapshot