From 47e110abbf0d3142d737e753833d0d6239965b2a Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Tue, 22 Jun 2010 13:46:25 +0200
Subject: fix package names and package flavour dependencies

ipkg does not allow package names with uppercase, so revert
some of phil changes.
dependency handling of package flavours were broken, because
of a chicken and egg problem. implement a new variable (PKGFS_XXX)
containing flavour dependent package dependencies.
---
 package/mpd/Makefile | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'package/mpd')

diff --git a/package/mpd/Makefile b/package/mpd/Makefile
index a9f375ce8..c173c6b56 100644
--- a/package/mpd/Makefile
+++ b/package/mpd/Makefile
@@ -12,51 +12,39 @@ PKG_SECTION:=		net
 PKG_DEPENDS:=		glib libstdcxx
 PKG_BUILDDEP+=		glib
 ifneq ($(ADK_PACKAGE_MPD_WITH_ALSA),)
-PKG_DEPENDS+=		alsa-lib
 PKG_BUILDDEP+=		alsa-lib
 endif
 ifneq ($(ADK_PACKAGE_MPD_WITH_AO),)
-PKG_DEPENDS+=		libao
 PKG_BUILDDEP+=		libao
 endif
 ifneq ($(ADK_PACKAGE_MPD_WITH_MP3),)
-PKG_DEPENDS+=		libid3tag libmad
 PKG_BUILDDEP+=		libid3tag libmad
 endif
 ifneq ($(ADK_PACKAGE_MPD_WITH_MP4),)
-PKG_DEPENDS+=		libfaad2
 PKG_BUILDDEP+=		faad2
 endif
 ifneq ($(ADK_PACKAGE_MPD_WITH_OGG),)
-PKG_DEPENDS+=		libvorbis libogg
 PKG_BUILDDEP+=		libvorbis libogg
 endif
 ifneq ($(ADK_PACKAGE_MPD_WITH_TREMOR),)
-PKG_DEPENDS+=		libvorbisidec
 PKG_BUILDDEP+=		libvorbisidec
 endif
 ifneq ($(ADK_PACKAGE_MPD_WITH_FLAC),)
-PKG_DEPENDS+=		libflac
 PKG_BUILDDEP+=		flac
 endif
 ifneq ($(ADK_PACKAGE_MPD_WITH_WAV),)
-PKG_DEPENDS+=		libaudiofile
 PKG_BUILDDEP+=		libaudiofile
 endif
 ifneq ($(ADK_PACKAGE_MPD_WITH_SHOUT),)
-PKG_DEPENDS+=		libshout liblame libvorbis
 PKG_BUILDDEP+=		lame libvorbis libshout
 endif
 ifneq ($(ADK_PACKAGE_MPD_WITH_CURL),)
-PKG_DEPENDS+=		libcurl
 PKG_BUILDDEP+=		curl
 endif
 ifneq ($(ADK_PACKAGE_MPD_WITH_MMS),)
-PKG_DEPENDS+=		libmms
 PKG_BUILDDEP+=		libmms
 endif
 ifneq ($(ADK_PACKAGE_MPD_WITH_FFMPEG),)
-PKG_DEPENDS+=		ffmpeg
 PKG_BUILDDEP+=		ffmpeg
 endif
 PKG_URL:=		http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki
@@ -66,17 +54,29 @@ PKG_FLAVOURS:=		WITH_ALSA WITH_AO WITH_MP3 WITH_MP4 WITH_TREMOR \
 			WITH_OGG WITH_FLAC WITH_WAV WITH_MMS WITH_FFMPEG \
 			WITH_SHOUT WITH_CURL
 PKGFD_WITH_ALSA:=	enable ALSA output
+PKGFS_WITH_ALSA:=	alsa-lib
 PKGFD_WITH_AO:=		enable Libao/ESD output
+PKGFS_WITH_AO:=		libao
 PKGFD_WITH_MP3:=	enable MP3 support
+PKGFS_WITH_MP3:=	libid3tag libmad
 PKGFD_WITH_MP4:=	enable MP4 support
+PKGFS_WITH_MP4:=	libfaad2
 PKGFD_WITH_OGG:=	enable OGG support
+PKGFS_WITH_OGG:=	libvorbis libogg
 PKGFD_WITH_TREMOR:=	enable fixpoint Vorbis/OGG support
+PKGFS_WITH_TREMOR:=	libvorbisidec
 PKGFD_WITH_FLAC:=	enable FLAC support
+PKGFD_WITH_FLAC:=	libflac
 PKGFD_WITH_WAV:=	enable WAVE support
+PKGFS_WITH_WAV:=	libaudiofile
 PKGFD_WITH_MMS:=	enable MMS support
+PKGFS_WITH_MMS:=	libmms
 PKGFD_WITH_FFMPEG:=	enable FFMPEG support
+PKGFS_WITH_FFMPEG:=	ffmpeg
 PKGFD_WITH_SHOUT:=	enable Shoutcast output support
+PKGFS_WITH_SHOUT:=	libshout liblame libvorbis
 PKGFD_WITH_CURL:=	enable CURL support
+PKGFS_WITH_CURL:=	libcurl
 
 include ${TOPDIR}/mk/package.mk
 
-- 
cgit v1.2.3