summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@gmail.com>2020-02-09 16:10:52 +0100
committerKhem Raj <raj.khem@gmail.com>2020-02-09 22:31:31 -0800
commit3b3f73379864a3d49b81db068436800198ab26d9 (patch)
treeb530d756978ca9b68a938bb1d92ef0c0864b051f
parentc8734f7d5a6c552b9981513dfe08b8541650e24d (diff)
downloadmeta-openembedded-3b3f73379864a3d49b81db068436800198ab26d9.tar.gz
gimp: upgrade 2.8.22 -> 2.10.14
* patches don't apply any more * get sources from location gimp's homepage suggests * license checksum was changed by replacing http -> https [1] [1] https://gitlab.gnome.org/GNOME/gimp/commit/bab75b7365cc87639cd5aaa9840ebe1f6228d556 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat
-rw-r--r--meta-gnome/recipes-gimp/gimp/gimp_2.10.14.bb60
-rw-r--r--meta-oe/recipes-graphics/gimp/gimp/0001-configure-ac-do-not-check-for-freetype-config.patch38
-rw-r--r--meta-oe/recipes-graphics/gimp/gimp/0003-Fix-use-of-gegl-API.patch34
-rw-r--r--meta-oe/recipes-graphics/gimp/gimp/bump_Babl-GEGL_versions.patch53
-rw-r--r--meta-oe/recipes-graphics/gimp/gimp_2.8.22.bb52
5 files changed, 60 insertions, 177 deletions
diff --git a/meta-gnome/recipes-gimp/gimp/gimp_2.10.14.bb b/meta-gnome/recipes-gimp/gimp/gimp_2.10.14.bb
new file mode 100644
index 0000000000..045958d0a6
--- /dev/null
+++ b/meta-gnome/recipes-gimp/gimp/gimp_2.10.14.bb
@@ -0,0 +1,60 @@
1SUMMARY = "The GIMP is the GNU Image Manipulation Program"
2HOMEPAGE = "http://www.gimp.org"
3SECTION = "x11/graphics"
4LICENSE = "GPLv3"
5LIC_FILES_CHKSUM = "file://COPYING;md5=c678957b0c8e964aa6c70fd77641a71e"
6
7DEPENDS = " \
8 gdk-pixbuf-native \
9 intltool-native \
10 libxslt-native \
11 gegl-native \
12 dbus-glib \
13 gtk+ \
14 babl \
15 gegl \
16 libmypaint \
17 mypaint-brushes-1.0 \
18 gexiv2 \
19 jpeg \
20 libpng \
21 libexif \
22 tiff \
23 lcms \
24 poppler \
25 poppler-data \
26 jasper \
27 bzip2 \
28 libgudev \
29 libmng \
30 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxmu libxpm', '', d)} \
31"
32
33inherit features_check gnomebase gtk-icon-cache gtk-doc mime-xdg
34
35REQUIRED_DISTRO_FEATURES = "x11"
36
37SHPV = "${@gnome_verdir("${PV}")}"
38
39SRC_URI = "https://download.gimp.org/pub/${BPN}/v${SHPV}/${BP}.tar.bz2"
40SRC_URI[md5sum] = "a64f2be299755a2da130306cad9b1d26"
41SRC_URI[sha256sum] = "df9b0f11c2078eea1de3ebc66529a5d3854c5e28636cd25a8dd077bd9d6ddc54"
42
43EXTRA_OECONF = "--disable-python \
44 --without-webkit \
45 --without-wmf"
46
47do_configure_append() {
48 find ${B} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
49 find ${B} -name Makefile | xargs sed -i s:'-I/usr/include':'-I${STAGING_INCDIR}':g
50}
51
52do_compile_prepend() {
53 # Let native babl/gegl find their plugins
54 export BABL_PATH=`find ${STAGING_LIBDIR_NATIVE} -maxdepth 1 -name 'babl-*'`
55 export GEGL_PATH=`find ${STAGING_LIBDIR_NATIVE} -maxdepth 1 -name 'gegl-*'`
56}
57
58FILES_${PN} += "${datadir}/metainfo"
59
60RDEPENDS_${PN} += "mypaint-brushes-1.0"
diff --git a/meta-oe/recipes-graphics/gimp/gimp/0001-configure-ac-do-not-check-for-freetype-config.patch b/meta-oe/recipes-graphics/gimp/gimp/0001-configure-ac-do-not-check-for-freetype-config.patch
deleted file mode 100644
index fecd0121c3..0000000000
--- a/meta-oe/recipes-graphics/gimp/gimp/0001-configure-ac-do-not-check-for-freetype-config.patch
+++ /dev/null
@@ -1,38 +0,0 @@
1From 72ad76841d87e857428693d812a961935284ac62 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Thu, 12 Feb 2015 15:57:47 +0100
4Subject: [PATCH] configure-ac: do not check for freetype-config
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9freetype-config is not allowed in our environment - see also binconfig-disabled
10
11Upstream-Status: inappropriate [OE specific]
12
13Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
14---
15 configure.ac | 7 -------
16 1 file changed, 7 deletions(-)
17
18diff --git a/configure.ac b/configure.ac
19index 26812b6..abec714 100644
20--- a/configure.ac
21+++ b/configure.ac
22@@ -647,13 +647,6 @@ if test "x$fontconfig_ok" = xno; then
23 fi
24
25
26-AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no)
27-if test "x$FREETYPE_CONFIG" != "xno" ; then
28- AC_MSG_CHECKING([for freetype libraries])
29- FREETYPE_LIBS=`$FREETYPE_CONFIG --libs`
30- AC_MSG_RESULT($FREETYPE_LIBS)
31-fi
32-AC_SUBST(FREETYPE_LIBS)
33
34
35 ##########################################
36--
371.9.3
38
diff --git a/meta-oe/recipes-graphics/gimp/gimp/0003-Fix-use-of-gegl-API.patch b/meta-oe/recipes-graphics/gimp/gimp/0003-Fix-use-of-gegl-API.patch
deleted file mode 100644
index 7da78e2052..0000000000
--- a/meta-oe/recipes-graphics/gimp/gimp/0003-Fix-use-of-gegl-API.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1From e1c8f4b8323e3965271a93529eab5774c1a7083c Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 29 Jun 2017 10:32:14 -0700
4Subject: [PATCH 3/3] Fix use of gegl API
5
6newer version of gegl does not define GEGL_IS_PARAM_SPEC_MULTILINE
7
8| core/libappcore.a(gimpparamspecs-duplicate.o): In function `gimp_param_spec_duplicate':
9| /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'
10| collect2: error: ld returned 1 exit status
11
12Upstream-Status: Pending
13
14Signed-off-by: Khem Raj <raj.khem@gmail.com>
15---
16 app/core/gimpparamspecs-duplicate.c | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19diff --git a/app/core/gimpparamspecs-duplicate.c b/app/core/gimpparamspecs-duplicate.c
20index c0b7426..2efaf23 100644
21--- a/app/core/gimpparamspecs-duplicate.c
22+++ b/app/core/gimpparamspecs-duplicate.c
23@@ -67,7 +67,7 @@ gimp_param_spec_duplicate (GParamSpec *pspec)
24 spec->default_value,
25 pspec->flags);
26
27- if (GEGL_IS_PARAM_SPEC_MULTILINE (pspec))
28+ if (gegl_param_spec_get_property_key(pspec, "multiline"))
29 {
30 g_param_spec_set_qdata (new, multiline_quark,
31 GINT_TO_POINTER (TRUE));
32--
332.13.2
34
diff --git a/meta-oe/recipes-graphics/gimp/gimp/bump_Babl-GEGL_versions.patch b/meta-oe/recipes-graphics/gimp/gimp/bump_Babl-GEGL_versions.patch
deleted file mode 100644
index b71bf329e9..0000000000
--- a/meta-oe/recipes-graphics/gimp/gimp/bump_Babl-GEGL_versions.patch
+++ /dev/null
@@ -1,53 +0,0 @@
1Bump acceptable versions of babl and gegl.
2
3Patch is taken from debian:
4https://packages.debian.org/stretch/gimp
5
6Upstream-Status: Inappropriate [OE specific]
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8diff --git a/app/sanity.c b/app/sanity.c
9index febddfb..85fea55 100644
10--- a/app/sanity.c
11+++ b/app/sanity.c
12@@ -351,7 +351,7 @@ sanity_check_babl (void)
13
14 #define BABL_REQUIRED_MAJOR 0
15 #define BABL_REQUIRED_MINOR 1
16-#define BABL_REQUIRED_MICRO 10
17+#define BABL_REQUIRED_MICRO 12
18
19 babl_get_version (&babl_major_version,
20 &babl_minor_version,
21@@ -388,7 +388,7 @@ sanity_check_gegl (void)
22 gint gegl_micro_version;
23
24 #define GEGL_REQUIRED_MAJOR 0
25-#define GEGL_REQUIRED_MINOR 2
26+#define GEGL_REQUIRED_MINOR 3
27 #define GEGL_REQUIRED_MICRO 0
28
29 gegl_get_version (&gegl_major_version,
30diff --git a/configure.ac b/configure.ac
31index 26812b6..4252fe9 100644
32--- a/configure.ac
33+++ b/configure.ac
34@@ -40,8 +40,8 @@ m4_define([gimp_stable],
35 m4_define([gimp_full_name], [GNU Image Manipulation Program])
36
37 # required versions of other packages
38-m4_define([babl_required_version], [0.1.10])
39-m4_define([gegl_required_version], [0.2.0])
40+m4_define([babl_required_version], [0.1.12])
41+m4_define([gegl_required_version], [0.3.0])
42 m4_define([glib_required_version], [2.30.2])
43 m4_define([atk_required_version], [2.2.0])
44 m4_define([gtk_required_version], [2.24.10])
45@@ -519,7 +519,7 @@ AC_SUBST(ISO_CODES_LOCALEDIR)
46 ###############################
47
48 PKG_CHECK_MODULES(BABL, babl >= babl_required_version)
49-PKG_CHECK_MODULES(GEGL, gegl-0.2 >= gegl_required_version)
50+PKG_CHECK_MODULES(GEGL, gegl-0.3 >= gegl_required_version)
51 PKG_CHECK_MODULES(ATK, atk >= atk_required_version)
52
53 AM_PATH_GLIB_2_0(glib_required_version, :,
diff --git a/meta-oe/recipes-graphics/gimp/gimp_2.8.22.bb b/meta-oe/recipes-graphics/gimp/gimp_2.8.22.bb
deleted file mode 100644
index 718f8998c5..0000000000
--- a/meta-oe/recipes-graphics/gimp/gimp_2.8.22.bb
+++ /dev/null
@@ -1,52 +0,0 @@
1SUMMARY = "The GIMP is the GNU Image Manipulation Program"
2HOMEPAGE = "http://www.gimp.org"
3SECTION = "x11/graphics"
4LICENSE = "GPLv3"
5LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
6
7DEPENDS = " \
8 gdk-pixbuf-native \
9 intltool-native \
10 libxslt-native \
11 dbus-glib \
12 gtk+ \
13 babl \
14 gegl \
15 jpeg \
16 libpng \
17 libexif \
18 tiff \
19 lcms \
20 poppler \
21 jasper \
22 bzip2 \
23 libgudev \
24 libmng \
25"
26DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxmu libxpm', '', d)}"
27
28inherit features_check gnomebase gtk-icon-cache gtk-doc mime-xdg
29
30REQUIRED_DISTRO_FEATURES = "x11"
31
32SRC_URI = "http://ftp.gimp.org/pub/gimp/v2.8/gimp-${PV}.tar.bz2 \
33 file://0001-configure-ac-do-not-check-for-freetype-config.patch \
34 file://bump_Babl-GEGL_versions.patch \
35 file://0003-Fix-use-of-gegl-API.patch \
36 "
37SRC_URI[md5sum] = "7e4fd7a53b1d3c32dff642ab1a94b44d"
38SRC_URI[sha256sum] = "9187a35cc52b110d78124d7b27b68a68ade14a794c2721314bac6134d2a5638a"
39
40EXTRA_OECONF = "--disable-python \
41 --without-webkit \
42 --without-wmf"
43
44do_configure_append() {
45 find ${B} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
46 find ${B} -name Makefile | xargs sed -i s:'-I/usr/include':'-I${STAGING_INCDIR}':g
47}
48
49CFLAGS += "-fPIC"
50
51FILES_${PN}-dbg += "${libdir}/gimp/2.0/*/.debug"
52FILES_${PN} += "${datadir}/appdata"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-12-14 13:35:35 +0000