diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/mplayer/Makefile | 14 | ||||
| -rw-r--r-- | package/mplayer/patches/patch-configure | 11 | ||||
| -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, 9 insertions, 37 deletions
diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile index 71e6190d8..791908d23 100644 --- a/package/mplayer/Makefile +++ b/package/mplayer/Makefile @@ -4,9 +4,9 @@ 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:= video PKG_DEPENDS:= alsa-lib libjpeg libfaad2 libmad libncurses @@ -27,6 +27,10 @@ CONFIG_STYLE:= manual FAKE_FLAGS+= INSTALLSTRIP='' +ifeq (${ADK_LINUX_MIPS64_LOONGSON},y) +XAKE_FLAGS+= -DHAVE_LOONGSON -DARCH_MIPS64 +endif + ifeq (${ADK_LINUX_X86_ALIX1C},y) CONFIGURE_CPU_OPTS:= \ --disable-ssse3 \ @@ -48,7 +52,7 @@ CONFIGURE_CPU_OPTS:= \ endif ifeq ($(ADK_DEBUG),y) - CONFIGURE_DEBUG=--enable-debug +CONFIGURE_DEBUG= --enable-debug endif pre-configure: @@ -58,12 +62,13 @@ 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-v4l2 \ --enable-png \ --enable-jpeg \ --enable-mad \ @@ -79,7 +84,6 @@ pre-configure: --disable-live \ --disable-pvr \ --disable-ftp \ - --disable-v4l2 \ --disable-ivtv \ --disable-dvdread-internal \ --disable-libdvdcss-internal \ diff --git a/package/mplayer/patches/patch-configure b/package/mplayer/patches/patch-configure deleted file mode 100644 index dcebb8645..000000000 --- a/package/mplayer/patches/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- 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" - ;; - -- mips) -+ mips|mips64|mipsel|mips64el) - _arch='SGI_MIPS' - _target_arch='ARCH_SGI_MIPS = yes' - iproc='sgi-mips' 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 |