Mercurial > mxe-octave
changeset 2274:bb4f669089de
Add missing entries to FFmpeg pkgconfig files.
| author | Martin Lambers <marlam@marlam.de> |
|---|---|
| date | Sat, 10 Mar 2012 20:00:28 +0100 |
| parents | 605f318ff773 |
| children | 8601be96cfa1 |
| files | src/ffmpeg-1-pkgconfig.patch |
| diffstat | 1 files changed, 20 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/ffmpeg-1-pkgconfig.patch Sat Mar 10 20:00:28 2012 +0100 @@ -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"