Revert "replace dependency of libffmpeg with libffmpeg-mini"

This reverts commit r40644.

libffmpeg is provided by libffmpeg-mini and libffmpeg-full.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/packages@40648 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/libs/libdlna/Makefile b/libs/libdlna/Makefile
index f0d2223..9c4ca16 100644 (file)
--- a/libs/libdlna/Makefile
+++ b/libs/libdlna/Makefile
@@ -28,7 +28,7 @@ define Package/libdlna
  CATEGORY:=Libraries
  TITLE:= Reference DLNA implementation
  URL:=http://libdlna.geexbox.org/
- DEPENDS:=+libffmpeg-mini
+ DEPENDS:=+libffmpeg
 endef
 
 define Package/libdlna/description

diff --git a/multimedia/minidlna/Makefile b/multimedia/minidlna/Makefile
index c6156f2..be9804d 100644 (file)
--- a/multimedia/minidlna/Makefile
+++ b/multimedia/minidlna/Makefile
@@ -27,7 +27,7 @@ define Package/minidlna
   CATEGORY:=Multimedia
   TITLE:=UPnP A/V & DLNA Media Server
   URL:=http://minidlna.sourceforge.net/
-  DEPENDS:= +libpthread +libexif +libjpeg +libsqlite3 +libffmpeg-mini \
+  DEPENDS:= +libpthread +libexif +libjpeg +libsqlite3 +libffmpeg \
        +libid3tag +libflac +libvorbis +libuuid \
        $(ICONV_DEPENDS) $(INTL_DEPENDS)
 endef

diff --git a/multimedia/ushare/Makefile b/multimedia/ushare/Makefile
index c4d9e27..794281f 100644 (file)
--- a/multimedia/ushare/Makefile
+++ b/multimedia/ushare/Makefile
@@ -24,7 +24,7 @@ define Package/ushare
  CATEGORY:=Multimedia
  TITLE:= UPnP A/V & DLNA Media Server
  URL:=http://ushare.geexbox.org/
- DEPENDS:=+libdlna +libupnp +libffmpeg-mini
+ DEPENDS:=+libdlna +libupnp +libffmpeg
 endef
 
 define Package/ushare/description

diff --git a/sound/mocp/Makefile b/sound/mocp/Makefile
index 1ca6d24..8f866e5 100644 (file)
--- a/sound/mocp/Makefile
+++ b/sound/mocp/Makefile
@@ -24,7 +24,7 @@ include $(INCLUDE_DIR)/nls.mk
 define Package/moc
   SECTION:=sound
   CATEGORY:=Sound
-  DEPENDS:=+libcurl +BUILD_PATENTED:libmad +libvorbis $(ICONV_DEPENDS) +alsa-utils +libid3tag +libflac +libsamplerate +PACKAGE_libncursesw:libncursesw +!PACKAGE_libncursesw:libncurses +libffmpeg-mini +libltdl +libmagic +faad2 +libdb47
+  DEPENDS:=+libcurl +BUILD_PATENTED:libmad +libvorbis $(ICONV_DEPENDS) +alsa-utils +libid3tag +libflac +libsamplerate +PACKAGE_libncursesw:libncursesw +!PACKAGE_libncursesw:libncurses +libffmpeg +libltdl +libmagic +faad2 +libdb47
   TITLE:=Music On Console
   URL:=http://moc.daper.net/
 endef

diff --git a/sound/mpd/Makefile b/sound/mpd/Makefile
index 2f99356..f1e3ff5 100644 (file)
--- a/sound/mpd/Makefile
+++ b/sound/mpd/Makefile
@@ -48,7 +48,7 @@ $(call Package/mpd/Default)
   TITLE+= (full)
   DEPENDS+= \
        +AUDIO_SUPPORT:alsa-lib \
-       +libaudiofile +BUILD_PATENTED:libfaad2 +libffmpeg-mini +libid3tag \
+       +libaudiofile +BUILD_PATENTED:libfaad2 +libffmpeg +libid3tag \
        +libmms +libogg +libshout +libsndfile +libvorbis
   PROVIDES:=mpd
   VARIANT:=full