summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorRobert Schuster <thebohemian@gmx.net>2008-02-10 02:42:41 +0000
committerRobert Schuster <thebohemian@gmx.net>2008-02-10 02:42:41 +0000
commit9d9f69b80f99932db142fbb6fb59151c66befebb (patch)
treeda3c831f5e2dd1a0f1ad462154c44a2e7b238a89 /packages
parentf4477e16a53df1ad084d6ef67037ba2518c71541 (diff)
parent86b701de28c51e8ff8365c2189f0d31801e151ab (diff)
merge of '4789fc4a55cdb58c5a1185215e671251be522827'
and 'ce15bdbb89211863b43db8fc56de6aaf8a0dd4f7'
Diffstat (limited to 'packages')
-rw-r--r--packages/kobodeluxe/files/buildfix.patch21
-rw-r--r--packages/kobodeluxe/kobodeluxe_0.5.1.bb7
2 files changed, 27 insertions, 1 deletions
diff --git a/packages/kobodeluxe/files/buildfix.patch b/packages/kobodeluxe/files/buildfix.patch
new file mode 100644
index 0000000000..01a97e14f2
--- /dev/null
+++ b/packages/kobodeluxe/files/buildfix.patch
@@ -0,0 +1,21 @@
+Index: kobodeluxe-0.5.1/graphics/gfxengine.cpp
+===================================================================
+--- kobodeluxe-0.5.1.orig/graphics/gfxengine.cpp 2008-02-10 03:02:29.000000000 +0100
++++ kobodeluxe-0.5.1/graphics/gfxengine.cpp 2008-02-10 03:03:45.000000000 +0100
+@@ -25,6 +25,7 @@
+
+ #include <string.h>
+ #include <math.h>
++#include <stdlib.h>
+
+ #include "gfxengine.h"
+ #include "filters.h"
+@@ -765,7 +766,7 @@
+ return 0;
+
+ if(_centered && !_fullscreen)
+- SDL_putenv((char *)"SDL_VIDEO_CENTERED=1");
++ putenv((char *)"SDL_VIDEO_CENTERED=1");
+
+ log_printf(DLOG, "Opening screen...\n");
+ if(!SDL_WasInit(SDL_INIT_VIDEO))
diff --git a/packages/kobodeluxe/kobodeluxe_0.5.1.bb b/packages/kobodeluxe/kobodeluxe_0.5.1.bb
index 0c9ae458f8..5d1196194f 100644
--- a/packages/kobodeluxe/kobodeluxe_0.5.1.bb
+++ b/packages/kobodeluxe/kobodeluxe_0.5.1.bb
@@ -5,19 +5,24 @@ LICENSE = "GPL"
AUTHOR = "David Olofson <david@olofson.net>"
HOMEPAGE = "http://olofson.net/kobodl"
+PR = "1"
+
DEPENDS = "libsdl-image virtual/libsdl"
RDEPENDS_${PN} = "${PN}-data"
SRC_URI = "http://olofson.net/kobodl/download/KoboDeluxe-${PV}.tar.bz2 \
file://debian-kobo.patch;patch=1 \
+ file://buildfix.patch;patch=1 \
"
S = "${WORKDIR}/KoboDeluxe-${PV}"
inherit autotools
-EXTRA_OECONF = "--disable-sdltest"
+export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config"
+
+EXTRA_OECONF = "--disable-opengl --disable-sdltest"
PACKAGES += "${PN}-data"