From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Thu, 27 Apr 2006 21:46:20 +0000 (+0000)
Subject: bootsplash: make it building - close #346
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=adedc268790814906bb7e93b92e50d69f304a623;p=openembedded.git

bootsplash: make it building - close #346
---

diff --git a/packages/bootsplash/bootsplash-native_3.0.7.bb b/packages/bootsplash/bootsplash-native_3.0.7.bb
index ccc9377961..df368ce38c 100644
--- a/packages/bootsplash/bootsplash-native_3.0.7.bb
+++ b/packages/bootsplash/bootsplash-native_3.0.7.bb
@@ -8,7 +8,7 @@ inherit native
 S="${WORKDIR}/bootsplash-${PV}"
 
 do_compile() {
-	oe_runmake -C Utilities splash
+	oe_runmake splash
 }
 
 do_stage() {
diff --git a/packages/bootsplash/bootsplash_3.0.7.bb b/packages/bootsplash/bootsplash_3.0.7.bb
index da2290e202..9ffa97d4d5 100644
--- a/packages/bootsplash/bootsplash_3.0.7.bb
+++ b/packages/bootsplash/bootsplash_3.0.7.bb
@@ -6,12 +6,18 @@ DESCRIPTION="Bootsplash shows pretty pictures during boot"
 HOMEPAGE="http://www.bootsplash.org"
 SECTION = "media-gfx"
 LICENSE = "GPL"
-SRC_URI="ftp://ftp.openbios.org/pub/bootsplash/rpm-sources/bootsplash/bootsplash-${PV}.tar.bz2"
+SRC_URI="ftp://ftp.openbios.org/pub/bootsplash/rpm-sources/bootsplash/bootsplash-${PV}.tar.bz2 \
+         file://freetype2.patch;patch=1"
 
-DEPENDS="freetype"
+DEPENDS="freetype libmng"
+PR = "r1"
+
+EXTRA_OEMAKE += "-C Utilities \
+		CFLAGS='${CFLAGS} -I${STAGING_INCDIR}/freetype2/ -I${STAGING_INCDIR}' \
+		LDFLAGS='${LDFLAGS} -L${STAGING_LIBDIR} -ljpeg'"
 
 do_compile() {
-	oe_runmake -C Utilities 
+	oe_runmake
 }
 
 do_install() {
diff --git a/packages/bootsplash/files/.mtn2git_empty b/packages/bootsplash/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/bootsplash/files/freetype2.patch b/packages/bootsplash/files/freetype2.patch
new file mode 100644
index 0000000000..3683c628f8
--- /dev/null
+++ b/packages/bootsplash/files/freetype2.patch
@@ -0,0 +1,15 @@
+Index: bootsplash-3.0.7/Utilities/ttf.c
+===================================================================
+--- bootsplash-3.0.7.orig/Utilities/ttf.c	2003-08-09 11:58:44.000000000 +0200
++++ bootsplash-3.0.7/Utilities/ttf.c	2006-04-04 11:26:54.210699456 +0200
+@@ -9,8 +9,9 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <assert.h>
++#include <ft2build.h> 
++#include FT_FREETYPE_H
+ 
+-#include <freetype/freetype.h>
+ #include <freetype/ftoutln.h>
+ #include <freetype/ttnameid.h>
+