1 files changed, 26 insertions, 21 deletions
diff --git a/src/ffmpeg.mk b/src/ffmpeg.mk
index 6b6f51f..ae3cea0 100644
--- a/src/ffmpeg.mk
+++ b/src/ffmpeg.mk
@@ -3,52 +3,57 @@
 
 PKG             := ffmpeg
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.2.1
-$(PKG)_CHECKSUM := 930e5612d75d04fdf7c0579f4d85d47e31e38945
+$(PKG)_VERSION  := 2.1.4
+$(PKG)_CHECKSUM := 99c2f7af3e6d5f4a962ae8bf627d3c53bc282fec
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := http://www.ffmpeg.org/releases/$($(PKG)_FILE)
 $(PKG)_URL_2    := http://launchpad.net/ffmpeg/main/$($(PKG)_VERSION)/+download/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc bzip2 lame libvpx opencore-amr opus sdl speex theora vorbis x264 xvidcore zlib
+$(PKG)_DEPS     := gcc bzip2 gnutls lame libass libbluray libvpx opencore-amr opus sdl speex theora vo-aacenc vo-amrwbenc vorbis x264 xvidcore yasm zlib
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'http://www.ffmpeg.org/download.html' | \
+    $(WGET) -q -O- 'http://ffmpeg.org/releases/' | \
     $(SED) -n 's,.*ffmpeg-\([0-9][^>]*\)\.tar.*,\1,p' | \
+    grep -v 'alpha\|beta\|rc\|git' | \
+    $(SORT) -Vr | \
     head -1
 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 \
-        --arch=$(patsubst -%,,$(TARGET)) \
+        --arch=$(firstword $(subst -, ,$(TARGET))) \
         --target-os=mingw32 \
         --prefix='$(PREFIX)/$(TARGET)' \
-        --disable-shared \
+        $(if $(BUILD_STATIC), \
+            --enable-static --disable-shared , \
+            --disable-static --enable-shared ) \
+        --yasmexe='$(TARGET)-yasm' \
         --disable-debug \
-        --disable-doc \
         --enable-memalign-hack \
-        --enable-gpl \
-        --enable-version3 \
-        --disable-nonfree \
-        --enable-postproc \
         --disable-pthreads \
         --enable-w32threads \
+        --disable-doc \
+        --enable-avresample \
+        --enable-gpl \
+        --enable-version3 \
         --enable-avisynth \
-        --enable-libspeex \
-        --enable-libtheora \
-        --enable-libvorbis \
+        --enable-gnutls \
+        --enable-libass \
+        --enable-libbluray \
         --enable-libmp3lame \
-        --enable-libxvid \
-        --disable-libfaac \
         --enable-libopencore-amrnb \
         --enable-libopencore-amrwb \
-        --enable-libx264 \
+        --enable-libopus \
+        --enable-libspeex \
+        --enable-libtheora \
+        --enable-libvo-aacenc \
+        --enable-libvo-amrwbenc \
+        --enable-libvorbis \
         --enable-libvpx \
-        --enable-libopus
+        --enable-libx264 \
+        --enable-libxvid
     $(MAKE) -C '$(1)' -j '$(JOBS)'
     $(MAKE) -C '$(1)' -j 1 install
 endef
-
-$(PKG)_BUILD_x86_64-w64-mingw32 = $(subst enable-libxvid,disable-libxvid,$($(PKG)_BUILD))