packages: ipv6/tayga: move static mappings to 'firewall' config

[openwrt/svn-archive/archive.git] / libs / libmad / Makefile

diff --git a/libs/libmad/Makefile b/libs/libmad/Makefile
index 1affa3360d940625a05539549ed401be74d2fd10..61466008f2710ce28819ade4ccd3de9d0400be2b 100644 (file)
--- a/libs/libmad/Makefile
+++ b/libs/libmad/Makefile
@@ -1,29 +1,31 @@
-# 
-# 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_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_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_FIXUP:=libtool
+
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
 FPM:=default
+ifeq ($(ARCH),armeb)
+  FPM:=arm
+endif
 ifeq ($(ARCH),i386)
   FPM:=intel
 endif
@@ -35,45 +37,45 @@ define Package/libmad
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=An high-quality MPEG audio decoding library
-  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.
   URL:=http://www.underbit.com/products/mad/
+  DEPENDS:=@BUILD_PATENTED
 endef
 
-define Build/Configure
-       $(call Build/Configure/Default, \
-               --enable-shared \
-               --enable-static \
-               --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
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
+TARGET_CFLAGS += $(FPIC)
 
-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/
-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="" \
 
-define Build/UninstallDev
-       rm -rf \
-               $(STAGING_DIR)/usr/include/mad.h \
-               $(STAGING_DIR)/usr/lib/libmad.{a,so*}
+# XXX: and pass our own to make
+MAKE_FLAGS+= \
+       CFLAGS="$(TARGET_CFLAGS)" \
+
+define Build/InstallDev
+       $(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 Package/libmad/install
-       install -d -m0755 $(1)/usr/lib
+       $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmad.so.* $(1)/usr/lib/
 endef