summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--scummvm/scummvm-0.6.0/sword1.patch0
-rw-r--r--scummvm/scummvm-0.6.0/tremor.patch0
-rw-r--r--scummvm/scummvm_0.6.0.oe12
3 files changed, 7 insertions, 5 deletions
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
--- /dev/null
+++ b/scummvm/scummvm-0.6.0/sword1.patch
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
--- /dev/null
+++ b/scummvm/scummvm-0.6.0/tremor.patch
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() {