diff options
author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-05-09 22:48:10 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-05-09 22:48:10 +0000 |
commit | 24d6c02c8e1eb7408f1fd09eb87c9eb63355da92 (patch) | |
tree | 7736651422af3e340d967dcf29139a9b381b1886 /packages/efl1/imlib2 | |
parent | 32652cd6ccd916670df6975cf89aebe93c4f9c31 (diff) | |
parent | fc672056c4760b31597316f58fa2a804f966118b (diff) |
merge of '5917d0f1af10ed2d5da45d6f72d648b629e1cb40'
and '5bd5703a4e0b185912bdd76a025e64b961d8044b'
Diffstat (limited to 'packages/efl1/imlib2')
-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 |
3 files changed, 30 insertions, 0 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 |