1
patch by Reinhard Tartler <siretart@debian.org>
3
remove varialbe pkg_requires from the configure script. According to
4
pkg-config upstream the field Requires.private is only necessary if a
5
library exposes internal types (structs, enums) of the "required"
6
libraries. This is only the case for libavutil that is exposed by
7
libavcodec, libavformat and others. Libraries like theora, dirac, etc
8
are exposed in Libs.private already.
10
Discussion about this started at:
12
http://permalink.gmane.org/gmane.comp.video.ffmpeg.devel/76897
13
http://comments.gmane.org/gmane.comp.video.ffmpeg.devel/76897
18
@@ -2064,11 +2064,6 @@ check_deps $CONFIG_LIST \
22
-enabled libdc1394 && append pkg_requires "libraw1394"
23
-enabled libdirac && append pkg_requires "dirac"
24
-enabled libtheora && append pkg_requires "theora"
25
-enabled libvorbis && append pkg_requires "vorbisenc"
27
echo "install prefix $prefix"
28
echo "source path $source_path"
30
@@ -2386,16 +2381,16 @@ EOF
33
pkgconfig_generate libavutil "FFmpeg utility library" "$LIBAVUTIL_VERSION"
34
-pkgconfig_generate libavcodec "FFmpeg codec library" "$LIBAVCODEC_VERSION" "$extralibs" "$pkg_requires libavutil = $LIBAVUTIL_VERSION"
35
-pkgconfig_generate libavformat "FFmpeg container format library" "$LIBAVFORMAT_VERSION" "$extralibs" "$pkg_requires libavcodec = $LIBAVCODEC_VERSION"
36
-pkgconfig_generate libavdevice "FFmpeg device handling library" "$LIBAVDEVICE_VERSION" "$extralibs" "$pkg_requires libavformat = $LIBAVFORMAT_VERSION"
37
+pkgconfig_generate libavcodec "FFmpeg codec library" "$LIBAVCODEC_VERSION" "$extralibs" "libavutil = $LIBAVUTIL_VERSION"
38
+pkgconfig_generate libavformat "FFmpeg container format library" "$LIBAVFORMAT_VERSION" "$extralibs" "libavcodec = $LIBAVCODEC_VERSION"
39
+pkgconfig_generate libavdevice "FFmpeg device handling library" "$LIBAVDEVICE_VERSION" "$extralibs" "libavformat = $LIBAVFORMAT_VERSION"
41
- pkgconfig_generate libavfilter "FFmpeg video filtering library" "$LIBAVFILTER_VERSION" "$extralibs" "$pkg_requires libavutil = $LIBAVUTIL_VERSION"
42
+ pkgconfig_generate libavfilter "FFmpeg video filtering library" "$LIBAVFILTER_VERSION" "$extralibs" "libavutil = $LIBAVUTIL_VERSION"
44
pkgconfig_generate libpostproc "FFmpeg post processing library" "$LIBPOSTPROC_VERSION"
45
if enabled swscale; then
46
pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "" "libavutil = $LIBAVUTIL_VERSION"
48
- pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "" "$pkg_requires libavcodec = $LIBAVCODEC_VERSION"
49
+ pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "" "libavcodec = $LIBAVCODEC_VERSION"
50
apply libswscale/libswscale.pc sed s/^Libs:.*$/Libs:/