diff options
Diffstat (limited to 'package/mplayer')
| -rw-r--r-- | package/mplayer/Makefile | 43 | ||||
| -rw-r--r-- | package/mplayer/patches/patch-configure | 18 | ||||
| -rw-r--r-- | package/mplayer/patches/patch-libao2_ao_alsa_c | 11 | ||||
| -rw-r--r-- | package/mplayer/patches/patch-loader_win32_c | 10 |
4 files changed, 45 insertions, 37 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 diff --git a/package/mplayer/patches/patch-configure b/package/mplayer/patches/patch-configure index dcebb8645..aabaf8282 100644 --- a/package/mplayer/patches/patch-configure +++ b/package/mplayer/patches/patch-configure @@ -1,11 +1,11 @@ --- mplayer-1.0-29987.orig/configure 2009-12-10 13:18:20.000000000 +0100 -+++ mplayer-1.0-29987/configure 2010-03-06 12:52:36.000000000 +0100 -@@ -2266,7 +2266,7 @@ EOF - _optimizing="$proc" - ;; ++++ mplayer-1.0-29987/configure 2010-06-13 22:58:34.756925268 +0200 +@@ -4141,7 +4141,7 @@ dfb_version() { -- mips) -+ mips|mips64|mipsel|mips64el) - _arch='SGI_MIPS' - _target_arch='ARCH_SGI_MIPS = yes' - iproc='sgi-mips' + 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 + ; diff --git a/package/mplayer/patches/patch-libao2_ao_alsa_c b/package/mplayer/patches/patch-libao2_ao_alsa_c deleted file mode 100644 index 7f6478baa..000000000 --- a/package/mplayer/patches/patch-libao2_ao_alsa_c +++ /dev/null @@ -1,11 +0,0 @@ ---- mplayer-1.0-29987.orig/libao2/ao_alsa.c 2009-12-10 21:54:25.000000000 +0100 -+++ mplayer-1.0-29987/libao2/ao_alsa.c 2009-12-10 22:38:31.000000000 +0100 -@@ -772,8 +772,6 @@ static int play(void* data, int len, int - { - int num_frames; - snd_pcm_sframes_t res = 0; -- if (!(flags & AOPLAY_FINAL_CHUNK) && len > ao_data.outburst) -- len = len / ao_data.outburst * ao_data.outburst; - num_frames = len / bytes_per_sample; - - //mp_msg(MSGT_AO,MSGL_ERR,"alsa-play: frames=%i, len=%i\n",num_frames,len); diff --git a/package/mplayer/patches/patch-loader_win32_c b/package/mplayer/patches/patch-loader_win32_c deleted file mode 100644 index 9392be1ce..000000000 --- a/package/mplayer/patches/patch-loader_win32_c +++ /dev/null @@ -1,10 +0,0 @@ ---- mplayer-1.0-29973.orig/loader/win32.c 2009-12-02 19:45:33.000000000 +0100 -+++ mplayer-1.0-29973/loader/win32.c 2009-12-04 22:32:05.000000000 +0100 -@@ -61,7 +61,6 @@ for DLL to know too much about its envir - #include <dirent.h> - #include <sys/time.h> - #include <sys/stat.h> --#include <sys/timeb.h> - #ifdef HAVE_KSTAT - #include <kstat.h> - #endif |