[svn] r4737 - in trunk/rpms: ffmpeg x264

packagers at lists.rpmforge.net packagers at lists.rpmforge.net
Mon Sep 18 19:27:22 CEST 2006 

Author: thias
Date: 2006-09-18 19:27:21 +0200 (Mon, 18 Sep 2006)
New Revision: 4737

Added:
   trunk/rpms/ffmpeg/ffmpeg-20060918-gsm.patch
Removed:
   trunk/rpms/ffmpeg/ffmpeg-0.4.9-20051207-a52link.patch
   trunk/rpms/ffmpeg/ffmpeg-0.4.9-20051207-gsm.patch
Modified:
   trunk/rpms/ffmpeg/ffmpeg.spec
   trunk/rpms/x264/x264.spec
Log:
Update x264 and ffmpeg to today's codebase (for FC6, beware of API breakage).


Deleted: trunk/rpms/ffmpeg/ffmpeg-0.4.9-20051207-a52link.patch
===================================================================
--- trunk/rpms/ffmpeg/ffmpeg-0.4.9-20051207-a52link.patch	2006-09-18 17:04:06 UTC (rev 4736)
+++ trunk/rpms/ffmpeg/ffmpeg-0.4.9-20051207-a52link.patch	2006-09-18 17:27:21 UTC (rev 4737)
@@ -1,14 +0,0 @@
-diff -Naupr ffmpeg-20051207.orig/libavcodec/Makefile ffmpeg-20051207/libavcodec/Makefile
---- ffmpeg-20051207.orig/libavcodec/Makefile	2005-11-30 02:40:50.000000000 +0100
-+++ ffmpeg-20051207/libavcodec/Makefile	2005-12-07 21:13:38.000000000 +0100
-@@ -249,7 +249,9 @@ ifeq ($(CONFIG_AC3),yes)
- OBJS+= a52dec.o
- 
- # using builtin liba52 or runtime linked liba52.so.0
--ifneq ($(CONFIG_A52BIN),yes)
-+ifeq ($(CONFIG_A52BIN),yes)
-+EXTRALIBS += -la52
-+else
- OBJS+= liba52/bit_allocate.o liba52/bitstream.o liba52/downmix.o \
- 	liba52/imdct.o  liba52/parse.o liba52/crc.o liba52/resample.o
- endif

Deleted: trunk/rpms/ffmpeg/ffmpeg-0.4.9-20051207-gsm.patch
===================================================================
--- trunk/rpms/ffmpeg/ffmpeg-0.4.9-20051207-gsm.patch	2006-09-18 17:04:06 UTC (rev 4736)
+++ trunk/rpms/ffmpeg/ffmpeg-0.4.9-20051207-gsm.patch	2006-09-18 17:27:21 UTC (rev 4737)
@@ -1,12 +0,0 @@
-diff -Naupr ffmpeg-20051207.orig/libavcodec/libgsm.c ffmpeg-20051207/libavcodec/libgsm.c
---- ffmpeg-20051207.orig/libavcodec/libgsm.c	2005-05-23 01:39:11.000000000 +0200
-+++ ffmpeg-20051207/libavcodec/libgsm.c	2005-12-08 00:56:37.000000000 +0100
-@@ -23,7 +23,7 @@
-  */
- 
- #include "avcodec.h"
--#include <gsm.h>
-+#include <gsm/gsm.h>
- 
- // gsm.h miss some essential constants
- #define GSM_BLOCK_SIZE 33

Added: trunk/rpms/ffmpeg/ffmpeg-20060918-gsm.patch
===================================================================
--- trunk/rpms/ffmpeg/ffmpeg-20060918-gsm.patch	                        (rev 0)
+++ trunk/rpms/ffmpeg/ffmpeg-20060918-gsm.patch	2006-09-18 17:27:21 UTC (rev 4737)
@@ -0,0 +1,24 @@
+diff -Naupr ffmpeg-20060918.orig/configure ffmpeg-20060918/configure
+--- ffmpeg-20060918.orig/configure	2006-09-17 00:07:20.000000000 +0200
++++ ffmpeg-20060918/configure	2006-09-18 17:42:59.000000000 +0200
+@@ -1281,7 +1281,7 @@ fi
+ 
+ # these are off by default, so fail if requested and not available
+ enabled dts     && require libdts dts.h dts_init -ldts
+-enabled libgsm  && require libgsm gsm.h gsm_create -lgsm
++enabled libgsm  && require libgsm gsm/gsm.h gsm_create -lgsm
+ enabled mp3lame && require LAME lame/lame.h lame_init -lmp3lame
+ enabled vorbis  && require libvorbis vorbis/vorbisenc.h vorbis_info_init -lvorbis -lvorbisenc -logg
+ enabled libogg  && require libogg ogg/ogg.h ogg_sync_init -logg
+diff -Naupr ffmpeg-20060918.orig/libavcodec/libgsm.c ffmpeg-20060918/libavcodec/libgsm.c
+--- ffmpeg-20060918.orig/libavcodec/libgsm.c	2006-01-12 23:43:26.000000000 +0100
++++ ffmpeg-20060918/libavcodec/libgsm.c	2006-09-18 17:42:48.000000000 +0200
+@@ -23,7 +23,7 @@
+  */
+ 
+ #include "avcodec.h"
+-#include <gsm.h>
++#include <gsm/gsm.h>
+ 
+ // gsm.h miss some essential constants
+ #define GSM_BLOCK_SIZE 33

Modified: trunk/rpms/ffmpeg/ffmpeg.spec
===================================================================
--- trunk/rpms/ffmpeg/ffmpeg.spec	2006-09-18 17:04:06 UTC (rev 4736)
+++ trunk/rpms/ffmpeg/ffmpeg.spec	2006-09-18 17:27:21 UTC (rev 4737)
@@ -18,36 +18,35 @@
 %{?el2:%define _without_vorbis 1}
 %{?el2:%define _without_x264 1}
 
-%define date   20060317
-#define prever pre1
+%define date   20060918
 
 Summary: Record, convert and stream audio and video
 Name: ffmpeg
 Version: 0.4.9
-Release: 0.5%{?date:.%{date}}%{?prever:.%{prever}}
+Release: 0.6%{?date:.%{date}}
 License: GPL
 Group: System Environment/Libraries
 URL: http://ffmpeg.sourceforge.net/
 %if 0%{!?date:1}
-Source: http://dl.sf.net/ffmpeg/ffmpeg-%{version}%{?prever:-%{prever}}.tar.gz
+Source: http://dl.sf.net/ffmpeg/ffmpeg-%{version}.tar.gz
 %else
-# cvs -z9 -d:pserver:anonymous at mplayerhq.hu:/cvsroot/ffmpeg co ffmpeg
+# svn checkout svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg
 # then rename the directory and compress
 Source: ffmpeg-%{date}.tar.bz2
 %endif
-Patch0: ffmpeg-0.4.9-20051207-a52link.patch
-Patch1: ffmpeg-0.4.9-20051207-gsm.patch
+Patch0: ffmpeg-20060918-gsm.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: imlib2-devel, SDL-devel, freetype-devel, zlib-devel
 BuildRequires: texi2html
 %{!?_without_lame:BuildRequires: lame-devel}
 %{!?_without_vorbis:BuildRequires: libogg-devel, libvorbis-devel}
-%{!?_without_theora:BuildRequires: libogg-devel, libtheora-devel}
+#{!?_without_theora:BuildRequires: libogg-devel, libtheora-devel}
 %{!?_without_faad:BuildRequires: faad2-devel}
 %{!?_without_faac:BuildRequires: faac-devel}
 %{!?_without_gsm:BuildRequires: gsm-devel}
 %{!?_without_xvid:BuildRequires: xvidcore-devel}
 %{!?_without_x264:BuildRequires: x264-devel}
+%{!?_without_a52dec:Requires: a52dec}
 %{!?_without_a52dec:BuildRequires: a52dec-devel}
 %{!?_without_dts:BuildRequires: libdca-devel}
 %{?_with_dc1394:BuildRequires: libdc1394-devel}
@@ -62,7 +61,7 @@
 quality polyphase filter.
 
 Available rpmbuild rebuild options :
---without : lame vorbis theora faad faac gsm xvid x264 a52dec dts altivec
+--without : lame vorbis faad faac gsm xvid x264 a52dec dts altivec
 --with    : dc1394
 
 
@@ -73,7 +72,7 @@
 Requires: imlib2-devel, SDL-devel, freetype-devel, zlib-devel, pkgconfig
 %{!?_without_lame:Requires: lame-devel}
 %{!?_without_vorbis:Requires: libogg-devel, libvorbis-devel}
-%{!?_without_theora:Requires: libogg-devel, libtheora-devel}
+#{!?_without_theora:Requires: libogg-devel, libtheora-devel}
 %{!?_without_faad:Requires: faad2-devel}
 %{!?_without_faac:Requires: faac-devel}
 %{!?_without_gsm:Requires: gsm-devel}
@@ -115,9 +114,8 @@
 
 
 %prep
-%setup -n %{?date:ffmpeg-%{date}}%{!?date:%{name}-%{version}%{?prever:-%{prever}}}
-%patch0 -p1 -b .a52link
-%patch1 -p1 -b .gsm
+%setup -n ffmpeg-%{?date}%{!?date:%{version}}
+%patch0 -p1 -b .gsm
 
 
 %build
@@ -132,7 +130,6 @@
 %endif
     %{!?_without_lame:   --enable-mp3lame} \
     %{!?_without_vorbis: --enable-libogg --enable-vorbis} \
-    %{!?_without_theora: --enable-theora} \
     %{!?_without_faad:   --enable-faad} \
     %{!?_without_faac:   --enable-faac} \
     %{!?_without_gsm:    --enable-libgsm} \
@@ -153,20 +150,18 @@
 %install
 %{__rm} -rf %{buildroot} _docs
 %makeinstall \
-    incdir=%{buildroot}%{_includedir}/ffmpeg
+    incdir=%{buildroot}%{_includedir}/ffmpeg \
+    shlibdir=%{buildroot}%{_libdir} \
+    libdir=%{buildroot}%{_libdir}
 
-# Make installlib is broken in 0.4.6-8 (20050502 too), so we do it by hand
-# in order to get the static libraries installed too.
-%{__install} -m 0644 libav*/libav*.a %{buildroot}%{_libdir}/
-
 # Remove unwanted files from the included docs
 %{__cp} -a doc _docs
-%{__rm} -rf _docs/{CVS,Makefile,*.1,*.texi,*.pl}
+%{__rm} -rf _docs/{Makefile,*.texi,*.pl}
 
 # The <postproc/postprocess.h> is now at <ffmpeg/postprocess.h>, so provide
-# a compatibility copy
+# a compatibility symlink
 %{__mkdir_p} %{buildroot}%{_includedir}/postproc/
-%{__cp} -a   %{buildroot}%{_includedir}/ffmpeg/postprocess.h \
+%{__ln_s}    ../ffmpeg/postprocess.h \
              %{buildroot}%{_includedir}/postproc/postprocess.h
 
 
@@ -181,6 +176,7 @@
 
 %postun -p /sbin/ldconfig
 
+
 %post libpostproc -p /sbin/ldconfig
 
 %postun libpostproc -p /sbin/ldconfig
@@ -212,6 +208,14 @@
 
 
 %changelog
+* Mon Sep 18 2006 Matthias Saou <http://freshrpms.net/> 0.4.9-0.5.20060918
+- Update to today's SVN codebase.
+- Remove theora support, it seems to be gone...
+- Remove a52 patch as ffmpeg doesn't link against it anyway.
+- Make installlib works again, so don't manually install anymore.
+- Remove all prever stuff that hasn't been useful in ages.
+- Change postproc/postprocess.h to be a symlink.
+
 * Fri May 12 2006 Matthias Saou <http://freshrpms.net/> 0.4.9-0.5.20060317
 - Change selinux library context in %%post to allow text relocation.
 

Modified: trunk/rpms/x264/x264.spec
===================================================================
--- trunk/rpms/x264/x264.spec	2006-09-18 17:04:06 UTC (rev 4736)
+++ trunk/rpms/x264/x264.spec	2006-09-18 17:27:21 UTC (rev 4737)
@@ -8,7 +8,7 @@
 %{?fc6:  %define _with_modxorg 1}
 %{?fc5:  %define _with_modxorg 1}
 
-%define date 20060731
+%define date 20060917
 
 Summary: Library for encoding and decoding H264/AVC video streams
 Name: x264
@@ -129,6 +129,9 @@
 
 
 %changelog
+* Mon Sep 18 2006 Matthias Saou <http://freshrpms.net/> 0.0.0-0.2.20060731
+- Update to 20060917 snapshot.
+
 * Tue Aug  1 2006 Matthias Saou <http://freshrpms.net/> 0.0.0-0.2.20060731
 - Update to 20060731 snapshot.
 - Require the main package from the devel since we have a shared lib now.

More information about the svn-commits mailing list