aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Hess <thess@kitschensync.net>2014-10-29 12:47:59 -0400
committerTed Hess <thess@kitschensync.net>2014-10-29 12:47:59 -0400
commit19e545b5933797d43edfa4492f2654c73d882db2 (patch)
tree78650a97df49a98b48bc4e42b2e539171a7f735c
parentdabf0c8587905aa1c2f1984740148ba8abc9260e (diff)
ffmpeg: Upgrade to 2.4.2. Supress libffmpeg-custom when ALL selected
Signed-off-by: Ted Hess <thess@kitschensync.net>
-rw-r--r--multimedia/ffmpeg/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 2470ad256..4316aae49 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=ffmpeg
-PKG_VERSION:=2.3.4
+PKG_VERSION:=2.4.2
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://ffmpeg.org/releases/
-PKG_MD5SUM:=d6a0c7f0827a2446ca2bed11ac9bf608
+PKG_MD5SUM:=9e6163b09b7b9331b834d80874c2c0ff
PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
PKG_LICENSE:=LGPL-2.1+ GPL-2+ LGPL-3
@@ -289,7 +289,7 @@ endef
define Package/libffmpeg-custom
$(call Package/libffmpeg/Default)
TITLE+= (custom)
- DEPENDS+= @DEVEL +libopus +libspeex
+ DEPENDS+= @DEVEL @!ALL +libopus +libspeex
VARIANT:=custom
MENU:=1
endef