From: Tim Ansell <mithro@mithis.com>
Date: Sat, 15 May 2004 20:04:20 +0000 (+0000)
Subject: Now uses tremor and has libmpeg2 support
X-Git-Tag: Release-2010-05/1~19145
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95b6b2dc732fb3b7e5646926a8a03a929b896670;p=openembedded.git

Now uses tremor and has libmpeg2 support

BKrev: 40a677c4FRMkOSa8jTJ2zt2u4hXE9w
---

diff --git a/scummvm/scummvm-0.6.0/sword1.patch b/scummvm/scummvm-0.6.0/sword1.patch
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/scummvm/scummvm-0.6.0/tremor.patch b/scummvm/scummvm-0.6.0/tremor.patch
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/scummvm/scummvm_0.6.0.oe b/scummvm/scummvm_0.6.0.oe
index 6c2a4af9b3..e0679b5154 100644
--- a/scummvm/scummvm_0.6.0.oe
+++ b/scummvm/scummvm_0.6.0.oe
@@ -1,9 +1,11 @@
 DESCRIPTION = "Virtual Machine for LucasArts Adventures"
 SECTION = "base"
 PRIORITY = "optional"
-DEPENDS = "virtual/libc libsdl-qpe libmad libvorbis libogg zlib"
+DEPENDS = "virtual/libc libsdl-qpe libmad tremor libogg zlib"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/scummvm/scummvm-${PV}.tar.bz2"
+SRC_URI = "${SOURCEFORGE_MIRROR}/scummvm/scummvm-${PV}.tar.bz2 \
+			file://${FILESDIR}/sword1.patch;patch=1 \
+			file://${FILESDIR}/tremor.patch;patch=1 "
 
 inherit autotools 
 
@@ -13,7 +15,7 @@ EXTRA_OECONF = "--host=${HOST_SYS} \
 		--disable-alsa \
 		--with-ogg-prefix=${STAGING_LIBDIR}/.. \
 		--with-vorbis-prefix=${STAGING_LIBDIR}/.. \
-		--disable-mpeg2 \
+		--with-mpeg2-prefix=${STAGING_LIBDIR}/.. \
 		--with-mad-prefix=${STAGING_BINDIR}/.. "
 
 do_configure() {
@@ -21,8 +23,8 @@ do_configure() {
 }
 
 do_compile() {
-	oe_runmake CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" \
-                   DEFINES="-DUNIX -DSCUMM_NEED_ALIGNMENT -DQTOPIA -DUSE_MAD -DUSE_VORBIS -DUSE_ZLIB"
+	oe_runmake CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS} -lmpeg2" \
+                   DEFINES="-DUNIX -DSCUMM_NEED_ALIGNMENT -DQTOPIA -DUSE_MAD -DUSE_VORBIS -DUSE_ZLIB -DUSE_MPEG2"
 }
 
 do_install() {