summaryrefslogtreecommitdiff
path: root/meta-openembedded/meta-gnome/recipes-gimp
diff options
context:
space:
mode:
authorAndrew Geissler <geissonator@yahoo.com>2021-02-13 00:32:45 +0300
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2021-02-25 23:15:06 +0300
commitac970dd705934286df062e0f1501f776dc2ef01d (patch)
treefadcf250bad7a38afc33bc423c0ebb8733b33345 /meta-openembedded/meta-gnome/recipes-gimp
parent1110521700bbfe9ffd32338fed19492114e8bbd4 (diff)
downloadopenbmc-ac970dd705934286df062e0f1501f776dc2ef01d.tar.xz
meta-openembedded: subtree update:fd123c9bb2..7206f7f5bc
Adam Miartus (1): cereal: add cereal a header-only c++11 serialization library Andreas Müller (14): xfce4-appfinder: upgrade 4.16.0 -> 4.16.1 xfce4-whiskermenu-plugin: upgrade 2.5.2 -> 2.5.3 xfce4-panel: upgrade 4.16.0 -> 4.16.1 xfce4-notes-plugin: re-add 1.9.0 gparted: upgrade 1.1.0 -> 1.2.0 poppler: upgrade 21.01.0 -> 21.02.0 fluidsynth: upgrade 2.1.6 -> 2.1.7 mousepad: upgrade 0.5.1 -> 0.5.2 xfce4-cpugraph-plugin: upgrade 1.2.0 -> 1.2.1 babl: upgrade 0.1.82 -> 0.1.84 gegl: upgrade 0.4.26 -> 0.4.28 gtk+: upgrade 2.24.32 -> 2.24.33 libsigc++-2.0: upgrade 2.10.3 -> 2.10.6 gtkmm3: upgrade 3.24.2 -> 3.24.3 Andrei Gherzan (1): gateone: Cleanup assets for removed recipe Andrey Zhizhikin (1): iperf3: fix build with autoconf 2.71 Gianfranco (1): mosquitto: Upgrade 1.6.12 -> 2.0.7 Harpritkaur Bhandari (1): rapidjson: Remove unwanted patches Hongxu Jia (4): lksctp-tools: make conpatible to autoconf-2.70 spice: make conpatible to autoconf-2.70 freeradius: fix build failure with autoconf 2.71 ndpi: fix autoconf-2.71 compatibility Kai Kang (3): meta-oe: add crash to NON_MULTILIB_RECIPES lxdm: support to change user password lxdm: disallow empty new password Khem Raj (28): libssh2: Fix build with autoconf 2.70+ yasm: Fix build with autotools 2.70+ boinc-client: Upgrade to 7.16.16 release net-snmp: Remove hardcoded paths to build host in net-snmp-config keepalived: Upgrade to 2.2.1 gst-shark: Upgrade to 0.7.2 hidapi: Backport patch to fix build with autotools 2.70+ libsrtp: Update to 2.3.0 libsrtp: Do not invoke automake during configure klibc: Upgrade to 2.0.8 release geany,geany-plugins: Upgrade to 1.37.x libstatgrab: Fix build with autoconf 2.70+ libmypaint: Fix build with autotools 2.70+ geany: Fix build with autotools 2.70+ ubi-utils-klibc: Fix build with clang kexecboot: Fix build with clang glm: Upgrade to 0.9.9.8 gimp: Fix build with autoconf-2.70+ klibc: Fix x86_64 build with binutils 2.36+ pavucontrol: Depend on libxml-parser-perl-native libsrtp: Copy ar-lib from automake libmcrypt: Run autoreconf steps manually libsdl2-mixer: Fix build with autoconf 2.70+ openldap: Fix build with autoconf 2.70+ transmission: Fix build with autotools 2.70+ boinc-client: Fix build with autotools 2.70+ iwd: Fix build with ell 0.37 kernel-selftest: Disable building bpf Leon Anavi (29): python3-gevent: Upgrade 20.9.0 -> 21.1.2 python3-prompt-toolkit: Upgrade 3.0.11 -> 3.0.14 python3-urllib3: Upgrade 1.26.2 -> 1.26.3 python3-pybind11: Upgrade 2.5.0 -> 2.6.2 python3-xlrd: Upgrade 1.2.0 -> 2.0.1 python3-croniter: Upgrade 1.0.2 -> 1.0.4 python3-cantools: Upgrade 36.1.0 -> 36.2.0 python3-pyzmq: Upgrade 21.0.2 -> 22.0.2 python3-aiohttp-jinja2: Upgrade 1.2.0 -> 1.4.2 python3-prctl: Upgrade 1.7 -> 1.8.1 python3-cmd2: Upgrade 1.4.0 -> 1.5.0 python3-elementpath: Upgrade 2.1.2 -> 2.1.3 python3-croniter: Upgrade 1.0.4 -> 1.0.5 python3-pychromecast: Upgrade 7.7.2 -> 8.0.0 python3-alembic: Upgrade 1.5.2 -> 1.5.3 python3-meh: Upgrade 0.49 -> 0.50 python3-pywbem: Upgrade 1.1.0 -> 1.1.3 python3-ipython: Upgrade 7.19.0 -> 7.20.0 python3-croniter: Upgrade 1.0.5 -> 1.0.6 python3-pywbemtools: Upgrade 0.8.0 -> 0.8.1 python3-sqlalchemy: Upgrade 1.3.22 -> 1.3.23 python3-flask-migrate: Upgrade 2.5.3 -> 2.6.0 python3-javaobj-py3: Upgrade 0.4.1 -> 0.4.2 python3-pytest-html: Upgrade 2.1.1 -> 3.1.1 python3-graphviz: Upgrade 0.14.2 -> 0.16 python3-tqdm: Upgrade 4.51.0 -> 4.56.0 python3-alembic: Upgrade 1.5.3 -> 1.5.4 python3-pymongo: Upgrade 3.11.2 -> 3.11.3 python3-pymisp: Upgrade 2.4.137.1 -> 2.4.137.3 Martin Jansa (6): zbar: fix random do_prepare_recipe_sysroot_gettext failures zbar: use 4 spaces for indentation net-snmp: fix build with dash wireguard-module: remove PKG assignment graphviz: drop unused SRCREV and outdated comment pidgin: upgrade to 2.14.1 and fix autoconf-2.71 compatibility Mingli Yu (5): net-snmp: improve reproducibility python3-h5py: improve reproducibility opencv: improve reproducibility mozjs: improve reproducibility netsnmp: remove --with-openssl=PATH configure option Nicolas Jeker (2): network-manager-applet: Build without libteam support networkmanager: Add PACKAGECONFIG for ovs Oleksandr Kravchuk (24): iwd: update to 1.11 cpuid: update to 20201006 libblockdev: update to 2.25 nano: update to 5.5 plymouth: update to 0.9.5 adcli: update to 0.9.0 cannelloni: update to 1.0.0 ipset: update to 7.10 kronosnet: update 1.20 nghttp2: update to 1.43.0 atftp: update to 0.7.4 cereal: update to 1.3.0 python3-aws-iot-device-sdk-python: update to 1.4.9 python3-flask-socketio: update to 4.3.1 python3-greenstalk: update to 2.0.0 python3-twitter: update to 3.10.0 fetchmail: udpate to 6.4.16 wireshark: update to 3.4.3 iqrencode: update to 4.1.1 libconfig add UPSTREAM_CHECK_URI ceres-solver: update to 2.0.0 libgit2: update to 1.1.0 hexedit: update to 1.5 ttf-abyssinica: update to 2.000 Oleksiy Obitotskyy (1): libhugetlbfs: improve reproducibility Peter Smith (1): python3-ruamel-yaml: add support for native and nativesdk Qi.Chen@windriver.com (1): minifi-cpp: set PSEUDO_CONSIDER_PATHS Ramon Fried (2): fluentbit: fix systemd input plugin fluentbit: Fix SIGSEGV caused by using flb_free instead of mk_mem_free Robert P. J. Day (1): correct "RRCOMMENDS" typo in ipset recipe Ross Burton (2): python3-ruamel-yaml: add native and nativesdk class extension python3-pykwalify: fix RDEPENDS Sakib Sajal (2): libgpiod: add ptest xfce4-session: increase ALTERNATIVE_PRIORITY Wang Mingyu (1): dnsmasq: upgrade 2.82 -> 2.84 Yi Fan Yu (1): postgresql: bypass autoconf version check Yi Zhao (1): openipmi: upgrade 2.0.30 -> 2.0.31 Zang Ruochen (7): libfastjson: upgrade 0.99.8 -> 0.99.9 libio-pty-perl: upgrade 1.15 -> 1.16 libjson-perl: upgrade 4.02000 -> 4.03000 libmbim: upgrade 1.24.4 -> 1.24.6 sanlock: upgrade 3.8.2 -> 3.8.3 python3-matplotlib: upgrade 3.3.2 -> 3.3.4 python3-pytz: upgrade 2020.1 -> 2021.1 akuster (2): enca: Fix SRC_URI meta-oe/README: add Ubuntu prerequisite information zangrc (6): libtalloc: upgrade 2.3.1 -> 2.3.2 gensio: upgrade 2.2.0 -> 2.2.3 zchunk: upgrade 1.1.8 -> 1.1.9 libnet-ldap-perl: upgrade 0.67 -> 0.68 librole-tiny-perl: upgrade 2.002003 -> 2.002004 cpprest: upgrade 2.10.17 -> 2.10.18 zhengruoqin (4): open-isns: upgrade 0.99 -> 0.101 gd: upgrade 2.3.0 -> 2.3.1 live555: upgrade 20210101 -> 20210129 python3-periphery: upgrade 2.1.0 -> 2.2.0 Signed-off-by: Andrew Geissler <geissonator@yahoo.com> Change-Id: I65a2b942fbfbc262976e6417d7481ae3fc82cb17
Diffstat (limited to 'meta-openembedded/meta-gnome/recipes-gimp')
-rw-r--r--meta-openembedded/meta-gnome/recipes-gimp/babl/babl_0.1.84.bb (renamed from meta-openembedded/meta-gnome/recipes-gimp/babl/babl_0.1.82.bb)2
-rw-r--r--meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl_0.4.28.bb (renamed from meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl_0.4.26.bb)2
-rw-r--r--meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp/0001-configure.ac-fix-with-linux-input-handling-with-upco.patch58
-rw-r--r--meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_2.10.22.bb4
-rw-r--r--meta-openembedded/meta-gnome/recipes-gimp/mypaint/libmypaint/0001-make-build-compatible-w.-autoconf-2.7.patch32
-rw-r--r--meta-openembedded/meta-gnome/recipes-gimp/mypaint/libmypaint_git.bb4
6 files changed, 98 insertions, 4 deletions
diff --git a/meta-openembedded/meta-gnome/recipes-gimp/babl/babl_0.1.82.bb b/meta-openembedded/meta-gnome/recipes-gimp/babl/babl_0.1.84.bb
index 244b867fae..b49d9d7e8b 100644
--- a/meta-openembedded/meta-gnome/recipes-gimp/babl/babl_0.1.82.bb
+++ b/meta-openembedded/meta-gnome/recipes-gimp/babl/babl_0.1.84.bb
@@ -15,6 +15,6 @@ CFLAGS_append_toolchain-clang_mipsarch = " -ffp-exception-behavior=ignore "
CFLAGS_append_toolchain-clang_riscv64 = " -ffp-exception-behavior=ignore "
SRC_URI = "https://download.gimp.org/pub/${BPN}/0.1/${BP}.tar.xz"
-SRC_URI[sha256sum] = "c62d93d4ad6774cb8e3231bbbc7f2e61e551e7242d78640d757505ee1a9fadc5"
+SRC_URI[sha256sum] = "e7e38b8441f77feb9dc8231cb434a86190a21f2f3692c281457e99d35e9c34ea"
BBCLASSEXTEND = "native"
diff --git a/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl_0.4.26.bb b/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl_0.4.28.bb
index 6ac1e6ca96..810036162c 100644
--- a/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl_0.4.26.bb
+++ b/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl_0.4.28.bb
@@ -26,7 +26,7 @@ SRC_URI = " \
https://download.gimp.org/pub/${BPN}/${SHPV}/${BP}.tar.xz \
file://0001-meson.build-Give-note-if-sdl2-was-found.patch \
"
-SRC_URI[sha256sum] = "0f371e2ed2b92162fefd3dde743e648ca08a6a1b2b05004867fbddc7e211e424"
+SRC_URI[sha256sum] = "1d110d8577d54cca3b34239315bd37c57ccb27dd4355655074a2d2b3fd897900"
PACKAGECONFIG ??= "gexiv2 jpeg libpng librsvg sdl2"
PACKAGECONFIG_class-native = "libpng librsvg"
diff --git a/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp/0001-configure.ac-fix-with-linux-input-handling-with-upco.patch b/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp/0001-configure.ac-fix-with-linux-input-handling-with-upco.patch
new file mode 100644
index 0000000000..7e12487c7b
--- /dev/null
+++ b/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp/0001-configure.ac-fix-with-linux-input-handling-with-upco.patch
@@ -0,0 +1,58 @@
+From 1b66e4cca6d95f4607599bcbdd4afeb601aee84e Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Sun, 25 Oct 2020 18:09:21 +0000
+Subject: [PATCH] configure.ac: fix `--with-linux-input` handling with upcoming autoconf-2.70
+
+Upcoming autoconf-2.70 exposes deficiency in configure.ac:
+
+```
+$ autoconf-2.70_beta2 && ./configure --host=x86_64-pc-linux-gnu
+./configure: line 1430: 5: Bad file descriptor
+checking whether is declared... ./configure: line 1432: ${+y}: bad
+```
+
+It happens because macros are called with parameters using insufficient quoting.
+
+More details at https://lists.gnu.org/archive/html/bug-autoconf/2020-10/msg00027.html
+
+The fix only amends `--with-linux-input`. Other cases of underquoting
+will need to be handled separately.
+
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gimp/-/commit/cebeb90a87105cd6e35bcb357d53cc04c828ca21]
+Fix-by: Zack Weinberg
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ configure.ac | 17 ++++++++---------
+ 1 file changed, 8 insertions(+), 9 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6e2c193..afbcdd8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2138,15 +2138,14 @@ fi
+ AC_ARG_WITH(linux-input, [ --without-linux-input don't build linux input event controller module])
+
+ have_linux_input="no (linux input support disabled)"
+-if test "x$with_linux_input" != "xno"; then
+- AC_CHECK_HEADER(linux/input.h,
+- AC_CHECK_DECL(KEY_OK,
+- have_linux_input=yes,
+- have_linux_input="no (needs Linux 2.6)",
+- [#include <linux/input.h>]))
+-fi
+-
+-AM_CONDITIONAL(HAVE_LINUX_INPUT, test "x$have_linux_input" = xyes)
++AS_IF([test "x$with_linux_input" != "xno"],
++ [AC_CHECK_HEADER([linux/input.h],
++ [AC_CHECK_DECL([KEY_OK],
++ [have_linux_input=yes],
++ [have_linux_input="no (needs Linux 2.6)"],
++ [#include <linux/input.h>])])])
++
++AM_CONDITIONAL([HAVE_LINUX_INPUT], [test "x$have_linux_input" = xyes])
+
+
+ ###############################
+--
+2.30.0
+
diff --git a/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_2.10.22.bb b/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_2.10.22.bb
index aec1ebf7b2..070ed1904b 100644
--- a/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_2.10.22.bb
+++ b/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_2.10.22.bb
@@ -37,7 +37,9 @@ REQUIRED_DISTRO_FEATURES = "x11"
SHPV = "${@gnome_verdir("${PV}")}"
-SRC_URI = "https://download.gimp.org/pub/${BPN}/v${SHPV}/${BP}.tar.bz2"
+SRC_URI = "https://download.gimp.org/pub/${BPN}/v${SHPV}/${BP}.tar.bz2 \
+ file://0001-configure.ac-fix-with-linux-input-handling-with-upco.patch \
+ "
SRC_URI[sha256sum] = "2db84b57f3778d80b3466d7c21a21d22e315c7b062de2883cbaaeda9a0f618bb"
EXTRA_OECONF = "--disable-python \
diff --git a/meta-openembedded/meta-gnome/recipes-gimp/mypaint/libmypaint/0001-make-build-compatible-w.-autoconf-2.7.patch b/meta-openembedded/meta-gnome/recipes-gimp/mypaint/libmypaint/0001-make-build-compatible-w.-autoconf-2.7.patch
new file mode 100644
index 0000000000..28e279438a
--- /dev/null
+++ b/meta-openembedded/meta-gnome/recipes-gimp/mypaint/libmypaint/0001-make-build-compatible-w.-autoconf-2.7.patch
@@ -0,0 +1,32 @@
+From 712a101c9aa2eb8548e4d0100a4a2eaf76fad164 Mon Sep 17 00:00:00 2001
+From: Jesper Lloyd <jpl.lloyd@gmail.com>
+Date: Wed, 20 Jan 2021 20:21:53 +0100
+Subject: [PATCH] make build compatible w. autoconf 2.7
+
+Workaround for stricter behaviour (due to a bugfix) in 2.7,
+which makes a failing intltoolize macro check fail the build.
+
+Fix provided by hosiet.
+
+Upstream-Status: Backport [https://github.com/mypaint/libmypaint/commit/a6bac154db018e1f1cc4dbddc34f6c8422c891fb]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 416d9fe..48b9d02 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -248,7 +248,7 @@ if test "x$enable_i18n" != "xno"; then
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
+ [The prefix for our gettext translation domains.])
+ AC_SUBST(GETTEXT_PACKAGE)
+- IT_PROG_INTLTOOL
++IT_PROG_INTLTOOL
+ AM_GLIB_GNU_GETTEXT
+
+ dnl Debian: stdlib
+--
+2.30.0
+
diff --git a/meta-openembedded/meta-gnome/recipes-gimp/mypaint/libmypaint_git.bb b/meta-openembedded/meta-gnome/recipes-gimp/mypaint/libmypaint_git.bb
index 37d41780d2..e711a2a7fa 100644
--- a/meta-openembedded/meta-gnome/recipes-gimp/mypaint/libmypaint_git.bb
+++ b/meta-openembedded/meta-gnome/recipes-gimp/mypaint/libmypaint_git.bb
@@ -12,7 +12,9 @@ DEPENDS = " \
inherit autotools gobject-introspection gettext python3native
-SRC_URI = "git://github.com/mypaint/libmypaint.git;protocol=https;branch=libmypaint-v1"
+SRC_URI = "git://github.com/mypaint/libmypaint.git;protocol=https;branch=libmypaint-v1 \
+ file://0001-make-build-compatible-w.-autoconf-2.7.patch \
+ "
SRCREV = "2768251dacce3939136c839aeca413f4aa4241d0"
PV = "1.6.1"
S = "${WORKDIR}/git"