summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/mplayer/mplayer-atty-1.1.5/alsa-configure.patch37
-rw-r--r--packages/mplayer/mplayer-atty_1.1.5.bb8
2 files changed, 42 insertions, 3 deletions
diff --git a/packages/mplayer/mplayer-atty-1.1.5/alsa-configure.patch b/packages/mplayer/mplayer-atty-1.1.5/alsa-configure.patch
new file mode 100644
index 0000000000..ad6d4504e1
--- /dev/null
+++ b/packages/mplayer/mplayer-atty-1.1.5/alsa-configure.patch
@@ -0,0 +1,37 @@
+--- mplayer-1.1.5/configure.orig 2005-11-08 15:07:52.000000000 +0000
++++ mplayer-1.1.5/configure 2005-11-08 15:08:40.000000000 +0000
+@@ -4627,33 +4627,7 @@
+ echocheck "ALSA audio"
+ if test "$_alsa" != no ; then
+ _alsa=no
+- cat > $TMPC << EOF
+-#include <sys/asoundlib.h>
+-int main(void) { return (!(SND_LIB_MAJOR==0 && SND_LIB_MINOR==5)); }
+-EOF
+- cc_check -lasound $_ld_dl $_ld_pthread && $TMPO && _alsaver='0.5.x'
+-
+- cat > $TMPC << EOF
+-#include <sys/asoundlib.h>
+-int main(void) { return (!(SND_LIB_MAJOR==0 && SND_LIB_MINOR==9)); }
+-EOF
+- cc_check -lasound $_ld_dl $_ld_pthread && $TMPO && _alsaver='0.9.x-sys'
+- cat > $TMPC << EOF
+-#include <alsa/asoundlib.h>
+-int main(void) { return (!(SND_LIB_MAJOR==0 && SND_LIB_MINOR==9)); }
+-EOF
+- cc_check -lasound $_ld_dl $_ld_pthread && $TMPO && _alsaver='0.9.x-alsa'
+-
+- cat > $TMPC << EOF
+-#include <sys/asoundlib.h>
+-int main(void) { return (!(SND_LIB_MAJOR==1 && SND_LIB_MINOR==0)); }
+-EOF
+- cc_check -lasound $_ld_dl $_ld_pthread && $TMPO && _alsaver='1.0.x-sys'
+- cat > $TMPC << EOF
+-#include <alsa/asoundlib.h>
+-int main(void) { return (!(SND_LIB_MAJOR==1 && SND_LIB_MINOR==0)); }
+-EOF
+- cc_check -lasound $_ld_dl $_ld_pthread && $TMPO && _alsaver='1.0.x-alsa'
++ _alsaver='1.0.x-alsa'
+ fi
+ _def_alsa5='#undef HAVE_ALSA5'
+ _def_alsa9='#undef HAVE_ALSA9'
diff --git a/packages/mplayer/mplayer-atty_1.1.5.bb b/packages/mplayer/mplayer-atty_1.1.5.bb
index 1ee4a49936..eb8d8ad124 100644
--- a/packages/mplayer/mplayer-atty_1.1.5.bb
+++ b/packages/mplayer/mplayer-atty_1.1.5.bb
@@ -2,18 +2,19 @@ DESCRIPTION = "Open Source multimedia player."
SECTION = "opie/multimedia"
PRIORITY = "optional"
HOMEPAGE = "http://atty.jp/?Zaurus%2Fmplayer"
-DEPENDS = "virtual/libsdl freetype libmad libogg libvorbis zlib libpng jpeg"
+DEPENDS = "virtual/libsdl freetype libmad libogg libvorbis zlib libpng jpeg alsa-lib"
LICENSE = "GPL"
RCONFLICTS = "mplayer"
MAINTAINER = "Graeme Gregory <dp@xora.org.uk>"
-PR = "r2"
+PR = "r3"
SRC_URI = "http://www.xora.org.uk/oe/mplayer-${PV}.tar.gz \
file://Makefile.patch;patch=1;pnum=0 \
file://sdl.patch;patch=1 \
file://Makefile-libs.patch;patch=1 \
file://libmpdemux-ogg-include.patch;patch=1 \
- file://libmpcodecs-ogg-include.patch;patch=1 "
+ file://libmpcodecs-ogg-include.patch;patch=1 \
+ file://alsa-configure.patch;patch=1 "
PARALLEL_MAKE = ""
@@ -54,6 +55,7 @@ EXTRA_OECONF = " \
--enable-dynamic-plugins \
--enable-fbdev \
--enable-sdl \
+ --enable-alsa \
--with-sdl-config=${STAGING_BINDIR}/sdl-config \
\
--enable-mad \