summaryrefslogtreecommitdiff
path: root/package/mplayer
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2009-12-11 13:37:53 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2009-12-11 13:37:53 +0100
commit53b0d7f3a69a90417b2101aad5609f0ac9942cce (patch)
tree79a8d37651bb4d474873f65d3ac68312d29d32c6 /package/mplayer
parentaefd01b3816a68e981293f2d4033170e6cbcfc12 (diff)
fix FPU exception, update to latest upstream
Diffstat (limited to 'package/mplayer')
-rw-r--r--package/mplayer/Makefile15
-rw-r--r--package/mplayer/patches/patch-libao2_ao_alsa_c11
2 files changed, 19 insertions, 7 deletions
diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile
index 5ad3cc1f5..fc32bf9b2 100644
--- a/package/mplayer/Makefile
+++ b/package/mplayer/Makefile
@@ -4,18 +4,15 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= mplayer
-PKG_VERSION:= 1.0-29973
+PKG_VERSION:= 1.0-29987
PKG_RELEASE:= 1
-PKG_MD5SUM:= a2fd085d18fc92c70389e7b4d2b6ad43
+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_URL:= http://www.mplayerhq.hu
PKG_SITES:= http://openadk.org/distfiles/
-#DISTFILES:= MPlayer-${PKG_VERSION}.tar.bz2
-#WRKDIST= ${WRKDIR}/MPlayer-${PKG_VERSION}
-
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,MPLAYER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
@@ -29,8 +26,8 @@ CONFIGURE_CPU_OPTS:= \
--disable-sse2 \
--disable-sse \
--enable-mmxext \
- --enable-3dnowext \
--enable-mmx \
+ --enable-3dnowext \
--enable-3dnow
else
CONFIGURE_CPU_OPTS:= \
@@ -43,6 +40,10 @@ CONFIGURE_CPU_OPTS:= \
--disable-3dnow
endif
+ifneq ($(ADK_DEBUG),)
+ CONFIGURE_DEBUG=--enable-debug
+endif
+
pre-configure:
(cd ${WRKBUILD}; rm -rf config.{cache,status} ; \
./configure \
@@ -90,7 +91,7 @@ pre-configure:
--disable-md5sum \
--disable-liblzo \
${CONFIGURE_CPU_OPTS} \
- ${CONFIGURE_ARG} \
+ ${CONFIGURE_DEBUG} \
);
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);