From b9b84a1b1ed80fa9a4ed33d662ce77bc79e873e2 Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: Sun, 14 Dec 2008 19:03:09 +0000 Subject: [PATCH] * Sun Dec 14 2008 Dominik Mierzejewski - 0.4.9-0.55.20081214 - 20081214 snapshot - change the lib split on x86, it doesn't work right for P3/AthlonXP - specfile cleanups - enable bzlib, dirac and speex support via external libs - sort BR list alphabetically - drop upstream'd patch --- .gitignore | 2 +- ffmpeg-pkgconfig.patch | 37 ---------------------- ffmpeg.spec | 69 ++++++++++++++++++++++-------------------- sources | 2 +- 4 files changed, 39 insertions(+), 71 deletions(-) delete mode 100644 ffmpeg-pkgconfig.patch diff --git a/.gitignore b/.gitignore index a6cc96d..ee1311d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -ffmpeg-20081202.tar.bz2 +ffmpeg-20081214.tar.bz2 diff --git a/ffmpeg-pkgconfig.patch b/ffmpeg-pkgconfig.patch deleted file mode 100644 index 5a00735..0000000 --- a/ffmpeg-pkgconfig.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -up ffmpeg-20081202/configure.p ffmpeg-20081202/configure ---- ffmpeg-20081202/configure.p 2008-11-30 01:20:19.000000000 +0100 -+++ ffmpeg-20081202/configure 2008-12-11 20:33:55.000000000 +0100 -@@ -2114,11 +2114,6 @@ check_deps $CONFIG_LIST \ - $OUTDEV_LIST \ - $PROTOCOL_LIST \ - --enabled libdc1394 && append pkg_requires "libraw1394" --enabled libdirac && append pkg_requires "dirac" --enabled libtheora && append pkg_requires "theora" --enabled libvorbis && append pkg_requires "vorbisenc" -- - echo "install prefix $prefix" - echo "source path $source_path" - echo "C compiler $cc" -@@ -2442,16 +2437,16 @@ EOF - } - - pkgconfig_generate libavutil "FFmpeg utility library" "$LIBAVUTIL_VERSION" --pkgconfig_generate libavcodec "FFmpeg codec library" "$LIBAVCODEC_VERSION" "$extralibs" "$pkg_requires libavutil = $LIBAVUTIL_VERSION" --pkgconfig_generate libavformat "FFmpeg container format library" "$LIBAVFORMAT_VERSION" "$extralibs" "$pkg_requires libavcodec = $LIBAVCODEC_VERSION" --pkgconfig_generate libavdevice "FFmpeg device handling library" "$LIBAVDEVICE_VERSION" "$extralibs" "$pkg_requires libavformat = $LIBAVFORMAT_VERSION" -+pkgconfig_generate libavcodec "FFmpeg codec library" "$LIBAVCODEC_VERSION" "$extralibs" "libavutil = $LIBAVUTIL_VERSION" -+pkgconfig_generate libavformat "FFmpeg container format library" "$LIBAVFORMAT_VERSION" "$extralibs" "libavcodec = $LIBAVCODEC_VERSION" -+pkgconfig_generate libavdevice "FFmpeg device handling library" "$LIBAVDEVICE_VERSION" "$extralibs" "libavformat = $LIBAVFORMAT_VERSION" - enabled avfilter && -- pkgconfig_generate libavfilter "FFmpeg video filtering library" "$LIBAVFILTER_VERSION" "$extralibs" "$pkg_requires libavutil = $LIBAVUTIL_VERSION" -+ pkgconfig_generate libavfilter "FFmpeg video filtering library" "$LIBAVFILTER_VERSION" "$extralibs" "libavutil = $LIBAVUTIL_VERSION" - enabled postproc && - pkgconfig_generate libpostproc "FFmpeg post processing library" "$LIBPOSTPROC_VERSION" - if enabled swscale; then - pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "" "libavutil = $LIBAVUTIL_VERSION" - else -- pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "" "$pkg_requires libavcodec = $LIBAVCODEC_VERSION" -+ pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "" "libavcodec = $LIBAVCODEC_VERSION" - apply libswscale/libswscale.pc sed s/^Libs:.*$/Libs:/ - fi diff --git a/ffmpeg.spec b/ffmpeg.spec index 7d9d64c..8fa7ece 100644 --- a/ffmpeg.spec +++ b/ffmpeg.spec @@ -1,12 +1,12 @@ # TODO: add make test to %%check section -%define svn 20081202 +%define svn 20081214 %define faad2min 1:2.6.1 Summary: Digital VCR and streaming server Name: ffmpeg Version: 0.4.9 -Release: 0.54.%{svn}%{?dist} +Release: 0.55.%{svn}%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://ffmpeg.org/ @@ -16,19 +16,23 @@ Patch0: %{name}-pkgconfig.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %{?_with_amr:BuildRequires: amrnb-devel amrwb-devel} -BuildRequires: zlib-devel +BuildRequires: bzip2-devel +BuildRequires: dirac-devel +BuildRequires: faac-devel +BuildRequires: faad2-devel >= %{faad2min} +BuildRequires: gsm-devel +BuildRequires: imlib2-devel BuildRequires: lame-devel BuildRequires: libdc1394-devel -BuildRequires: libvorbis-devel BuildRequires: libtheora-devel -BuildRequires: faad2-devel >= %{faad2min} -BuildRequires: xvidcore-devel +BuildRequires: libvorbis-devel +BuildRequires: schroedinger-devel BuildRequires: SDL-devel -BuildRequires: gsm-devel -BuildRequires: imlib2-devel +BuildRequires: speex-devel BuildRequires: texi2html -BuildRequires: faac-devel BuildRequires: x264-devel >= 0.0.0-0.14.20080613 +BuildRequires: xvidcore-devel +BuildRequires: zlib-devel #don't enable on x86_64 until PIC issues on are fixed (in libavcodec/i386/fft_mmx.asm) %ifarch %{ix86} BuildRequires: yasm @@ -76,11 +80,15 @@ This package contains development files for %{name} --arch=%{_target_cpu} \\\ --extra-cflags="$RPM_OPT_FLAGS" \\\ %{?_with_amr:--enable-libamr-nb --enable-libamr-wb --enable-nonfree} \\\ + --enable-bzlib \\\ --enable-libdc1394 \\\ + --enable-libdirac \\\ --enable-libfaac \\\ --enable-libfaad \\\ --enable-libgsm \\\ --enable-libmp3lame \\\ + --enable-libschroedinger \\\ + --enable-libspeex \\\ --enable-libtheora \\\ --enable-libvorbis \\\ --enable-libx264 \\\ @@ -110,7 +118,6 @@ pushd generic --shlibdir=%{_libdir} \ %ifarch %{ix86} --cpu=%{_target_cpu} \ - --disable-mmx \ %endif %ifarch ppc ppc64 --disable-altivec \ @@ -122,22 +129,19 @@ pushd generic make %{?_smp_mflags} popd +mkdir simd +pushd simd %ifarch %{ix86} -mkdir sse2 -pushd sse2 %{ff_configure}\ - --shlibdir=%{_libdir}/sse2 \ + --shlibdir=%{_libdir}/i686 \ --cpu=i686 \ --disable-ffmpeg \ --disable-ffserver \ --disable-ffplay \ make %{?_smp_mflags} -popd %endif %ifarch ppc -mkdir altivec -pushd altivec %{ff_configure}\ --shlibdir=%{_libdir}/altivec \ --cpu=g4 \ @@ -146,11 +150,9 @@ pushd altivec --disable-ffserver \ --disable-ffplay \ -popd +make %{?_smp_mflags} %endif %ifarch ppc64 -mkdir altivec -pushd altivec %{ff_configure}\ --shlibdir=%{_libdir}/altivec \ --cpu=g5 \ @@ -159,11 +161,9 @@ pushd altivec --disable-ffserver \ --disable-ffplay \ -popd +make %{?_smp_mflags} %endif %ifarch sparc sparc64 -mkdir vis -pushd vis %{ff_configure}\ --shlibdir=%{_libdir}/v9 \ --cpu=v9 \ @@ -172,29 +172,26 @@ pushd vis --disable-ffserver \ --disable-ffplay \ -popd +make %{?_smp_mflags} %endif +popd %install rm -rf $RPM_BUILD_ROOT __doc pushd generic make install DESTDIR=$RPM_BUILD_ROOT popd +pushd simd %ifarch %{ix86} -pushd sse2 make install DESTDIR=$RPM_BUILD_ROOT -popd %endif %ifarch ppc ppc64 -pushd altivec make install DESTDIR=$RPM_BUILD_ROOT -popd %endif %ifarch sparc sparc64 -pushd vis make install DESTDIR=$RPM_BUILD_ROOT -popd %endif +popd cp -a doc __doc rm -f __doc/{Makefile,*.{1,pl,texi}} @@ -223,8 +220,8 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/lib*.so.* %{_libdir}/vhook/ %ifarch %{ix86} -%{_libdir}/sse2/lib*.so.* -%{_libdir}/sse2/vhook/ +%{_libdir}/i686/lib*.so.* +%{_libdir}/i686/vhook/ %endif %ifarch ppc ppc64 %{_libdir}/altivec/lib*.so.* @@ -241,7 +238,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/lib*.pc %{_libdir}/lib*.so %ifarch %{ix86} -%{_libdir}/sse2/lib*.so +%{_libdir}/i686/lib*.so %endif %ifarch ppc ppc64 %{_libdir}/altivec/lib*.so @@ -252,6 +249,14 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Dec 14 2008 Dominik Mierzejewski - 0.4.9-0.55.20081214 +- 20081214 snapshot +- change the lib split on x86, it doesn't work right for P3/AthlonXP +- specfile cleanups +- enable bzlib, dirac and speex support via external libs +- sort BR list alphabetically +- drop upstream'd patch + * Thu Dec 11 2008 Dominik Mierzejewski - 0.4.9-0.54.20081202 - fix pkgconfig file generation diff --git a/sources b/sources index 69bc3b4..1e1c3e7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -231d71e5cc6101ac8fb8403b76758877 ffmpeg-20081202.tar.bz2 +eb90bfeda4ea39ff3c6b92806909a5be ffmpeg-20081214.tar.bz2