Merge branch 'master' of git+ssh://openadk.org/git/openadk

9 files changed, 18 insertions, 13 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/boost/Makefile b/package/boost/Makefile
index 485582d47..93f5fba55 100644
--- a/package/boost/Makefile
+++ b/package/boost/Makefile
@@ -12,6 +12,8 @@ PKG_SECTION:=		libs
 PKG_URL:=		http://www.boost.org/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=boost/}
 
+PKG_ARCH_DEPENDS:=	!avr32
+
 DISTFILES:=		boost_1_54_0.tar.gz
 WRKDIST=		${WRKDIR}/${PKG_NAME}_1_54_0
 
diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile
index 550b8e103..045b9edec 100644
--- a/package/ffmpeg/Makefile
+++ b/package/ffmpeg/Makefile
@@ -13,7 +13,7 @@ PKG_FDEPENDS:=		libpthread
 PKG_URL:=		http://www.ffmpeg.org/
 PKG_SITES:=		http://www.ffmpeg.org/releases/
 
-PKG_ARCH_DEPENDS:=	!cris
+PKG_ARCH_DEPENDS:=	!avr32 !cris
 
 PKG_SUBPKGS:=		LIBFFMPEG FFSERVER FFPROBE FFMPEG
 #PKGSD_FFPLAY:=		ffmpeg based video player
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/libvpx/Makefile b/package/libvpx/Makefile
index c68f128cb..c442d0981 100644
--- a/package/libvpx/Makefile
+++ b/package/libvpx/Makefile
@@ -12,6 +12,8 @@ PKG_SECTION:=		libs
 PKG_URL:=		http://www.webmproject.org/about/
 PKG_SITES:=		http://webm.googlecode.com/files/
 
+PKG_ARCH_DEPENDS:=	!avr32
+
 DISTFILES:=             ${PKG_NAME}-v${PKG_VERSION}.tar.bz2
 WRKDIST=		$(WRKDIR)/${PKG_NAME}-v${PKG_VERSION}
 
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
diff --git a/package/mpd/Makefile b/package/mpd/Makefile
index 175f86237..c9c06e4bf 100644
--- a/package/mpd/Makefile
+++ b/package/mpd/Makefile
@@ -15,6 +15,8 @@ PKG_BUILDDEP:=		glib
 PKG_URL:=		http://www.musicpd.org/
 PKG_SITES:=		http://www.musicpd.org/download/mpd/0.17/
 
+PKG_ARCH_DEPENDS:=	!avr32
+
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
 
 PKG_FLAVOURS_MPD:=	WITH_ALSA WITH_AO WITH_MP3 WITH_MP4 WITH_TREMOR
diff --git a/package/pcc-libs/Makefile b/package/pcc-libs/Makefile
index 0603810e8..4e04de03c 100644
--- a/package/pcc-libs/Makefile
+++ b/package/pcc-libs/Makefile
@@ -12,7 +12,7 @@ PKG_SECTION:=		lang
 PKG_URL:=		http://pcc.ludd.ltu.se/
 PKG_SITES:=		http://pcc.ludd.ltu.se/ftp/pub/pcc-releases/
 
-PKG_ARCH_DEPENDS:=	!arm !cris !mips !ppc !avr32
+PKG_ARCH_DEPENDS:=	!arm !cris !m68k !mips !ppc !avr32
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tgz
 
 include $(TOPDIR)/mk/package.mk
diff --git a/package/pcc/Makefile b/package/pcc/Makefile
index c38faccfc..5630157de 100644
--- a/package/pcc/Makefile
+++ b/package/pcc/Makefile
@@ -14,7 +14,7 @@ PKG_URL:=		http://pcc.ludd.ltu.se/
 PKG_SITES:=		http://pcc.ludd.ltu.se/ftp/pub/pcc-releases/
 PKG_NOPARALLEL:=	1
 
-PKG_ARCH_DEPENDS:=	!arm !cris !mips !ppc !avr32
+PKG_ARCH_DEPENDS:=	!arm !cris !m68k !mips !ppc !avr32
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tgz
 
 include $(TOPDIR)/mk/package.mk