Author: rathann Update of /cvs/free/rpms/x264/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv31451 Modified Files: .cvsignore sources x264-rpm.patch x264.spec Log Message: * Tue Feb 10 2009 Dominik Mierzejewski <rpm(a)greysector.net&gt; 0.0.0-0.23.20090119git451ba8d - 20090119 snapshot - fix BRs for build-time options Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/x264/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 13 Dec 2008 13:48:28 -0000 1.5 +++ .cvsignore 10 Feb 2009 19:14:39 -0000 1.6 @@ -1 +1 @@ -x264-20081213.tar.bz2 +x264-20090119.tar.bz2 Index: sources =================================================================== RCS file: /cvs/free/rpms/x264/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 13 Dec 2008 13:48:28 -0000 1.5 +++ sources 10 Feb 2009 19:14:39 -0000 1.6 @@ -1 +1 @@ -33addf8e4e1ff4e4b34c8d167aa471ac x264-20081213.tar.bz2 +0e4de4b2c2b551a107ee136c22d4e2f3 x264-20090119.tar.bz2 x264-rpm.patch: Index: x264-rpm.patch =================================================================== RCS file: /cvs/free/rpms/x264/devel/x264-rpm.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- x264-rpm.patch 4 Dec 2008 00:54:53 -0000 1.5 +++ x264-rpm.patch 10 Feb 2009 19:14:39 -0000 1.6 @@ -1,6 +1,6 @@ -diff -up x264-20081202/configure.r x264-20081202/configure ---- x264-20081202/configure.r 2008-12-02 23:26:25.000000000 +0100 -+++ x264-20081202/configure 2008-12-03 01:19:48.000000000 +0100 +diff -up x264-20090119/configure.r x264-20090119/configure +--- x264-20090119/configure.r 2009-02-10 20:05:17.000000000 +0100 ++++ x264-20090119/configure 2009-02-10 20:06:33.000000000 +0100 @@ -41,7 +41,7 @@ as_check() { return $TMP } @@ -39,10 +39,10 @@ pclibs="-L$libdir -lx264 $libpthread" cat > x264.pc << EOF -diff -up x264-20081202/Makefile.r x264-20081202/Makefile ---- x264-20081202/Makefile.r 2008-12-02 23:26:25.000000000 +0100 -+++ x264-20081202/Makefile 2008-12-03 01:21:24.000000000 +0100 -@@ -77,14 +78,25 @@ libx264.a: .depend $(OBJS) $(OBJASM) +diff -up x264-20090119/Makefile.r x264-20090119/Makefile +--- x264-20090119/Makefile.r 2009-02-10 20:05:17.000000000 +0100 ++++ x264-20090119/Makefile 2009-02-10 20:06:02.000000000 +0100 +@@ -77,14 +77,25 @@ libx264.a: .depend $(OBJS) $(OBJASM) ar rc libx264.a $(OBJS) $(OBJASM) ranlib libx264.a @@ -52,23 +52,23 @@ $(SONAME): .depend $(OBJS) $(OBJASM) $(CC) -shared -o $@ $(OBJS) $(OBJASM) $(SOFLAGS) $(LDFLAGS) -+ifneq ($(SONAME),) -+x264$(EXE): $(OBJCLI) libx264.so -+ $(CC) -o $@ $+ $(LDFLAGS) -lx264 -L. -+ -+checkasm: tools/checkasm.o $(SONAME) -+ $(CC) -o $@ $+ $(LDFLAGS) -lx264 -L. -+else ++ifeq ($(SONAME),) x264$(EXE): $(OBJCLI) libx264.a $(CC) -o $@ $+ $(LDFLAGS) checkasm: tools/checkasm.o libx264.a $(CC) -o $@ $+ $(LDFLAGS) ++else ++x264$(EXE): $(OBJCLI) libx264.so ++ $(CC) -o $@ $+ $(LDFLAGS) -lx264 -L. ++ ++checkasm: tools/checkasm.o $(SONAME) ++ $(CC) -o $@ $+ $(LDFLAGS) -lx264 -L. +endif %.o: %.asm $(AS) $(ASFLAGS) -o $@ $< -@@ -148,10 +160,12 @@ install: x264$(EXE) $(SONAME) +@@ -148,10 +159,12 @@ install: x264$(EXE) $(SONAME) install -d $(DESTDIR)$(bindir) $(DESTDIR)$(includedir) install -d $(DESTDIR)$(libdir) $(DESTDIR)$(libdir)/pkgconfig install -m 644 x264.h $(DESTDIR)$(includedir) Index: x264.spec =================================================================== RCS file: /cvs/free/rpms/x264/devel/x264.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- x264.spec 20 Dec 2008 17:32:58 -0000 1.9 +++ x264.spec 10 Feb 2009 19:14:39 -0000 1.10 @@ -1,10 +1,10 @@ -%define snapshot 20081213 -%define git 9089d21 +%define snapshot 20090119 +%define git 451ba8d Summary: H264/AVC video streams encoder Name: x264 Version: 0.0.0 -Release: 0.22.%{snapshot}git%{git}%{?dist} +Release: 0.23.%{snapshot}git%{git}%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://developers.videolan.org/x264.html @@ -12,7 +12,8 @@ Source1: x264-snapshot.sh Patch0: %{name}-rpm.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n) -BuildRequires: gpac-devel +%{?_with_gpac:BuildRequires: gpac-devel} +%{?_with_visualize:BuildRequires: libX11-devel} %ifarch x86_64 %{ix86} BuildRequires: yasm %endif @@ -53,7 +54,7 @@ --bindir=%{_bindir} \\\ --includedir=%{_includedir} \\\ --extra-cflags="$RPM_OPT_FLAGS" \\\ - --enable-mp4-output \\\ + %{?_with_gpac:--enable-mp4-output} \\\ %{?_with_visualize:--enable-visualize} \\\ --enable-pthread \\\ --enable-debug \\\ @@ -131,6 +132,10 @@ %endif %changelog +* Tue Feb 10 2009 Dominik Mierzejewski <rpm(a)greysector.net&gt; 0.0.0-0.23.20090119git451ba8d +- 20090119 snapshot +- fix BRs for build-time options + * Sat Dec 20 2008 Dominik Mierzejewski <rpm(a)greysector.net&gt; 0.0.0-0.22.20081213git9089d21 - rebuild against new gpac