diff options
Diffstat (limited to 'package/mplayer/Makefile')
| -rw-r--r-- | package/mplayer/Makefile | 43 |
1 files changed, 36 insertions, 7 deletions
diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile index d5f2abbc3..cbdf7808f 100644 --- a/package/mplayer/Makefile +++ b/package/mplayer/Makefile @@ -4,19 +4,26 @@ include ${TOPDIR}/rules.mk PKG_NAME:= mplayer -PKG_VERSION:= 1.0-29987 +PKG_VERSION:= 1.0-31425 PKG_RELEASE:= 1 -PKG_MD5SUM:= 416fa6a247987305d74572d03dc6dde7 +PKG_MD5SUM:= e65b88e7a5c1c2f98c98e565357b9663 PKG_DESCR:= popular video player 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 @@ -27,6 +34,18 @@ CONFIG_STYLE:= manual FAKE_FLAGS+= INSTALLSTRIP='' +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) CONFIGURE_CPU_OPTS:= \ --disable-ssse3 \ @@ -48,7 +67,13 @@ CONFIGURE_CPU_OPTS:= \ endif ifeq ($(ADK_DEBUG),y) - CONFIGURE_DEBUG=--enable-debug +CONFIGURE_DEBUG= --enable-debug --enable-crash-debug +endif + +ifeq (${ADK_PACKAGE_MPLAYER_WITH_DIRECTFB},y) +CONFIGURE_DIRECTFB=--enable-directfb +else +CONFIGURE_DIRECTFB=--disable-directfb endif pre-configure: @@ -58,12 +83,14 @@ pre-configure: --prefix=/usr \ --confdir=/etc \ --enable-cross-compile \ - --target=$(REAL_GNU_TARGET_NAME) \ + --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 \ @@ -79,7 +106,6 @@ pre-configure: --disable-live \ --disable-pvr \ --disable-ftp \ - --disable-v4l2 \ --disable-ivtv \ --disable-dvdread-internal \ --disable-libdvdcss-internal \ @@ -99,10 +125,13 @@ pre-configure: --disable-liblzo \ --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 |