diff options
| -rw-r--r-- | src/ffmpeg-1-libbluray-pkg-config.patch | 16 | ||||
| -rw-r--r-- | src/ffmpeg.mk | 4 |
2 files changed, 2 insertions, 18 deletions
diff --git a/src/ffmpeg-1-libbluray-pkg-config.patch b/src/ffmpeg-1-libbluray-pkg-config.patch deleted file mode 100644 index d1b37be..0000000 --- a/src/ffmpeg-1-libbluray-pkg-config.patch +++ /dev/null @@ -1,16 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -diff --git a/configure b/configure -index f831999..40c0a19 100755 ---- a/configure -+++ b/configure -@@ -4273,7 +4273,7 @@ enabled ladspa && { check_header ladspa.h || die "ERROR: ladspa.h hea - enabled libiec61883 && require libiec61883 libiec61883/iec61883.h iec61883_cmp_connect -lraw1394 -lavc1394 -lrom1394 -liec61883 - enabled libaacplus && require "libaacplus >= 2.0.0" aacplus.h aacplusEncOpen -laacplus - enabled libass && require_pkg_config libass ass/ass.h ass_library_init --enabled libbluray && require libbluray libbluray/bluray.h bd_open -lbluray -+enabled libbluray && require_pkg_config libbluray libbluray/bluray.h bd_open - enabled libcelt && require libcelt celt/celt.h celt_decode -lcelt0 && - { check_lib celt/celt.h celt_decoder_create_custom -lcelt0 || - die "ERROR: libcelt must be installed and version must be >= 0.11.0."; } diff --git a/src/ffmpeg.mk b/src/ffmpeg.mk index ae3cea0..8792e23 100644 --- a/src/ffmpeg.mk +++ b/src/ffmpeg.mk @@ -3,8 +3,8 @@ PKG := ffmpeg $(PKG)_IGNORE := -$(PKG)_VERSION := 2.1.4 -$(PKG)_CHECKSUM := 99c2f7af3e6d5f4a962ae8bf627d3c53bc282fec +$(PKG)_VERSION := 2.2.1 +$(PKG)_CHECKSUM := c5f8d103b20cd73d329401d85ced4a014757f8b9 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://www.ffmpeg.org/releases/$($(PKG)_FILE) |