diff options
| author | Openmoko anonymizer key <devel@lists.openmoko.org> | 2007-09-01 14:50:36 +0000 |
|---|---|---|
| committer | Openmoko anonymizer key <devel@lists.openmoko.org> | 2007-09-01 14:50:36 +0000 |
| commit | 556738d8af19cda2845be0d51e97d8935e360abd (patch) | |
| tree | a7a8f3641fd9dd782bca4fd0ebe09e84a0ed5c81 | |
| parent | f77756481ff953f4ead07bb093b36b96ba1a2135 (diff) | |
| parent | ddab57ac262e7db79f8a360d239b91f6055fa2e9 (diff) | |
merge of '4c108250ef95743112aee6c23a4f206124025bbb'
and 'd3620bd2aae6d0d9fd6b35e93a1d2a1e914dda31'
| -rw-r--r-- | packages/efl1/imlib2/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/efl1/imlib2/remove-local-includes.patch | 15 | ||||
| -rw-r--r-- | packages/efl1/imlib2_1.4.0.002.bb | 8 |
3 files changed, 21 insertions, 2 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.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" |