[oe-commits] org.oe.dev imlib2_cvs.bb : fixes from OM mtn

[xora commit]

imlib2_cvs.bb : fixes from OM mtn

Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: 4b3c78442de80efab7caa20c1a89bd5660f17888
ViewMTN: http://monotone.openembedded.org/revision/info/4b3c78442de80efab7caa20c1a89bd5660f17888
Files:
1
packages/efl1/imlib2
packages/efl1/imlib2/remove-local-includes-20080421.patch
packages/efl1/imlib2/remove-local-includes.patch
packages/efl1/imlib2_cvs.bb
Diffs:

#
# mt diff -r105c1f4649781949e158a39dc0a129bdcd89bb73 -r4b3c78442de80efab7caa20c1a89bd5660f17888
#
#
#
# add_dir "packages/efl1/imlib2"
# 
# add_file "packages/efl1/imlib2/remove-local-includes-20080421.patch"
#  content [6cb1af5e1d744afaed49d06493a112c10cf8210b]
# 
# add_file "packages/efl1/imlib2/remove-local-includes.patch"
#  content [575153404b4483b1dc4a71f3af556661d52804e5]
# 
# patch "packages/efl1/imlib2_cvs.bb"
#  from [5c3c8c06ae6d9a4d18d10a066fc8973ec535e871]
#    to [c32847438359b0993cb9eadcf6f4b6019585f54c]
#
============================================================
--- packages/efl1/imlib2/remove-local-includes-20080421.patch	6cb1af5e1d744afaed49d06493a112c10cf8210b
+++ packages/efl1/imlib2/remove-local-includes-20080421.patch	6cb1af5e1d744afaed49d06493a112c10cf8210b
@@ -0,0 +1,15 @@
+Index: imlib2/configure.in
+===================================================================
+--- imlib2.orig/configure.in	2008-04-21 14:28:58.000000000 +0800
++++ imlib2/configure.in	2008-04-21 14:30:07.000000000 +0800
+@@ -191,9 +191,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"
+   AC_DEFINE(BUILD_X11, 1, [enabling X11 support])
+ else
+   x_cflags=""
============================================================
--- 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_cvs.bb	5c3c8c06ae6d9a4d18d10a066fc8973ec535e871
+++ packages/efl1/imlib2_cvs.bb	c32847438359b0993cb9eadcf6f4b6019585f54c
@@ -3,10 +3,14 @@ PV = "1.4.1.000+cvs${SRCDATE}"
 # can also depend on tiff34, ungif or gif, z, bz2, id3tag
 DEPENDS = "freetype libpng jpeg virtual/libx11 libxext"
 PV = "1.4.1.000+cvs${SRCDATE}"
-PR = "r1"
+PR = "r2"
 
 inherit efl
 
+# The original patch was out of date in 20080420
+SRC_URI += "file://remove-local-includes.patch;patch=1;maxdate=20080420 \
+            file://remove-local-includes-20080421.patch;patch=1;mindate=20080420 "
+
 EXTRA_OECONF = "--with-x"
 
 # TODO: Use more fine granular version