From cd544546ab61caf3142a5053ac5b91b86114c8b4 Mon Sep 17 00:00:00 2001 From: hauke Date: Thu, 1 May 2014 19:48:46 +0000 Subject: [PATCH] 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 git-svn-id: svn://svn.openwrt.org/openwrt/packages@40648 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- libs/libdlna/Makefile | 2 +- multimedia/minidlna/Makefile | 2 +- multimedia/ushare/Makefile | 2 +- sound/mocp/Makefile | 2 +- sound/mpd/Makefile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/libdlna/Makefile b/libs/libdlna/Makefile index f0d22233d..9c4ca1652 100644 --- 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 c6156f2f1..be9804d50 100644 --- 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 c4d9e2780..794281f9a 100644 --- 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 1ca6d246f..8f866e553 100644 --- 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 2f9935646..f1e3ff5fa 100644 --- 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 -- 2.11.0