From ddab57ac262e7db79f8a360d239b91f6055fa2e9 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 1 Sep 2007 14:49:10 +0000
Subject: imlib2: explicitly state that we're building a version with X11
 support add patch to remove using local X11 includes

---
 packages/efl1/imlib2/.mtn2git_empty              |  0
 packages/efl1/imlib2/remove-local-includes.patch | 15 +++++++++++++++
 packages/efl1/imlib2_1.4.0.002.bb                |  8 ++++++--
 3 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 packages/efl1/imlib2/.mtn2git_empty
 create mode 100644 packages/efl1/imlib2/remove-local-includes.patch

(limited to 'packages/efl1')

diff --git a/packages/efl1/imlib2/.mtn2git_empty b/packages/efl1/imlib2/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/efl1/imlib2/remove-local-includes.patch b/packages/efl1/imlib2/remove-local-includes.patch
new file mode 100644
index 0000000000..bc85b10424
--- /dev/null
+++ b/packages/efl1/imlib2/remove-local-includes.patch
@@ -0,0 +1,15 @@
+Index: imlib2/configure.in
+===================================================================
+--- imlib2.orig/configure.in	2007-09-01 14:34:26.000000000 +0000
++++ imlib2/configure.in	2007-09-01 14:35:07.000000000 +0000
+@@ -188,9 +188,7 @@
+ 
+ if test "x$have_x" = "xyes"; then
+   AC_PATH_XTRA
+-  x_dir=${x_dir:-/usr/X11R6}
+-  x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
+-  x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"
++  x_libs="-lX11 -lXext"
+   AM_CONDITIONAL(BUILD_X11, true)
+   AC_DEFINE(BUILD_X11, 1, [enabling X11 support])
+ else
diff --git a/packages/efl1/imlib2_1.4.0.002.bb b/packages/efl1/imlib2_1.4.0.002.bb
index a275143d3a..baee4b62b0 100644
--- a/packages/efl1/imlib2_1.4.0.002.bb
+++ b/packages/efl1/imlib2_1.4.0.002.bb
@@ -1,11 +1,15 @@
 DESCRIPTION = "A graphic library for file loading, saving, rendering, and manipulation."
 LICENSE = "BSD"
 # can also depend on tiff34, ungif or gif, z, bz2, id3tag
-DEPENDS = "freetype libpng jpeg"
-PR = "r1"
+DEPENDS = "freetype libpng jpeg virtual/libx11 libxext"
+PR = "r2"
 
 inherit efl_library
 
+SRC_URI += "file://remove-local-includes.patch;patch=1"
+
+EXTRA_OECONF = "--with-x"
+
 # TODO: Use more fine granular version
 #OE_LT_RPATH_ALLOW=":${libdir}/imlib2/loaders:${libdir}/imlib2/filters:"
 OE_LT_RPATH_ALLOW = "any"
-- 
cgit v1.2.3