From: Hauke Mehrtens Date: Thu, 1 May 2014 18:59:46 +0000 (+0000) Subject: replace dependency of libffmpeg with libffmpeg-mini X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f8c9111a7ed371fef3537d536d74d9026290b8cf;p=openwrt%2Fsvn-archive%2Farchive.git replace dependency of libffmpeg with libffmpeg-mini libffmpeg does not exist in OpenWrt, but libffmpeg-mini does. Signed-off-by: Hauke Mehrtens SVN-Revision: 40644 --- diff --git a/libs/libdlna/Makefile b/libs/libdlna/Makefile index 9c4ca1652f..f0d22233d3 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 + DEPENDS:=+libffmpeg-mini endef define Package/libdlna/description diff --git a/multimedia/minidlna/Makefile b/multimedia/minidlna/Makefile index be9804d509..c6156f2f13 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 \ + DEPENDS:= +libpthread +libexif +libjpeg +libsqlite3 +libffmpeg-mini \ +libid3tag +libflac +libvorbis +libuuid \ $(ICONV_DEPENDS) $(INTL_DEPENDS) endef diff --git a/multimedia/ushare/Makefile b/multimedia/ushare/Makefile index 794281f9a6..c4d9e27806 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 + DEPENDS:=+libdlna +libupnp +libffmpeg-mini endef define Package/ushare/description diff --git a/sound/mpd/Makefile b/sound/mpd/Makefile index f1e3ff5faa..2f9935646b 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 +libid3tag \ + +libaudiofile +BUILD_PATENTED:libfaad2 +libffmpeg-mini +libid3tag \ +libmms +libogg +libshout +libsndfile +libvorbis PROVIDES:=mpd VARIANT:=full