[oe-commits] org.oe.dev kobodeluxe: Some fixes.

[thebohemian commit]

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

Author: thebohemian at openembedded.org
Branch: org.openembedded.dev
Revision: ce15bdbb89211863b43db8fc56de6aaf8a0dd4f7
ViewMTN: http://monotone.openembedded.org/revision/info/ce15bdbb89211863b43db8fc56de6aaf8a0dd4f7
Files:
1
packages/kobodeluxe/files/buildfix.patch
packages/kobodeluxe/kobodeluxe_0.5.1.bb
Diffs:

#
# mt diff -r296ef22edf7d9a90ec4e4b1c1207b8d2c33940d9 -rce15bdbb89211863b43db8fc56de6aaf8a0dd4f7
#
# 
# 
# add_file "packages/kobodeluxe/files/buildfix.patch"
#  content [2270bdaaf6c6602f840b73f3601fcb1aa5f0d72e]
# 
# patch "packages/kobodeluxe/kobodeluxe_0.5.1.bb"
#  from [6f71e3405f6607ff54f63f6cd5e55312b2cfdc58]
#    to [06dfc0c63f0c42830b88eabc0491d2547473dbe2]
# 
============================================================
--- packages/kobodeluxe/files/buildfix.patch	2270bdaaf6c6602f840b73f3601fcb1aa5f0d72e
+++ packages/kobodeluxe/files/buildfix.patch	2270bdaaf6c6602f840b73f3601fcb1aa5f0d72e
@@ -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))
============================================================
--- packages/kobodeluxe/kobodeluxe_0.5.1.bb	6f71e3405f6607ff54f63f6cd5e55312b2cfdc58
+++ packages/kobodeluxe/kobodeluxe_0.5.1.bb	06dfc0c63f0c42830b88eabc0491d2547473dbe2
@@ -5,20 +5,25 @@ HOMEPAGE = "http://olofson.net/kobodl"
 AUTHOR = "David Olofson <david at 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"
 
 FILES_${PN}-data = "${datadir}"