diff options
author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-04-15 14:04:37 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-04-15 14:04:37 +0000 |
commit | 0af187780864b83e5ec107f10a9d8f4c4bd33af0 (patch) | |
tree | 3a42c510b5c391c9201325629ae4c43a577299b3 /packages/libsdl | |
parent | 0a8b86b9085d11314b170d5d40b0715a8ef3d3eb (diff) | |
parent | 5acbd244f1d2123346fede058e7bd524e7bd6454 (diff) |
merge of '101eec5076cbe6de0504b5ce78498024e3c16e03'
and '53534b02ad19a4d9ac608eedde7747fa84f7f8fc'
Diffstat (limited to 'packages/libsdl')
-rw-r--r-- | packages/libsdl/libsdl-qpe_1.2.9.bb | 3 | ||||
-rw-r--r-- | packages/libsdl/libsdl.inc | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/packages/libsdl/libsdl-qpe_1.2.9.bb b/packages/libsdl/libsdl-qpe_1.2.9.bb index 3583f20cf0..e33cf44e60 100644 --- a/packages/libsdl/libsdl-qpe_1.2.9.bb +++ b/packages/libsdl/libsdl-qpe_1.2.9.bb @@ -12,6 +12,7 @@ SRC_URI += "\ file://SDL-Akita-1.2.9.patch;patch=1 \ file://fixlibs-1.2.9.patch;patch=1 \ file://explicit-extern-C.patch;patch=1 \ + file://no-PAGE_SIZE.patch;patch=1 \ " EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads --enable-timers --enable-endian \ @@ -26,6 +27,6 @@ EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads do_compile_prepend() { if [ "${PALMTOP_USE_MULTITHREADED_QT}" == "yes" ] then - sed -i s,-lqte,-lqte-mt, src/Makefile + sed -i s,-lqte\([^-]\),-lqte-mt, src/Makefile fi } diff --git a/packages/libsdl/libsdl.inc b/packages/libsdl/libsdl.inc index 217072ce61..c039f7c398 100644 --- a/packages/libsdl/libsdl.inc +++ b/packages/libsdl/libsdl.inc @@ -5,7 +5,7 @@ DEPENDS = "alsa-lib mesa virtual/libx11 libxext" DEPENDS_avr32 = "alsa-lib virtual/libx11 libxext" PROVIDES = "virtual/libsdl" LICENSE = "LGPL" -PR = "r4" +PR = "r5" SRC_URI = "\ http://www.libsdl.org/release/SDL-${PV}.tar.gz \ |