diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2008-12-14 15:42:14 +0000 |
|---|---|---|
| committer | Dominik Mierzejewski <dominik@rangers.eu.org> | 2008-12-14 15:42:14 +0000 |
| commit | 469833092144768c45004f5e473d1f6f02dcaa5f (patch) | |
| tree | 148a8a73096097b330dc2e1eb72d4f3508dcd770 /configure | |
| parent | 76bdac6dbfc8728b4449296963c6b419a3ba7122 (diff) | |
| download | ffmpeg-streaming-469833092144768c45004f5e473d1f6f02dcaa5f.zip ffmpeg-streaming-469833092144768c45004f5e473d1f6f02dcaa5f.tar.gz | |
Fix the use of Requires.private and Libs.private in generated .pc files.
Patch by Reinhard Tartler \ siretart ! tauware + de /.
Originally committed as revision 16125 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 15 |
1 files changed, 5 insertions, 10 deletions
@@ -2113,11 +2113,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" @@ -2441,16 +2436,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 |
