diff options
| author |   nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-02-23 15:40:12 +0000 |
|---|---|---|
| committer | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-02-23 15:40:12 +0000 |
| commit | 99a2c8c9cda0133d249b854e031d1a35632b9dfa (patch) | |
| tree | 559d115078ec3829c31ce720fcd9dcf02f5da59f /packages | |
| parent | dbcf075f21c0bb8581f29ac5ee8d5b64666216fb (diff) | |
| download | openembedded-99a2c8c9cda0133d249b854e031d1a35632b9dfa.tar.gz | |
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/02/23 15:43:21+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages
2005/02/23 15:13:42+01:00 (none)!koen
scummvm_0.6.1b.bb, scummvm.inc, scummvm-qpe_0.6.1b.bb:
force libsdl-qpe with qpe build
2005/02/23 14:40:23+01:00 (none)!koen
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into lieve.(none):/data/build/oe/clean-tree/openembedded
2005/02/23 14:39:51+01:00 (none)!koen
split scummvm into scummvm.inc, scummvm-qpe.bb and scummvm.bb
2005/02/23 14:01:29+01:00 uni-frankfurt.de!mickeyl
re-enable non-inlining of opie images into libqpe now that decoration drawing has been fixed upstream.
BKrev: 421ca3dcb9j0-UXXcX77r2f2sdRsEw
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/libqpe/libqpe-opie_cvs.bb | 6 | ||||
| -rw-r--r-- | packages/opie-pics/opie-pics_cvs.bb | 4 | ||||
| -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.bb | 0 | ||||
| -rw-r--r-- | packages/scummvm/scummvm.inc | 0 | ||||
| -rw-r--r-- | packages/scummvm/scummvm_0.6.1b.bb | 32 |
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 -} |