summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-09-16 11:52:51 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2011-09-16 11:52:51 +0200
commit418d5b8ac14e2599fc3c0d14c3d86d6cfd8f394c (patch)
tree5a2a97ed0fe5551f4a8aba3a6e34f49d07106cc8 /package
parentcf69e58c326665f925f3a22a70f30a58c664c3d5 (diff)
update ffmpeg to latest stable version, enable more subpackages
Diffstat (limited to 'package')
-rw-r--r--package/forked-daapd/Makefile4
-rw-r--r--package/moc/Makefile2
-rw-r--r--package/mpd/Makefile4
-rw-r--r--package/vlc/Makefile2
4 files changed, 5 insertions, 7 deletions
diff --git a/package/forked-daapd/Makefile b/package/forked-daapd/Makefile
index 435a3c560..824d05636 100644
--- a/package/forked-daapd/Makefile
+++ b/package/forked-daapd/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= b45aab5b60382ec3ada7e71cb1356b1d
PKG_DESCR:= DAAPD server
PKG_SECTION:= multimedia
-PKG_DEPENDS:= libunistring zlib libconfuse sqlite ffmpeg libgcrypt
+PKG_DEPENDS:= libunistring zlib libconfuse sqlite libffmpeg libgcrypt
PKG_DEPENDS+= libavahi libmxml libevent libavl libantlr3c alsa-lib
PKG_DEPENDS+= libsqlite libintl dbus
PKG_BUILDDEP:= libunistring zlib confuse avahi sqlite ffmpeg dbus
@@ -23,8 +23,6 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,FORKED_DAAPD,forked-daapd,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-#TARGET_LDFLAGS+= -lgcc
-
forked-daapd-install:
$(INSTALL_DIR) $(IDIR_FORKED_DAAPD)/etc
$(CP) ./files/forked-daapd.conf \
diff --git a/package/moc/Makefile b/package/moc/Makefile
index 7e45410ce..45c41f3d8 100644
--- a/package/moc/Makefile
+++ b/package/moc/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= 2dd0cb6481d77fda09c58ec3154a21c0
PKG_DESCR:= console music player
PKG_SECTION:= multimedia
-PKG_DEPENDS:= libmad libvorbis libcurl libflac ffmpeg libiconv
+PKG_DEPENDS:= libmad libvorbis libcurl libflac libffmpeg libiconv
PKG_DEPENDS+= libncurses libid3tag
PKG_BUILDDEP:= ncurses libvorbis curl libmad flac ffmpeg libiconv
PKG_BUILDDEP+= libid3tag
diff --git a/package/mpd/Makefile b/package/mpd/Makefile
index 738172650..9aa986100 100644
--- a/package/mpd/Makefile
+++ b/package/mpd/Makefile
@@ -74,10 +74,10 @@ ifeq ($(ADK_PACKAGE_MPD_WITH_MMS),y)
PKG_FDEPENDS+= libmms
endif
PKGFD_WITH_FFMPEG:= enable FFMPEG support
-PKGFS_WITH_FFMPEG:= ffmpeg
+PKGFS_WITH_FFMPEG:= libffmpeg
PKGFB_WITH_FFMPEG:= ffmpeg
ifeq ($(ADK_PACKAGE_MPD_WITH_FFMPEG),y)
-PKG_FDEPENDS+= ffmpeg
+PKG_FDEPENDS+= libffmpeg
endif
PKGFD_WITH_SHOUT:= enable Shoutcast output support
PKGFS_WITH_SHOUT:= libshout liblame libvorbisenc
diff --git a/package/vlc/Makefile b/package/vlc/Makefile
index 0a57bf7ea..68417de05 100644
--- a/package/vlc/Makefile
+++ b/package/vlc/Makefile
@@ -10,7 +10,7 @@ PKG_MD5SUM:= a64846d6f21ea179ae8e8bfb6f9447fe
PKG_DESCR:= Media Player
PKG_SECTION:= multimedia
PKG_BUILDDEP:= ffmpeg xcb-util
-PKG_DEPENDS:= ffmpeg xcb-util
+PKG_DEPENDS:= libffmpeg xcb-util
PKG_URL:= http://www.videolan.org/vlc/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=vlc/1.1.11/}