diff --git a/ffmpeg-pkgconfig.patch b/ffmpeg-pkgconfig.patch new file mode 100644 index 0000000..5a00735 --- /dev/null +++ b/ffmpeg-pkgconfig.patch @@ -0,0 +1,37 @@ +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 37b93a8..7d9d64c 100644 --- a/ffmpeg.spec +++ b/ffmpeg.spec @@ -6,12 +6,13 @@ Summary: Digital VCR and streaming server Name: ffmpeg Version: 0.4.9 -Release: 0.53.%{svn}%{?dist} +Release: 0.54.%{svn}%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://ffmpeg.org/ Source0: http://rpm.greysector.net/livna/%{name}-%{svn}.tar.bz2 Source1: %{name}-snapshot.sh +Patch0: %{name}-pkgconfig.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %{?_with_amr:BuildRequires: amrnb-devel amrwb-devel} @@ -100,6 +101,7 @@ This package contains development files for %{name} %prep %setup -q -n %{name}-%{svn} +%patch0 -p1 -b .p %build mkdir generic @@ -250,6 +252,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Dec 11 2008 Dominik Mierzejewski - 0.4.9-0.54.20081202 +- fix pkgconfig file generation + * Thu Dec 04 2008 Dominik Mierzejewski - 0.4.9-0.53.20081202 - 20081202 snapshot - drop upstreamed/obsolete patches