X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=libs%2Flibmad%2FMakefile;h=98da47fb4fe0a8d9ce42d79db752d2dfb7275682;hb=b27f837409e28183232346a78f08ea2bccc6bd70;hp=713a433ab6122deeb08377ffe430d6fcf238f3c7;hpb=9ad9e38053997d721d204f1455146ac15e9c6e0c;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/libs/libmad/Makefile b/libs/libmad/Makefile
index 713a433ab6..98da47fb4f 100644
--- a/libs/libmad/Makefile
+++ b/libs/libmad/Makefile
@@ -1,109 +1,85 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libmad
 PKG_VERSION:=0.15.1b
-PKG_RELEASE:=1
+PKG_RELEASE:=3
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/mad \
 	ftp://ftp.mars.org/pub/mpeg/
 PKG_MD5SUM:=1be543bc30c56fb6bea1d7bf6a64e66c
-PKG_CAT:=zcat
 
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=COPYING
+
+PKG_FIXUP:=autoreconf
+
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
 FPM:=default
+ifeq ($(ARCH),armeb)
+  FPM:=arm
+endif
 ifeq ($(ARCH),i386)
-FPM:=intel
+  FPM:=intel
 endif
 ifeq ($(ARCH),mipsel)
-FPM:=mips
+  FPM:=mips
 endif
 
 define Package/libmad
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=An high-quality MPEG audio decoding library
-  DESCRIPTION:=An high-quality MPEG audio decoding library.\\\
-    MAD is a high-quality MPEG audio decoder. It currently supports \\\
-    MPEG-1 and the MPEG-2 extension to lower sampling frequencies, \\\
-    as well as the de facto MPEG 2.5 format. All three audio layers - \\\
-    Layer I, Layer II, and Layer III (i.e. MP3) - are fully implemented.
   URL:=http://www.underbit.com/products/mad/
+  DEPENDS:=@BUILD_PATENTED
 endef
 
-define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
-		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(strip $(TARGET_CFLAGS))" \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
-		PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
-		./configure \
-			--target=$(GNU_TARGET_NAME) \
-			--host=$(GNU_TARGET_NAME) \
-			--build=$(GNU_HOST_NAME) \
-			--program-prefix="" \
-			--program-suffix="" \
-			--prefix=/usr \
-			--exec-prefix=/usr \
-			--bindir=/usr/bin \
-			--datadir=/usr/share \
-			--includedir=/usr/include \
-			--infodir=/usr/share/info \
-			--libdir=/usr/lib \
-			--libexecdir=/usr/lib \
-			--localstatedir=/var \
-			--mandir=/usr/share/man \
-			--sbindir=/usr/sbin \
-			--sysconfdir=/etc \
-			$(DISABLE_LARGEFILE) \
-			$(DISABLE_NLS) \
-			--enable-shared \
-			--enable-static \
-			--disable-rpath \
-			--with-gnu-ld \
-			--enable-fpm=$(FPM) \
-			--disable-debugging \
-			--enable-speed \
-	);
+define Package/libmad/description
+	MAD is a high-quality MPEG audio decoder. It currently supports 
+	MPEG-1 and the MPEG-2 extension to lower sampling frequencies, 
+	as well as the de facto MPEG 2.5 format. All three audio layers - 
+	Layer I, Layer II, and Layer III (i.e. MP3) - are fully implemented.
 endef
 
-define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
+TARGET_CFLAGS += $(FPIC)
 
-define Package/libmad/install
-	install -m0755 -d $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libmad.so.* $(1)/usr/lib/
-endef
+CONFIGURE_ARGS+= \
+	--enable-shared \
+	--enable-static \
+	--enable-fpm="$(FPM)" \
+	--disable-debugging \
+	--enable-speed \
+
+# XXX: configure is parsing and "optimizing" CFLAGS, adding unsupported 
+# XXX: compiler args to it (like -fforce-mem)
+# XXX: so pass an empty one to configure
+CONFIGURE_VARS+= \
+	CFLAGS="" \
+
+# XXX: and pass our own to make
+MAKE_FLAGS+= \
+	CFLAGS="$(TARGET_CFLAGS)" \
 
 define Build/InstallDev
-	mkdir -p $(STAGING_DIR)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/mad.h $(STAGING_DIR)/usr/include/
-	mkdir -p $(STAGING_DIR)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libmad.{a,so*} $(STAGING_DIR)/usr/lib/
+	$(INSTALL_DIR) $(1)/usr/include
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/mad.h $(1)/usr/include/
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libmad.{a,so*} $(1)/usr/lib/
 endef
 
-define Build/UninstallDev
-	rm -rf \
-		$(STAGING_DIR)/usr/include/mad.h \
-		$(STAGING_DIR)/usr/lib/libmad.{a,so*}
+define Package/libmad/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libmad.so.* $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,libmad))