mplayer: force use of libmad

Signed-off-by: Rene Wagner <rw@handhelds.org>

diff --git a/org.handhelds.familiar/packages/mplayer/mplayer-1.0pre7/go-mad.patch b/org.handhelds.familiar/packages/mplayer/mplayer-1.0pre7/go-mad.patch
new file mode 100644 (file)
index 0000000..b5eb06b
--- /dev/null
+++ b/org.handhelds.familiar/packages/mplayer/mplayer-1.0pre7/go-mad.patch
@@ -0,0 +1,34 @@
+--- ../mplayer-1.0pre7-r2/MPlayer-1.0pre7/etc/codecs.conf      2005-04-10 18:44:29.000000000 +0200
++++ MPlayer-1.0pre7/etc/codecs.conf    2006-09-21 20:21:20.000000000 +0200
+@@ -2309,16 +2309,6 @@
+   driver ffmpeg
+   dll "mp3on4"
+ 
+-audiocodec ffmp3
+-  info "FFmpeg MPEG layer-3 audio decoder"
+-  comment "integer only"
+-  status working
+-  format 0x55
+-  format 0x33706d2e  ; ".mp3" CBR/VBR MP3 (MOV files)
+-  format 0x5500736d  ; "ms\0\x55" older mp3 fcc (MOV files)
+-  driver ffmpeg
+-  dll "mp3"
+-
+ audiocodec ffmp3adu
+   info "FFmpeg MPEG layer-3 adu audio decoder"
+   comment "integer only"
+@@ -2327,14 +2317,6 @@
+   driver ffmpeg
+   dll "mp3adu"
+ 
+-audiocodec ffmp2
+-  info "FFmpeg MPEG layer-1 and layer-2 audio decoder"
+-  comment "integer only"
+-  status working
+-  format 0x50
+-  driver ffmpeg
+-  dll "mp2"
+-
+ audiocodec mad
+   info "libMAD MPEG layer 1-2-3"
+   status working

diff --git a/org.handhelds.familiar/packages/mplayer/mplayer_1.0pre7.bb b/org.handhelds.familiar/packages/mplayer/mplayer_1.0pre7.bb
index a9ace8853019b12aca2889d729c62326dc853f61..b3311fd1e29802543ccc2b941f3668958591bbd8 100644 (file)
--- a/org.handhelds.familiar/packages/mplayer/mplayer_1.0pre7.bb
+++ b/org.handhelds.familiar/packages/mplayer/mplayer_1.0pre7.bb
@@ -9,10 +9,11 @@ SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-${PV}.tar.bz2 \
            file://sdl.patch;patch=0 \
            file://zlib.patch;patch=0 \
            file://libmpdemux-ogg-include.patch;patch=1 \
-           file://libmpcodecs-ogg-include.patch;patch=1 "
+           file://libmpcodecs-ogg-include.patch;patch=1 \
+           file://go-mad.patch;patch=1 "
 MAINTAINER="Graeme Gregory <dp@xora.org.uk>"
 RCONFLICTS_${PN} = "mplayer-atty"
-PR = "r2"
+PR = "r3"
 
 PARALLEL_MAKE = ""
 
@@ -56,6 +57,7 @@ EXTRA_OECONF = " \
         --enable-sdl \
         --with-sdl-config=${STAGING_BINDIR}/sdl-config \
         \
+        --disable-mp3lib \
         --enable-mad \
        --enable-tremor-low \
         \