kobodeluxe: Some fixes.

  - correct path to sdl-config script
  - disable building opengl code
  - added patch to use putenv() instead of SDL_putenv()

diff --git a/packages/kobodeluxe/files/buildfix.patch b/packages/kobodeluxe/files/buildfix.patch
new file mode 100644 (file)
index 0000000..01a97e1
--- /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 0c9ae45..5d11961 100644 (file)
--- 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"