summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2009-05-31 16:45:55 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2009-05-31 16:45:55 +0200
commit2f66ec3afbb9a9470b6408ec161d379eb901247c (patch)
tree583ffe9a0cd9990bda7af45643e1081c27166804 /package
parentf05d25d6064cfd5ce9ab82d8d032a23af790f454 (diff)
finetune dependencies, make compile work on non-alix1c
Diffstat (limited to 'package')
-rw-r--r--package/mplayer/Config.in2
-rw-r--r--package/mplayer/Makefile41
2 files changed, 34 insertions, 9 deletions
diff --git a/package/mplayer/Config.in b/package/mplayer/Config.in
index a1f1b676b..5dca1eb2f 100644
--- a/package/mplayer/Config.in
+++ b/package/mplayer/Config.in
@@ -2,6 +2,8 @@ config ADK_PACKAGE_MPLAYER
prompt "mplayer........................... popular movie player"
tristate
default n
+ select ADK_PACKAGE_LIBJPEG
+ select ADK_PACKAGE_LIBPNG
select ADK_PACKAGE_LIBPTHREAD
select ADK_PACKAGE_LIBOGG
select ADK_PACKAGE_LIBVORBIS
diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile
index b3a908e8b..05c104037 100644
--- a/package/mplayer/Makefile
+++ b/package/mplayer/Makefile
@@ -11,7 +11,7 @@ PKG_RELEASE:= 2
PKG_MD5SUM:= 7e27e535c2d267637df34898f1b91707
PKG_DESCR:= popular video player
PKG_SECTION:= video
-PKG_DEPENDS:= zlib libncurses libmad alsa-lib libvorbis libogg libfaad2 libpthread
+PKG_DEPENDS:= zlib libncurses libmad alsa-lib libvorbis libogg libfaad2 libpthread libpng libjpeg
PKG_URL:= http://www.mplayerhq.hu
PKG_SITES:= http://www7.mplayerhq.hu/MPlayer/releases/
@@ -25,6 +25,32 @@ $(eval $(call PKG_template,MPLAYER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${P
BUILD_STYLE:= auto
INSTALL_STYLE:= auto
+ifeq (${ADK_X11},y)
+CONFIGURE_ARG:= --enable-x11
+else
+CONFIGURE_ARG:= --disable-x11
+endif
+
+ifeq (${ADK_LINUX_X86_ALIX1C},y)
+CONFIGURE_CPU_OPTS:= \
+ --disable-ssse3 \
+ --disable-sse2 \
+ --disable-sse \
+ --enable-mmxext \
+ --enable-3dnowext \
+ --enable-mmx \
+ --enable-3dnow
+else
+CONFIGURE_CPU_OPTS:= \
+ --disable-ssse3 \
+ --disable-sse2 \
+ --disable-sse \
+ --disable-mmxext \
+ --disable-3dnowext \
+ --disable-mmx \
+ --disable-3dnow
+endif
+
pre-configure:
(cd ${WRKBUILD}; rm -rf config.{cache,status} ; \
./configure \
@@ -36,16 +62,11 @@ pre-configure:
--host-cc=$(HOSTCC) \
--with-extraincdir=$(STAGING_DIR)/usr/include \
--with-extralibdir=$(STAGING_DIR)/usr/lib \
- --disable-ssse3 \
- --disable-sse2 \
- --disable-sse \
- --enable-mmxext \
- --enable-3dnowext \
- --enable-mmx \
- --enable-3dnow \
--disable-mencoder \
--enable-fbdev \
--enable-alsa \
+ --enable-png \
+ --enable-jpeg \
--enable-mad \
--enable-faad-external \
--disable-faad-internal \
@@ -79,7 +100,9 @@ pre-configure:
--disable-tga \
--disable-pnm \
--disable-md5sum \
- --disable-x11 \
+ --disable-liblzo \
+ ${CONFIGURE_CPU_OPTS} \
+ ${CONFIGURE_ARG} \
);