diff options
| author | Graeme Gregory <dp@xora.org.uk> | 2008-05-09 14:05:05 +0000 |
|---|---|---|
| committer | Graeme Gregory <dp@xora.org.uk> | 2008-05-09 14:05:05 +0000 |
| commit | 8197cff6e0e771683ffd0e5c3666963c35b5465a (patch) | |
| tree | 3bb62572bf73106e44f99e7ca3ee8cc78e48bbc9 /packages/efl1 | |
| parent | 104098aac850efca9dacd3f3973ddbc557105cb0 (diff) | |
imlib2_cvs.bb : fixes from OM mtn
Diffstat (limited to 'packages/efl1')
| -rw-r--r-- | packages/efl1/imlib2/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/efl1/imlib2/remove-local-includes-20080421.patch | 15 | ||||
| -rw-r--r-- | packages/efl1/imlib2/remove-local-includes.patch | 15 | ||||
| -rw-r--r-- | packages/efl1/imlib2_cvs.bb | 6 |
4 files changed, 35 insertions, 1 deletions
diff --git a/packages/efl1/imlib2/.mtn2git_empty b/packages/efl1/imlib2/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/efl1/imlib2/.mtn2git_empty diff --git a/packages/efl1/imlib2/remove-local-includes-20080421.patch b/packages/efl1/imlib2/remove-local-includes-20080421.patch new file mode 100644 index 0000000000..d28ba9ebf0 --- /dev/null +++ b/packages/efl1/imlib2/remove-local-includes-20080421.patch @@ -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="" 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_cvs.bb b/packages/efl1/imlib2_cvs.bb index 18cca99ae4..0008ca9122 100644 --- a/packages/efl1/imlib2_cvs.bb +++ b/packages/efl1/imlib2_cvs.bb @@ -3,10 +3,14 @@ LICENSE = "BSD" # 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 |