Author: rathann Update of /cvs/free/rpms/ffmpeg/F-11 In directory se02.es.rpmfusion.net:/tmp/cvs-serv11403 Modified Files: ffmpeg.spec Added Files: ffmpeg-ppc.patch Log Message: * Thu Oct 22 2009 Dominik Mierzejewski <rpm at greysector.net> - 0.5-3 - dropped workaround for non-standard openjpeg headers location - Add BR dirac vdpau. (kwizart) - Don't build faac by default because it's nonfree. (kwizart) - fixed PowerPC builds (bug 808) ffmpeg-ppc.patch: --- NEW FILE ffmpeg-ppc.patch --- --- ffmpeg-0.5/configure.pic 2009-09-07 13:29:28.000000000 +0100 +++ ffmpeg-0.5/configure 2009-09-07 13:29:44.000000000 +0100 @@ -2191,7 +2191,7 @@ if enabled shared; then # LIBOBJFLAGS may have already been set in the OS configuration if test -z "$LIBOBJFLAGS" ; then case "${subarch-$arch}" in - x86_64|ia64|alpha|sparc*|power*|parisc*|mips*) LIBOBJFLAGS='$(PIC)' ;; + x86_64|ia64|alpha|sparc*|ppc*|power*|parisc*|mips*) LIBOBJFLAGS='$(PIC)' ;; esac fi fi Index: ffmpeg.spec =================================================================== RCS file: /cvs/free/rpms/ffmpeg/F-11/ffmpeg.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- ffmpeg.spec 26 Mar 2009 23:06:34 -0000 1.16 +++ ffmpeg.spec 26 Oct 2009 01:26:55 -0000 1.17 @@ -5,24 +5,29 @@ Summary: Digital VCR and streaming server Name: ffmpeg Version: 0.5 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://ffmpeg.org/ Source0: http://ffmpeg.org/releases/%{name}-%{version}.tar.bz2 # get rid of textrels on x86_64 in yasm code Patch0: %{name}-textrel.patch +# fix ppc builds +Patch1: %{name}-ppc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %{?_with_amr:BuildRequires: amrnb-devel amrwb-devel} BuildRequires: bzip2-devel -BuildRequires: faac-devel +BuildRequires: dirac-devel +%{?_with_faac:BuildRequires: faac-devel} BuildRequires: faad2-devel >= %{faad2min} BuildRequires: gsm-devel BuildRequires: imlib2-devel BuildRequires: lame-devel BuildRequires: libdc1394-devel BuildRequires: libtheora-devel +%{?_with_vaapi:BuildRequires:libva-devel >= 0.31.0} +BuildRequires: libvdpau-devel BuildRequires: libvorbis-devel BuildRequires: openjpeg-devel BuildRequires: schroedinger-devel @@ -79,12 +84,13 @@ --libdir=%{_libdir} \\\ --mandir=%{_mandir} \\\ --arch=%{_target_cpu} \\\ - --extra-cflags="$RPM_OPT_FLAGS -I%{_includedir}/openjpeg" \\\ + --extra-cflags="$RPM_OPT_FLAGS" \\\ --extra-version=rpmfusion \\\ %{?_with_amr:--enable-libamr-nb --enable-libamr-wb --enable-nonfree} \\\ --enable-bzlib \\\ --enable-libdc1394 \\\ - --enable-libfaac \\\ + --enable-libdirac \\\ + %{?_with_faac:--enable-libfaac --enable-nonfree} \\\ --enable-libfaad \\\ --enable-libgsm \\\ --enable-libmp3lame \\\ @@ -95,6 +101,7 @@ --enable-libvorbis \\\ --enable-libx264 \\\ --enable-libxvid \\\ + --enable-vdpau \\\ --enable-x11grab \\\ --enable-avfilter \\\ --enable-avfilter-lavf \\\ @@ -111,6 +118,7 @@ %prep %setup -q %patch0 -p1 -b .textrel +%patch1 -p1 -b .ppc %build mkdir generic @@ -247,6 +255,12 @@ %changelog +* Thu Oct 22 2009 Dominik Mierzejewski <rpm at greysector.net> - 0.5-3 +- dropped workaround for non-standard openjpeg headers location +- Add BR dirac vdpau. (kwizart) +- Don't build faac by default because it's nonfree. (kwizart) +- fixed PowerPC builds (bug 808) + * Fri Mar 27 2009 Dominik Mierzejewski <rpm at greysector.net> - 0.5-2 - rebuild for new faad2 and x264