From 82c905dc58a36aeae40b1b273a12f63fb1973cf4 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 13 Apr 2020 13:39:40 -0500 Subject: meta-openembedded and poky: subtree updates Squash of the following due to dependencies among them and OpenBMC changes: meta-openembedded: subtree update:d0748372d2..9201611135 meta-openembedded: subtree update:9201611135..17fd382f34 poky: subtree update:9052e5b32a..2e11d97b6c poky: subtree update:2e11d97b6c..a8544811d7 The change log was too large for the jenkins plugin to handle therefore it has been removed. Here is the first and last commit of each subtree: meta-openembedded:d0748372d2 cppzmq: bump to version 4.6.0 meta-openembedded:17fd382f34 mpv: Remove X11 dependency poky:9052e5b32a package_ipk: Remove pointless comment to trigger rebuild poky:a8544811d7 pbzip2: Fix license warning Change-Id: If0fc6c37629642ee207a4ca2f7aa501a2c673cd6 Signed-off-by: Andrew Geissler --- .../meta-gnome/recipes-gimp/babl/babl_0.1.74.bb | 21 +++++++ ...1-meson.build-Give-note-if-sdl2-was-found.patch | 32 +++++++++++ .../meta-gnome/recipes-gimp/gegl/gegl_0.4.22.bb | 61 +++++++++++++++++++++ .../meta-gnome/recipes-gimp/gimp/gimp_2.10.18.bb | 64 ++++++++++++++++++++++ .../recipes-gimp/mypaint/libmypaint_git.bb | 24 ++++++++ .../mypaint/mypaint-brushes-1.0_git.bb | 12 ++++ 6 files changed, 214 insertions(+) create mode 100644 meta-openembedded/meta-gnome/recipes-gimp/babl/babl_0.1.74.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl/0001-meson.build-Give-note-if-sdl2-was-found.patch create mode 100644 meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl_0.4.22.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_2.10.18.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gimp/mypaint/libmypaint_git.bb create mode 100644 meta-openembedded/meta-gnome/recipes-gimp/mypaint/mypaint-brushes-1.0_git.bb (limited to 'meta-openembedded/meta-gnome/recipes-gimp') diff --git a/meta-openembedded/meta-gnome/recipes-gimp/babl/babl_0.1.74.bb b/meta-openembedded/meta-gnome/recipes-gimp/babl/babl_0.1.74.bb new file mode 100644 index 0000000000..c470987b4f --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gimp/babl/babl_0.1.74.bb @@ -0,0 +1,21 @@ +SUMMARY = "Babl is a dynamic, any to any, pixel format conversion library" +LICENSE = "LGPL-3.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6" + +GNOMEBASEBUILDCLASS = "meson" + +GIR_MESON_OPTION = "enable-gir" + +inherit setuptools3 gnomebase gobject-introspection + +DEPENDS += "lcms" + +# https://bugs.llvm.org/show_bug.cgi?id=45555 +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[md5sum] = "d032853f2678bc95054c39d4f02045c1" +SRC_URI[sha256sum] = "9a710b6950da37ada94cd9e2046cbce26de12473da32a7b79b7d1432fc66ce0e" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl/0001-meson.build-Give-note-if-sdl2-was-found.patch b/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl/0001-meson.build-Give-note-if-sdl2-was-found.patch new file mode 100644 index 0000000000..6a49f1d7ce --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl/0001-meson.build-Give-note-if-sdl2-was-found.patch @@ -0,0 +1,32 @@ +From 6bed199a73a7af39344cf8e799b665011553600c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Sat, 8 Feb 2020 14:29:52 +0100 +Subject: [PATCH] meson.build: Give note if sdl2 was found +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Configure output confused me a bit + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller +--- + meson.build | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/meson.build b/meson.build +index 9d5b484..296b5f3 100644 +--- a/meson.build ++++ b/meson.build +@@ -374,6 +374,7 @@ message('\n'.join(['', + ' OpenEXR: @0@'.format(openexr.found()), + ' rsvg: @0@'.format(librsvg.found()), + ' SDL: @0@'.format(sdl1.found()), ++' SDL2: @0@'.format(sdl2.found()), + ' libraw: @0@'.format(libraw.found()), + ' Jasper: @0@'.format(jasper.found()), + ' av libs: @0@'.format(avlibs_found), +-- +2.21.0 + diff --git a/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl_0.4.22.bb b/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl_0.4.22.bb new file mode 100644 index 0000000000..ca73e66f3e --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl_0.4.22.bb @@ -0,0 +1,61 @@ +SUMMARY = "GEGL (Generic Graphics Library) is a graph based image processing framework" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=f1a8bfcbc85304df454b65d378b299c7" + +DEPENDS = " \ + intltool-native \ + babl \ + glib-2.0 \ + pango \ + cairo \ + expat \ + zlib \ + \ + json-glib \ +" + +GNOMEBASEBUILDCLASS = "meson" + +inherit features_check gnomebase vala gobject-introspection + +REQUIRED_DISTRO_FEATURES = "x11" + +SHPV = "${@gnome_verdir("${PV}")}" + +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[md5sum] = "1776ac26792de0de3c3d680872e94b72" +SRC_URI[sha256sum] = "1888ec41dfd19fe28273795c2209efc1a542be742691561816683990dc642c61" + +PACKAGECONFIG ??= "gexiv2 jpeg libpng librsvg sdl2" +PACKAGECONFIG_class-native = "libpng librsvg" + +PACKAGECONFIG[jasper] = "-Djasper=enabled,-Djasper=disabled,jasper" +PACKAGECONFIG[gexiv2] = "-Dgexiv2=enabled,-Dgexiv2=disabled,gexiv2" +PACKAGECONFIG[graphviz] = "-Dgraphviz=enabled,-Dgraphviz=disabled,graphviz" +PACKAGECONFIG[jpeg] = "-Dlibjpeg=enabled,-Dlibjpeg=disabled,jpeg" +PACKAGECONFIG[lcms] = "-Dlcms=enabled,-Dlcms=disabled,lcms" +PACKAGECONFIG[libav] = "-Dlibav=enabled,-Dlibav=disabled,libav" +PACKAGECONFIG[libpng] = "-Dlibpng=enabled,-Dlibpng=disabled,libpng" +PACKAGECONFIG[librsvg] = "-Dlibrsvg=enabled,-Dlibrsvg=disabled,librsvg" +PACKAGECONFIG[sdl] = "-Dsdl1=enabled,-Dsdl1=disabled,virtual/libsdl" +PACKAGECONFIG[sdl2] = "-Dsdl2=enabled,-Dsdl2=disabled,virtual/libsdl2" +PACKAGECONFIG[tiff] = "-Dlibtiff=enabled,-Dlibtiff=disabled,tiff" +PACKAGECONFIG[webp] = "-Dwebp=enabled,-Dwebp=disabled,webp" + +# There are a couple of non-symlink .so files installed into libdir, which need to go into main package +FILES_${PN} += " \ + ${libdir}/*.so \ + ${libdir}/gegl-${SHPV}/*.json \ + ${libdir}/gegl-${SHPV}/*.so \ +" +FILES_SOLIBSDEV = "${libdir}/libgegl-${SHPV}${SOLIBSDEV}" + +# Fails to build with thumb-1 (qemuarm) +# gegl-0.2.0/operations/common/matting-global.c: In function 'matting_process': +# gegl-0.2.0/operations/common/matting-global.c:463:1: internal compiler error: in patch_jump_insn, at cfgrtl.c:1275 +ARM_INSTRUCTION_SET = "arm" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_2.10.18.bb b/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_2.10.18.bb new file mode 100644 index 0000000000..1350573342 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_2.10.18.bb @@ -0,0 +1,64 @@ +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=c678957b0c8e964aa6c70fd77641a71e" + +DEPENDS = " \ + gdk-pixbuf-native \ + intltool-native \ + libxslt-native \ + gegl-native \ + dbus-glib \ + gtk+ \ + babl \ + gegl \ + libmypaint \ + mypaint-brushes-1.0 \ + gexiv2 \ + jpeg \ + libpng \ + libexif \ + tiff \ + lcms \ + poppler \ + poppler-data \ + jasper \ + bzip2 \ + libgudev \ + libmng \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxmu libxpm', '', d)} \ +" +DEPENDS_append_libc-musl = " libexecinfo" + +inherit features_check gnomebase gtk-icon-cache gtk-doc mime-xdg + +REQUIRED_DISTRO_FEATURES = "x11" + +SHPV = "${@gnome_verdir("${PV}")}" + +SRC_URI = "https://download.gimp.org/pub/${BPN}/v${SHPV}/${BP}.tar.bz2" +SRC_URI[md5sum] = "096d04ffb2c4559cb2152f507ff31c9c" +SRC_URI[sha256sum] = "65bfe111e8eebffd3dde3016ccb507f9948d2663d9497cb438d9bb609e11d716" + +EXTRA_OECONF = "--disable-python \ + --without-webkit \ + --without-wmf" + +EXTRA_OECONF_append_libc-musl_mipsarch = " --disable-vector-icons" +EXTRA_OECONF_append_toolchain-clang_arm = " --disable-vector-icons" + +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 +} + +do_compile_prepend() { + # Let native babl/gegl find their plugins + export BABL_PATH=`find ${STAGING_LIBDIR_NATIVE} -maxdepth 1 -name 'babl-*'` + export GEGL_PATH=`find ${STAGING_LIBDIR_NATIVE} -maxdepth 1 -name 'gegl-*'` +} + +FILES_${PN} += "${datadir}/metainfo" + +RDEPENDS_${PN} += "mypaint-brushes-1.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 new file mode 100644 index 0000000000..2ca80f3e69 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gimp/mypaint/libmypaint_git.bb @@ -0,0 +1,24 @@ +SUMMARY = "libmypaint is a library for making brushstrokes" +LICENSE = "ISC" +LIC_FILES_CHKSUM = "file://COPYING;md5=9d13203ab4013e5a14dd62105f75d58b" + +DEPENDS = " \ + glib-2.0-native \ + intltool-native \ + glib-2.0 \ + babl \ + json-c \ +" + +inherit autotools gobject-introspection gettext python3native + +SRC_URI = "git://github.com/mypaint/libmypaint.git;protocol=https;branch=libmypaint-v1" +SRCREV = "477cb94b596035b54a255faaf95d13f6a8ee3619" +PV = "1.4.0" +S = "${WORKDIR}/git" + +do_configure_append() { + # autogen uses python2 so generate headers ourselves + cd ${S} + python3 generate.py mypaint-brush-settings-gen.h brushsettings-gen.h +} diff --git a/meta-openembedded/meta-gnome/recipes-gimp/mypaint/mypaint-brushes-1.0_git.bb b/meta-openembedded/meta-gnome/recipes-gimp/mypaint/mypaint-brushes-1.0_git.bb new file mode 100644 index 0000000000..d4d08fe8da --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gimp/mypaint/mypaint-brushes-1.0_git.bb @@ -0,0 +1,12 @@ +SUMMARY = "MyPaint brushes" +LICENSE = "CC0-1.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=65d3616852dbf7b1a6d4b53b00626032" + +inherit autotools allarch + +SRC_URI = "git://github.com/mypaint/mypaint-brushes.git;protocol=https;branch=v1.3.x" +SRCREV = "be9fdf9ef6c54e29c7499992f04e29114857b3fc" +PV = "1.3.0+git${SRCPV}" +S = "${WORKDIR}/git" + +FILES_${PN} += "${datadir}/mypaint-data" -- cgit v1.2.3