summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/alsa-lib/Makefile3
-rw-r--r--package/libmad/Makefile10
-rw-r--r--package/madplay/Makefile6
3 files changed, 9 insertions, 10 deletions
diff --git a/package/alsa-lib/Makefile b/package/alsa-lib/Makefile
index 01d5fee2e..3be639ffa 100644
--- a/package/alsa-lib/Makefile
+++ b/package/alsa-lib/Makefile
@@ -24,8 +24,7 @@ $(eval $(call PKG_template,ALSA_LIB,alsa-lib,${PKG_VERSION}-${PKG_RELEASE},${PKG
$(eval $(call PKG_template,ALSA_LIB_DEV,alsa-lib-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ALSA_LIB_DEV},${PKGSC_ALSA_LIB_DEV}))
TARGET_CPPFLAGS+= -D_POSIX_C_SOURCE=1
-CONFIGURE_ARGS+= --disable-python \
- --without-versioned
+CONFIGURE_ARGS+= --disable-python
alsa-lib-install:
${INSTALL_DIR} ${IDIR_ALSA_LIB}/usr/lib ${IDIR_ALSA_LIB}/usr/share/alsa
diff --git a/package/libmad/Makefile b/package/libmad/Makefile
index 58faf3463..822ecb9b5 100644
--- a/package/libmad/Makefile
+++ b/package/libmad/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= libmad
PKG_VERSION:= 0.15.1b
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_MD5SUM:= 1be543bc30c56fb6bea1d7bf6a64e66c
PKG_DESCR:= An high-quality MPEG audio decoding library
PKG_SECTION:= libs
@@ -21,13 +21,13 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBMAD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
$(eval $(call PKG_template,LIBMAD_DEV,libmad-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBMAD_DEV},${PKGSC_LIBMAD_DEV}))
-#FIXME
-XAKE_FLAGS+= GCC_HONOUR_COPTS=s
-
FPM:=default
ifeq (${ARCH},i386)
FPM:=intel
endif
+ifeq (${ARCH},arm)
+FPM:=arm
+endif
# MIPS optimization is broken for gcc 4.4 (removed h constraint)
#ifeq (${ARCH},mips)
#FPM:=mips
@@ -41,7 +41,7 @@ pre-install:
${INSTALL_DIR} ${WRKINST}/usr/lib/pkgconfig
${CP} ./files/mad.pc ${WRKINST}/usr/lib/pkgconfig
-post-install:
+libmad-install:
${INSTALL_DIR} ${IDIR_LIBMAD}/usr/lib
${CP} ${WRKINST}/usr/lib/libmad.so* ${IDIR_LIBMAD}/usr/lib/
diff --git a/package/madplay/Makefile b/package/madplay/Makefile
index 50187a26a..d089b8358 100644
--- a/package/madplay/Makefile
+++ b/package/madplay/Makefile
@@ -9,8 +9,8 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= 6814b47ceaa99880c754c5195aa1aac1
PKG_DESCR:= MPEG audio player in fixed point
PKG_SECTION:= multimedia
-PKG_DEPENDS:= libid3tag libmad
-PKG_BUILDDEP:= libid3tag libmad
+PKG_DEPENDS:= libid3tag libmad alsa-lib
+PKG_BUILDDEP:= libid3tag libmad alsa-lib
PKG_URL:= http://www.underbit.com/products/mad
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=mad/} \
ftp://ftp.mars.org/pub/mpeg/
@@ -29,7 +29,7 @@ CONFIGURE_ARGS+= --disable-debugging \
--without-libiconv-prefix \
--without-libintl-prefix \
--without-esd \
- --without-alsa
+ --with-alsa
post-install:
${INSTALL_DIR} ${IDIR_MADPLAY}/usr/bin