diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2006-05-15 14:51:32 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-05-15 14:51:32 +0000 |
| commit | 0bb8c3044a3122a2af92f1749fbccddd9254bfce (patch) | |
| tree | 2cfa93b106921505646f10a0017ec99aaa8a5dc2 /packages | |
| parent | db00d03b1d5fbf78f7a2eae2802f6c8a7691935b (diff) | |
| parent | 167ec12f015cbb50d681aae5d608e5f3422b43fb (diff) | |
merge of 701e498cb6b22382fd13e288d7b47f93abb32feb
and a3de2e3141246a68170d4fe5e4a7390e7ebe041e
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/libsdl/libsdl-qpe_1.2.7.bb | 9 | ||||
| -rw-r--r-- | packages/libsdl/libsdl-x11_1.2.7.bb | 2 | ||||
| -rw-r--r-- | packages/pipepanic/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/pipepanic/pipepanic_0.1.1.bb | 23 |
4 files changed, 32 insertions, 2 deletions
diff --git a/packages/libsdl/libsdl-qpe_1.2.7.bb b/packages/libsdl/libsdl-qpe_1.2.7.bb index d3f7236761..c003d76a31 100644 --- a/packages/libsdl/libsdl-qpe_1.2.7.bb +++ b/packages/libsdl/libsdl-qpe_1.2.7.bb @@ -7,7 +7,7 @@ PROVIDES = "virtual/libsdl" LICENSE = "LGPL" # NOTE: make sure to keep PR in sync with libsdl-x11 -PR = "r7" +PR = "r8" SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \ file://agawa-piro-mickey.patch;patch=1 \ @@ -34,6 +34,13 @@ EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads FILES_${PN} = "${libdir}/lib*.so.*" FILES_${PN}-dev += "${bindir}/*config" +do_compile_prepend() { + if [ "${PALMTOP_USE_MULTITHREADED_QT}" == "yes" ] + then + sed -i s,-lqte,-lqte-mt, src/Makefile + fi +} + do_stage() { oe_libinstall -so -C src libSDL ${STAGING_LIBDIR} rm ${STAGING_LIBDIR}/libSDL.la diff --git a/packages/libsdl/libsdl-x11_1.2.7.bb b/packages/libsdl/libsdl-x11_1.2.7.bb index b2060cd0fd..2bdf6933a0 100644 --- a/packages/libsdl/libsdl-x11_1.2.7.bb +++ b/packages/libsdl/libsdl-x11_1.2.7.bb @@ -7,7 +7,7 @@ PROVIDES = "virtual/libsdl" LICENSE = "LGPL" # NOTE: make sure to keep PR in sync with libsdl-qpe -PR = "r7" +PR = "r8" SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \ file://extra-keys.patch;patch=1 \ diff --git a/packages/pipepanic/.mtn2git_empty b/packages/pipepanic/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/pipepanic/.mtn2git_empty diff --git a/packages/pipepanic/pipepanic_0.1.1.bb b/packages/pipepanic/pipepanic_0.1.1.bb new file mode 100644 index 0000000000..ac54f119a4 --- /dev/null +++ b/packages/pipepanic/pipepanic_0.1.1.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "Pipepanic is a pipe connecting game using libSDL. \ +Connect as many different shaped pipes together as possible within the time given." +HOMEPAGE = "http://www.users.waitrose.com/~thunor/pipepanic/" +LICENSE = "GPL" +MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" + +SRC_URI = "http://www.users.waitrose.com/~thunor/pipepanic/dload/pipepanic-${PV}-source.tar.gz" +S = "${WORKDIR}/pipepanic-0.1.1-source" + +APPIMAGE = "zaurus/pipepanic.png" +APPDESKTOP = "zaurus/pipenaic.desktop" + +inherit sdl + +do_compile() { + oe_runmake CC="${CC}" CFLAGS="${CFLAGS}" LINK="${CCLD}" LDFLAGS="${LDFLAGS} -Wl,-rpath-link,${STAGING_LIBDIR}/../qt2/lib" +} + +do_install() { + install -d ${D}${bindir} + install -m 0755 pipepanic ${D}${bindir} +} + |