Merge pull request #4853 from StevenHessing/noddos

[feed/packages.git] / sound / madplay / Makefile

diff --git a/sound/madplay/Makefile b/sound/madplay/Makefile
index b1c97d705988eac0cf7ba6b975282b093578d15a..068280f3657ee13c44295ad25fa976ca17c56f5e 100644 (file)
--- a/sound/madplay/Makefile
+++ b/sound/madplay/Makefile
@@ -9,16 +9,18 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=madplay
 PKG_VERSION:=0.15.2b
-PKG_RELEASE:=5
+PKG_RELEASE:=6
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/mad \
        ftp://ftp.mars.org/pub/mpeg/
-PKG_MD5SUM:=6814b47ceaa99880c754c5195aa1aac1
+PKG_HASH:=5a79c7516ff7560dffc6a14399a389432bc619c905b13d3b73da22fa65acede0
 PKG_LICENSE:=GPL-2.0+
 PKG_LICENSE_FILES:=COPYING
 PKG_MAINTAINER:=Simon Peter <probono@puredarwin.org>
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
+
 PKG_FIXUP:=autoreconf
 
 include $(INCLUDE_DIR)/package.mk
@@ -27,13 +29,13 @@ include $(INCLUDE_DIR)/nls.mk
 define Package/madplay/default
   SECTION:=sound
   CATEGORY:=Sound
-  DEPENDS:=+libid3tag +libmad $(INTL_DEPENDS)
+  DEPENDS:=+libid3tag +libmad $(INTL_DEPENDS) $(2)
   TITLE:=MPEG audio player in fixed point - $(1)
   VARIANT:=$(1)
   URL:=http://sourceforge.net/projects/mad
 endef
 
-Package/madplay-alsa=$(call Package/madplay/default,alsa)
+Package/madplay-alsa=$(call Package/madplay/default,alsa,+alsa-lib)
 Package/madplay=$(call Package/madplay/default,oss)
 
 define Package/madplay/description
@@ -58,18 +60,23 @@ define Build/Configure
        )
 endef
 
-ifeq ($(BUILD_VARIANT),madplay-alsa)
+ifeq ($(BUILD_VARIANT),alsa)
        CONFIGURE_ARGS += \
                --without-oss \
                --with-alsa
 endif
 
-ifeq ($(BUILD_VARIANT),madplay)
+ifeq ($(BUILD_VARIANT),oss)
        CONFIGURE_ARGS += \
                --without-alsa
 endif
 
-define Package/madplay-$(BUILD_VARIANT)/install
+define Package/madplay/install
+       $(INSTALL_DIR) $(1)/usr/bin
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/madplay $(1)/usr/bin/
+endef
+
+define Package/madplay-alsa/install
        $(INSTALL_DIR) $(1)/usr/bin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/madplay $(1)/usr/bin/
 endef