diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-graphics/gimp')
4 files changed, 176 insertions, 0 deletions
diff --git a/meta-openembedded/meta-oe/recipes-graphics/gimp/gimp/0001-configure-ac-do-not-check-for-freetype-config.patch b/meta-openembedded/meta-oe/recipes-graphics/gimp/gimp/0001-configure-ac-do-not-check-for-freetype-config.patch new file mode 100644 index 000000000..fecd0121c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/gimp/gimp/0001-configure-ac-do-not-check-for-freetype-config.patch @@ -0,0 +1,38 @@ +From 72ad76841d87e857428693d812a961935284ac62 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> +Date: Thu, 12 Feb 2015 15:57:47 +0100 +Subject: [PATCH] configure-ac: do not check for freetype-config +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +freetype-config is not allowed in our environment - see also binconfig-disabled + +Upstream-Status: inappropriate [OE specific] + +Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> +--- + configure.ac | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 26812b6..abec714 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -647,13 +647,6 @@ if test "x$fontconfig_ok" = xno; then + fi + + +-AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no) +-if test "x$FREETYPE_CONFIG" != "xno" ; then +- AC_MSG_CHECKING([for freetype libraries]) +- FREETYPE_LIBS=`$FREETYPE_CONFIG --libs` +- AC_MSG_RESULT($FREETYPE_LIBS) +-fi +-AC_SUBST(FREETYPE_LIBS) + + + ########################################## +-- +1.9.3 + diff --git a/meta-openembedded/meta-oe/recipes-graphics/gimp/gimp/0003-Fix-use-of-gegl-API.patch b/meta-openembedded/meta-oe/recipes-graphics/gimp/gimp/0003-Fix-use-of-gegl-API.patch new file mode 100644 index 000000000..7da78e205 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/gimp/gimp/0003-Fix-use-of-gegl-API.patch @@ -0,0 +1,34 @@ +From e1c8f4b8323e3965271a93529eab5774c1a7083c Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 29 Jun 2017 10:32:14 -0700 +Subject: [PATCH 3/3] Fix use of gegl API + +newer version of gegl does not define GEGL_IS_PARAM_SPEC_MULTILINE + +| core/libappcore.a(gimpparamspecs-duplicate.o): In function `gimp_param_spec_duplicate': +| /usr/src/debug/gimp/2.8.22-r0/gimp-2.8.22/app/core/../../../../../../../../../workspace/sources/gimp/app/core/gimpparamspecs-duplicate.c:70: undefined reference to `GEGL_IS_PARAM_SPEC_MULTILINE' +| collect2: error: ld returned 1 exit status + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + app/core/gimpparamspecs-duplicate.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/app/core/gimpparamspecs-duplicate.c b/app/core/gimpparamspecs-duplicate.c +index c0b7426..2efaf23 100644 +--- a/app/core/gimpparamspecs-duplicate.c ++++ b/app/core/gimpparamspecs-duplicate.c +@@ -67,7 +67,7 @@ gimp_param_spec_duplicate (GParamSpec *pspec) + spec->default_value, + pspec->flags); + +- if (GEGL_IS_PARAM_SPEC_MULTILINE (pspec)) ++ if (gegl_param_spec_get_property_key(pspec, "multiline")) + { + g_param_spec_set_qdata (new, multiline_quark, + GINT_TO_POINTER (TRUE)); +-- +2.13.2 + diff --git a/meta-openembedded/meta-oe/recipes-graphics/gimp/gimp/bump_Babl-GEGL_versions.patch b/meta-openembedded/meta-oe/recipes-graphics/gimp/gimp/bump_Babl-GEGL_versions.patch new file mode 100644 index 000000000..b71bf329e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/gimp/gimp/bump_Babl-GEGL_versions.patch @@ -0,0 +1,53 @@ +Bump acceptable versions of babl and gegl. + +Patch is taken from debian: +https://packages.debian.org/stretch/gimp + +Upstream-Status: Inappropriate [OE specific] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +diff --git a/app/sanity.c b/app/sanity.c +index febddfb..85fea55 100644 +--- a/app/sanity.c ++++ b/app/sanity.c +@@ -351,7 +351,7 @@ sanity_check_babl (void) + + #define BABL_REQUIRED_MAJOR 0 + #define BABL_REQUIRED_MINOR 1 +-#define BABL_REQUIRED_MICRO 10 ++#define BABL_REQUIRED_MICRO 12 + + babl_get_version (&babl_major_version, + &babl_minor_version, +@@ -388,7 +388,7 @@ sanity_check_gegl (void) + gint gegl_micro_version; + + #define GEGL_REQUIRED_MAJOR 0 +-#define GEGL_REQUIRED_MINOR 2 ++#define GEGL_REQUIRED_MINOR 3 + #define GEGL_REQUIRED_MICRO 0 + + gegl_get_version (&gegl_major_version, +diff --git a/configure.ac b/configure.ac +index 26812b6..4252fe9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -40,8 +40,8 @@ m4_define([gimp_stable], + m4_define([gimp_full_name], [GNU Image Manipulation Program]) + + # required versions of other packages +-m4_define([babl_required_version], [0.1.10]) +-m4_define([gegl_required_version], [0.2.0]) ++m4_define([babl_required_version], [0.1.12]) ++m4_define([gegl_required_version], [0.3.0]) + m4_define([glib_required_version], [2.30.2]) + m4_define([atk_required_version], [2.2.0]) + m4_define([gtk_required_version], [2.24.10]) +@@ -519,7 +519,7 @@ AC_SUBST(ISO_CODES_LOCALEDIR) + ############################### + + PKG_CHECK_MODULES(BABL, babl >= babl_required_version) +-PKG_CHECK_MODULES(GEGL, gegl-0.2 >= gegl_required_version) ++PKG_CHECK_MODULES(GEGL, gegl-0.3 >= gegl_required_version) + PKG_CHECK_MODULES(ATK, atk >= atk_required_version) + + AM_PATH_GLIB_2_0(glib_required_version, :, diff --git a/meta-openembedded/meta-oe/recipes-graphics/gimp/gimp_2.8.22.bb b/meta-openembedded/meta-oe/recipes-graphics/gimp/gimp_2.8.22.bb new file mode 100644 index 000000000..943986e77 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/gimp/gimp_2.8.22.bb @@ -0,0 +1,51 @@ +SUMMARY = "The GIMP is the GNU Image Manipulation Program" +HOMEPAGE = "http://www.gimp.org" +SECTION = "x11/graphics" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +DEPENDS = " \ + gdk-pixbuf-native \ + intltool-native \ + libxslt-native \ + gtk+ \ + babl \ + gegl \ + jpeg \ + libpng \ + libexif \ + tiff \ + lcms \ + poppler \ + jasper \ + bzip2 \ + libgudev \ + libmng \ +" +DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxmu libxpm', '', d)}" + +inherit distro_features_check gnome gtk-doc + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI = "http://ftp.gimp.org/pub/gimp/v2.8/gimp-${PV}.tar.bz2 \ + file://0001-configure-ac-do-not-check-for-freetype-config.patch \ + file://bump_Babl-GEGL_versions.patch \ + file://0003-Fix-use-of-gegl-API.patch \ + " +SRC_URI[md5sum] = "7e4fd7a53b1d3c32dff642ab1a94b44d" +SRC_URI[sha256sum] = "9187a35cc52b110d78124d7b27b68a68ade14a794c2721314bac6134d2a5638a" + +EXTRA_OECONF = "--disable-python \ + --without-webkit \ + --without-wmf" + +do_configure_append() { + find ${B} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g + find ${B} -name Makefile | xargs sed -i s:'-I/usr/include':'-I${STAGING_INCDIR}':g +} + +CFLAGS += "-fPIC" + +FILES_${PN}-dbg += "${libdir}/gimp/2.0/*/.debug" +FILES_${PN} += "${datadir}/appdata" |
