From 220a96f9926788ed531717f78e44fdf1e7ab3b34 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 30 Dec 2010 22:45:29 +0100
Subject: rework architecture / embedded systems concept

Make configuration of new targets cheap.
Just add a new file in target/arch/sys-enabled/foo.
See other files for syntax. While doing runtime tests
with the new infrastructure I've updated a lot of other
stuff:
- gcc 4.5.2
- uClibc 0.9.32-rc1 (NPTL)
- strongswan, php, miredo, parted, util-linux-ng, e2fsprogs

I promise, this is the last big fat commit this year ;)
---
 package/mplayer/Makefile | 41 +++++++++++++++--------------------------
 1 file changed, 15 insertions(+), 26 deletions(-)

(limited to 'package/mplayer/Makefile')

diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile
index afb2e68d4..6d6438fa9 100644
--- a/package/mplayer/Makefile
+++ b/package/mplayer/Makefile
@@ -17,7 +17,7 @@ PKG_BUILDDEP+=		libX11 libXv libpng libXext
 PKG_URL:=		http://www.mplayerhq.hu/
 PKG_SITES:=		http://openadk.org/distfiles/
 
-PKG_TARGET_DEPENDS:=	alix x86 x86_64 mips mipsel mips64 mips64el
+PKG_ARCH_DEPENDS:=	x86 x86_64 mips mipsel mips64 mips64el
 
 PKG_FLAVOURS:=		WITH_DIRECTFB
 PKGFD_WITH_DIRECTFB:=	enable DirectFB video output support
@@ -33,7 +33,6 @@ $(eval $(call PKG_template,MPLAYER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${P
 #TCFLAGS:=$(subst Os,O2,$(TCFLAGS))
 
 CONFIG_STYLE:=		minimal
-
 FAKE_FLAGS+=		INSTALLSTRIP=''
 
 ifeq (${ADK_LINUX_MIPS64EL},y)
@@ -48,33 +47,23 @@ endif
 # related patch to allow configure to find out the DirectFB
 # version number.
 ifeq (${ADK_PACKAGE_MPLAYER_WITH_DIRECTFB},y)
-TCFLAGS+=		-I${STAGING_DIR}/usr/include/directfb
+TCFLAGS+=		-I${STAGING_TARGET_DIR}/usr/include/directfb
 endif
 
-ifeq (${ADK_LINUX_X86_ALIX},y)
-CONFIGURE_CPU_OPTS:=	--disable-ssse3 \
-			--disable-sse2 \
-			--disable-sse \
-			--enable-mmxext \
-			--enable-mmx \
-			--enable-3dnowext \
-			--enable-3dnow
-else ifeq (${ADK_HARDWARE_IBM_X40},y)
-CONFIGURE_CPU_OPTS:=	--disable-ssse3 \
-			--enable-sse2 \
-			--enable-sse \
-			--enable-mmxext \
-			--enable-mmx \
-			--disable-3dnowext \
-			--disable-3dnow
+ifeq (${ADK_TARGET_CPU_WITH_MMX},y)
+CONFIGURE_CPU_OPTS:=	--enable-mmx
+else
+CONFIGURE_CPU_OPTS:=	--disable-mmx
+endif
+ifeq (${ADK_TARGET_CPU_WITH_MMXEXT},y)
+CONFIGURE_CPU_OPTS:=	--enable-mmxext
+else
+CONFIGURE_CPU_OPTS:=	--disable-mmxext
+endif
+ifeq (${ADK_TARGET_CPU_WITH_SSE},y)
+CONFIGURE_CPU_OPTS:=	--enable-sse
 else
-CONFIGURE_CPU_OPTS:=	--disable-ssse3 \
-			--disable-sse2 \
-			--disable-sse \
-			--disable-mmxext \
-			--disable-3dnowext \
-			--disable-mmx \
-			--disable-3dnow
+CONFIGURE_CPU_OPTS:=	--disable-sse
 endif
 
 ifeq ($(ADK_DEBUG),y)
-- 
cgit v1.2.3