summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-01-03 17:09:43 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2011-01-03 17:09:43 +0100
commit098a23b35bf8c4017e79c57ad062d971f4483184 (patch)
tree593708c91429034ca2d0b0d23c16a5373166e33f /package
parent3322bd4ee175042e5596777bbcefd9096b314cf9 (diff)
update mplayer to latest svn
Diffstat (limited to 'package')
-rw-r--r--package/mplayer/Makefile18
-rw-r--r--package/mplayer/patches/patch-configure20
-rw-r--r--package/mplayer/patches/patch-libvo_vo_dga_c11
3 files changed, 22 insertions, 27 deletions
diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile
index 0bef82316..bad5c656d 100644
--- a/package/mplayer/Makefile
+++ b/package/mplayer/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= mplayer
-PKG_VERSION:= 1.0-31868
+PKG_VERSION:= 1.0-32749
PKG_RELEASE:= 1
-PKG_MD5SUM:= 9d5c2c1c927947b31afa6f42c11e8f23
+PKG_MD5SUM:= aadc5d8cca503c8b18b3ed00b3a52cf5
PKG_DESCR:= popular video player
PKG_SECTION:= multimedia
PKG_DEPENDS:= alsa-lib libjpeg libfaad2 libmad libncurses
@@ -53,14 +53,19 @@ else
CONFIGURE_CPU_OPTS:= --disable-mmx
endif
ifeq (${ADK_TARGET_CPU_WITH_MMXEXT},y)
-CONFIGURE_CPU_OPTS:= --enable-mmxext
+CONFIGURE_CPU_OPTS+= --enable-mmxext
else
-CONFIGURE_CPU_OPTS:= --disable-mmxext
+CONFIGURE_CPU_OPTS+= --disable-mmxext
endif
ifeq (${ADK_TARGET_CPU_WITH_SSE},y)
-CONFIGURE_CPU_OPTS:= --enable-sse
+CONFIGURE_CPU_OPTS+= --enable-sse
else
-CONFIGURE_CPU_OPTS:= --disable-sse
+CONFIGURE_CPU_OPTS+= --disable-sse
+endif
+ifeq (${ADK_TARGET_CPU_WITH_SSE2},y)
+CONFIGURE_CPU_OPTS+= --enable-sse2
+else
+CONFIGURE_CPU_OPTS+= --disable-sse2
endif
ifeq ($(ADK_DEBUG),y)
@@ -89,7 +94,6 @@ CONFIGURE_ARGS:= --prefix=/usr \
--enable-png \
--enable-jpeg \
--enable-mad \
- --disable-faad-internal \
--enable-libvorbis \
--disable-ossaudio \
--disable-vm \
diff --git a/package/mplayer/patches/patch-configure b/package/mplayer/patches/patch-configure
deleted file mode 100644
index 0189d6962..000000000
--- a/package/mplayer/patches/patch-configure
+++ /dev/null
@@ -1,20 +0,0 @@
---- mplayer-1.0-31868.orig/configure 2010-07-30 17:43:10.000000000 +0200
-+++ mplayer-1.0-31868/configure 2010-10-10 13:06:15.000000000 +0200
-@@ -1530,7 +1530,7 @@ fi
- if irix ; then
- _ranlib='ar -r'
- elif linux ; then
-- _ranlib='true'
-+ _ranlib='ranlib'
- fi
-
- if win32 ; then
-@@ -4354,7 +4354,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
- ;
diff --git a/package/mplayer/patches/patch-libvo_vo_dga_c b/package/mplayer/patches/patch-libvo_vo_dga_c
new file mode 100644
index 000000000..57836218f
--- /dev/null
+++ b/package/mplayer/patches/patch-libvo_vo_dga_c
@@ -0,0 +1,11 @@
+--- mplayer-1.0-32749.orig/libvo/vo_dga.c 2011-01-03 11:26:57.000000000 +0100
++++ mplayer-1.0-32749/libvo/vo_dga.c 2011-01-03 11:44:50.000000000 +0100
+@@ -35,7 +35,7 @@
+ #include "mp_msg.h"
+
+ #include <X11/Xlib.h>
+-#include <X11/extensions/xf86dga.h>
++#include <X11/extensions/Xxf86dga.h>
+
+ #ifdef CONFIG_XF86VM
+ #include <X11/extensions/xf86vmode.h>