diff options
| author | Graeme Gregory <dp@xora.org.uk> | 2006-05-31 09:49:03 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-05-31 09:49:03 +0000 |
| commit | 08aab5d13004100d91d4014f416ef8dd077d118c (patch) | |
| tree | de89c4f035083cc4f16263cb97dbf39930c5a63f | |
| parent | 1e42b4d30cf60f6b546e4464e307ba5ee97a5fad (diff) | |
gimp_2.3.8.bb : fix configure.in so it is possible to disable libwmf
with a --without-libwmf argument.
| -rw-r--r-- | packages/gimp/files/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/gimp/files/configure-libwmf.patch | 21 | ||||
| -rw-r--r-- | packages/gimp/gimp_2.3.8.bb | 6 |
3 files changed, 25 insertions, 2 deletions
diff --git a/packages/gimp/files/.mtn2git_empty b/packages/gimp/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/gimp/files/.mtn2git_empty diff --git a/packages/gimp/files/configure-libwmf.patch b/packages/gimp/files/configure-libwmf.patch new file mode 100644 index 0000000000..ca3697cfa2 --- /dev/null +++ b/packages/gimp/files/configure-libwmf.patch @@ -0,0 +1,21 @@ +--- gimp-2.3.8/configure.in.orig 2006-05-31 10:16:40.000000000 +0100 ++++ gimp-2.3.8/configure.in 2006-05-31 10:18:56.000000000 +0100 +@@ -1342,7 +1342,10 @@ + # Check for libwmf2 + ################### + ++AC_ARG_WITH(libwmf, [ --without-libwmf build without libwmf support]) ++ + have_libwmf=no ++if test "x$with_libwmf" != xno; then + AC_PATH_PROG(WMF_CONFIG, libwmf-config, no) + if test "x$WMF_CONFIG" != "xno" ; then + have_libwmf=yes +@@ -1359,6 +1362,7 @@ + else + have_libwmf="no (libwmf not found)" + fi ++fi + AC_SUBST(LIBWMF) + AC_SUBST(WMF_CFLAGS) + diff --git a/packages/gimp/gimp_2.3.8.bb b/packages/gimp/gimp_2.3.8.bb index 89d9be3e8d..84b35b1e8d 100644 --- a/packages/gimp/gimp_2.3.8.bb +++ b/packages/gimp/gimp_2.3.8.bb @@ -3,7 +3,8 @@ HOMEPAGE = "http://www.gimp.org" LICENSE = "GPL" MAINTAINER = "Koen Kooi <koen@handhelds.org>" -SRC_URI = "ftp://ftp.gimp.org/pub/gimp/v2.3/gimp-${PV}.tar.bz2" +SRC_URI = "ftp://ftp.gimp.org/pub/gimp/v2.3/gimp-${PV}.tar.bz2 \ + file://configure-libwmf.patch;patch=1" DEPENDS = "sed-native libart-lgpl gtk+ jpeg libpng libexif tiff" @@ -12,7 +13,8 @@ inherit autotools pkgconfig EXTRA_OECONF = " --disable-gtktest \ --disable-print \ --disable-python \ - --enable-mp" + --enable-mp \ + --without-libwmf" do_configure_append() { find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g |