subtree updates

meta-security: ddf301c45c..5c2379f4bc:
  Armin Kuster (2):
        samhain: Update to 4.4.10
        layer.conf: Insert addpylib declaration

  John Edward Broadbent (1):
        libhoth_git.bb:SRCREV bump 1622e8a04..d769296220d

meta-openembedded: 0474e0b870..829dcb63f0:
  Alexander Stein (2):
        libcamera: Allow overwriting default pipelines and IPA
        libcamera: Simplify pipeline configuration

  Christophe Vu-Brugier (1):
        exfatprogs: upgrade 1.2.0 -> 1.2.1

  Denys Zagorui (2):
        bpftool: Fix externalsrc support
        bpftool: return do_configure dependency

  Joe Slater (2):
        bats: use baselib
        libgpiod: modify test 'gpioset: toggle (continuous)'

  Johannes Kauffmann (2):
        open62541: rename encryption PACKAGECONFIG
        open62541: add OpenSSL as crypto provider

  Khem Raj (52):
        gerbera: Fix build with fmt 10+
        mpd: Fix build with clang-16
        ptest-packagelists-meta-oe: Remove nodejs ptests for rv32/rv64
        libpeas: Fix reference to TMPDIR in tests
        lirc: Define SH_PATH=/bin/sh
        libwebsockets: Fix reference to TMPDIR
        mce-inject: Pass CFLAGS to make
        mcelog: Upgrade to 194
        xrdb: Pass target CPP location to configure
        mce-test: Update to latest
        mce-test: Pass CFLAGS to make
        ippool: Port to using ppp 2.5.x
        ippool: Enable systemd service on install
        libtraceevent: Delete
        meta-oe-ptests: Add mcelog to PTESTS_FAST_META_OE
        ptest-packagelists-meta-python: Add python3-pylint to PTESTS_FAST_META_PYTHON
        oscam: Upgrade to 11718
        oscam: Fix buildpaths in generated sources
        lockfile-progs: Pass DEBUG_PREFIX_MAP options
        tvheadend: Upgrade to latest master
        nbdkit: Remove buildpaths from binaries
        system-config-printer: Delete __pycache__ files
        dovecot: Upgrade to 2.3.20
        dovecot: Do not install dovecot-config
        mpv: Remove references to builddir from mpv binary
        libnice: Remove buildpaths from binaries
        curlpp: Remove references to buildpaths e.g. TMPDIR
        unbound: Remove references to buildpaths
        fftw: Check for TOOLCHAIN_OPTIONS to be non-empty before sed ops
        aom: Upgrade to 3.6.1
        aom: Pass nasm flags via toochain.cmake
        uml-utilities: Fix references to TMPDIR
        openct: Fix buildpaths being emitted into generated types.h
        babeld: Upgrade to 1.12.2
        nautilus: Fix buildpath QA errors
        minifi-cpp: Remove references to buildpaths in generated files
        freerdp: Fix reference to TMPDIR in libfreerdp2.so
        vlc: Remove WORKDIR from CONFIGURE_LINE definition
        system-config-printer: Check for gobject-introspection as well in distro features
        packagegroup-xfce-extended: Blueman also needs gobject introspection distro feature
        remmina: Fix buildpaths QA warnings
        cgdb: Fix buildpaths emitted into cgdb binary
        ibus: Point python interpreter to target location
        eog: Fix absolute src paths in generated files
        gimp: Fix buildpaths in binaries and scripts
        libgphoto2: Edit out sysroot from CC variable in configure
        tracker: Point TOP_SRCDIR to target path
        vlan: Pass CFLAGS via CCFLAGS
        sgpio: Pass CFLAGS to make
        x265: Pass --debug-prefix-map to nasm
        ipmiutil: Upgrade to 3.1.9
        ipmiutil: Pass --enable-useflags

  Marek Vasut (1):
        lvgl: lvgl-demo-fb: Switch to CMake and add DRM and SDL support

  Markus Volk (7):
        evince: edit include path for debug package
        pipewire: update 0.3.70 -> 0.3.71
        dav1d: update 1.1.0 -> 1.2.0
        gnome-control-center: update 43.2 -> 44.1
        mutter: update 43.1 -> 44.1
        gnome-shell: update 43.2 -> 44.1
        fluidsynth: update 2.2.6 -> 2.3.2

  Martin Jansa (20):
        libsquish: remove unused 0001-makefile-Add-LIBDIR.patch
        meta-python: remove unused patches from python2 recipes
        python3-pybind11: remove unused 0001-Do-not-strip-binaries.patch
        python3-anyjson: remove unused files
        monkey: remove unused patch file
        gnome-terminal: remove unused patch file
        geary: remove unused patch files
        ndpi: remove unused CVE-2021-36082.patch
        soci: remove unused soci_libdir.patch
        cyrus-sasl: remove unused patch file
        plymouth: remove unused patch file
        glibmm: remove unused remove-examples.patch
        opencv: remove unused patch file
        libiio: remove unused patch file
        libinih: remove unused patch file
        beep: remove unused linux-input.patch
        paho-mqtt-c: remove unused patch file
        tigervnc: remove unused patch file
        fbida: remove unused use-jpeg-turbo.patch
        graphviz: remove unused patch files

  Martin Siegumfeldt (1):
        libiio: update to version 0.24

  Mingli Yu (1):
        php: Link with libatomic on rv64

  Peter Bergin (6):
        redis-plus-plus: clean up recipe and make use of packageconfig
        redis-plus-plus: introduce fix for library detection
        redis-plus-plus: uprev to 1.3.8
        hiredis: uprev to 1.1.0
        hiredis: change dependency to redis
        hiredis: add ptest

  Ross Burton (38):
        libblockdev: add PACKAGECONFIG for tools
        libblockdev: clean up DEPENDS
        glade: add autoconf-archive-native DEPENDS
        python3-kivy: depend on gobject-introspection-data DISTRO_FEATURE
        vte9: add missing dependency on glib-2.0-native
        libgxim: add autoconf-archive-native DEPENDS
        gnome-common: add autoconf-archive RDEPENDS
        graphviz: no longer needs intltool-native
        libpeas: depend on gobject-introspection-data
        system-config-printer: clean up DEPENDS
        imsettings: add missing DEPENDS on autoconf-archive-native
        python3-pyatspi: make dependent on gobject-introspection-data being enabled
        gnome-menu: remove redundant dependencies
        hplip: build against libusb1
        hplip: remove redundant FILES:${PN}-dbg
        gutenprint: rewrite recipe and update
        gutenprint: match ownership on /etc/cups
        python3-pydbus-manager: remove obsolete recipe
        python3-pydbus: remove obsolete recipe
        firewalld: add features_check on gobject-introspection-data
        blueman: add features_check on gobject-introspection-data
        networkd-dispatcher: add features_check on gobject-introspection-data
        python3-asyncio-glib: add features_check on gobject-introspection-data
        eog: requires gobject-introspection-data DISTRO_FEATURE
        grilo-plugins: add PACKAGECONFIG for tracker
        packagegroup-meta-oe.bb: only build libpeas if gobject-introspection is enabled
        libpeas: requires gobject-introspection-data DISTRO_FEATURE
        gnome-desktop: gobject-introspection is not in fact mandatory
        gnome-photos: requires gobject-introspection-data DISTRO_FEATURE
        geoclue: the library doesn't need gobject-introspection
        nautilus: requires gobject-introspection-data DISTRO_FEATURE
        packagegroup-xfce-extended: only build catfish and panel-profies if G-I enabled
        python3-blivetgui: requires gobject-introspection-data DISTRO_FEATURE
        xfce4-whiskermenu-plugin: don't forcibly recommend a menu editor
        catfish: requires gobject-introspection-data DISTRO_FEATURE
        menulibre: requires gobject-introspection-data DISTRO_FEATURE
        xfce4-panel-profiles: requires gobject-introspection-data DISTRO_FEATURE
        networkmanager: add dependency on pyhthon3-pygobject-native

  Sanjay Chitroda (1):
        gnulib: Update recipe name to 2018-12-18

  Thomas Perrot (1):
        networkmanager: Turn ppp support into a packageconfig option

  Wang Mingyu (43):
        fmt: upgrade 9.1.0 -> 10.0.0
        spdlog: fix build error for master fmt
        mpd: fix build error when fmt updated
        gensio: upgrade 2.6.4 -> 2.6.5
        ctags: upgrade 6.0.20230507.0 -> 6.0.20230521.0
        libirecovery: upgrade 1.0.1 -> 1.1.0
        hidapi: upgrade 0.13.1 -> 0.14.0
        double-conversion: upgrade 3.2.1 -> 3.3.0
        adw-gtk3: upgrade 4.6 -> 4.7
        gnome-terminal: upgrade 3.48.0 -> 3.48.1
        grilo: upgrade 0.3.15 -> 0.3.16
        lldpd: upgrade 1.0.16 -> 1.0.17
        f2fs-tools: upgrade 1.15.0 -> 1.16.0
        dbus-cxx: upgrade 2.3.1 -> 2.4.0
        mailcap: upgrade 2.1.53 -> 2.1.54
        c-ares: upgrade 1.19.0 -> 1.19.1
        fetchmail: upgrade 6.4.23 -> 6.4.37
        python3-flask-restful: upgrade 0.3.9 -> 0.3.10
        python3-dominate: upgrade 2.7.0 -> 2.8.0
        python3-antlr4-runtime: upgrade 4.12.0 -> 4.13.0
        python3-coverage: upgrade 7.2.5 -> 7.2.6
        python3-imageio: upgrade 2.28.1 -> 2.29.0
        ostree: upgrade 2023.2 -> 2023.3
        python3-asgiref: upgrade 3.6.0 -> 3.7.1
        python3-can: upgrade 4.2.0 -> 4.2.1
        python3-u-msgpack-python: upgrade 2.7.2 -> 2.8.0
        python3-astroid: upgrade 2.15.4 -> 2.15.5
        python3-protobuf: upgrade 4.23.0 -> 4.23.1
        python3-pulsectl: upgrade 23.5.1 -> 23.5.2
        python3-django: upgrade 4.1.7 -> 4.2.1
        python3-google-auth: upgrade 2.18.0 -> 2.18.1
        python3-pytest-xdist: upgrade 3.3.0 -> 3.3.1
        python3-sqlalchemy: upgrade 2.0.13 -> 2.0.15
        python3-xlsxwriter: upgrade 3.1.0 -> 3.1.1
        python3-websocket-client: upgrade 1.5.1 -> 1.5.2
        zchunk: upgrade 1.3.0 -> 1.3.1
        python3-stevedore: upgrade 5.0.0 -> 5.1.0
        python3-sentry-sdk: upgrade 1.22.2 -> 1.24.0
        rdma-core: upgrade 45.0 -> 46.0
        valijson: upgrade 1.0 -> 1.0.1
        python3-tzlocal: upgrade 4.3 -> 5.0.1
        python3-xmlschema: upgrade 2.2.3 -> 2.3.0
        setxkbmap: upgrade 1.3.3 -> 1.3.4

  Xiangyu Chen (2):
        Revert "pahole: fix native package build error"
        libbpf: installing uapi headers for native package

  Zhang Xiao (1):
        dhcp-relay: dev subpackage conflicts with bind-dev

  richardhb (1):
        python3-bleak: add recipe

  ricoheller (3):
        python3-dbus-fast: add recipe
        python3-aioredis: add recipe
        mbpoll: add recipe

poky: 35e5d29a7d..76494f2b66:
  Alexander Kanavin (23):
        glib-2.0: upgrade 2.74.6 -> 2.76.2
        ppp: upgrade 2.4.9 -> 2.5.0
        ovmf: update 202211 -> 202302
        btrfs-tools: update 6.1.3 -> 6.3
        erofs-utils: update 1.5 -> 1.6
        llvm: update 15.0.7 -> 16.0.3
        perlcross: update 1.4 -> 1.4.1
        perl: update 5.36.0 -> 5.36.1
        rpm: update 4.18.0 -> 4.18.1
        less: update 608 -> 633
        librsvf: update 2.54.5 -> 2.56.0
        libva: update 2.16 -> 2.18
        cryptodev: remove unneeded patch
        gpgme: update 1.18.0 -> 1.20.0
        libatomic-ops: update 7.6.14 -> 7.8.0
        libgcrypt: update 1.10.1 -> 1.10.2
        libgpg-error: update 1.46 -> 1.47
        createrepo-c: update 0.20.1 -> 0.21.1
        elfutils: update 0.188 -> 0.189
        meson: update 1.0.1 ->1.1.0
        gdb: trim python support RDEPENDS
        gdb: enable python PACKAGECONFIG
        valgrind: update 3.20.0 -> 3.21.0

  Antonin Godard (1):
        archiver: move exclusion logic in a dedicated function

  Anuj Mittal (4):
        gsettings-desktop-schemas: upgrade 43.0 -> 44.0
        harfbuzz: upgrade 7.1.0 -> 7.3.0
        libevdev: upgrade 1.13.0 -> 1.13.1
        libsoup: upgrade 3.4.0 -> 3.4.2

  Arno Baumfalk (1):
        bitbake: fetch2/npm: evaluate PATH before patching HOME

  Bartosz Golaszewski (17):
        python3-attrs: unify RDEPENDS
        python3-attrs: don't use PYTHON_PN
        python3-attrs: add missing run-time dependencies
        python3-certifi: add missing run-time dependencies
        python3-hypothesis: fix run-time dependencies
        python3-tomli: add missing run-time dependencies
        python3-pathspec: add missing run-time dependencies
        python3-installer: add missing run-time dependencies
        python3-sphinx-rtd-theme: add missing run-time dependencies
        python3-setuptools-rust: fix RDEPENDS and allow target build
        python3-pyproject-hooks: add missing run-time dependencies
        python3-pycryptodome: don't use PYTHON_PN
        python3-pycryptodome: add missing run-time dependencies
        python3-pygobject: add missing run-time dependencies
        python3-manifest: cgitb: new package
        python3-manifest: zipapp: new package
        python3-manifest: turtle: new package

  Bergin, Peter (1):
        bitbake: lib/bb/tests/fetch.py: set initial branch

  Chen Qi (2):
        oe-buildenv-internal: remove path from previous project
        staging.bbclass: do not add extend_recipe_sysroot to prefuncs of prepare_recipe_sysroot

  Chi Xu (1):
        expect: Add ptest support

  Deepthi Hemraj (1):
        binutils: stable 2.40 branch updates

  Denys Dmytriyenko (2):
        grep: upgrade 3.10 -> 3.11
        xz: upgrade 5.4.2 -> 5.4.3

  Eero Aaltonen (1):
        avahi: fix D-Bus introspection

  Frieder Schrempf (1):
        psmisc: Set ALTERNATIVE for pstree to resolve conflict with busybox

  Geoff Parker (1):
        libwebp: add BBCLASSEXTEND

  Kai Kang (1):
        pm-utils: fix multilib conflictions

  Khem Raj (8):
        llvm: Enable RISCV support
        llvm,mesa: Drop MESA_LLVM_RELEASE
        systemd: Drop a backport
        go: Upgrade 1.20.1 -> 1.20.4
        go: Use -no-pie to build target cgo
        gcc: Upgrade to GCC 13.1 release
        bitbake.conf: Add -fcanon-prefix-map to DEBUG_PREFIX_MAP
        perf: Fix build with gcc-13

  Leon Anavi (1):
        wic: Add argument --hidden to default imager

  Lorenzo Arena (1):
        conf: add nice level to the hash config ignred variables

  Martin Jansa (11):
        kernel-devicetree: make shell scripts posix compliant
        go.bbclass: don't use test to check output from ls
        image-live.bbclass: respect IMAGE_MACHINE_SUFFIX
        binutils: package static libs from gprofng
        rpm: drop unused 0001-Rip-out-partial-support-for-unused-MD2-and-RIPEMD160.patch
        libx11: remove unused patch and FILESEXTRAPATHS
        qemu: remove unused qemu-7.0.0-glibc-2.36.patch
        minicom: remove unused patch files
        inetutils: remove unused patch files
        libgloss: remove unused patch file
        kmod: remove unused ptest.patch

  Max Krummenacher (4):
        libtraceevent: import from meta-openembedded
        libtraceevent: fix qa issue reference to tmpdir
        perf: make pkg-config available
        perf: add libtraceevent packageconfig

  Mikko Rapeli (3):
        qemurunner: support serial console login via qemu stdout
        qemurunner: avoid leaking server_socket
        qemurunner: add boot logs to do_testimage task logs in real time

  Pavel Zhukov (1):
        lib/terminal.py: Add urxvt terminal

  Peter Kjellerstedt (5):
        glib-2.0: Avoid having g_futex_simple() inadvertently modify errno
        musl: Correct SRC_URI
        xf86-video-intel: Use the HTTPS protocol to fetch the Git repositories
        bitbake: fetch2/crate: Simplify extraction of crate names and versions from URIs
        bitbake: fetch2/crate: Correct unpack for a crate that matches the recipe name

  Qiu Tingting (1):
        e2fsprogs: Fix error SRCDIR when using usrmerge DISTRO_FEATURES

  Randolph Sapp (2):
        package: enable recursion on file globs
        kernel-devicetree: recursively search for dtbs

  Randy MacLeod (1):
        vim: upgrade 9.0.1429 -> 9.0.1527

  Ranjitsinh Rathod (1):
        kmscube: Correct DEPENDS to avoid overwrite

  Richard Purdie (9):
        bitbake: cooker: Fix/improve collections handling
        bitbake: fetch2: Clarify different localpaths functions
        bitbake: fetch2/local: Add debug to include chosen path
        bitbake.conf: Empty SRC_URI for code parser cache handling
        bitbake: cooker: Add FILE_LAYERNAME variable containing the layername for a recipe
        linux-yocto: Drop 5.15 support
        lttng-tools: Add patch to fix gcc 13 test issue
        glib-2.0: Fix TMPDIR mismatch test failures
        linux-yocto: Drop 5.15 support

  Robert Joslyn (1):
        curl: Update from 8.0.1 to 8.1.0

  Ross Burton (23):
        cpio: upgrade to 2.14
        gnutls: add PACKAGECONFIG for DANE
        gnutls: add PACKAGECONFIG options for certification compression
        gnutls: use system libtasn1
        gnutls: clean up ptest compilation
        gnutls: remove use of argp-standalone for musl
        glib-networking: fix LICENSE statement
        glib-networking: add gnomeproxy PACKAGECONFIG
        glib-networking add environment variable proxy PACKAGECONFIG
        qemu: add PACKAGECONFIG for debuginfo support
        meta: depend on autoconf-archive-native, not autoconf-archive
        gobject-introspection: always DEPEND on gobject-introspection-native
        python3-pygobject: remove explicit gobject-introspection DEPENDS
        gconf: remove explicit gobject-introspection DEPENDS
        gi-docgen.bbclass: depends on gobject-introspection-data being enabled
        python3-pygobject: mandate gobject-introspection-data DISTRO_FEATURE
        gstreamer1.0-python: mandate gobject-introspection-data DISTRO_FEATURE
        python3-gitdb: remove python3-async dependency
        python3-async: remove recipe
        libcheck: add ghetto automake output
        libnl: clean up ptest
        libcomps: clean up DEPENDS
        gdbm: improve run-ptest

  Sudip Mukherjee (2):
        dhcpcd: upgrade to v10.0.1
        libxi: upgrade to v1.8.1

  Thomas Roos (2):
        oeqa: adding selftest-hello and use it to speed up tests
        oeqa/selftest/cases/devtool.py: skip all tests require folder a git repo

  Tom Hochstein (1):
        piglit: Add missing glslang dependencies

  Trevor Gamblin (2):
        python3-hatchling: upgrade 1.14.1 -> 1.17.0
        python3-trove-classifiers: upgrade 2023.4.29 -> 2023.5.2

  Wang Mingyu (1):
        iso-codes: upgrade 4.13.0 -> 4.15.0

meta-raspberrypi: 928bb234bb..9240ea91ca:
  Zachary T Welch (1):
        machines: simplify MACHINEOVERRIDES definitions

meta-arm: f9d80e1a14..5cbe3041be:
  Clément Péron (5):
        arm/lib: pass the PATH to fvp runner
        scripts/runfvp: Fix KeyError exception when there is no FVP_CONSOLE provided
        runfvp: make fvp runner to hold the config
        fvp: runner: execute fvp process in the same working directory as fvpconf
        runfvp: update filepath in fvpconf to relative path

  Jon Mason (2):
        arm-bsp/tc1: use latest kernel and u-boot
        arm-bsp/tc1: re-enable signed kernel image

  Ross Burton (2):
        arm/lib/fvp: remove redundant trailing commas
        arm-bsp/fvp-base: remove u-boot version pinning

Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: If7df9ee24ecd0b574eeb9ca799dd15d915d4ec42

3 files changed, 47 insertions, 83 deletions

diff --git a/meta-openembedded/meta-oe/recipes-printing/gutenprint/gutenprint-native_git.bb b/meta-openembedded/meta-oe/recipes-printing/gutenprint/gutenprint-native_git.bb
deleted file mode 100644
index c6e00c340a..0000000000
--- a/meta-openembedded/meta-oe/recipes-printing/gutenprint/gutenprint-native_git.bb
+++ /dev/null
@@ -1,42 +0,0 @@
-# Recipe for building gutenprint-native
-#
-# Native part is for generating strings - xmli18n-tmp.h used by target recipe
-# We don't depend on cups as this is for generating the string header.
-#
-# Copyright (c) Ambu A/S - All rights reserved
-# SPDX-License-Identifier: MIT
-#
-# Author(s)
-#   clst@ambu.com (Claus Stovgaard)
-#
-
-require gutenprint.inc
-
-# We could consider switching to BBCLASSEXTEND native instead of inherit
-# Using devtool with this results in warning, as devtool append externalsrc to
-# inheritance, making native not being inherited last.
-inherit autotools-brokensep pkgconfig native
-
-SECTION = "libs"
-
-# binutils is for xz etc.
-# gettext-native for configuration
-# flex-native is used for compilation
-# byacc-native is for yacc command (compilation)
-DEPENDS += "binutils-native gettext-native flex-native byacc-native"
-
-EXTRA_OECONF = "--without-doc --without-cups"
-
-# gutenprint does not have a configure file in its root folder.
-# Rather it has a autogen.sh in its root folder. We just use it
-do_configure() {
-    ${S}/autogen.sh || bbnote "${PN} failed to autogen.sh"
-    oe_runconf
-}
-
-# Currently we only uses the string header, even though we compile the complete
-# native version of the library. So we limit the install to the needed.
-do_install() {
-    install -d ${D}${datadir}/gutenprint/
-    install -m644 ${B}/src/xml/xmli18n-tmp.h ${D}${datadir}/gutenprint/
-}
\ No newline at end of file
diff --git a/meta-openembedded/meta-oe/recipes-printing/gutenprint/gutenprint.inc b/meta-openembedded/meta-oe/recipes-printing/gutenprint/gutenprint.inc
deleted file mode 100644
index 1f712585f7..0000000000
--- a/meta-openembedded/meta-oe/recipes-printing/gutenprint/gutenprint.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-# common part for gutenprint-native / gutenprint
-#
-# As we are using the native part for generating string header to the target
-# version, it is important they use the same version.
-# So we set the SRC_URI and SRCREV here.
-#
-# Copyright (c) Ambu A/S - All rights reserved
-# SPDX-License-Identifier: MIT
-#
-# Author(s)
-#   clst@ambu.com (Claus Stovgaard)
-#
-
-DESCRIPTION = "Gutenprint printer drivers"
-HOMEPAGE = "http://gimp-print.sourceforge.net/"
-LICENSE = "GPL-2.0-or-later"
-
-SRC_URI = "git://git.code.sf.net/p/gimp-print/source;protocol=https;branch=master"
-SRCREV = "8e47dc44dd7738302ba9e8fbc1f918461fed0236"
-S = "${WORKDIR}/git"
-
-LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
\ No newline at end of file
diff --git a/meta-openembedded/meta-oe/recipes-printing/gutenprint/gutenprint_git.bb b/meta-openembedded/meta-oe/recipes-printing/gutenprint/gutenprint_git.bb
index 7779793948..f0dc6adea0 100644
--- a/meta-openembedded/meta-oe/recipes-printing/gutenprint/gutenprint_git.bb
+++ b/meta-openembedded/meta-oe/recipes-printing/gutenprint/gutenprint_git.bb
@@ -9,38 +9,66 @@
 #   clst@ambu.com (Claus Stovgaard)
 #
 
-require gutenprint.inc
+DESCRIPTION = "Gutenprint printer drivers"
+HOMEPAGE = "http://gimp-print.sourceforge.net/"
+LICENSE = "GPL-2.0-or-later"
 
-inherit autotools-brokensep pkgconfig
+SRC_URI = "git://git.code.sf.net/p/gimp-print/source;protocol=https;branch=master"
+SRCREV = "66b0a7bc3fd25659a3f295db0ebb39d04e413c01"
+PV = "5.3.3+git${SRCPV}"
 
-DEPENDS += "cups gutenprint-native"
+S = "${WORKDIR}/git"
 
-# cups-genppdupdate depend on perl
-# We also set the path to PERL as else the version in hosttools would be used
-# with full path
-RDEPENDS:${PN} = "perl "
+LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
 
-EXTRA_OECONF = "--without-doc --disable-test --disable-nls PERL=/usr/bin/perl"
+inherit autotools gettext pkgconfig
 
-# gutenprint does not have a configure file in its root folder.
-# Rather it has a autogen.sh in its root folder. We just use it
-# together with adapting for cross compilation
-do_configure() {
+DEPENDS += "glib-2.0-native cups gutenprint-native"
+# autogen.sh needs autopoint
+DEPENDS:class-native = "glib-2.0-native gettext-native"
+
+EXTRA_OECONF = "--without-doc --disable-test PERL=/usr/bin/perl"
+EXTRA_OECONF:append:class-native = " --without-cups"
+
+do_configure:prepend:class-target() {
     # Disable the xmli18n-tmp.h rule
     # It depend on the local build extract-strings, we are not able to run this
     # So we are using the xmli18n-tmp.h created by gutenprint-native
     sed -i 's/all-local: xmli18n-tmp.h xml-stamp/all-local: xml-stamp/'  ${S}/src/xml/Makefile.am
     sed -i 's/dist-hook: xmli18n-tmp.h xml-stamp/dist-hook: xml-stamp/'  ${S}/src/xml/Makefile.am
-    cp ${RECIPE_SYSROOT_NATIVE}${datadir}/gutenprint/xmli18n-tmp.h ${S}/src/xml/
+    # Despite being a generated file, this needs to be in S.
+    cp ${STAGING_DATADIR_NATIVE}/gutenprint/xmli18n-tmp.h ${S}/src/xml/
+}
 
-    ${S}/autogen.sh || bbnote "${PN} failed to autogen.sh"
+do_configure() {
+    # Need to call autogen.sh as that creates m4/stp_release.m4
+    cd ${S}
+    NOCONFIGURE=1 ./autogen.sh
+    cd ${B}
     oe_runconf
 }
 
-# gutenprint install the calibrate.ppm and net.sf.gimp-print.usb-quirks in
-# /usr/share/cups
+do_install:append() {
+    # This file contains build paths and isn't very useful, remove it
+    rm -f ${D}${libdir}/gutenprint/*/config.summary
+    # Match ownership to cups
+    chgrp lp ${D}${sysconfdir}/cups
+}
+
+do_compile:class-native() {
+    oe_runmake -C ${B}/src/xml
+}
+
+do_install:class-native() {
+    install -d ${D}${datadir}/gutenprint/
+    install -m644 ${B}/src/xml/xmli18n-tmp.h ${D}${datadir}/gutenprint/
+}
+
 FILES:${PN} += "${datadir}/cups/*"
+RDEPENDS:${PN} = "perl"
+
+BBCLASSEXTEND = "native"
 
-# Install in /etc/cups when RPM needs DIRFILES to not conflict
-# https://stackoverflow.com/questions/44762430/why-do-i-get-etc-cups-conflicts-between-attempted-installs-in-yocto
-DIRFILES = "1"
\ No newline at end of file
+# Pull in base-passwd for the lp user
+DEPENDS:append:class-target = " base-passwd"
+PACKAGE_WRITE_DEPS += "base-passwd"