diff --git a/.gitignore b/.gitignore index 969e652..005e686 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -x264-20110227.tar.bz2 +x264-stable-20110714.tar.bz2 diff --git a/sources b/sources index 4760045..66fe7f5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -784318733e4301d7c49c1317cdfe6baf x264-20110227.tar.bz2 +80191c61a9480435ef3b3219203a214b x264-stable-20110714.tar.bz2 diff --git a/x264-nostrip.patch b/x264-nostrip.patch deleted file mode 100644 index 851cbea..0000000 --- a/x264-nostrip.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 diff --git a/x264-nover.patch b/x264-nover.patch index d67f0b3..3d4fe51 100644 --- a/x264-nover.patch +++ b/x264-nover.patch @@ -1,9 +1,9 @@ -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 +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 + echo "LDFLAGSCLI = $LDFLAGSCLI" >> config.mak + echo "CLI_LIBX264 = $CLI_LIBX264" >> config.mak -./version.sh >> config.h +cat version.h >> config.h diff --git a/x264-shared.patch b/x264-shared.patch deleted file mode 100644 index d800b7e..0000000 --- a/x264-shared.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -up x264-20101211/configure.shared x264-20101211/configure ---- x264-20101211/configure.shared 2010-12-11 19:47:37.000000000 +0100 -+++ x264-20101211/configure 2010-12-11 19:48:05.000000000 +0100 -@@ -796,7 +796,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 - - cat version.h >> config.h -diff -up x264-20101211/Makefile.shared x264-20101211/Makefile ---- x264-20101211/Makefile.shared 2010-12-11 19:46:33.000000000 +0100 -+++ x264-20101211/Makefile 2010-12-11 19:47:37.000000000 +0100 -@@ -124,6 +124,9 @@ ifneq ($(SONAME),) - ifeq ($(SYS),MINGW) - SRCSO += x264dll.c - endif -+LIB=$(SONAME) -+else -+LIB=libx264.a - endif - - OBJS = $(SRCS:%.c=%.o) -@@ -142,7 +145,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 $@ $+ $(LDFLAGSCLI) $(LDFLAGS) - - checkasm: tools/checkasm.o libx264.a diff --git a/x264-snapshot.sh b/x264-snapshot.sh index c3dbaca..fba68fa 100755 --- a/x264-snapshot.sh +++ b/x264-snapshot.sh @@ -12,13 +12,15 @@ cleanup() { unset CDPATH pwd=$(pwd) -git=$(date +%Y%m%d) +date=$(date +%Y%m%d) +package=x264 +branch=stable pushd "$tmp" -git clone git://git.videolan.org/x264.git x264-$git -pushd x264-$git +git clone git://git.videolan.org/${package}.git -b ${branch} +cd ${package} ./version.sh > version.h -find . -type d -name .git -print0 | xargs -0r rm -rf -popd -tar jcf "$pwd"/x264-$git.tar.bz2 x264-$git +git add version.h +git commit version.h +git archive --prefix="${package}-${branch}-${date}/" --format=tar ${branch} | bzip2 > "$pwd"/${package}-${branch}-${date}.tar.bz2 popd >/dev/null diff --git a/x264.spec b/x264.spec index f7cbd0b..9a8b679 100644 --- a/x264.spec +++ b/x264.spec @@ -1,22 +1,21 @@ -%global snapshot 20110227 +%global snapshot 20110714 +%global branch stable Summary: H264/AVC video streams encoder Name: x264 Version: 0.0.0 -Release: 0.29.%{snapshot}%{?dist} +Release: 0.30.%{snapshot}%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://developers.videolan.org/x264.html -Source0: %{name}-%{snapshot}.tar.bz2 +Source0: %{name}-%{branch}-%{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_libavformat:BuildRequires: ffmpeg-devel} +%{?_with_ffmpegsource:BuildRequires: ffmpegsource-devel} %{?_with_visualize:BuildRequires: libX11-devel} %ifarch x86_64 i686 BuildRequires: yasm @@ -57,19 +56,16 @@ This package contains the development files. --includedir=%{_includedir} \\\ --extra-cflags="$RPM_OPT_FLAGS" \\\ %{?_with_visualize:--enable-visualize} \\\ + %{!?_with_libavformat:--disable-lavf} \\\ + %{!?_with_ffmpegsource:--disable-ffms} \\\ --enable-debug \\\ --enable-shared \\\ --enable-pic %prep -%setup -q -n %{name}-%{snapshot} +%setup -q -n %{name}-%{branch}-%{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 %ifarch i686 mkdir simd cp -a `ls -1|grep -v simd` simd/ @@ -104,6 +100,10 @@ rm %{buildroot}%{_libdir}/*/pkgconfig/x264.pc popd %endif +#Fix timestamp on x264 generated headers +touch -r version.h %{buildroot}%{_includedir}/x264.h %{buildroot}%{_includedir}/x264_config.h + + %clean %{__rm} -rf %{buildroot} @@ -121,9 +121,7 @@ popd %{_libdir}/libx264.so.* %ifarch i686 %{_libdir}/sse2/libx264.so.* -%exclude %{_libdir}/sse2/libx264.a %endif -%exclude %{_libdir}/libx264.a %files devel %defattr(644, root, root, 0755) @@ -137,6 +135,13 @@ popd %endif %changelog +* Thu Jul 14 2011 Nicolas Chauvet - 0.0.0-0.30.20110714 +- Update to 20110714 stable branch (ABI 115) +- Convert x264-snapshot to git (based on ffmpeg script). +- New Build Conditionals --with ffmpegsource libavformat +- Remove shared and strip patches - undeeded anymore +- Remove uneeded convertion of AUTHORS + * Mon Jan 10 2011 Dominik Mierzejewski 0.0.0-0.29.20110227 - 20110227 snapshot (ABI bump)