Merge bk://oe-devel@oe-devel.bkbits.net/openembedded

into cimmeria.(none):/home/dp/zaurus/openembedded

2005/04/19 12:18:56+01:00 (none)!XorA
Added some patches to change include order so we pick up internel tremor not the one in staging

BKrev: 4264e96aNeURBbvMnhtac3mX6VZAMw

diff --git a/packages/mplayer/mplayer-1.0pre7/libmpcodecs-ogg-include.patch b/packages/mplayer/mplayer-1.0pre7/libmpcodecs-ogg-include.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/mplayer/mplayer-1.0pre7/libmpdemux-ogg-include.patch b/packages/mplayer/mplayer-1.0pre7/libmpdemux-ogg-include.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/mplayer/mplayer_1.0pre7.bb b/packages/mplayer/mplayer_1.0pre7.bb
index c154cd2..ff8f8a6 100644 (file)
--- a/packages/mplayer/mplayer_1.0pre7.bb
+++ b/packages/mplayer/mplayer_1.0pre7.bb
@@ -7,7 +7,9 @@ LICENSE = "GPL"
 SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-${PV}.tar.bz2 \
            file://Makefile.patch;patch=1 \
            file://sdl.patch;patch=0 \
-           file://zlib.patch;patch=0 "
+           file://zlib.patch;patch=0 \
+           file://libmpdemux-ogg-include.patch;patch=1 \
+           file://libmpcodecs-ogg-include.patch;patch=1 "
 MAINTAINER="Graeme Gregory <dp@xora.org.uk>"
 RCONFLICTS="mplayer-atty"
 PR = "r0"
@@ -54,7 +56,7 @@ EXTRA_OECONF = " \
         --with-sdl-config=${STAGING_BINDIR}/sdl-config \
         \
         --enable-mad \
-        --enable-vorbis \
+       --enable-tremor-low \
         \
         --enable-ossaudio \
         \