summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/libqpe/libqpe-opie_cvs.bb6
-rw-r--r--packages/opie-pics/opie-pics_cvs.bb4
-rw-r--r--packages/scummvm/files/mouse.patch (renamed from packages/scummvm/scummvm-0.6.1b/mouse.patch)0
-rw-r--r--packages/scummvm/files/tremor.patch (renamed from packages/scummvm/scummvm-0.6.1b/tremor.patch)0
-rw-r--r--packages/scummvm/scummvm-qpe_0.6.1b.bb0
-rw-r--r--packages/scummvm/scummvm.inc0
-rw-r--r--packages/scummvm/scummvm_0.6.1b.bb32
7 files changed, 8 insertions, 34 deletions
diff --git a/packages/libqpe/libqpe-opie_cvs.bb b/packages/libqpe/libqpe-opie_cvs.bb
index d496600354..7e1cdc7a32 100644
--- a/packages/libqpe/libqpe-opie_cvs.bb
+++ b/packages/libqpe/libqpe-opie_cvs.bb
@@ -6,7 +6,7 @@ LICENSE = "GPL"
DEPENDS = "uicmoc-native qte"
PROVIDES = "virtual/libqpe"
PV = "1.1.9+cvs-${CVSDATE}"
-PR = "r4"
+PR = "r5"
SRC_URI = "${HANDHELDS_CVS};module=opie/library \
file://nomax.patch;patch=1;pnum=1"
@@ -16,8 +16,8 @@ inherit qmake
QMAKE_PROFILES = "library.pro"
EXTRA_QMAKEVARS_PRE = "CONFIG+=LIBQPE_WITHROHFEEDBACK"
-# EXTRA_QMAKEVARS_POST = "DESTDIR= DEFINES+=LIBQPE_NO_INLINE_IMAGES"
-EXTRA_QMAKEVARS_POST = "DESTDIR="
+EXTRA_QMAKEVARS_POST = "DESTDIR= DEFINES+=LIBQPE_NO_INLINE_IMAGES"
+# EXTRA_QMAKEVARS_POST = "DESTDIR="
CXXFLAGS_append = " -DQWS -DOPIE_NO_ERASE_RECT_HACKFIX -DOPIE_NEW_MALLOC -fno-rtti -fno-exceptions"
CXXFLAGS_append_c7x0 = " -DOPIE_NO_WINDOWED "
diff --git a/packages/opie-pics/opie-pics_cvs.bb b/packages/opie-pics/opie-pics_cvs.bb
index 5809134398..9cc5235d2d 100644
--- a/packages/opie-pics/opie-pics_cvs.bb
+++ b/packages/opie-pics/opie-pics_cvs.bb
@@ -4,13 +4,13 @@ PRIORITY = "optional"
MAINTAINER = "Team Opie <opie@handhelds.org>"
LICENSE = "GPL"
PV = "1.1.9+cvs-${CVSDATE}"
-PR = "r2"
+PR = "r3"
SRC_URI = "${HANDHELDS_CVS};module=opie/pics \
${HANDHELDS_CVS};module=opie/pics-hires"
S = "${WORKDIR}"
-SHIP_INLINE_PICS = "no"
+SHIP_INLINE_PICS = "yes"
INLINE_PICS = "pics/inline"
INLINE_PICS_tosa = "pics-hires/inline"
INLINE_PICS_c7x0 = "pics-hires/inline"
diff --git a/packages/scummvm/scummvm-0.6.1b/mouse.patch b/packages/scummvm/files/mouse.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/scummvm/scummvm-0.6.1b/mouse.patch
+++ b/packages/scummvm/files/mouse.patch
diff --git a/packages/scummvm/scummvm-0.6.1b/tremor.patch b/packages/scummvm/files/tremor.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/scummvm/scummvm-0.6.1b/tremor.patch
+++ b/packages/scummvm/files/tremor.patch
diff --git a/packages/scummvm/scummvm-qpe_0.6.1b.bb b/packages/scummvm/scummvm-qpe_0.6.1b.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/scummvm/scummvm-qpe_0.6.1b.bb
diff --git a/packages/scummvm/scummvm.inc b/packages/scummvm/scummvm.inc
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/scummvm/scummvm.inc
diff --git a/packages/scummvm/scummvm_0.6.1b.bb b/packages/scummvm/scummvm_0.6.1b.bb
index b25d91e6ec..8e70acef68 100644
--- a/packages/scummvm/scummvm_0.6.1b.bb
+++ b/packages/scummvm/scummvm_0.6.1b.bb
@@ -1,35 +1,9 @@
-DESCRIPTION = "Virtual Machine for LucasArts Adventures for Qt/Embedded based palmtop environments w/ SDL."
-SECTION = "opie/games"
-PRIORITY = "optional"
-DEPENDS = "libsdl-qpe libmad tremor libogg zlib libmpeg2"
-LICENSE = "GPL"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/scummvm/scummvm-${PV}.tar.bz2 \
- file://tremor.patch;patch=1 \
- file://mouse.patch;patch=1 "
-
-inherit autotools
-
-EXTRA_OECONF = "--host=${HOST_SYS} \
- --backend=sdl \
- --with-sdl-prefix=${STAGING_BINDIR}/.. \
- --disable-alsa \
- --with-ogg-prefix=${STAGING_LIBDIR}/.. \
- --with-vorbis-prefix=${STAGING_LIBDIR}/.. \
- --with-mpeg2-prefix=${STAGING_LIBDIR}/.. \
- --with-mad-prefix=${STAGING_LIBDIR}/.. "
-
-do_configure() {
- ./configure ${EXTRA_OECONF}
-}
+include scummvm.inc
+DEPENDS = "virtual/libsdl libmad tremor libogg zlib libmpeg2"
do_compile() {
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"
+ DEFINES="-DUNIX -DSCUMM_NEED_ALIGNMENT -DUSE_MAD -DUSE_VORBIS -DUSE_ZLIB -DUSE_MPEG2"
}
-do_install() {
- install -d ${D}${bindir}
- install -m 0755 scummvm ${D}${bindir}/scummvm
-}