11:54 p.m.
Author: rathann
Update of /cvs/free/rpms/x264/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv23639
Modified Files:
.cvsignore sources x264-snapshot.sh x264.spec
Added Files:
x264-nostrip.patch x264-nover.patch x264-shared.patch
Log Message:
* Fri Mar 05 2010 Dominik Mierzejewski <rpm(a)greysector.net>
0.0.0-0.27.20091109git3daa02e
- 20091109 snapshot (last before ABI change)
- 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 | 8 +++++++-
configure | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
--- NEW FILE x264-shared.patch ---
diff -up x264-20091109/configure.shared x264-20091109/configure
--- x264-20091109/configure.shared 2010-03-06 00:40:16.000000000 +0100
+++ x264-20091109/configure 2010-03-06 00:40:16.000000000 +0100
@@ -499,7 +499,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-20091109/Makefile.shared x264-20091109/Makefile
--- x264-20091109/Makefile.shared 2010-03-06 00:08:55.000000000 +0100
+++ x264-20091109/Makefile 2010-03-06 00:44:06.000000000 +0100
@@ -92,6 +92,12 @@ ifneq ($(HAVE_GETOPT_LONG),1)
SRCS += extras/getopt.c
endif
+ifneq ($(SONAME),)
+LIB=$(SONAME)
+else
+LIB=libx264.a
+endif
+
OBJS = $(SRCS:%.c=%.o)
OBJCLI = $(SRCCLI:%.c=%.o)
DEP = depend
@@ -107,7 +113,7 @@ libx264.a: .depend $(OBJS) $(OBJASM)
$(SONAME): .depend $(OBJS) $(OBJASM)
$(CC) -shared -o $@ $(OBJS) $(OBJASM) $(SOFLAGS) $(LDFLAGS)
-x264$(EXE): $(OBJCLI) libx264.a
+x264$(EXE): $(OBJCLI) $(LIB)
$(CC) -o $@ $+ $(LDFLAGS)
checkasm: tools/checkasm.o libx264.a
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/x264/F-12/.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 5 Mar 2010 23:54:45 -0000 1.11
@@ -1 +1 @@
-x264-20091026.tar.bz2
+x264-20091109.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/x264/F-12/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 5 Mar 2010 23:54:45 -0000 1.11
@@ -1 +1 @@
-1a2a758b237859391d802e9b9ffe2ce9 x264-20091026.tar.bz2
+722cb266377a611be17042f906c7e056 x264-20091109.tar.bz2
Index: x264-snapshot.sh
===================================================================
RCS file: /cvs/free/rpms/x264/F-12/x264-snapshot.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- x264-snapshot.sh 3 Aug 2008 17:53:20 -0000 1.1
+++ x264-snapshot.sh 5 Mar 2010 23:54:45 -0000 1.2
@@ -13,10 +13,12 @@
unset CDPATH
pwd=$(pwd)
git=$(date +%Y%m%d)
+git=20091109
pushd "$tmp"
git clone git://git.videolan.org/x264.git x264-$git
pushd x264-$git
+git checkout 3daa02e9c79ec46fd980bcfcd317df45539c91f6
./version.sh .
find . -type d -name .git -print0 | xargs -0r rm -rf
popd
Index: x264.spec
===================================================================
RCS file: /cvs/free/rpms/x264/F-12/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 5 Mar 2010 23:54:45 -0000 1.17
@@ -1,15 +1,21 @@
-%global snapshot 20091026
-%global git ec46ace7
+%global snapshot 20091109
+%global git 3daa02e
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
+Source0: %{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
+* Fri Mar 05 2010 Dominik Mierzejewski <rpm(a)greysector.net>
0.0.0-0.27.20091109git3daa02e
+- 20091109 snapshot (last before ABI change)
+- 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(a)greysector.net>
0.0.0-0.26.20091026gitec46ace7
- 20091026 snapshot