bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "replace dependency of libffmpeg with libffmpeg-mini"

Browse Source 
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
This commit is contained in:
hauke 2014-05-01 19:48:46 +00:00
parent 60bace6cff
commit cd544546ab
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/libdlna/Makefile
View File

@ -28,7 +28,7 @@ define Package/libdlna
CATEGORY:=Libraries CATEGORY:=Libraries
TITLE:= Reference DLNA implementation TITLE:= Reference DLNA implementation
URL:=http://libdlna.geexbox.org/ URL:=http://libdlna.geexbox.org/
DEPENDS:=+libffmpeg-mini DEPENDS:=+libffmpeg
endef endef
define Package/libdlna/description define Package/libdlna/description

2
multimedia/minidlna/Makefile
View File

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

2
multimedia/ushare/Makefile
View File

@ -24,7 +24,7 @@ define Package/ushare
CATEGORY:=Multimedia CATEGORY:=Multimedia
TITLE:= UPnP A/V & DLNA Media Server TITLE:= UPnP A/V & DLNA Media Server
URL:=http://ushare.geexbox.org/ URL:=http://ushare.geexbox.org/
DEPENDS:=+libdlna +libupnp +libffmpeg-mini DEPENDS:=+libdlna +libupnp +libffmpeg
endef endef
define Package/ushare/description define Package/ushare/description

2
sound/mocp/Makefile
View File

@ -24,7 +24,7 @@ include $(INCLUDE_DIR)/nls.mk
define Package/moc define Package/moc
SECTION:=sound SECTION:=sound
CATEGORY:=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 TITLE:=Music On Console
URL:=http://moc.daper.net/ URL:=http://moc.daper.net/
endef endef

2
sound/mpd/Makefile
View File

@ -48,7 +48,7 @@ $(call Package/mpd/Default)
TITLE+= (full) TITLE+= (full)
DEPENDS+= \ DEPENDS+= \
+AUDIO_SUPPORT:alsa-lib \ +AUDIO_SUPPORT:alsa-lib \
+libaudiofile +BUILD_PATENTED:libfaad2 +libffmpeg-mini +libid3tag \ +libaudiofile +BUILD_PATENTED:libfaad2 +libffmpeg +libid3tag \
+libmms +libogg +libshout +libsndfile +libvorbis +libmms +libogg +libshout +libsndfile +libvorbis
PROVIDES:=mpd PROVIDES:=mpd
VARIANT:=full VARIANT:=full