[oe-commits] woglinde : disko: add disko framework to openembedded

[GIT User account]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 3d25ff174b24e7691e17ceddeef5ce95f9f4e6a6
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=3d25ff174b24e7691e17ceddeef5ce95f9f4e6a6

Author: woglinde <heinold at inf.fu-berlin.de>
Date:   Wed Apr  1 23:05:41 2009 +0200

disko: add disko framework to openembedded

---

 recipes/disko/disko_git.bb          |   22 ++++++++++++++++++++++
 recipes/disko/files/header.patch    |   13 +++++++++++++
 recipes/disko/files/pkgconfig.patch |   26 ++++++++++++++++++++++++++
 3 files changed, 61 insertions(+), 0 deletions(-)

diff --git a/recipes/disko/disko_git.bb b/recipes/disko/disko_git.bb
new file mode 100644
index 0000000..657fb40
--- /dev/null
+++ b/recipes/disko/disko_git.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "Disko is an application framework, that can be used to develop GUI applications for embedded devices. It is closely connected to the DirectFB"
+LICENSE = "GPL"
+PV = "1.1.5+gitr${SRCREV}"
+PR = "r0"
+
+DEPENDS = "sqlite3 libpng jpeg curl alsa-lib taglib directfb libxml2 virtual/libx11 libsigc++-2.0 hal \
+	   libxv libxxf86vm"
+
+SRC_URI = "git://www.diskohq.org/disko.git;protocol=git \
+	   file://header.patch;patch=1 \
+           file://pkgconfig.patch;patch=1 \
+	  "
+SRCREV = "bf29da8c0060a2b4f0f9593524ca71aa1adfbc0c"
+
+S = "${WORKDIR}/git"
+
+inherit scons pkgconfig
+
+do_compile() {
+	${STAGING_BINDIR_NATIVE}/scons ${PARALLEL_MAKE} graphics=all PREFIX=${prefix} prefix=${prefix} || \
+        oefatal "scons build execution failed."
+}
diff --git a/recipes/disko/files/header.patch b/recipes/disko/files/header.patch
new file mode 100644
index 0000000..e60d558
--- /dev/null
+++ b/recipes/disko/files/header.patch
@@ -0,0 +1,13 @@
+Index: git/src/mmsconfig/mmsrcparser.cpp
+===================================================================
+--- git.orig/src/mmsconfig/mmsrcparser.cpp	2009-03-25 01:29:20.822096657 +0100
++++ git/src/mmsconfig/mmsrcparser.cpp	2009-03-25 01:29:34.320881340 +0100
+@@ -26,6 +26,8 @@
+  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+  ***************************************************************************/
+ 
++#include <cstring>
++
+ #include "mmsconfig/mmsrcparser.h"
+ #include "mmstools/tools.h"
+ 
diff --git a/recipes/disko/files/pkgconfig.patch b/recipes/disko/files/pkgconfig.patch
new file mode 100644
index 0000000..a84106e
--- /dev/null
+++ b/recipes/disko/files/pkgconfig.patch
@@ -0,0 +1,26 @@
+Index: git/Makefile
+===================================================================
+--- git.orig/Makefile	2009-03-24 14:41:03.000000000 +0100
++++ git/Makefile	2009-03-25 02:20:38.613872577 +0100
+@@ -59,7 +59,7 @@
+ install-pkgconfig:
+ 	@echo "writing pkgconfig information"
+ 	@install -d "$(DESTDIR)$(libdir)/../pkgconfig"
+-	@echo "prefix=$(prefix)" > $(DESTDIR)$(libdir)/../pkgconfig/$(PROJECTNAME).pc
++	@echo "prefix=/usr" > $(DESTDIR)$(libdir)/../pkgconfig/$(PROJECTNAME).pc
+ 	@echo "exec_prefix=\$${prefix}/bin" >> $(DESTDIR)$(libdir)/../pkgconfig/$(PROJECTNAME).pc
+ 	@echo "libdir=\$${prefix}/lib/disko" >> $(DESTDIR)$(libdir)/../pkgconfig/$(PROJECTNAME).pc
+ 	@echo "includedir=\$${prefix}/include/disko" >> $(DESTDIR)$(libdir)/../pkgconfig/$(PROJECTNAME).pc
+Index: git/SConstruct
+===================================================================
+--- git.orig/SConstruct	2009-03-25 02:22:03.018024446 +0100
++++ git/SConstruct	2009-03-25 02:22:41.668240834 +0100
+@@ -473,7 +473,7 @@
+ 	if 'mysql' in env['database']:
+ 		disko_pc_requires += ', mysql'
+ 
+-	disko_pc.write('prefix=' + env['prefix'] + '\n')
++	disko_pc.write('prefix=/usr' + '\n')
+ 	disko_pc.write('exec_prefix=${prefix}\n')
+ 	disko_pc.write('libdir=${exec_prefix}/lib/disko\n')
+ 	disko_pc.write('includedir=${exec_prefix}/include/disko\n\n')