diff options
| -rw-r--r-- | index.html | 2 | ||||
| -rw-r--r-- | src/ffmpeg-1-pkgconfig.patch | 20 | ||||
| -rw-r--r-- | src/ffmpeg.mk | 3 |
3 files changed, 3 insertions, 22 deletions
@@ -1040,7 +1040,7 @@ USE_OSGPLUGIN(<plugin2>) </tr> <tr> <td id="ffmpeg-package">ffmpeg</td> - <td id="ffmpeg-version">0.10.3</td> + <td id="ffmpeg-version">0.11</td> <td id="ffmpeg-website"><a href="http://www.ffmpeg.org/">ffmpeg</a></td> </tr> <tr> diff --git a/src/ffmpeg-1-pkgconfig.patch b/src/ffmpeg-1-pkgconfig.patch deleted file mode 100644 index cc20096..0000000 --- a/src/ffmpeg-1-pkgconfig.patch +++ /dev/null @@ -1,20 +0,0 @@ -This file is part of MXE. -See 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" diff --git a/src/ffmpeg.mk b/src/ffmpeg.mk index b78e7e4..85b090b 100644 --- a/src/ffmpeg.mk +++ b/src/ffmpeg.mk @@ -3,7 +3,7 @@ PKG := ffmpeg $(PKG)_IGNORE := -$(PKG)_CHECKSUM := 4fb6f682dbc1b4ea54178040d515fc3a4c05d415 +$(PKG)_CHECKSUM := 1aa3443c20b1c5d132d1fe06de7cc949a7219edd $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://www.ffmpeg.org/releases/$($(PKG)_FILE) @@ -17,6 +17,7 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD + '$(SED)' -i "s^[-]lvpx^`'$(TARGET)'-pkg-config --libs-only-l vpx`^g;" $(1)/configure cd '$(1)' && ./configure \ --cross-prefix='$(TARGET)'- \ --enable-cross-compile \ |