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

2 files changed, 97 insertions, 60 deletions

diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile
index 791908d23..0c9e3945c 100644
--- a/package/mplayer/Makefile
+++ b/package/mplayer/Makefile
@@ -4,31 +4,49 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		mplayer
-PKG_VERSION:=		1.0-31425
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		e65b88e7a5c1c2f98c98e565357b9663
+PKG_VERSION:=		1.0-31648
+PKG_RELEASE:=		3
+PKG_MD5SUM:=		eeb9219f9015e0e0dfbf4a70efefb751
 PKG_DESCR:=		popular video player
-PKG_SECTION:=		video
+PKG_SECTION:=		multimedia
 PKG_DEPENDS:=		alsa-lib libjpeg libfaad2 libmad libncurses
 PKG_DEPENDS+=		libogg libpng libpthread libvorbis
-PKG_DEPENDS+=		libx11 libxau libxdmcp libxext libxv zlib 
+PKG_DEPENDS+=		libx11 libxau libxdmcp libxext libxv zlib
 PKG_BUILDDEP+=		alsa-lib libmad libvorbis faad2 ncurses zlib
 PKG_BUILDDEP+=		libX11 libXv libpng libXext
+ifeq (${ADK_PACKAGE_MPLAYER_WITH_DIRECTFB},y)
+PKG_BUILDDEP+=		DirectFB
+endif
 PKG_URL:=		http://www.mplayerhq.hu
 PKG_SITES:=		http://openadk.org/distfiles/
 
+PKG_FLAVOURS:=		WITH_DIRECTFB
+PKGFS_WITH_DIRECTFB:=	directfb
+PKGFD_WITH_DIRECTFB:=	enable DirectFB video output support
+
 PKG_TARGET_DEPENDS:=	alix1c x86_qemu x86_64_qemu shuttle lemote
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,MPLAYER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIG_STYLE:=		manual
+# gcc 4.5 produces internal compiler error with -Os
+#TCFLAGS:=$(subst Os,O2,$(TCFLAGS))
+
+CONFIG_STYLE:=		minimal
 
 FAKE_FLAGS+=		INSTALLSTRIP=''
 
-ifeq (${ADK_LINUX_MIPS64_LOONGSON},y)
-XAKE_FLAGS+=		-DHAVE_LOONGSON -DARCH_MIPS64
+ifeq (${ADK_LINUX_MIPS64_LEMOTE},y)
+EXTRA_CFLAGS:=		-DARCH_MIPS64
+endif
+
+# Somehow this include path is missing here, although other
+# applications build fine against DirectFB. There is also a
+# 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
 endif
 
 ifeq (${ADK_LINUX_X86_ALIX1C},y)
@@ -55,58 +73,66 @@ ifeq ($(ADK_DEBUG),y)
 CONFIGURE_DEBUG=	--enable-debug
 endif
 
-pre-configure:
-	(cd ${WRKBUILD}; rm -rf config.{cache,status} ; \
-		./configure \
-		--enable-x11 \
-		--prefix=/usr \
-		--confdir=/etc \
-		--enable-cross-compile \
-		--target=${ARCH}-linux \
-		--cc=$(TARGET_CC) \
-		--host-cc=$(HOSTCC) \
-		--disable-mencoder \
-		--enable-fbdev \
-		--enable-alsa \
-		--enable-v4l2 \
-		--enable-png \
-		--enable-jpeg \
-		--enable-mad \
-		--disable-faad-internal \
-		--enable-libvorbis \
-		--disable-ossaudio \
-		--disable-vm \
-		--disable-iconv \
-		--disable-lirc \
-		--disable-radio-v4l2 \
-		--disable-faac \
-		--disable-libdv \
-		--disable-live \
-		--disable-pvr \
-		--disable-ftp \
-		--disable-ivtv \
-		--disable-dvdread-internal \
-		--disable-libdvdcss-internal \
-		--disable-freetype \
-		--disable-tremor-internal \
-		--disable-arts \
-		--disable-esd \
-		--disable-jack \
-		--disable-openal \
-		--disable-nas \
-		--disable-sgiaudio \
-		--disable-sunaudio \
-		--disable-win32waveout \
-		--disable-tga \
-		--disable-pnm \
-		--disable-md5sum \
-		--disable-liblzo \
-		--disable-xinerama \
-		--disable-vidix \
-		${CONFIGURE_CPU_OPTS} \
-		${CONFIGURE_DEBUG} \
-	);
-	
+ifeq (${ADK_PACKAGE_MPLAYER_WITH_DIRECTFB},y)
+CONFIGURE_DIRECTFB=	--enable-directfb
+else
+CONFIGURE_DIRECTFB=	--disable-directfb
+endif
+
+CONFIGURE_ARGS:=	--prefix=/usr \
+			--enable-x11 \
+			--confdir=/etc \
+			--enable-cross-compile \
+			--target=${ARCH}-linux \
+			--cc=$(TARGET_CC) \
+			--host-cc=$(HOSTCC) \
+			--disable-mencoder \
+			--enable-fbdev \
+			--enable-alsa \
+			--enable-tv \
+			--enable-v4l2 \
+			--enable-png \
+			--enable-jpeg \
+			--enable-mad \
+			--disable-faad-internal \
+			--enable-libvorbis \
+			--disable-ossaudio \
+			--disable-vm \
+			--disable-iconv \
+			--disable-lirc \
+			--disable-radio-v4l2 \
+			--disable-faac \
+			--disable-libdv \
+			--disable-live \
+			--disable-pvr \
+			--disable-ftp \
+			--disable-ivtv \
+			--disable-dvdread-internal \
+			--disable-libdvdcss-internal \
+			--disable-freetype \
+			--disable-mpg123 \
+			--disable-tremor-internal \
+			--disable-arts \
+			--disable-esd \
+			--disable-jack \
+			--disable-openal \
+			--disable-nas \
+			--disable-sgiaudio \
+			--disable-sunaudio \
+			--disable-win32waveout \
+			--disable-tga \
+			--disable-pnm \
+			--disable-md5sum \
+			--disable-liblzo \
+			--disable-sdl \
+			--disable-xinerama \
+			--disable-vidix \
+			--disable-gl \
+			--extra-cflags="${TCFLAGS} ${EXTRA_CFLAGS}" \
+			${CONFIGURE_CPU_OPTS} \
+			${CONFIGURE_DEBUG} \
+			${CONFIGURE_DIRECTFB}
+
 post-install:
 	${INSTALL_DIR} ${IDIR_MPLAYER}/usr/bin
 	${CP} ${WRKINST}/usr/bin/mplayer ${IDIR_MPLAYER}/usr/bin
diff --git a/package/mplayer/patches/patch-configure b/package/mplayer/patches/patch-configure
new file mode 100644
index 000000000..711488515
--- /dev/null
+++ b/package/mplayer/patches/patch-configure
@@ -0,0 +1,11 @@
+--- mplayer-1.0-31648.orig/configure	2010-07-09 11:54:31.000000000 +0200
++++ mplayer-1.0-31648/configure	2010-07-15 19:03:13.247109421 +0200
+@@ -4304,7 +4304,7 @@ dfb_version() {
+ 
+ if test "$_directfb" = yes; then
+   cat > $TMPC << EOF
+-#include <directfb_version.h>
++#include <directfb/directfb_version.h>
+ int
+ dfb_ver = DIRECTFB_MAJOR_VERSION.DIRECTFB_MINOR_VERSION.DIRECTFB_MICRO_VERSION
+ ;