summaryrefslogtreecommitdiff
path: root/package/mplayer
diff options
context:
space:
mode:
Diffstat (limited to 'package/mplayer')
-rw-r--r--package/mplayer/Config.in18
-rw-r--r--package/mplayer/Makefile43
-rw-r--r--package/mplayer/patches/patch-configure48
-rw-r--r--package/mplayer/patches/patch-libao2_ao_alsa_c11
-rw-r--r--package/mplayer/patches/patch-loader_win32_c9
5 files changed, 46 insertions, 83 deletions
diff --git a/package/mplayer/Config.in b/package/mplayer/Config.in
deleted file mode 100644
index 963e2c0ba..000000000
--- a/package/mplayer/Config.in
+++ /dev/null
@@ -1,18 +0,0 @@
-config ADK_PACKAGE_MPLAYER
- prompt "mplayer........................... popular movie player"
- tristate
- default n
- select ADK_PACKAGE_ALSA_LIB
- select ADK_PACKAGE_LIBJPEG
- select ADK_PACKAGE_LIBPNG
- select ADK_PACKAGE_LIBPTHREAD
- select ADK_PACKAGE_LIBOGG
- select ADK_PACKAGE_LIBMAD
- select ADK_PACKAGE_LIBNCURSES
- select ADK_PACKAGE_LIBFAAD2
- select ADK_PACKAGE_LIBVORBIS
- select ADK_PACKAGE_ZLIB
- depends on ADK_LINUX_X86_ALIX1C
- help
- http://www.mplayerhq.hu
-
diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile
index 0c330a792..71e6190d8 100644
--- a/package/mplayer/Makefile
+++ b/package/mplayer/Makefile
@@ -4,30 +4,28 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= mplayer
-PKG_VERSION:= 1.0rc2
-PKG_RELEASE:= 2
-PKG_MD5SUM:= 7e27e535c2d267637df34898f1b91707
+PKG_VERSION:= 1.0-29987
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 416fa6a247987305d74572d03dc6dde7
PKG_DESCR:= popular video player
PKG_SECTION:= video
-PKG_DEPENDS:= zlib libncurses libmad alsa-lib libvorbis libogg libfaad2 libpthread libpng libjpeg
+PKG_DEPENDS:= alsa-lib libjpeg libfaad2 libmad libncurses
+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
PKG_URL:= http://www.mplayerhq.hu
-PKG_SITES:= http://www7.mplayerhq.hu/MPlayer/releases/
+PKG_SITES:= http://openadk.org/distfiles/
-DISTFILES:= MPlayer-${PKG_VERSION}.tar.bz2
-WRKDIST= ${WRKDIR}/MPlayer-${PKG_VERSION}
+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}))
-BUILD_STYLE:= auto
-INSTALL_STYLE:= auto
+CONFIG_STYLE:= manual
-ifeq ($(ADK_X11),y)
-CONFIGURE_ARG:= --enable-x11
-else
-CONFIGURE_ARG:= --disable-x11
-endif
+FAKE_FLAGS+= INSTALLSTRIP=''
ifeq (${ADK_LINUX_X86_ALIX1C},y)
CONFIGURE_CPU_OPTS:= \
@@ -35,8 +33,8 @@ CONFIGURE_CPU_OPTS:= \
--disable-sse2 \
--disable-sse \
--enable-mmxext \
- --enable-3dnowext \
--enable-mmx \
+ --enable-3dnowext \
--enable-3dnow
else
CONFIGURE_CPU_OPTS:= \
@@ -49,24 +47,26 @@ CONFIGURE_CPU_OPTS:= \
--disable-3dnow
endif
+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=$(REAL_GNU_TARGET_NAME) \
--cc=$(TARGET_CC) \
--host-cc=$(HOSTCC) \
- --with-extraincdir=$(STAGING_DIR)/usr/include \
- --with-extralibdir=$(STAGING_DIR)/usr/lib \
--disable-mencoder \
--enable-fbdev \
--enable-alsa \
--enable-png \
--enable-jpeg \
--enable-mad \
- --enable-faad-external \
--disable-faad-internal \
--enable-libvorbis \
--disable-ossaudio \
@@ -81,14 +81,12 @@ pre-configure:
--disable-ftp \
--disable-v4l2 \
--disable-ivtv \
- --disable-vidix-internal \
--disable-dvdread-internal \
--disable-libdvdcss-internal \
--disable-freetype \
--disable-tremor-internal \
--disable-arts \
--disable-esd \
- --disable-polyp \
--disable-jack \
--disable-openal \
--disable-nas \
@@ -99,11 +97,12 @@ pre-configure:
--disable-pnm \
--disable-md5sum \
--disable-liblzo \
+ --disable-xinerama \
+ --disable-vidix \
${CONFIGURE_CPU_OPTS} \
- ${CONFIGURE_ARG} \
+ ${CONFIGURE_DEBUG} \
);
-
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 4ef4de805..dcebb8645 100644
--- a/package/mplayer/patches/patch-configure
+++ b/package/mplayer/patches/patch-configure
@@ -1,39 +1,11 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- MPlayer-1.0rc2.orig/configure 2007-10-07 21:49:33.000000000 +0200
-+++ MPlayer-1.0rc2/configure 2009-05-10 18:37:32.000000000 +0200
-@@ -2331,7 +2331,7 @@ elif test -z "$CFLAGS" ; then
- elif test "$cc_vendor" != "gnu" ; then
- CFLAGS="-O2 $_march $_mcpu $_pipe"
- else
-- CFLAGS="-Wall -Wno-switch -Wpointer-arith -Wredundant-decls -O4 $_march $_mcpu $_pipe -ffast-math -fomit-frame-pointer"
-+ CFLAGS="-Wall -Wno-switch -Wpointer-arith -Wredundant-decls $_march $_mcpu $_pipe -ffast-math -fomit-frame-pointer"
- fi
- else
- _warn_CFLAGS=yes
-@@ -3853,26 +3853,6 @@ else
- fi
+--- 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"
+ ;;
-
--echocheck "X11 headers presence"
-- _x11_headers="no"
-- _res_comment="check if the dev(el) packages are installed"
-- for I in `echo $_inc_extra | sed s/-I//g` /usr/include ; do
-- if test -f "$I/X11/Xlib.h" ; then
-- _x11_headers="yes"
-- _res_comment=""
-- break
-- fi
-- done
-- for I in /usr/X11/include /usr/X11R6/include /usr/include/X11R6 /usr/openwin/include ; do
-- if test -f "$I/X11/Xlib.h" ; then
-- _inc_extra="$_inc_extra -I$I"
-- _x11_headers="yes"
-- _res_comment="using $I"
-- break
-- fi
-- done
--echores "$_x11_headers"
--
-
- echocheck "X11"
- if test "$_x11" = auto && test "$_x11_headers" = yes ; then
+- 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
new file mode 100644
index 000000000..7f6478baa
--- /dev/null
+++ b/package/mplayer/patches/patch-libao2_ao_alsa_c
@@ -0,0 +1,11 @@
+--- 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
index e5537e02a..9392be1ce 100644
--- a/package/mplayer/patches/patch-loader_win32_c
+++ b/package/mplayer/patches/patch-loader_win32_c
@@ -1,10 +1,9 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- MPlayer-1.0rc2.orig/loader/win32.c 2007-10-07 21:49:32.000000000 +0200
-+++ MPlayer-1.0rc2/loader/win32.c 2008-10-28 15:29:47.000000000 +0100
-@@ -63,7 +63,6 @@ for DLL to know too much about its envir
- #include <sys/types.h>
+--- 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>
generated by cgit v1.2.3 (git 2.46.0) at 2025-12-10 09:58:56 +0000