summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Ansell <mithro@mithis.com>2004-05-14 19:30:32 +0000
committerTim Ansell <mithro@mithis.com>2004-05-14 19:30:32 +0000
commitc08abb58bc22b47c1cd91ebba5dfb70e36811ebb (patch)
tree0cb6e2d2852a19b824fd6e497a5078382e0fcb18
parentb01029a95daa16f4179223e6b9ca14a22050635e (diff)
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
-rw-r--r--BitKeeper/etc/logging_ok1
-rw-r--r--scummvm/scummvm_0.6.0.oe6
2 files changed, 4 insertions, 3 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index d5590fb2c3..261f13f8db 100644
--- 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 bfa60de2d2..3a73eecfb9 100644
--- 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() {