summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMartin Lambers <marlam@marlam.de>2012-03-10 19:00:28 (GMT)
committerMartin Lambers <marlam@marlam.de>2012-03-10 19:00:28 (GMT)
commit0e8072da461369b5a02a85a70749610fe245519a (patch)
treeaaf4f872ae48ef3ab1a08a69c60b25b6e3892543 /src
parent495d04bc78822707b3bad8800227b685c3eee9a7 (diff)
downloadmxe-0e8072da461369b5a02a85a70749610fe245519a.zip
mxe-0e8072da461369b5a02a85a70749610fe245519a.tar.gz
mxe-0e8072da461369b5a02a85a70749610fe245519a.tar.bz2
Add missing entries to FFmpeg pkgconfig files.
Diffstat (limited to 'src')
-rw-r--r--src/ffmpeg-1-pkgconfig.patch20
1 files changed, 20 insertions, 0 deletions
diff --git a/src/ffmpeg-1-pkgconfig.patch b/src/ffmpeg-1-pkgconfig.patch
new file mode 100644
index 0000000..05ad401
--- /dev/null
+++ b/src/ffmpeg-1-pkgconfig.patch
@@ -0,0 +1,20 @@
+This file is part of mingw-cross-env.
+See doc/index.html for further information.
+
+This patch adds a libswresample dependency to libavfilter.pc, and a libavfilter
+dependency to libavdevice.pc. Both issues have patches upstream, so this patch
+can be dropped for the next FFmpeg version.
+
+--- ffmpeg-0.10/configure.orig 2012-03-09 21:18:38.403806202 +0100
++++ ffmpeg-0.10/configure 2012-03-09 21:19:37.175808737 +0100
+@@ -3749,8 +3749,8 @@
+ pkgconfig_generate libavutil "FFmpeg utility library" "$LIBAVUTIL_VERSION" "$LIBM"
+ 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"
+-pkgconfig_generate libavfilter "FFmpeg video filtering library" "$LIBAVFILTER_VERSION" "$extralibs"
++pkgconfig_generate libavdevice "FFmpeg device handling library" "$LIBAVDEVICE_VERSION" "$extralibs" "libavformat = $LIBAVFORMAT_VERSION, libavfilter = $LIBAVFILTER_VERSION"
++pkgconfig_generate libavfilter "FFmpeg video filtering library" "$LIBAVFILTER_VERSION" "$extralibs" "libswresample = $LIBSWRESAMPLE_VERSION"
+ pkgconfig_generate libpostproc "FFmpeg postprocessing library" "$LIBPOSTPROC_VERSION" "" "libavutil = $LIBAVUTIL_VERSION"
+ pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "$LIBM" "libavutil = $LIBAVUTIL_VERSION"
+ pkgconfig_generate libswresample "FFmpeg audio rescaling library" "$LIBSWRESAMPLE_VERSION" "$LIBM" "libavutil = $LIBAVUTIL_VERSION"