[oe-commits] org.oe.dev imlib2: explicitly state that we're building a version with X11 support

[mickeyl commit]

imlib2: explicitly state that we're building a version with X11 support
add patch to remove using local X11 includes

Author: mickeyl
Branch: org.openembedded.dev
Revision: d3620bd2aae6d0d9fd6b35e93a1d2a1e914dda31
ViewMTN: http://monotone.openembedded.org/revision.psp?id=d3620bd2aae6d0d9fd6b35e93a1d2a1e914dda31
Files:
1
packages/efl1/imlib2
packages/efl1/imlib2/remove-local-includes.patch
packages/efl1/imlib2_1.4.0.002.bb
Diffs:

#
# mt diff -rcc5f9c504c8d6937a010f74dd3804541e62b0fc2 -rd3620bd2aae6d0d9fd6b35e93a1d2a1e914dda31
#
# 
# 
# add_dir "packages/efl1/imlib2"
# 
# add_file "packages/efl1/imlib2/remove-local-includes.patch"
#  content [575153404b4483b1dc4a71f3af556661d52804e5]
# 
# patch "packages/efl1/imlib2_1.4.0.002.bb"
#  from [8b80e93373cdcb6aa046dbbdc02f134fddcd0004]
#    to [e017df241684fa755bba2f2f9b4d95dcf494b052]
# 
============================================================
--- packages/efl1/imlib2/remove-local-includes.patch	575153404b4483b1dc4a71f3af556661d52804e5
+++ packages/efl1/imlib2/remove-local-includes.patch	575153404b4483b1dc4a71f3af556661d52804e5
@@ -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
============================================================
--- packages/efl1/imlib2_1.4.0.002.bb	8b80e93373cdcb6aa046dbbdc02f134fddcd0004
+++ packages/efl1/imlib2_1.4.0.002.bb	e017df241684fa755bba2f2f9b4d95dcf494b052
@@ -1,11 +1,15 @@ LICENSE = "BSD"
 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"