diff options
Diffstat (limited to 'package/mplayer')
| -rw-r--r-- | package/mplayer/Makefile | 24 | ||||
| -rw-r--r-- | package/mplayer/patches/patch-configure | 11 |
2 files changed, 34 insertions, 1 deletions
diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile index 5ec1d48db..762994139 100644 --- a/package/mplayer/Makefile +++ b/package/mplayer/Makefile @@ -14,9 +14,16 @@ PKG_DEPENDS+= libogg libpng libpthread libvorbis 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_MPD_WITH_DIRECTFB},y) +PKG_DEPENDS+= DirectFB +PKG_BUILDDEP+= DirectFB +endif PKG_URL:= http://www.mplayerhq.hu PKG_SITES:= http://openadk.org/distfiles/ +PKG_FLAVOURS:= WITH_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 @@ -31,6 +38,14 @@ 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_MPD_WITH_DIRECTFB},y) +TCFLAGS+= -I${STAGING_DIR}/usr/include/directfb +endif + ifeq (${ADK_LINUX_X86_ALIX1C},y) CONFIGURE_CPU_OPTS:= \ --disable-ssse3 \ @@ -55,6 +70,12 @@ ifeq ($(ADK_DEBUG),y) CONFIGURE_DEBUG= --enable-debug endif +ifeq (${ADK_PACKAGE_MPD_WITH_DIRECTFB},y) +CONFIGURE_DIRECTFB=--enable-directfb +else +CONFIGURE_DIRECTFB=--disable-directfb +endif + pre-configure: (cd ${WRKBUILD}; rm -rf config.{cache,status} ; \ ./configure \ @@ -108,8 +129,9 @@ pre-configure: --extra-cflags="${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..aabaf8282 --- /dev/null +++ b/package/mplayer/patches/patch-configure @@ -0,0 +1,11 @@ +--- mplayer-1.0-29987.orig/configure 2009-12-10 13:18:20.000000000 +0100 ++++ mplayer-1.0-29987/configure 2010-06-13 22:58:34.756925268 +0200 +@@ -4141,7 +4141,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 + ; |