Merge bk://openembedded@openembedded.bkbits.net/packages

into mithis.com:/home/arm/openembedded/packages.boxer

2004/05/15 04:57:49+09:30 mithis.com!mithro
Merge bk://openembedded@openembedded.bkbits.net/packages
into mithis.com:/home/arm/openembedded/packages.boxer

2004/05/15 04:40:38+09:30 mithis.com!mithro
scummvm_0.6.0.oe:
  Now compiles with vorbis, zlib and mad support

BKrev: 40a51e58PBlFTvx702Uz-mi-k8r-Xw

diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index d5590fb..261f13f 100644 (file)
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -23,6 +23,7 @@ mickey@r2d2.tm.informatik.uni-frankfurt.de
 mickeyl@allanon.vanille.de
 mickeyl@gandalf.tm.informatik.uni-frankfurt.de
 mickeyl@r2d2.tm.informatik.uni-frankfurt.de
+mithro@mithis.com
 p.osiczko@tetrapyloctomy.org
 pablo@kosmos.(none)
 pb_@gandalf.tm.informatik.uni-frankfurt.de

diff --git a/scummvm/scummvm_0.6.0.oe b/scummvm/scummvm_0.6.0.oe
index bfa60de..3a73eec 100644 (file)
--- a/scummvm/scummvm_0.6.0.oe
+++ b/scummvm/scummvm_0.6.0.oe
@@ -1,7 +1,7 @@
 DESCRIPTION = "Virtual Machine for LucasArts Adventures"
 SECTION = "base"
 PRIORITY = "optional"
-DEPENDS = "virtual/libc libsdl-qpe libmad libvorbis libogg"
+DEPENDS = "virtual/libc libsdl-qpe libmad libvorbis libogg zlib"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/scummvm/scummvm-${PV}.tar.bz2"
 
@@ -13,7 +13,7 @@ EXTRA_OECONF = "--backend=sdl \
                --with-ogg-prefix=${STAGING_LIBDIR}/.. \
                --with-vorbis-prefix=${STAGING_LIBDIR}/.. \
                --disable-mpeg2 \
-               --with-mad-prefix=${STAGING_BINDIR}/.."
+               --with-mad-prefix=${STAGING_BINDIR}/.. "
 
 do_configure() {
        ./configure ${EXTRA_OECONF}
@@ -21,7 +21,7 @@ do_configure() {
 
 do_compile() {
        oe_runmake CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" \
-                   DEFINES="-DUNIX -DSCUMM_NEED_ALIGNMENT -DQTOPIA"
+                   DEFINES="-DUNIX -DSCUMM_NEED_ALIGNMENT -DQTOPIA -DUSE_MAD -DUSE_VORBIS -DUSE_ZLIB"
 }
 
 do_install() {