subtree updates Jan-13-2023

meta-openembedded: d04444509a..cd13881611:
  Alex Kiernan (10):
        mdns: Upgrade 1310.140.1 -> 1790.40.31
        mdns: Set MDNS_VERSIONSTR_NODTS
        mdns: Upgrade 1790.40.31 -> 1790.60.25
        ostree: Upgrade 2022.5 -> 2022.7
        ostree: Use systemd_system_unitdir for systemd units
        ostree: Switch to fuse3 which is supported in ostree now
        ostree: Fix comments for configuration/ptest
        ostree: Handle musl's ERANGE mapping
        usbguard: Remove pegtl from DEPENDS
        usbguard: Upgrade 1.1.1 -> 1.1.2

  Alex Stewart (2):
        gvfs: stylize DEPENDS
        gvfs: obviate the ssh-client requirement for gvfs

  Alexander Kanavin (5):
        frr: add a patch to correctly check presence of python from pkg-config
        lirc: correctly use PYTHONPATH
        libportal: move to oe-core
        packagegroup-meta-python: drop python3-strict-rfc3339
        nftables: fix builds with latest setuptools

  Alexander Stein (1):
        dool: Add patch to fix rebuild

  Archana Polampalli (1):
        Nodejs - Upgrade to 16.18.1

  Bartosz Golaszewski (3):
        python3-kmod: new package
        python3-watchdogdev: new package
        packagegroup-meta-python: add missing packages

  Bruce Ashfield (1):
        zfs: update to 2.1.7

  Changqing Li (5):
        linuxptp: fix do_compile error
        keyutils: fix ptest failed since "+++ Can't Determine Endianness"
        graphviz: Do not build tcl support for native
        redis: 6.2.7 -> 6.2.8
        redis: 7.0.5 -> 7.0.7

  Chen Pei (2):
        suitesparse:fix git branch in SRC_URI
        botan: upgrade 2.19.2 -> 2.19.3

  Chen Qi (4):
        xfce4-verve-plugin: fix do_configure faiure about missing libpcre
        networkmanager: fix dhcpcd PACKAGECONFIG
        networkmanager: install config files into correct place
        networkmanager: fix /etc/resolv.conf handling

  Christian Eggers (1):
        boost-url: remove recipe

  Clément Péron (3):
        navigation: bump proj to 9.1.0 library
        proj: add a packageconfig to build as a static library
        proj: avoid leaking host path in libproj

  Devendra Tewari (1):
        android-tools: Use echo instead of bbnote

  Dmitry Baryshkov (1):
        nss: fix cross-compilation error

  Erwann Roussy (3):
        python3-schedutils: add recipe
        python3-linux-procfs: add recipe
        tuna: add recipe

  Fabio Estevam (2):
        remmina: Update to 1.4.28
        crucible: Upgrade to 2022.12.06

  Geoff Parker (1):
        python3-yappi: upgrade 1.3.6 -> 1.4.0, python 3.11 compatible

  Gerbrand De Laender (1):
        python3-aioserial: new package

  Gianfranco Costamagna (2):
        vbxguestdrivers: upgrade 7.0.2 -> 7.0.4
        boinc-client: Update boinc from 7.18.1 to 7.20.4

  Gianluigi Spagnuolo (1):
        libbpf: add native and nativesdk BBCLASSEXTEND

  Hains van den Bosch (2):
        python3-twisted: Add python3-asyncio to RDEPENDS
        python3-twisted: Add python3-typing-extensions to RDEPENDS

  He Zhe (1):
        protobuf: upgrade 3.21.5 -> 3.21.10

  Jose Quaresma (1):
        lshw: bump to 42fef565

  Kai Kang (31):
        freeradius: fix multilib systemd service start failure
        wxwidgets: 3.1.5 -> 3.2.1
        python3-attrdict3: add recipe with version 2.0.2
        python3-wxgtk4: 4.1.1 -> 4.2.0
        xfce4-settings: 4.16.3 -> 4.16.5
        python3-m2crypto: fix CVE-2020-25657 and buildpaths qa issue
        fixup! wxwidgets: 3.1.5 -> 3.2.1
        postfix: fix multilib conflict of sample-main.cf
        python3-wxgtk4: replace deprecated inspect.getargspec
        libxfce4ui: 4.16.1 -> 4.18.0
        thunar-volman: 4.16.0 -> 4.18.0
        xfce4-cpufreq-plugin: 1.2.7 -> 1.2.8
        xfce4-wavelan-plugin: 0.6.2 -> 0.6.3
        xfce4-cpugraph-plugin: 1.2.6 -> 1.2.7
        xfce4-sensors-plugin: 1.4.3 -> 1.4.4
        thunar-shares-plugin: Bump GLib minimum required to 2.26
        xfce4-dev-tools: 4.16.0 -> 4.18.0
        libxfce4util: 4.16.0 -> 4.18.0
        exo: 4.16.4 -> 4.18.0
        garcon: 4.16.1 -> 4.18.0
        xfce4-panel: 4.16.3 -> 4.18.0
        thunar: 4.16.9 -> 4.18.0
        tumbler: 4.16.0 -> 4.18.0
        xfconf: 4.16.0 -> 4.18.0
        xfce4-appfinder: 4.16.1 -> 4.18.0
        xfce4-settings: 4.16.5 -> 4.18.0
        xfce4-power-manager: 4.16.0 -> 4.18.0
        xfce4-session: 4.16.0 -> 4.18.0
        xfwm4: 4.16.1 -> 4.18.0
        xfdesktop: 4.16.0 -> 4.18.0
        xorg-lib: set XORG_EXT for recipes

  Khem Raj (91):
        gnome-text-editor: Add missing libpcre build time depenedency
        ettercap: Add missing dependency on libpcre
        xcb-util-cursor: Update to 0.1.4
        lldpd: Use github release assets for SRC_URI
        aufs-util: Fix build with large file support enabled systems
        volume-key: Inherit python3targetconfig
        proj: Enable apps when building native variant
        python3-pyproj: Export PROJ_DIR
        satyr: Inherit python3targetconfig
        rest: Re-add 0.8.1
        gfbgraph: Use rest 0.8.1
        audit: Inherit python3targetconfig
        opensaf: Check for _FILE_OFFSET_BITS instead of __TIMESIZE
        flite: Add missing deps on alsa-lib and chrpath
        python3-pystemd: Regenerate .c sources using newer cython
        libreport: Inherit python3targetconfig
        uw-imap: Disable parallelism
        gnome-calendar: Upgrade to 43.1
        gnome-photos: Upgrade to 43.0
        libgweather: Remove 40.0
        waf-samba.bbclass: point PYTHON_CONFIG to target python3-config
        amtk: Add missing dep on python3-pygments-native
        fontforge: Inherit python3targetconfig
        tepl: Add missing dep on python3-pygments-native
        alsa-oss: Remove recipe
        opencv: Check for commercial_ffmpeg as well to enable ffmpeg
        opencv: Fix build with ffmpeg 5.1+
        fwts: Upgrade to 22.11.00
        minio: Disable on mips
        sip: Add recipe for 6.7.5
        imapfilter: Upgrade to 2.7.6
        perfetto: Do not pass TUNE_CCARGS to native/host compiler
        stressapptest: Upgrade to latest tip
        mariadb: Upgrade to 10.11.1
        surf: Depend on gcr3
        fatcat: Enable 64bit off_t
        stressapptest: Fix build with largefile support and musl
        nspr: Upgrade to 4.35
        cryptsetup: Upgrade to 2.6.0
        libyui,libyui-ncurses: Upgrade to 4.2.3
        inotify-tools: Fix build on musl and lfs64
        sdbus-c++-libsystemd: Upgrade to 250.9 systemd release
        xfsprogs: Upgrade to 6.0.0
        drbd,drbd-utils: Upgrade to 9.2.1 and drbd-utils to 9.22.0
        libtraceevent: Add recipe
        libtracefs: Add recipe
        trace-cmd: Remove use of off64_t and lseek64
        xfsdump: Add -D_LARGEFILE64_SOURCE on musl
        xfstests: Add -D_LARGEFILE64_SOURCE on musl
        mariadb: Alias lseek64/open64/ftruncate64 on musl systems
        gperftools: Define off64_t on musl
        android-tools: Define lseek64 = lseek on musl
        php: Add -D_LARGEFILE64_SOURCE to cflags
        spice-gtk: Use libucontext for coroutines on musl
        wxwidgets: Fix build with musl
        wxwidgets: Fix locale on musl
        wxwidgets: Set HAVE_LARGEFILE_SUPPORT
        python3-wxgtk4: Do not use GetAssertStackTrace with USE_STACKWALKER disabled
        f2fs-tools: Upgrade to 1.15.0
        trace-cmd: Pass ldflags to compiler
        parole: Define DATADIRNAME
        abseil-cpp: Replace off64_t with off_t
        vsftpd_3.0.5.bb: Define _LARGEFILE64_SOURCE on musl
        mozjs-102: Disable mozilla stackwalk on musl
        fatresize: Fix build when 64bit time_t is enabled
        boinc-client: Fix build when using 64bit time_t
        python3-grpcio: Define -D_LARGEFILE64_SOURCE only for musl
        gnome-online-accounts: Fix build race seen on musl systems
        imagemagick: Do not set ac_cv_sys_file_offset_bits
        spdlog: Do not use LFS64 functions with musl
        mongodb: Do not use off64_t on musl
        dracut: Do not undefine _FILE_OFFSET_BITS
        libcamera: Diable 64bit time_t on glibc targets
        v4l-utils: Diable 64bit time_t on glibc targets
        opensaf: Fix the check for __fsblkcnt64_t size
        libcereal,poco: Link with -latomic on ppc32 as well
        sshpass: Use SPDX identified string for GPLv2
        nftables: Upgrade to 1.0.6
        mycroft: Check for pulseaudio in distro features
        trace-cmd: Build libs before building rest
        open-vm-tools: Fix build with 64-bit time_t
        libtraceevent: Move plugins into package of its own
        trace-cmd: Upgrade to 3.1.5
        luajit: Update to latest on v2.1 branch
        concurrencykit: Update to 0.7.0
        concurrencykit: Set correct PLAT value for riscv32
        concurrencykit: Fix build on riscv32 and riscv64
        sysbench: Enable only on architectures supporting LuaJIT
        packagegroup-meta-oe: Ensure sysbench is included in limited arches
        hwloc: Update to 2.9.0
        fluentbit: Link with libatomic on ppc32

  Lei Maohui (1):
        polkit: Fix multilib builds

  Leon Anavi (9):
        python3-watchdog: Upgrade 2.2.0 -> 2.2.1
        python3-zeroconf: Upgrade 0.39.4 -> 0.47.1
        python3-croniter: Upgrade 1.3.7 -> 1.3.8
        python3-coverage: Upgrade 7.0.1 -> 7.0.3
        python3-prompt-toolkit: Upgrade 3.0.31 -> 3.0.36
        python3-simplejson: Upgrade 3.18.0 -> 3.18.1
        python3-termcolor: Upgrade 2.1.1 -> 2.2.0
        python3-cantools: Upgrade 37.2.0 -> 38.0.0
        python3-marshmallow: Upgrade 3.18.0 -> 3.19.0

  Livin Sunny (1):
        libwebsockets: add ipv6 in PACKAGECONFIG

  Markus Volk (88):
        blueman: add RDEPEND on python3-fcntl
        hwdata: add patch to use sysroot prefix for pkgdatadir
        pipewire: upgrade 0.3.59 -> 0.3.60
        spirv-cross: upgrade; fix build
        blueman: upgrade 2.34 -> 2.35
        pipewire: upgrade 0.3.60 -> 0.3.61
        iwd: upgrade 1.30 -> 2.0
        libgdata: use gcr3
        libgweather: update 4.0.0 -> 4.2.0
        gnome-online-accounts: use gcr3
        geary: build with gcr3
        gnome-keyring: use gcr3
        evolution-data-server: update 3.44.2 -> 3.46.1
        gnome-settings-daemon: update 42.1 -> 43.0
        libnma: update 1.8.38 -> 1.10.4
        geocode-glib: build with libsoup-3.0
        gjs: update 1.72.2 -> 1.75.1
        gnome-shell: update 42.0 -> 43.1
        mutter: update 42.0 -> 43.1
        polkit: add recipe for v122
        mozjs: update 98 -> 102
        appstream-glib: update 0.7.18 -> 0.8.2
        gthumb: build with libsoup-3
        amtk: update 5.3.1 -> 5.6.1
        gedit: update 42.2 -> 43.2
        evolution-data-server: remove libgdata dependency
        tepl: update 6.0.0 -> 6.2.0
        perfetto: pass TUNE_CCARGS to use machine tune
        gnome-photos: update dependencies
        thunar-archive-plugin: update 0.4.0 -> 0.5.0
        libadwaita: remove deprecated sassc-native dependency
        gnome-shell: remove deprecated sassc-native dependency
        spice-gtk: add missing license information
        pipewire: update 0.3.61 -> 0.3.62
        gdm: update 42.0 -> 43.0
        gnome-session: update 42.0 -> 43-0
        geoclue: update to latest commit to allow to build with libsoup-3.0
        gvfs: fix polkit homedir
        editorconfig: add recipe
        tracker: update 3.4.1 -> 3.4.2
        gvfs: fix dependencies
        gnome-calculator: update 42.2 -> 43.0.1
        tracker-miners: update 3.4.1 -> 3.4.2
        gnome-photos: add missing runtime dependency on tracker-miners
        gtksourceview5: update 5.4.2 -> 5.6.1
        remmina: build with libsoup-3.0
        ostree: replace libsoup-2.4 by curl
        gnome-text-editor: update 42.2 -> 43.1
        gtk4: remove recipe
        libxmlb: allow to build native
        pipewire: update 0.3.62 -> 0.3.63
        gnome-shell-extensions: update SRC_URI and remove sassc-native dep
        grilo: update 0.3.14 -> 0.3.15
        libstemmer: move recipe to meta-oe
        xdg-desktop-portal: add recipe
        bubblewrap: import recipe from meta-security
        gnome-software: add recipe
        basu: import recipe from meta-wayland
        xdg-desktop-portal-wlr: add recipe
        appstream: add recipe
        flatpak: add recipe
        flatpak-xdg-utils: add recipe
        flatpak: add runtime dependency on flatpak-xdg-utils
        wireplumber: update 0.4.12 -> 0.4.13
        wireplumber: build with dbus support by default
        xdg-desktop-portal-gnome: add recipe
        libcloudproviders: add recipe
        evince: update 42.3 -> 43.1
        libportal: build libportal-gtk4 and vala support
        nautilus: update 42.2 -> 43.1
        gnome-desktop: update 42.0 -> 43
        file-roller: update 3.42.0 -> 43.0
        wireplumber: dont start systemd system service by default
        gnome-bluetooth: update 42.4 -> 42.5
        gnome-flashback: update 3.44.0 -> 3.46.0
        libwnck3: update 40.1 -> 43.0
        gnome-panel: update 3.44.0 -> 3.47.1
        gnome-terminal: update 3.42.2 -> 3.46.7
        dconf-editor: update 3.38.3 -> 43.0
        gnome-shell: add missing RDEPENDS
        gnome-control-center: update 42.0 -> 43.2
        gnome-shell: add runtime dependency on adwaita-icon-theme
        xdg-desktop-portal-gtk: add recipe
        thunar: add tumbler to RRECOMMENDS
        gnome:terminal add missing inherit meson
        gnome-disk-utility: update 42.0 -> 43.0
        eog: add recipe
        libdecor: import recipe

  Martin Jansa (3):
        nss: fix SRC_URI
        geoclue: fix polkit files only with modem-gps PACKAGECONFIG
        layer.conf: update LAYERSERIES_COMPAT for mickledore

  Mathieu Dubois-Briand (2):
        nss: Add missing CVE product
        nss: Whitelist CVEs related to libnssdbm

  Matthias Klein (1):
        paho-mqtt-c: upgrade 1.3.11 -> 1.3.12

  Max Krummenacher (1):
        opencv: follow changed name license_flags_accepted

  Mingli Yu (25):
        gnome-calculator: add opengl to REQUIRED_DISTRO_FEATURES
        waylandpp: add opengl to REQUIRED_DISTRO_FEATURES
        libnma: add opengl to REQUIRED_DISTRO_FEATURES
        network-manager-applet: add opengl to REQUIRED_DISTRO_FEATURES
        gssdp: check opengl is enabled or not
        gtksourceview5: add opengl to REQUIRED_DISTRO_FEATURES
        gnome-font-viewer: add opengl to REQUIRED_DISTRO_FEATURES
        libxfce4ui: check opengl DISTRO_FEATURES
        gnome-desktop: add opengl to REQUIRED_DISTRO_FEATURES
        ibus: add opengl related check
        nautilus: add opengl to REQUIRED_DISTRO_FEATURES
        gnome-bluetooth: add opengl to REQUIRED_DISTRO_FEATURES
        evince: add opengl to REQUIRED_DISTRO_FEATURES
        gnome-calendar: add opengl to REQUIRED_DISTRO_FEATURES
        xf86-video-amdgpu: add opengl to REQUIRED_DISTRO_FEATURES
        spice-gtk: add opengl to REQUIRED_DISTRO_FEATURES
        grail: add opengl to REQUIRED_DISTRO_FEATURES
        frame: add opengl to REQUIRED_DISTRO_FEATURES
        geis: add opengl to REQUIRED_DISTRO_FEATURES
        evolution-data-server: add opengl to REQUIRED_DISTRO_FEATURES
        libgweather4: add opengl to REQUIRED_DISTRO_FEATURES
        geary: add opengl to REQUIRED_DISTRO_FEATURES
        file-roller: add opengl to REQUIRED_DISTRO_FEATURES
        gnome-photos: add opengl to REQUIRED_DISTRO_FEATURES
        xdg-desktop-portal-wlr: add opengl to REQUIRED_DISTRO_FEATURES

  Naveen Saini (3):
        opencl-headers: add native and nativesdk
        tcsh: add native nativesdk BBCLASSEXTEND
        tbb: upgrade 2021.5.0 -> 2021.7.0

  Omkar Patil (1):
        ntfs-3g-ntfsprogs: Upgrade 2022.5.17 to 2022.10.3

  Ovidiu Panait (1):
        multipath-tools: upgrade 0.8.4 -> 0.9.3

  Peter Bergin (1):
        sysbench: Upgrade 0.4.12 -> 1.0.20

  Peter Kjellerstedt (4):
        chrony: Make it possible to enable editline support again
        chrony: Remove the libcap and nss PACKAGECONFIGs
        Revert "lldpd: Use github release assets for SRC_URI"
        lldpd: Correct the checksum for the tar ball to match 1.0.16

  Preeti Sachan (1):
        fluidsynth: update SRC_URI to remove non-existing 2.2.x branch

  Roger Knecht (1):
        python3-rapidjson: add recipe

  Sakib Sajal (1):
        minio: fix license information

  Samuli Piippo (1):
        protobuf: stage protoc binary to sysroot

  Tim Orling (4):
        libio-pty-perl: upgrade 1.16 -> 1.17; enable ptest
        libmozilla-ca-perl: add recipe for 20221114
        libio-socket-ssl-perl: upgrade 2.075 -> 2.076
        libtest-warnings-perl: move to oe-core

  Tomasz Żyjewski (2):
        python3-binwalk: add recipe for version 2.3.3
        python3-uefi-firmware: add recipe for version 1.9

  Wang Mingyu (190):
        byacc: upgrade 20220128 -> 20221106
        libforms: upgrade 1.2.4 -> 1.2.5pre1
        libnftnl: upgrade 1.2.3 -> 1.2.4
        mpich: upgrade 4.0.2 -> 4.0.3
        python3-u-msgpack-python: upgrade 2.7.1 -> 2.7.2
        python3-aiosignal: upgrade 1.2.0 -> 1.3.1
        python3-eth-hash: upgrade 0.5.0 -> 0.5.1
        python3-frozenlist: upgrade 1.3.1 -> 1.3.3
        python3-google-auth: upgrade 2.14.0 -> 2.14.1
        python3-greenlet: upgrade 2.0.0 -> 2.0.1
        python3-imageio: upgrade 2.22.3 -> 2.22.4
        python3-pycocotools: upgrade 2.0.5 -> 2.0.6
        babl: upgrade 0.1.96 -> 0.1.98
        ctags: upgrade 5.9.20221106.0 -> 5.9.20221113.0
        gegl: upgrade 0.4.38 -> 0.4.40
        freerdp: upgrade 2.8.1 -> 2.9.0
        glibmm-2.68: upgrade 2.72.1 -> 2.74.0
        googlebenchmark: upgrade 1.7.0 -> 1.7.1
        gnome-backgrounds: upgrade 42.0 -> 43
        nano: upgrade 6.4 -> 7.0
        networkmanager-openvpn: upgrade 1.10.0 -> 1.10.2
        python3-django: upgrade 4.1 -> 4.1.3
        python3-flask-migrate: upgrade 3.1.0 -> 4.0.0
        python3-eth-utils: upgrade 2.0.0 -> 2.1.0
        python3-eventlet: upgrade 0.33.1 -> 0.33.2
        python3-googleapis-common-protos: upgrade 1.56.4 -> 1.57.0
        python3-google-api-python-client: upgrade 2.65.0 -> 2.66.0
        python3-pymongo: upgrade 4.3.2 -> 4.3.3
        lldpd: upgrade 1.0.15 -> 1.0.16
        audit: upgrade 3.0.8 -> 3.0.9
        ccid: upgrade 1.5.0 -> 1.5.1
        colord: upgrade 1.4.5 -> 1.4.6
        ctags: upgrade 5.9.20221113.0 -> 5.9.20221120.0
        flatbuffers: upgrade 22.10.26 -> 22.11.23
        libglvnd: upgrade 1.5.0 -> 1.6.0
        gensio: upgrade 2.5.2 -> 2.6.1
        mg: upgrade 20220614 -> 20221112
        nbdkit: upgrade 1.33.2 -> 1.33.3
        xfstests: upgrade 2022.10.30 -> 2022.11.06
        pcsc-lite: upgrade 1.9.8 -> 1.9.9
        python3-matplotlib-inline: upgrade 0.1.2 -> 0.1.6
        python3-astroid: upgrade 2.12.12 -> 2.12.13
        python3-asyncinotify: upgrade 2.0.5 -> 2.0.8
        python3-charset-normalizer: upgrade 3.0.0 -> 3.0.1
        python3-dateparser: upgrade 1.1.0 -> 1.1.4
        python3-can: upgrade 4.0.0 -> 4.1.0
        python3-flask-socketio: upgrade 5.3.1 -> 5.3.2
        python3-ipython: upgrade 8.2.0 -> 8.6.0
        python3-langtable: upgrade 0.0.60 -> 0.0.61
        python3-jedi: upgrade 0.18.1 -> 0.18.2
        python3-grpcio-tools: upgrade 1.50.0 -> 1.51.0
        python3-grpcio: upgrade 1.50.0 -> 1.51.0
        python3-networkx: upgrade 2.8.7 -> 2.8.8
        python3-pyatspi: upgrade 2.38.2 -> 2.46.0
        python3-pandas: upgrade 1.5.1 -> 1.5.2
        python3-pybind11-json: upgrade 0.2.11 -> 0.2.13
        python3-pychromecast: upgrade 12.1.4 -> 13.0.1
        python3-pycodestyle: upgrade 2.9.1 -> 2.10.0
        xterm: upgrade 373 -> 377
        smarty: upgrade 4.2.1 -> 4.3.0
        spdlog: upgrade 1.10.0 -> 1.11.0
        python3-pyperf: upgrade 2.4.1 -> 2.5.0
        python3-pyflakes: upgrade 2.5.0 -> 3.0.1
        python3-pymisp: upgrade 2.4.157 -> 2.4.165.1
        capnproto: upgrade 0.10.2 -> 0.10.3
        libass: upgrade 0.16.0 -> 0.17.0
        ctags: upgrade 5.9.20221120.0 -> 5.9.20221127.0
        libio-socket-ssl-perl: upgrade 2.076 -> 2.077
        python3-grpcio-tools: upgrade 1.51.0 -> 1.51.1
        python3-asyncinotify: upgrade 2.0.8 -> 3.0.1
        python3-grpcio: upgrade 1.51.0 -> 1.51.1
        opensc: upgrade 0.22.0 -> 0.23.0
        python3-ipython: upgrade 8.6.0 -> 8.7.0
        ply: upgrade 2.2.0 -> 2.3.0
        python3-apt: upgrade 2.3.0 -> 2.5.0
        poppler: upgrade 22.11.0 -> 22.12.0
        python3-asttokens: upgrade 2.1.0 -> 2.2.0
        python3-cbor2: upgrade 5.4.3 -> 5.4.5
        python3-geomet: upgrade 0.3.0 -> 1.0.0
        python3-google-api-core: upgrade 2.10.2 -> 2.11.0
        python3-google-api-python-client: upgrade 2.66.0 -> 2.68.0
        python3-path: upgrade 16.5.0 -> 16.6.0
        python3-google-auth: upgrade 2.14.1 -> 2.15.0
        zabbix: upgrade 6.2.4 -> 6.2.5
        xmlsec1: upgrade 1.2.36 -> 1.2.37
        smcroute: upgrade 2.5.5 -> 2.5.6
        python3-protobuf: upgrade 4.21.9 -> 4.21.10
        python3-traitlets: upgrade 5.5.0 -> 5.6.0
        python3-twine: upgrade 4.0.1 -> 4.0.2
        python3-web3: upgrade 5.31.1 -> 5.31.2
        python3-ujson: upgrade 5.5.0 -> 5.6.0
        ctags: upgrade 5.9.20221127.0 -> 5.9.20221204.0
        dnsmasq: upgrade 2.87 -> 2.88
        flatbuffers: upgrade 22.11.23 -> 22.12.06
        nbdkit: upgrade 1.33.3 -> 1.33.4
        hwdata: upgrade 0.364 -> 0.365
        evolution-data-server: update 3.46.1 -> 3.46.2
        xfstests: upgrade 2022.11.06 -> 2022.11.27
        python3-protobuf: upgrade 4.21.10 -> 4.21.11
        python3-traitlets: upgrade 5.6.0 -> 5.7.0
        python3-redis: upgrade 4.3.5 -> 4.4.0
        python3-web3: upgrade 5.31.2 -> 5.31.3
        python3-asttokens: upgrade 2.2.0 -> 2.2.1
        python3-cbor2: upgrade 5.4.5 -> 5.4.6
        python3-google-api-python-client: upgrade 2.68.0 -> 2.69.0
        python3-gmpy2: upgrade 2.1.2 -> 2.1.3
        python3-multidict: upgrade 6.0.2 -> 6.0.3
        python3-watchdog: upgrade 2.1.9 -> 2.2.0
        python3-pychromecast: upgrade 13.0.1 -> 13.0.2
        python3-pymisp: upgrade 2.4.165.1 -> 2.4.166
        python3-pytest-xdist: upgrade 3.0.2 -> 3.1.0
        python3-yarl: upgrade 1.8.1 -> 1.8.2
        zabbix: upgrade 6.2.5 -> 6.2.6
        python3-yamlloader: upgrade 1.1.0 -> 1.2.2
        tio: upgrade 2.3 -> 2.4
        ctags: upgrade 5.9.20221204.0 -> 6.0.20221218.0
        dash: upgrade 0.5.11.5 -> 0.5.12
        nanopb: upgrade 0.4.6.4 -> 0.4.7
        libio-socket-ssl-perl: upgrade 2.077 -> 2.078
        libfile-slurper-perl: upgrade 0.013 -> 0.014
        protobuf: upgrade 3.21.10 -> 3.21.12
        python3-alembic: upgrade 1.8.1 -> 1.9.0
        nano: upgrade 7.0 -> 7.1
        python3-gmpy2: upgrade 2.1.3 -> 2.1.5
        python3-eth-account: upgrade 0.7.0 -> 0.8.0
        python3-google-api-python-client: upgrade 2.69.0 -> 2.70.0
        python3-protobuf: upgrade 4.21.11 -> 4.21.12
        python3-pycares: upgrade 4.2.2 -> 4.3.0
        python3-pycurl: upgrade 7.45.1 -> 7.45.2
        python3-pychromecast: upgrade 13.0.2 -> 13.0.4
        python3-pyproj: upgrade 3.4.0 -> 3.4.1
        python3-pydicti: upgrade 1.1.6 -> 1.2.0
        python3-sentry-sdk: upgrade 1.11.1 -> 1.12.0
        python3-traitlets: upgrade 5.7.0 -> 5.7.1
        tio: upgrade 2.4 -> 2.5
        python3-sqlalchemy: upgrade 1.4.44 -> 1.4.45
        xfsdump: upgrade 3.1.11 -> 3.1.12
        python3-isort: upgrade 5.10.1 -> 5.11.3
        xfstests: upgrade 2022.11.27 -> 2022.12.11
        ctags: upgrade 6.0.20221218.0 -> 6.0.20221225.0
        gst-editing-services: upgrade 1.20.4 -> 1.20.5
        logcheck: upgrade 1.3.24 -> 1.4.0
        memtester: upgrade 4.5.1 -> 4.6.0
        libmime-types-perl: upgrade 2.22 -> 2.23
        metacity: upgrade 3.46.0 -> 3.46.1
        python3-alembic: upgrade 1.9.0 -> 1.9.1
        xfstests: upgrade 2022.12.11 -> 2022.12.18
        python3-cytoolz: upgrade 0.12.0 -> 0.12.1
        python3-asgiref: upgrade 3.5.2 -> 3.6.0
        python3-autobahn: upgrade 22.7.1 -> 22.12.1
        python3-coverage: upgrade 6.5.0 -> 7.0.1
        python3-bitarray: upgrade 2.6.0 -> 2.6.1
        python3-imageio: upgrade 2.22.4 -> 2.23.0
        python3-isort: upgrade 5.11.3 -> 5.11.4
        python3-multidict: upgrade 6.0.3 -> 6.0.4
        python3-traitlets: upgrade 5.7.1 -> 5.8.0
        python3-pymisp: upgrade 2.4.166 -> 2.4.167
        python3-sentry-sdk: upgrade 1.12.0 -> 1.12.1
        python3-supervisor: upgrade 4.2.4 -> 4.2.5
        wolfssl: upgrade 5.5.3 -> 5.5.4
        remmina: upgrade 1.4.28 -> 1.4.29
        ser2net: upgrade 4.3.10 -> 4.3.11
        tesseract: upgrade 5.2.0 -> 5.3.0
        network-manager-applet: upgrade 1.26.0 -> 1.30.0
        byacc: upgrade 20221106 -> 20221229
        ctags: upgrade 6.0.20221225.0 -> 6.0.20230101.0
        flashrom: upgrade 1.2 -> 1.2.1
        fontforge: upgrade 20220308 -> 20230101
        hunspell: upgrade 1.7.1 -> 1.7.2
        libmime-types-perl: upgrade 2.23 -> 2.24
        libnet-dns-perl: upgrade 1.35 -> 1.36
        tepl: upgrade 6.2.0 -> 6.4.0
        tcpdump: upgrade 4.99.1 -> 4.99.2
        traceroute: upgrade 2.1.0 -> 2.1.1
        openwsman: upgrade 2.7.1 -> 2.7.2
        pcsc-tools: upgrade 1.6.0 -> 1.6.1
        poppler: upgrade 22.12.0 -> 23.01.0
        rsnapshot: upgrade 1.4.4 -> 1.4.5
        tree: upgrade 2.0.4 -> 2.1.0
        python3-bidict: upgrade 0.22.0 -> 0.22.1
        python3-bitarray: upgrade 2.6.1 -> 2.6.2
        python3-dateparser: upgrade 1.1.4 -> 1.1.5
        python3-lz4: upgrade 4.0.2 -> 4.3.2
        python3-mock: upgrade 4.0.3 -> 5.0.0
        python3-pillow: upgrade 9.3.0 -> 9.4.0
        python3-pydantic: upgrade 1.10.2 -> 1.10.4
        python3-pyephem: upgrade 4.1.3 -> 4.1.4
        python3-xlsxwriter: upgrade 3.0.3 -> 3.0.5
        python3-xxhash: upgrade 3.1.0 -> 3.2.0
        dnf-plugins/rpm.py: Fix grammar when RPM_PREFER_ELF_ARCH doesn't exit.

  Xiangyu Chen (1):
        lldpd: add ptest for lldpd package

  Yi Zhao (13):
        libpwquality: set correct pam plugin directory
        ostree: add runtime dependency bubblewrap for PACKAGECONFIG[selinux]
        ostree: fix selinux policy rebuild error on first deployment
        frr: upgrade 8.3.1 -> 8.4.1
        open-vm-tools: upgrade 12.1.0 -> 12.1.5
        libtdb: upgrade 1.4.3 -> 1.4.7
        libldb: upgrade 2.3.4 -> 2.6.1
        libtalloc: upgrade 2.3.3 -> 2.3.4
        libtevent: upgrade 0.10.2 -> 0.13.0
        samba upgrade 4.14.14 -> 4.17.4
        krb5: upgrade 1.17.2 -> 1.20.1
        grubby: update to latest git rev
        grubby: drop version 8.40

  Zheng Qiu (1):
        python3-inotify: add ptest

  persianpros (1):
        samba: Remove samba related PYTHONHASHSEED patches and use export function

  zhengrq.fnst@fujitsu.com (15):
        python3-pymodbus: upgrade 3.0.0 -> 3.0.2
        python3-pywbemtools: upgrade 1.0.1 -> 1.1.0
        python3-stevedore: upgrade 4.1.0 -> 4.1.1
        ser2net: upgrade 4.3.9 -> 4.3.10
        yelp-tools: upgrade 42.0 -> 42.1
        python3-python-vlc: upgrade 3.0.16120 -> 3.0.18121
        python3-sqlalchemy: upgrade 1.4.43 -> 1.4.44
        python3-zopeinterface: upgrade 5.5.1 -> 5.5.2
        python3-simplejson: upgrade 3.17.6 -> 3.18.0
        python3-pywbemtools: upgrade 1.0.1 -> 1.1.1
        python3-redis: upgrade 4.3.4 -> 4.3.5
        python3-texttable: upgrade 1.6.4 -> 1.6.7
        python3-sentry-sdk: upgrade 1.9.10 -> 1.11.1
        python3-twitter: upgrade 4.10.1 -> 4.12.1
        python3-termcolor: upgrade 2.1.0 -> 2.1.1

meta-security: 2aa48e6f4e..f991b20f56:
  Alex Kiernan (1):
        bubblewrap: Update 0.6.2 -> 0.7.0

  Armin Kuster (2):
        python3-privacyidea: update to 2.7.4
        chipsec: update to 1.9.1

  Michael Haener (1):
        tpm2-tools: update to 5.3

meta-arm: d5f132b199..5c42f084f7:
  Adam Johnston (1):
        arm/trusted-services: Fix 'no such file' when building libts

  Adrian Herrera (2):
        atp: decouple m5readfile from m5ops
        atp: move m5readfile to meta-gem5

  Adrián Herrera Arcila (5):
        atp: fix failing test_readme
        gem5: support for EXTRAS
        atp: separate recipe for gem5 models
        atp: fix machine overrides in recipes
        ci: add meta-atp to check-layers

  David Bagonyi (1):
        meta-arm-toolchain: Drop calls to datastore finalize

  Diego Sueiro (2):
        arm/classes: Introduce apply_local_src_patches bbclass
        arm/trusted-firmware-m: Fix local source patches application

  Emekcan (1):
        arm/fvp: Upgrade Corstone1000 FVP

  Emekcan Aras (6):
        arm-bsp/documentation: corstone1000: update the user guide
        arm/optee: Move optee-3.18 patches
        arm/optee: support optee 3.19
        arm-bsp/optee-os: Adds 3.19 bbappend
        arm-bsp/optee-os: N1SDP support for optee-os 3.19
        arm/qemuarm-secureboot: pin optee-os version

  Jon Mason (5):
        arm-bsp/trusted-services: rename bbappends with git version
        arm/trusted-services: limit the ts compatible machines
        arm-bsp/trusted-services: add n1sdp support
        arm/trusted-firmware-m: update to 1.6.1
        CI: define DEFAULT_TAG and CPU_REQUEST

  Khem Raj (1):
        gn: Replace lfs64 functions with original counterparts

  Mohamed Omar Asaker (5):
        arm-bsp/trusted-services: corstone1000: Use the stateless platform service calls
        arm-bsp/trusted-firmware-m: Bump TFM to v1.7
        arm-bsp/trusted-firmware-m: corstone1000: TFM 1.7
        arm-bsp/musca_b1: Edit the platform name
        arm-bsp/trusted-firmware-m: Remove TF-M 1.6 recipe

  Peter Hoyes (3):
        arm/fvp: Backport shlex.join from Python 3.8
        arm/fvpboot: Disable timing annotation by default
        arm/classes: Ensure patch files are sorted in apply_local_src_patches

  Robbie Cao (1):
        arm/fvp-base-r-aem: upgrade to version 11.20.15

  Ross Burton (17):
        CI: revert a meta-clang change which breaks pixman (thus, xserver)
        CI: add variables needed for k8s runners
        CI: add tags to all jobs
        CI: no need to install telnet
        CI: fix builds with clang
        CI: use the .setup fragment in machine-coverage
        arm/fvp-base-a-aem: upgrade to 11.20.15
        arm-bsp/edk2-firmware: allow clang builds on juno
        ci/get-binary-toolchains: rewrite, slightly
        arm-bsp/documentation: update fvp-base documentation to use runfvp
        CI: use qemuarm64 for pending-updates report job
        meta-atp: remove
        meta-gem5: remove
        arm/fvp-envelope: name the FVP tarballs for checksums
        arm/fvp-envelope: update HOMEPAGE
        arm/fvp-base-a-aem: add support for aarch64 binaries
        CI: don't pin fvp-base jobs to x86-64

poky: 44bb88cc86..0ce159991d:
  Alejandro Hernandez Samaniego (6):
        baremetal-image: Avoid overriding qemu variables from IMAGE_CLASSES
        rust: Enable building rust from stable, beta and nightly channels
        rust: Enable baremetal targets
        baremetal-helloworld: Enable x86 and x86-64 ports
        baremetal-helloworld: Move from skeleton to recipes-extended matching what rust-hello-world is doing
        oe-selftest: Add baremetal toolchain test

  Alex Kiernan (20):
        rust: Install target.json for target rustc
        rust: update 1.65.0 -> 1.66.0
        oeqa/runtime/rust: Add basic compile/run test
        libstd-rs: Merge .inc into .bb
        libstd-rs: Move source directory to library/test
        rust-llvm: Merge .inc into .bb
        rust-llvm: Update LLVM_VERSION to match embedded version
        packagegroup-rust-sdk-target: Add Rust SDK target packagegroup
        packagegroup-core-sdk: Add SDK toolchain language selection support
        rust: Merge .inc into .bb
        rust: Move musl-x86 fix for `__stack_chk_fail_local` to rust-source
        cargo: Merge .inc into .bb
        cargo: Extend DEBUG_PREFIX_MAP to cover vendor
        cargo: Include crossbeam-utils patch
        cargo: Drop exclude from world
        packagegroup-rust-sdk-target: Add cargo
        oeqa/runtime/rust: Add cargo test
        classes: image: Set empty weak default IMAGE_LINGUAS
        default-distrovars: Include "c" in IMAGE_LINGUAS for glibc
        rust: Merge all rustc-source patches into rust-source.inc

  Alex Stewart (2):
        lsof: add update-alternatives logic
        opkg: upgrade to version 0.6.1

  Alexander Kanavin (155):
        elfutils: update 0.187 -> 0.188
        rsync: update 3.2.5 -> 3.2.7
        swig: update 4.0.2 -> 4.1.0
        tcl: update 8.6.11 -> 8.6.12
        quota: update 4.06 -> 4.09
        shadow: update 4.12.3 -> 4.13
        texinfo: update 6.8 -> 7.0
        libhandy: update 1.6.3 -> 1.8.0
        xf86-input-mouse: update 1.9.3 -> 1.9.4
        flac: update 1.4.0 -> 1.4.2
        icu: update 71.1 -> 72-1
        libgpg-error: update 1.45 -> 1.46
        popt: update 1.18 -> 1.19
        vte: update 0.68.0 -> 0.70.1
        webkitgtk: update 2.36.7 -> 2.38.2
        man-db: update 2.10.2 -> 2.11.1
        gawk: update 5.1.1 -> 5.2.1
        unfs: update 0.9.22 -> 0.10.0
        qemu-helper: depend on unfs3 and pseudo directly
        runqemu: do not hardcode the ip address of the nfs server when using tap
        selftest/runqemu: reenable the nfs rootfs test
        glibc-tests: correctly pull in the actual tests when installing -ptest package
        python3: fix tests on x86 (32 bit)
        ptest-packagelists.inc: do not run valgrind ptests on 32 bit x86
        python3: use the standard shell version of python3-config
        python3targetconfig.bbclass: use PYTHONPATH to point to the target config
        bitbake: fetch2/wget.py: correctly match versioned directories
        devtool/upgrade: correctly handle recipes where S is a subdir of upstream tree
        python3-numpy: fix upstream version check
        python3-poetry-core: update 1.3.2 -> 1.4.0
        tcl: update 8.6.12 -> 8.6.13
        libnewt: update 0.52.21 -> 0.52.23
        libxdmcp: update 1.1.3 -> 1.1.4
        libxpm: update 3.5.13 -> 3.5.14
        libxrandr: update 1.5.2 -> 1.5.3
        bluez: update 5.65 -> 5.66
        libxcrypt: update PV to match SRCREV
        python3-dbusmock: update 0.28.4 -> 0.28.6
        ruby: merge .inc into .bb
        ruby: update 3.1.2 -> 3.1.3
        ghostscript: update 9.56.1 -> 10.0.0
        tzdata: update 2022d -> 2022g
        systemtap: upgrade 4.7 -> 4.8
        gnupg: upgrade 2.3.7 -> 2.3.8
        ptest-packagelists.inc: correctly assign fast and slow tests
        ovmf: update edk2-stable202208 -> edk2-stable202211
        llvm: update 15.0.4 -> 15.0.6
        tcmode-default.inc: set LLVMVERSION to a major version wildcard
        cmake: update 3.24.2 -> 3.25.1
        python3-native: further tweak to sysconfig.py to find python includes correctly
        libslirp: add recipe to continue slirp support in qemu
        qemu: update 7.1.0 -> 7.2.0
        systemd: update 251.8 -> 252.4
        dpkg: update 1.21.9 -> 1.21.13
        python3-installer: update 0.5.1 -> 0.6.0
        python3: update 3.11.0 -> 3.11.1
        weston: update 11.0.0 -> 11.0.1
        xhost: update 1.0.8 -> 1.0.9
        xinit: update 1.4.1 -> 1.4.2
        xkbcomp: update 1.4.5 -> 1.4.6
        xprop: update 1.2.5 -> 1.2.6
        xset: update 1.2.4 -> 1.2.5
        xvinfo: update 1.1.4 -> 1.1.5
        xf86-video-vesa: update 2.5.0 -> 2.6.0
        libice: update 1.0.10 -> 1.1.1
        libxcomposite: update 0.4.5 -> 0.4.6
        libxdamage: update 1.1.5 -> 1.1.6
        libxres: update 1.2.1 -> 1.2.2
        libxscrnsaver: update 1.2.3 -> 1.2.4
        libxv: update 1.0.11 -> 1.0.12
        jquery: upgrade 3.6.1 -> 3.6.2
        libmodule-build-perl: update 0.4231 -> 0.4232
        python3-chardet: upgrade 5.0.0 -> 5.1.0
        libarchive: upgrade 3.6.1 -> 3.6.2
        stress-ng: upgrade 0.15.00 -> 0.15.01
        vulkan: upgrade 1.3.231.1 -> 1.3.236.0
        Revert "python3-native: further tweak to sysconfig.py to find python includes correctly"
        conf/machine/include: add x86-64-v3 tunes (AVX, AVX2, BMI1, BMI2, F16C, FMA, LZCNT, MOVBE, XSAVE)
        go: update 1.19.3 -> 1.19.4
        vulkan-samples: update to latest revision
        boost-build-native: update 1.80.0 -> 1.81.0
        qemu: disable sporadically failing test-io-channel-command
        devtool: process local files only for the main branch
        libportal: add from meta-openembedded/meta-gnome
        libportal: convert from gtk-doc to gi-docgen
        epiphany: update 42.4 -> 43.0
        qemux86-64: build for x86-64-v3 (2013 Haswell and later) rather than Core 2 from 2006
        valgrind: disable tests that started failing after switching to x86-64-v3 target
        glib-2.0: upgrade 2.74.3 -> 2.74.4
        jquery: upgrade 3.6.2 -> 3.6.3
        nasm: update 2.15.05 -> 2.16.01
        ffmpeg: use nasm patched-in debug-prefix-map option to restore reproducibility
        gtk+3: update 3.24.35 -> 3.24.36
        libva-utils: update 2.16.0 -> 2.17.0
        xcb-util: update 0.4.0 -> 0.4.1
        gnupg: update 2.3.8 -> 2.4.0
        libksba: update 1.6.2 -> 1.6.3
        python3-pycryptodomex: upgrade 3.15.0 -> 3.16.0
        piglit: upgrade to latest revision
        python3-setuptools-scm: upgrade 7.0.5 -> 7.1.0
        python3-attrs: upgrade 22.1.0 -> 22.2.0
        webkitgtk: upgrade 2.38.2 -> 2.38.3
        linux-firmware: upgrade 20221109 -> 20221214
        harfbuzz: upgrade 5.3.1 -> 6.0.0
        python3-pytz: upgrade 2022.6 -> 2022.7
        strace: upgrade 6.0 -> 6.1
        python3-pycryptodome: upgrade 3.15.0 -> 3.16.0
        meson: upgrade 0.64.0 -> 1.0.0
        xwayland: upgrade 22.1.5 -> 22.1.7
        python3-pyrsistent: upgrade 0.19.2 -> 0.19.3
        file: upgrade 5.43 -> 5.44
        python3-subunit: upgrade 1.4.1 -> 1.4.2
        python3-zipp: upgrade 3.10.0 -> 3.11.0
        python3-cryptography: upgrade 38.0.3 -> 38.0.4
        logrotate: upgrade 3.20.1 -> 3.21.0
        python3-importlib-metadata: upgrade 5.0.0 -> 5.2.0
        python3-numpy: upgrade 1.23.4 -> 1.24.1
        xserver-xorg: upgrade 21.1.4 -> 21.1.6
        puzzles: upgrade to latest revision
        vte: upgrade 0.70.1 -> 0.70.2
        libpsl: upgrade 0.21.1 -> 0.21.2
        libtest-fatal-perl: upgrade 0.016 -> 0.017
        python3-urllib3: upgrade 1.26.12 -> 1.26.13
        python3-cryptography-vectors: upgrade 38.0.3 -> 38.0.4
        python3-setuptools: upgrade 65.5.1 -> 65.6.3
        libsdl2: upgrade 2.26.0 -> 2.26.1
        python3-gitdb: upgrade 4.0.9 -> 4.0.10
        diffoscope: upgrade 224 -> 230
        python3-mako: upgrade 1.2.3 -> 1.2.4
        python3-sphinx: upgrade 5.3.0 -> 6.0.0
        libsolv: upgrade 0.7.22 -> 0.7.23
        ruby: upgrade 3.1.3 -> 3.2.0
        python3-lxml: upgrade 4.9.1 -> 4.9.2
        python3-git: upgrade 3.1.29 -> 3.1.30
        curl: upgrade 7.86.0 -> 7.87.0
        kmscube: upgrade to latest revision
        gobject-introspection: upgrade 1.72.0 -> 1.74.0
        python3-dtschema: upgrade 2022.11 -> 2022.12
        bash: upgrade 5.2.9 -> 5.2.15
        kexec-tools: upgrade 2.0.25 -> 2.0.26
        python3-jsonschema: upgrade 4.17.0 -> 4.17.3
        python3-pycairo: upgrade 1.21.0 -> 1.23.0
        nghttp2: upgrade 1.50.0 -> 1.51.0
        python3-certifi: upgrade 2022.9.24 -> 2022.12.7
        python3-hypothesis: upgrade 6.57.1 -> 6.61.0
        libsndfile1: upgrade 1.1.0 -> 1.2.0
        repo: upgrade 2.29.9 -> 2.31
        libpcap: upgrade 1.10.1 -> 1.10.2
        python3-jsonschema: depend on rfc3339-validator in all cases
        python3-strict-rfc3339: remove the recipe
        elfutils: do not error out on deprecated declarations
        gcr3: limit version check to 3.x versions without odd-even rule
        ncurses: restore version check as it's now again working due to release of 6.4
        tiff: update 4.4.0 -> 4.5.0
        qemu: fix recent reproducibility issues

  Alexey Smirnov (1):
        classes: make TOOLCHAIN more permissive for kernel

  Anton Antonov (1):
        rust: Do not use default compiler flags defined in CC crate

  Antonin Godard (2):
        busybox: always start do_compile with orig config files
        busybox: rm temporary files if do_compile was interrupted

  Atanas Bunchev (1):
        qemu.rst: slirp port forwarding details

  Bruce Ashfield (30):
        linux-yocto-dev: bump to v6.0+
        linux-yocto/5.19: update to v5.19.16
        linux-yocto/5.15: update to v5.15.74
        linux-yocto/5.19: update to v5.19.17
        linux-yocto/5.15: update to v5.15.76
        linux-yocto/5.19: cfg: intel and vesa updates
        kern-tools: integrate ZFS speedup patch
        linux-yocto-dev: bump to v6.1
        kernel-devsrc: fix for v6.1+
        lttng-modules: fix build for v6.1+
        linux-yocto/5.19: security.cfg: remove configs which have been dropped
        linux-yocto/5.15: update to v5.15.78
        linux-yocto/5.19: fix CONFIG_CRYPTO_CCM mismatch warnings
        linux-yocto/5.15: fix CONFIG_CRYPTO_CCM mismatch warnings
        linux-yocto/5.19: fix elfutils run-backtrace-native-core ptest failure
        linux-libc-headers: add 6.x fetch location
        linux-libc-headers: bump to 6.1
        linux-yocto/5.19: fix perf build with clang
        linux-yocto/5.15: ltp and squashfs fixes
        linux-yocto: introduce v6.1 reference kernel recipes
        linux-yocto/5.15: fix perf build with clang
        linux-yocto/5.15: libbpf: Fix build warning on ref_ctr_off
        linux-yocto/5.15: update to v5.15.84
        linux-yocto/6.1: update to v6.1.1
        linux-yocto/5.15: powerpc: Fix reschedule bug in KUAP-unlocked user copy
        linux-yocto/5.19: powerpc: Fix reschedule bug in KUAP-unlocked user copy
        linux-yocto/6.1: update to v6.1.3
        linux-yocto/6.1: cfg: remove CONFIG_ARM_CRYPTO
        yocto-bsps/5.15: update to v5.15.78
        linux-yocto/5.15: update to v5.15.80

  Carlos Alberto Lopez Perez (3):
        xwayland: libxshmfence is needed when dri3 is enabled
        recipes: Enable nativesdk for gperf, unifdef, gi-docgen and its dependencies
        mesa-gl: gallium is required when enabling x11

  Changqing Li (2):
        base.bbclass: Fix way to check ccache path
        sqlite3: upgrade 3.40.0 -> 3.40.1

  Charlie Johnston (1):
        opkg: ensure opkg uses private gpg.conf when applying keys.

  Chee Yang Lee (1):
        migration-guides: add release-notes for 4.1.1

  Chen Qi (10):
        kernel.bbclass: make KERNEL_DEBUG_TIMESTAMPS work at rebuild
        resolvconf: make it work
        dhcpcd: fix to work with systemd
        bitbake: command.py: cleanup bb.cache.parse_recipe
        psplash: consider the situation of psplash not exist for systemd
        bc: extend to nativesdk
        rm_work: adjust dependency to make do_rm_work_all depend on do_rm_work
        selftest: allow '-R' and '-r' be used together
        dhcpcd: backport two patches to fix runtime error
        libseccomp: fix typo in DESCRIPTION

  Christian Eggers (1):
        boost: add url lib

  David Bagonyi (1):
        u-boot: Fix u-boot signing when building with multiple u-boot configs

  Dmitry Baryshkov (2):
        linux-firmware: upgrade 20221012 -> 20221109
        linux-firmware: add new fw file to ${PN}-qcom-adreno-a530

  Enguerrand de Ribaucourt (1):
        bitbake-layers: fix a typo

  Enrico Jörns (1):
        sstatesig: emit more helpful error message when not finding sstate manifest

  Enrico Scholz (1):
        sstate: show progress bar again

  Fabre Sébastien (1):
        u-boot: Add /boot in SYSROOT_DIRS

  Frank de Brabander (4):
        bitbake: README: Improve explanation about running the testsuite
        bitbake: bin/utils: Ensure locale en_US.UTF-8 is available on the system
        bitbake: process: log odd unlink events with bitbake.sock
        bitbake: README: add required python version for bitbake

  Harald Seiler (1):
        opkg: Set correct info_dir and status_file in opkg.conf

  Jagadeesh Krishnanjanappa (1):
        qemuboot.bbclass: make sure runqemu boots bundled initramfs kernel image

  Jan Kircher (1):
        toolchain-scripts: compatibility with unbound variable protection

  Javier Tia (1):
        poky.conf: Add Fedora 36 as supported distro

  Joe Slater (2):
        python3: Fix CVE-2022-37460
        libarchive: fix CVE-2022-36227

  Jose Quaresma (2):
        Revert "gstreamer1.0: disable flaky gstbin:test_watch_for_state_change test"
        gstreamer1.0: Fix race conditions in gstbin tests

  Joshua Watt (4):
        qemu-helper-native: Correctly pass program name as argv[0]
        bitbake: cooker: Use event to terminate parser threads
        bitbake: cooker: Start sync thread a little earlier
        bitbake: bitbake: Convert to argparse

  Kai Kang (4):
        xorg-lib-common.inc: set default value of XORG_EXT
        libx11-compose-data: 1.6.8 -> 1.8.3
        libx11: 1.8.1 -> 1.8.3
        libsm: 1.2.3 > 1.2.4

  Kasper Revsbech (1):
        bitbake: fetch2/wget: handle username/password in uri

  Khem Raj (47):
        rsync: Delete pedantic errors re-ordering patch
        pseudo: Disable LFS on 32bit arches
        libxkbcommon: Extend to build native package
        iso-codes: Extend to build native packages
        xkeyboard-config: Extend to build native package
        bluez5: enable position independent executables flag
        rpcsvc-proto: Use autoconf knob to enable largefile support
        gptfdisk: Enable largefile support functions
        libpcre2: Upgrade to 10.42
        erofs-utils: Convert from off64_t to off_t
        pseudo: Remove 64bit time_t flags
        unfs3: Define off64_t in terms of off_t on musl
        acpid: Fix largefile enabled build
        efivar: Replace off64_t with off_t
        ltp: Fix largefile support
        acl: Enable largefile support by default
        libpciaccess: Do not use 64bit functions for largefile support
        mdadm: Use _FILE_OFFSET_BITS to use largefile support
        btrfs-tools: Do not use 64bit functions for largefile support
        e2fsprogs: Do not use 64bit functions for largefile support
        libbsd: Fix build with largefile support
        gpgme: Fix with with largefile support
        virglrenderer: Replace lseek64 with lseek
        nfs-utils: Replace statfs64 with statfs
        alsa-utils: Replace off64_t with off_t
        lttng-tools: Fix build with largefile support
        strace: Add knob to enable largefile support
        numactl: Enable largefile support
        qemu: Fix build with largefile support
        systemd: Fix 252 release build on musl
        rust: Do not use open64 on musl in getrandom crate
        rust,libstd-rs: Fix build with latest musl
        rust-llvm: Fix build on latest musl
        cargo: Do not use open64 on musl anymore
        llvm: Do not use lseek64
        strace: Replace off64_t with off_t in sync_file_range.c test
        vulkan-samples: Do not use LFS64 APIs in spdlog
        pulseaudio: Do not use 64bit time_t flags
        musl: Update to latest on tip of trunk
        rust: Fix build with 64bit time_t
        stress-ng: Do not enforce gold linker
        time64.inc: Add GLIBC_64BIT_TIME_FLAGS on ppc/x86 as well
        time64: Remove leading whitespace from GLIBC_64BIT_TIME_FLAGS
        mpg123: Enable largefile support
        site/powerpc32-linux: Do not cache statvfs64 across glibc and musl
        tiff: Add packageconfig knob for webp
        site/common-musl: Set ac_cv_sys_file_offset_bits default to 64

  Lee Chee Yang (1):
        migration-guides: add release-notes for 4.0.6

  Luca Boccassi (2):
        systemd: refresh patch to remove fuzz introduced by rebase on v252
        systemd: ship pcrphase/measure tools and units in systemd-extra-utils

  Luis (1):
        rm_work.bbclass: use HOSTTOOLS 'rm' binary exclusively

  Marek Vasut (5):
        bitbake: fetch2/git: Prevent git fetcher from fetching gitlab repository metadata
        package_rpm: Fix Linux 6.1.0 perf 1.0 version mistranslation
        systemd: Make importd depend on glib-2.0 again
        bitbake: bitbake-user-manual: Document override :append, :prepend, :remove order
        bitbake: fetch2/git: Clarify the meaning of namespace

  Markus Volk (12):
        ell: upgrade 0.53 -> 0.54
        libsdl2: update 2.24.2 -> 2.26.0
        graphene: import from meta-oe
        gtk4: import recipe from meta-gnome
        gcr: rename gcr -> gcr3
        gcr: add recipe for gcr-4, needed to build with gtk4
        epiphany: use gcr3
        gtk4: add tracker-miners runtime dependency
        python3-dbusmock: allow to build native
        gtk4: update 4.8.2 -> 4.8.3
        gcr3: update 3.40.0 -> 3.41.1
        librsvg: enable vapi build

  Marta Rybczynska (2):
        efibootmgr: update compilation with musl
        cve-update-db-native: avoid incomplete updates

  Martin Jansa (4):
        libxml2: upgrade test data from 20080827 to 20130923
        nativesdk-rpm: export RPM_ETCCONFIGDIR and MAGIC in environment like RPM_CONFIGDIR
        nativesdk-rpm: don't create wrappers for WRAPPER_TOOLS
        tune-x86-64-v3.inc: set QEMU_EXTRAOPTIONS like other tune-* files

  Mathieu Dubois-Briand (1):
        dbus: Add missing CVE product name

  Michael Halstead (1):
        uninative: Upgrade to 3.8.1 to include libgcc

  Michael Opdenacker (34):
        manuals: add missing references to classes
        manuals: fix paragraphs with the "inherit" word
        ref-manual/classes.rst: remove reference to sip.bbclass
        manuals: simplify .gitignore files
        manuals: split dev-manual/common-tasks.rst
        dev-manual/sbom.rst: minor corrections
        bitbake: bitbake-user-manual: update references to Yocto Project manual
        bitbake.conf: remove SERIAL_CONSOLE variable
        bitbake: bitbake-user-manual: add reference to bitbake git repository
        ref-manual: add references to variables only documented in the BitBake manual
        manuals: add reference to yocto-docs git repository to page footer
        manuals: add missing references to variables
        manuals: add missing SPDX license header to source files
        manuals: fix double colons
        ref-manual/resources.rst: fix formating
        ref-manual: update references to release notes
        manual: improve documentation about using external toolchains
        ref-manual/images.rst: fix unnumbered list
        manuals: define proper numbered lists
        manuals: final removal of SERIAL_CONSOLE variable
        ref-manual/resources.rst: improve description of mailing lists
        ref-manual/system-requirements.rst: update buildtools instructions
        manuals: create references to buildtools
        documentation/poky.yaml.in: update minimum python version to 3.8
        manuals: prepare 4.2 migration notes
        bitbake: bitbake-user-manual: double colon fix
        bitbake: bitbake-user-manual: remove "OEBasic" signature generator
        migration-guides: fix 4.2 migration note issues
        toaster-manual: fix description of introduction video
        ref-manual/classes.rst: remove .bbclass from section titles
        manuals: simplify references to classes
        migration-1.6.rst: fix redundant reference
        ref-manual/system-requirements.rst: recommend buildtools for not supported distros
        .gitignore: ignore files generated by Toaster

  Mikko Rapeli (5):
        qemurunner.py: support setting slirp host IP address
        runqemu: limit slirp host port forwarding to localhost 127.0.0.1
        qemurunner.py: use IP address from command line
        dev-manual/runtime-testing.rst: fix oeqa runtime test path
        runqemu: add QB_SETUP_CMD and QB_CLEANUP_CMD

  Mingli Yu (8):
        tcl: correct the header location in tcl.pc
        python3: make tkinter available when enabled
        sudo: add selinux and audit PACKAGECONFIG
        iproute2: add selinux PACKAGECONFIG
        util-linux: add selinux PACKAGECONFIG
        cronie: add selinux PACKAGECONFIG
        psmisc: add selinux PACKAGECONFIG
        gcr: add opengl to REQUIRED_DISTRO_FEATURES

  Narpat Mali (2):
        ffmpeg: fix for CVE-2022-3964
        ffmpeg: fix for CVE-2022-3965

  Ola x Nilsson (4):
        kbd: Don't build tests
        glibc: Add ppoll fortify symbol for 64 bit time_t
        insane: Add QA check for 32 bit time and file offset functions
        time64.conf: Include to enable 64 bit time flags

  Ovidiu Panait (1):
        kernel.bbclass: remove empty module directories to prevent QA issues

  Patrick Williams (1):
        kernel-fitimage: reduce dependency to the cpio

  Pavel Zhukov (1):
        oeqa/rpm.py: Increase timeout and add debug output

  Peter Kjellerstedt (1):
        recipes, classes: Avoid adding extra whitespace to PACKAGESPLITFUNCS

  Peter Marko (2):
        externalsrc: fix lookup for .gitmodules
        oeqa/selftest/externalsrc: add test for srctree_hash_files

  Petr Kubizňák (1):
        harfbuzz: remove bindir only if it exists

  Petr Vorel (1):
        iputils: update to 20221126

  Polampalli, Archana (1):
        libpam: fix CVE-2022-28321

  Qiu, Zheng (3):
        valgrind: remove most hidden tests for arm64
        tiff: Security fix for CVE-2022-3970
        vim: upgrade 9.0.0820 -> 9.0.0947

  Quentin Schulz (4):
        cairo: update patch for CVE-2019-6461 with upstream solution
        cairo: fix CVE patches assigned wrong CVE number
        docs: kernel-dev: faq: update tip on how to not include kernel in image
        docs: migration-guides: migration-4.0: specify variable name change for kernel inclusion in image recipe

  Randy MacLeod (1):
        valgrind: skip the boost_thread test on arm

  Ranjitsinh Rathod (1):
        curl: Correct LICENSE from MIT-open-group to curl

  Ravula Adhitya Siddartha (2):
        linux-yocto/5.15: update genericx86* machines to v5.15.78
        linux-yocto/5.19: update genericx86* machines to v5.19.17

  Richard Purdie (97):
        bitbake: cache/cookerdata: Move recipe parsing functions from cache to databuilder
        bitbake: cache: Drop broken/unused code
        bitbake: cache: Drop unused function
        bitbake: server: Ensure cooker profiling works
        bitbake: worker/runqueue: Reduce initial data transfer in workerdata
        bitbake: cache: Drop support for not saving the cache file
        bitbake: runqueue: Add further debug for sstate reuse issues
        bitbake: runqueue: Fix race issues around hash equivalence and sstate reuse
        bitbake: data/siggen: Switch to use frozensets and optimize
        bitbake: data_smart: Add debugging for overrides stability issue
        bitbake: utils: Allow to_boolean to support int values
        base: Drop do_package base definition
        bitbake: data: Drop obsolete pydoc/path code
        bitbake: BBHandler: Remove pointless global variable declarations
        bitbake: runqueue: Improve error message for missing multiconfig
        bitbake: data_smart: Small cache reuse optimization
        bitbake.conf: Simplify CACHE setting
        oeqa/selftest/tinfoil: Add test for separate config_data with recipe_parse_file()
        qemu: Ensure libpng dependency is deterministic
        bitbake: data: Tweak code layout
        bitbake: cache/siggen: Simplify passing basehash data into the cache
        bitbake: siggen/cache: Optionally allow adding siggen hash data to the bitbake cache
        bitbake: parse: Add support for addpylib conf file directive and BB_GLOBAL_PYMODULES
        bitbake: cookerdata: Ensure layers use LAYERSERIES_COMPAT fairly
        base: Switch to use addpylib directive and BB_GLOBAL_PYMODULES
        devtool/friends: Use LAYERSERIES_CORENAMES when generating LAYERSERIES_COMPAT entries
        scripts/checklayer: Update to match bitbake changes
        yocto-check-layer: Allow OE-Core to be tested
        bitbake: main: Add timestamp to server retry messages
        bitbake: main/server: Add lockfile debugging upon server retry
        poky/poky-tiny: Drop largefile mentions
        lib/sstatesig: Drop OEBasic siggen
        bitbake: siggen: Drop non-multiconfig aware siggen support
        bitbake: build/siggen/runqueue: Drop do_setscene references
        bitbake: bitbake: Bump minimum python version requirement to 3.8
        sanity: Update minimum python version to 3.8
        bitbake: main/process: Add extra sockname debugging
        Revert "kernel-fitimage: reduce dependency to the cpio"
        bitbake: siggen: Directly store datacaches reference
        bitbake: bitbake: siggen/runqueue: Switch to using RECIPE_SIGGEN_INFO feature for signature dumping
        bitbake: siggen: Add dummy dataCaches from task context/datastore
        bitbake: build/siggen: Rework stamps functions
        bitbake: siggen: Clarify which fn is meant
        bitbake: ast/data/codeparser: Add dependencies from python module functions
        bitbake: codeparser/data: Add vardepsexclude support to module dependency code
        bitbake.conf: Add module function vardepsexclude entries
        time64: Rename to a .inc file to match the others
        bitbake: command: Add ping command
        bitbake: cache: Allow compression of the data in SiggenRecipeInfo
        bitbake: siggen: Minor code improvement
        bitbake: server/process: Add bitbake.sock race handling
        oeqa/concurrencytest: Add number of failures to summary output
        python3-poetry-core: Fix determinism issue breaking reproducibility
        bitbake: cache/siggen: Fix cache issues with signature handling
        bitbake: event: builtins fix for 'd' deletion
        bitbake: cooker: Ensure cache is cleared for partial resets
        bitbake: tinfoil: Ensure CommandExit is handled
        bitbake: cache: Drop reciever side counting for SiggenRecipeInfo
        bitbake: knotty: Avoid looping with tracebacks
        bitbake: event: Add enable/disable heartbeat code
        bitbake: cooker/cookerdata: Rework the way the datastores are reset
        bitbake: server/process: Improve exception and idle function logging
        bitbake: command: Tweak finishAsyncCommand ordering to avoid races
        bitbake: cooker: Ensure commands clean up any parser processes
        bitbake: server/process: Improve idle loop exit code
        bitbake: event: Always use threadlock
        bitbake: server/process: Add locking around idle functions accesses
        bitbake: server/process: Run idle commands in a separate idle thread
        bitbake: knotty: Ping the server/cooker periodically
        bitbake: cookerdata: Fix cache/reparsing issue
        bitbake: cookerdata: Fix previous commit to use a string, not a generator
        bitbake: command: Ensure that failure cases call finishAsyncComand
        layer.conf: Update to use mickledore as the layer series name
        layer.conf: Mark master as compatible with mickledore
        bitbake: lib/bb: Update thread/process locks to use a timeout
        package: Move fixup_perms function to bb function library
        package: Move get_conffiles/files_from_filevars functions to lib
        package: Move pkgdata handling functions to oe.packagedata
        package: Move emit_pkgdata to packagedata.py
        package: Move package functions to function library
        package: Drop unused function and obsolete comment
        package: Move mapping_rename_hook to packagedata function library
        python3-cython: Use PACKAGESPLITFUNCS instead of PACKAGEBUILDPKGD
        package: Drop support for PACKAGEBUILDPKGD function customisation
        recipes/classes: Drop prepend/append usage with PACKAGESPLITFUNCS
        bitbake: cooker: Rework the parsing results submission
        bitbake: cooker: Clean up inotify idle handler
        uninative-tarball: Add libgcc
        patchelf: Add fix submitted upstream for uninative segfaults
        bitbake: cooker/command: Drop async command handler indirection via cooker
        bitbake: process/cooker/command: Fix currentAsyncCommand locking/races
        uninative: Ensure uninative is enabled in all cases for BuildStarted event
        qemux86-64: Reduce tuning to core2-64
        bitbake: tinfoil: Don't wait for events indefinitely
        bitbake: knotty: Improve shutdown handling
        bitbake: cooker: Fix exit handling issues
        bitbake: server/process: Move heartbeat to idle thread

  Robert Andersson (1):
        go-crosssdk: avoid host contamination by GOCACHE

  Ross Burton (28):
        build-appliance-image: Update to master head revision
        lib/buildstats: fix parsing of trees with reduced_proc_pressure directories
        combo-layer: remove unused import
        combo-layer: dont use bb.utils.rename
        combo-layer: add sync-revs command
        libxml2: upgrade 2.9.14 -> 2.10.3
        libxml2: add more testing
        python3-packaging: upgrade to 22.0
        python3-hatchling: remove python3-tomli DEPENDS
        python3-cryptography: remove python3-tomli RDEPENDS
        meson: drop redundant is_debianlike() patch
        meson: always use meson subcommands
        libepoxy: remove upstreamed patch
        gtk+3: upgrade 3.24.34 -> 3.24.35
        gtk+3: port to Meson
        meson: no need to rebuild on install
        at-spi2-core: clean up x11 enabling
        at-spi2-core: disable API docs if x11 is disabled
        gtk+3: fix reproducible builds
        lsof: upgrade 4.96.4 -> 4.96.5
        pango: upgrade 1.50.11 -> 1.50.12
        python3-hatch-vcs: upgrade 0.2.0 -> 0.3.0
        python3-hatchling: upgrade 1.11.1 -> 1.12.1
        python3-pathspec: upgrade 0.10.1 -> 0.10.3
        rm_work: handle non-existant stamps directory
        oeqa/selftest/debuginfod: improve testcase
        elfutils: disable deprecation errors in all builds, not just native
        curl: don't enable debug builds

  Ryan Eatmon (1):
        go: Update reproducibility patch to fix panic errors

  Sandeep Gundlupet Raju (3):
        libdrm: Remove libdrm-kms package
        kernel-fitimage: Adjust order of dtb/dtbo files
        kernel-fitimage: Allow user to select dtb when multiple dtb exists

  Saul Wold (1):
        at: Change when files are copied

  Sergei Zhmylev (1):
        oeqa/qemurunner: implement vmdk images support

  Tim Orling (7):
        python3-hypothesis: upgrade 6.56.4 -> 6.57.1
        at-spi2-core: upgrade 2.44.1 -> 2.46.0
        mirrors.bbclass: update CPAN_MIRROR
        libtry-tiny-perl: add recipe for 0.31
        libtest-fatal-perl: add recipe for 0.016
        libtest-warnings-perl: move from meta-perl
        liburi-perl: upgrade 5.08 -> 5.17

  Trevor Woerner (1):
        local.conf.sample: update bbclass locations

  Vincent Davis Jr (1):
        mesa: enable glvnd support

  Wang Mingyu (49):
        btrfs-tools: upgrade 6.0 -> 6.0.1
        libpipeline: upgrade 1.5.6 -> 1.5.7
        btrfs-tools: upgrade 6.0.1 -> 6.0.2
        bind: upgrade 9.18.8 -> 9.18.9
        ccache: upgrade 4.7.2 -> 4.7.4
        dropbear: upgrade 2022.82 -> 2022.83
        libinput: upgrade 1.21.0 -> 1.22.0
        libxft: upgrade 2.3.6 -> 2.3.7
        mpfr: upgrade 4.1.0 -> 4.1.1
        glib-2.0: upgrade 2.74.1 -> 2.74.3
        libxcrypt-compat: upgrade 4.4.30 -> 4.4.33
        patchelf: upgrade 0.16.1 -> 0.17.0
        pciutils: upgrade 3.8.0 -> 3.9.0
        shaderc: upgrade 2022.3 -> 2022.4
        sqlite3: upgrade 3.39.4 -> 3.40.0
        stress-ng: upgrade 0.14.06 -> 0.15.00
        swig: upgrade 4.1.0 -> 4.1.1
        texinfo: upgrade 7.0 -> 7.0.1
        usbutils: upgrade 014 -> 015
        xz: upgrade 5.2.7 -> 5.2.9
        wayland-protocols: upgrade 1.28 -> 1.31
        gnu-config: upgrade to latest revision
        libfontenc: upgrade 1.1.6 -> 1.1.7
        libpcre2: upgrade 10.40 -> 10.41
        libpng: upgrade 1.6.38 -> 1.6.39
        libxau: upgrade 1.0.10 -> 1.0.11
        libxkbfile: upgrade 1.1.1 -> 1.1.2
        libxshmfence: upgrade 1.3.1 -> 1.3.2
        xrandr: upgrade 1.5.1 -> 1.5.2
        boost: upgrade 1.80.0 -> 1.81.0
        ell: upgrade 0.54 -> 0.55
        git: upgrade 2.38.1 -> 2.39.0
        help2man: upgrade 1.49.2 -> 1.49.3
        iproute2: upgrade 6.0.0 -> 6.1.0
        libmpc: upgrade 1.2.1 -> 1.3.1
        makedepend: upgrade 1.0.7 -> 1.0.8
        psmisc: upgrade 23.5 -> 23.6
        xz: upgrade 5.2.9 -> 5.4.0
        gstreamer1.0: upgrade 1.20.4 -> 1.20.5
        bind: upgrade 9.18.9 -> 9.18.10
        btrfs-tools: upgrade 6.0.2 -> 6.1
        librepo: upgrade 1.14.5 -> 1.15.1
        libsdl2: upgrade 2.26.1 -> 2.26.2
        libva-utils: upgrade 2.17.0 -> 2.17.1
        libxkbcommon: upgrade 1.4.1 -> 1.5.0
        mpfr: upgrade 4.1.1 -> 4.2.0
        dpkg: upgrade 1.21.13 -> 1.21.17
        rxvt-unicode: upgrade 9.30 -> 9.31
        virglrenderer: upgrade 0.10.3 -> 0.10.4

  Xiangyu Chen (3):
        grub: backport patches to fix CVE-2022-28736
        openssh: remove RRECOMMENDS to rng-tools for sshd package
        grub2: backport patch to fix CVE-2022-2601 CVE-2022-3775

  Yoann Congal (2):
        bitbake: Group and reorder options in bitbake help
        bitbake: main: Move --buildfile help at the end of "Execution" group

  leimaohui (1):
        libpng: Enable NEON for aarch64 to enensure consistency with arm32.

  pgowda (1):
        binutils: Add patch to fix CVE-2022-4285

  张忠山 (1):
        bitbake: data_smart: Use regex consistently for override matching

meta-raspberrypi: 93dadf336c..896566aa92:
  Carlos Alberto Lopez Perez (1):
        weston: disablepackageconfig options that fail to build with userland drivers

  Khem Raj (2):
        lirc: Drop upstreamed patch
        linux-raspberrypi.inc: Weakly assign COMPATIBLE_MACHINE

  Martin Jansa (2):
        bluez5: update patches to apply on 5.66 version
        layer.conf: update LAYERSERIES_COMPAT for mickledore

  Vincent Davis Jr (5):
        rpidistro-vlc,rpidistro-ffmpeg: update COMPATIBLE_HOST regex
        rpidistro-vlc: upgrade 3.0.12 -> 3.0.17
        rpi-default-providers: add libav and libpostproc
        rpidistro-ffmpeg: upgrade 4.3.2 -> 4.3.4
        rpidistro-ffmpeg: remove --enable-v4l2-request flag

Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: Ied8537beedde0f83790e6e3595057db45f408107

21 files changed, 1107 insertions, 1098 deletions

diff --git a/poky/meta/recipes-gnome/epiphany/epiphany_42.4.bb b/poky/meta/recipes-gnome/epiphany/epiphany_43.0.bb
index afaaefc46f..4a6007b0df 100644
--- a/poky/meta/recipes-gnome/epiphany/epiphany_42.4.bb
+++ b/poky/meta/recipes-gnome/epiphany/epiphany_43.0.bb
@@ -8,19 +8,22 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
 DEPENDS = " \
           webkitgtk \
-          gcr \
+          gcr3 \
           gsettings-desktop-schemas \
           nettle \
           json-glib \
           libarchive \
           libdazzle \
           libhandy \
+          libportal \
+          libsoup \
           glib-2.0-native \
           coreutils-native \
+          desktop-file-utils-native \
           "
 
 GNOMEBASEBUILDCLASS = "meson"
-inherit gnomebase gsettings features_check gettext mime-xdg
+inherit gnomebase gsettings features_check gettext mime-xdg gtk-icon-cache
 REQUIRED_DISTRO_FEATURES = "x11 opengl"
 
 SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@oe.utils.trim_version("${PV}", 1)}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \
@@ -28,16 +31,10 @@ SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@oe.utils.trim_version("${PV}", 1)}/${GN
            file://migrator.patch \
            file://distributor.patch \
            "
-SRC_URI[archive.sha256sum] = "370938ad2920eeb28bc2435944776b7ba55a0e2ede65836f79818cfb7e8f0860"
-
-PACKAGECONFIG_SOUP ?= "soup3"
-PACKAGECONFIG ??= "${PACKAGECONFIG_SOUP}"
+SRC_URI[archive.sha256sum] = "b66d499f9ee72696d83cf844125377181a954554a4bb3785b73293380ac0c227"
 
 # Developer mode enables debugging
 PACKAGECONFIG[developer-mode] = "-Ddeveloper_mode=true,-Ddeveloper_mode=false"
-PACKAGECONFIG[soup2] = "-Dsoup2=enabled,-Dsoup2=disabled,libsoup-2.4,,,soup3"
-PACKAGECONFIG[soup3] = ",,libsoup,,,soup2"
-PACKAGECONFIG[libportal] = "-Dlibportal=enabled,-Dlibportal=disabled,libportal"
 
 FILES:${PN} += "${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers ${datadir}/metainfo"
 RDEPENDS:${PN} = "iso-codes adwaita-icon-theme gsettings-desktop-schemas"
diff --git a/poky/meta/recipes-gnome/gcr/gcr/0001-gcr-meson.build-fix-one-parallel-build-failure.patch b/poky/meta/recipes-gnome/gcr/gcr/0001-gcr-meson.build-fix-one-parallel-build-failure.patch
deleted file mode 100644
index 81c4bdbbcc..0000000000
--- a/poky/meta/recipes-gnome/gcr/gcr/0001-gcr-meson.build-fix-one-parallel-build-failure.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From cb3708bad88e713e4ccf705cb8c14c5996cd9d06 Mon Sep 17 00:00:00 2001
-From: Changqing Li <changqing.li@windriver.com>
-Date: Fri, 23 Apr 2021 16:32:38 +0800
-Subject: [PATCH] gcr/meson.build: fix one parallel build failure
-
-ui/gcr-live-search.c includes gcr/gcr-marshal.h. Because missing
-dependency, following error occurred intermittently during doing parallel
-build:
-
- -o ui/libgcr-ui-3.so.1.0.0.p/gcr-live-search.c.o -c ../gcr-3.38.1/ui/gcr-live-search.c
-../gcr-3.38.1/ui/gcr-live-search.c:32:10: fatal error: gcr/gcr-marshal.h: No such file or directory
-   32 | #include "gcr/gcr-marshal.h"
-      |          ^~~~~~~~~~~~~~~~~~~
-compilation terminated.
-
-Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gcr/-/merge_requests/68/diffs]
-
-Signed-off-by: Changqing Li <changqing.li@windriver.com>
----
- gcr/meson.build | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/gcr/meson.build b/gcr/meson.build
-index 06c3a63..d9d4b8f 100644
---- a/gcr/meson.build
-+++ b/gcr/meson.build
-@@ -181,6 +181,7 @@ gcr_base_dep = declare_dependency(
-   sources: [
-     gcr_enums_gen[1],
-     gcr_oids[1],
-+    gcr_marshal_gen[1],
-   ],
- )
- 
--- 
-2.17.1
-
diff --git a/poky/meta/recipes-gnome/gcr/gcr/0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch b/poky/meta/recipes-gnome/gcr/gcr/0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch
new file mode 100644
index 0000000000..940f78ebab
--- /dev/null
+++ b/poky/meta/recipes-gnome/gcr/gcr/0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch
@@ -0,0 +1,49 @@
+From 9b67bb18d8409e0e693cc6000507acbd73a30eab Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Wed, 16 Nov 2022 11:27:24 +0100
+Subject: [PATCH 1/2] meson.build: correctly handle disabled ssh_agent option
+
+Existing code produces these errors:
+| gcr/meson.build:61:0: ERROR: Unable to get the path of a not-found external program
+| gcr/meson.build:101:5: ERROR: Unknown variable "ssh_add_path".
+
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+
+Upstream-Status: Backport [ https://gitlab.gnome.org/GNOME/gcr/-/commit/9b67bb18d8409e0e693cc6000507acbd73a30eab ]
+---
+ meson.build | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 3f35173..11d7fa7 100644
+--- a/meson.build
++++ b/meson.build
+@@ -58,8 +58,10 @@ if p11_system_config_modules == ''
+   error('Couldn\'t find location for pkcs11 module config')
+ endif
+ libsecret_dep = dependency('libsecret-1', version: '>= 0.20', required: get_option('ssh_agent'))
+-ssh_add_path = find_program('ssh-add', required: get_option('ssh_agent')).full_path()
+-ssh_agent_path = find_program('ssh-agent', required: get_option('ssh_agent')).full_path()
++if get_option('ssh_agent')
++  ssh_add_path = find_program('ssh-add').full_path()
++  ssh_agent_path = find_program('ssh-agent').full_path()
++endif
+ 
+ with_systemd = false
+ libsystemd_deps = []
+@@ -96,8 +98,10 @@ conf.set('HAVE_TIMEGM', cc.has_function('timegm'))
+ conf.set('HAVE_MLOCK', cc.has_function('mlock'))
+ conf.set_quoted('GPG_EXECUTABLE', gpg_path)
+ conf.set_quoted('LIBGCRYPT_VERSION', libgcrypt_dep.version())
+-conf.set_quoted('SSH_ADD_EXECUTABLE', ssh_add_path)
+-conf.set_quoted('SSH_AGENT_EXECUTABLE', ssh_agent_path)
++if get_option('ssh_agent')
++  conf.set_quoted('SSH_ADD_EXECUTABLE', ssh_add_path)
++  conf.set_quoted('SSH_AGENT_EXECUTABLE', ssh_agent_path)
++endif
+ conf.set10('WITH_SYSTEMD', with_systemd)
+ config_file = configure_file(
+   output: 'config.h',
+-- 
+2.34.1
+
diff --git a/poky/meta/recipes-gnome/gcr/gcr/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch b/poky/meta/recipes-gnome/gcr/gcr/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch
deleted file mode 100644
index ae4e2ac1eb..0000000000
--- a/poky/meta/recipes-gnome/gcr/gcr/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8 Mon Sep 17 00:00:00 2001
-From: Jakub Jirutka <jakub@jirutka.cz>
-Date: Wed, 12 Jan 2022 00:24:20 +0100
-Subject: [PATCH] meson: Fix unknown kw argument in gnome.generate_gir
-
-This argument has been removed in Meson 0.61.0:
-
-    gck/meson.build:130:2: ERROR: gnome.generate_gir got unknown keyword arguments "packages"
-
-https://github.com/mesonbuild/meson/commit/f8fc5cb860465718fe7c79a1bf1fe00659f138de:
-
-> The packages argument to gnome.generate_gir was allowed, but never did anything, so stop passing it.
-
-Fixes #89
-Upstream-Status: Backport
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
----
- gck/meson.build | 1 -
- gcr/meson.build | 1 -
- ui/meson.build  | 1 -
- 3 files changed, 3 deletions(-)
-
-diff --git a/gck/meson.build b/gck/meson.build
-index 756b486..a21a1e9 100644
---- a/gck/meson.build
-+++ b/gck/meson.build
-@@ -131,7 +131,6 @@ if get_option('introspection')
-     sources: gck_gir_sources,
-     namespace: 'Gck',
-     nsversion: '@0@'.format(gck_major_version),
--    packages: gck_deps,
-     export_packages: 'gck-@0@'.format(gck_major_version),
-     includes: [ 'GObject-2.0', 'Gio-2.0' ],
-     header: 'gck/gck.h',
-diff --git a/gcr/meson.build b/gcr/meson.build
-index 2233a44..c83641b 100644
---- a/gcr/meson.build
-+++ b/gcr/meson.build
-@@ -190,7 +190,6 @@ if get_option('introspection')
-     sources: [ gcr_base_public_sources, gcr_base_headers ],
-     namespace: 'Gcr',
-     nsversion: '@0@'.format(gcr_major_version),
--    packages: gcr_base_deps,
-     export_packages: 'gcr-base-@0@'.format(gcr_major_version),
-     includes: [
-       'GObject-2.0',
-diff --git a/ui/meson.build b/ui/meson.build
-index e656ea2..32ee057 100644
---- a/ui/meson.build
-+++ b/ui/meson.build
-@@ -152,7 +152,6 @@ if get_option('introspection')
-     export_packages: 'gcr-ui-@0@'.format(gcr_major_version),
-     identifier_prefix: 'Gcr',
-     symbol_prefix: 'gcr',
--    packages: gcr_ui_deps,
-     includes: [
-       'GObject-2.0',
-       'Gio-2.0',
--- 
-GitLab
-
diff --git a/poky/meta/recipes-gnome/gcr/gcr3/0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch b/poky/meta/recipes-gnome/gcr/gcr3/0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch
new file mode 100644
index 0000000000..d3c26d97ae
--- /dev/null
+++ b/poky/meta/recipes-gnome/gcr/gcr3/0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch
@@ -0,0 +1,36 @@
+From 9b67bb18d8409e0e693cc6000507acbd73a30eab Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Wed, 16 Nov 2022 11:27:24 +0100
+Subject: [PATCH 1/2] meson.build: correctly handle disabled ssh_agent option
+
+Existing code produces these errors:
+| gcr/meson.build:61:0: ERROR: Unable to get the path of a not-found external program
+| gcr/meson.build:101:5: ERROR: Unknown variable "ssh_add_path".
+
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+
+Upstream-Status: Backport [ https://gitlab.gnome.org/GNOME/gcr/-/commit/9b67bb18d8409e0e693cc6000507acbd73a30eab ]
+---
+ meson.build | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 3f35173..11d7fa7 100644
+--- a/meson.build
++++ b/meson.build
+@@ -96,8 +98,10 @@ conf.set('HAVE_TIMEGM', cc.has_function('timegm'))
+ conf.set('HAVE_MLOCK', cc.has_function('mlock'))
+ conf.set_quoted('GPG_EXECUTABLE', gpg_path)
+ conf.set_quoted('LIBGCRYPT_VERSION', libgcrypt_dep.version())
+-conf.set_quoted('SSH_ADD_EXECUTABLE', ssh_add_path)
+-conf.set_quoted('SSH_AGENT_EXECUTABLE', ssh_agent_path)
++if get_option('ssh_agent')
++  conf.set_quoted('SSH_ADD_EXECUTABLE', ssh_add_path)
++  conf.set_quoted('SSH_AGENT_EXECUTABLE', ssh_agent_path)
++endif
+ conf.set10('WITH_SYSTEMD', with_systemd)
+ config_file = configure_file(
+   output: 'config.h',
+-- 
+2.34.1
+
diff --git a/poky/meta/recipes-gnome/gcr/gcr_3.40.0.bb b/poky/meta/recipes-gnome/gcr/gcr3_3.41.1.bb
index 917be5938b..ba5660a5ed 100644
--- a/poky/meta/recipes-gnome/gcr/gcr_3.40.0.bb
+++ b/poky/meta/recipes-gnome/gcr/gcr3_3.41.1.bb
@@ -17,23 +17,30 @@ CFLAGS += "-D_GNU_SOURCE"
 
 GNOMEBASEBUILDCLASS = "meson"
 GTKDOC_MESON_OPTION = "gtk_doc"
-inherit gnomebase gtk-icon-cache gtk-doc features_check upstream-version-is-even vala gobject-introspection gettext mime mime-xdg
-UPSTREAM_CHECK_REGEX = "[^\d\.](?P<pver>\d+\.(?!9\d+)(\d*[02468])+(\.\d+)+)\.tar"
+inherit gnomebase gtk-icon-cache gi-docgen features_check upstream-version-is-even vala gobject-introspection gettext mime mime-xdg
+UPSTREAM_CHECK_REGEX = "[^\d\.](?P<pver>3.(?!9\d+)\d+(\.\d+)+)\.tar"
 
-SRC_URI += "file://0001-gcr-meson.build-fix-one-parallel-build-failure.patch \ 
-            file://b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch"
+SRC_URI = "https://download.gnome.org/sources/gcr/3.41/gcr-${PV}.tar.xz;name=archive"
+SRC_URI += "file://0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch"
+SRC_URI[archive.sha256sum] = "bb7128a3c2febbfee9c03b90d77d498d0ceb237b0789802d60185c71c4bea24f"
 
-SRC_URI[archive.sha256sum] = "b9d3645a5fd953a54285cc64d4fc046736463dbd4dcc25caf5c7b59bed3027f5"
+S = "${WORKDIR}/gcr-${PV}"
 
 PACKAGECONFIG ??= " \
+	${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
 	${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk', '', d)} \
 	${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'gtk', '', d)} \
 "
 PACKAGECONFIG[gtk] = "-Dgtk=true,-Dgtk=false,gtk+3"
+PACKAGECONFIG[ssh_agent] = "-Dssh_agent=true,-Dssh_agent=false,libsecret,openssh"
+#'Use systemd socket activation for server programs'
+PACKAGECONFIG[systemd] = "-Dsystemd=enabled,-Dsystemd=disabled,systemd"
 
 FILES:${PN} += " \
     ${datadir}/dbus-1 \
     ${datadir}/gcr-3 \
+    ${systemd_user_unitdir}/gcr-ssh-agent.socket \
+    ${systemd_user_unitdir}/gcr-ssh-agent.service \
 "
 
 # http://errors.yoctoproject.org/Errors/Details/20229/
@@ -46,5 +53,7 @@ do_write_config:append() {
     cat >${WORKDIR}/meson-${PN}.cross <<EOF
 [binaries]
 gpg2 = '${bindir}/gpg2'
+ssh-add = '${bindir}/ssh-add'
+ssh-agent = '${bindir}/ssh-agent'
 EOF
 }
diff --git a/poky/meta/recipes-gnome/gcr/gcr_4.0.0.bb b/poky/meta/recipes-gnome/gcr/gcr_4.0.0.bb
new file mode 100644
index 0000000000..22edd386fc
--- /dev/null
+++ b/poky/meta/recipes-gnome/gcr/gcr_4.0.0.bb
@@ -0,0 +1,59 @@
+SUMMARY = "A library for bits of crypto UI and parsing etc"
+DESCRIPTION = "GCR is a library for displaying certificates, and crypto UI, \
+accessing key stores. It also provides the viewer for crypto files on the \
+GNOME desktop."
+HOMEPAGE = "https://gitlab.gnome.org/GNOME/gcr"
+BUGTRACKER = "https://gitlab.gnome.org/GNOME/gcr/issues"
+
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
+
+DEPENDS = "p11-kit glib-2.0 libgcrypt gnupg-native \
+           ${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'libxslt-native', '', d)}"
+
+CACHED_CONFIGUREVARS += "ac_cv_path_GPG='gpg2'"
+
+CFLAGS += "-D_GNU_SOURCE"
+
+GNOMEBASEBUILDCLASS = "meson"
+GTKDOC_MESON_OPTION = "gtk_doc"
+inherit gnomebase gtk-icon-cache gi-docgen features_check upstream-version-is-even vala gobject-introspection gettext mime mime-xdg
+UPSTREAM_CHECK_REGEX = "gcr-(?P<pver>\d+\.(\d*[02468])+(\.\d+)+)\.tar.xz"
+
+REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'opengl', '', d)}"
+
+SRC_URI += "file://0001-meson.build-correctly-handle-disabled-ssh_agent-opti.patch"
+SRC_URI[archive.sha256sum] = "c45855924f0ee7bab43e2dd38bfafd2ac815c6e9864341c0161e171173dcec7c"
+
+PACKAGECONFIG ??= " \
+	${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
+	${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk', '', d)} \
+	${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'gtk', '', d)} \
+"
+PACKAGECONFIG[gtk] = "-Dgtk4=true,-Dgtk4=false,gtk4"
+PACKAGECONFIG[ssh_agent] = "-Dssh_agent=true,-Dssh_agent=false,libsecret,openssh"
+#'Use systemd socket activation for server programs'
+PACKAGECONFIG[systemd] = "-Dsystemd=enabled,-Dsystemd=disabled,systemd"
+
+FILES:${PN} += " \
+    ${datadir}/dbus-1 \
+    ${datadir}/gcr-4 \
+    ${systemd_user_unitdir}/gcr-ssh-agent.socket \
+    ${systemd_user_unitdir}/gcr-ssh-agent.service \
+"
+
+# http://errors.yoctoproject.org/Errors/Details/20229/
+ARM_INSTRUCTION_SET:armv4 = "arm"
+ARM_INSTRUCTION_SET:armv5 = "arm"
+ARM_INSTRUCTION_SET:armv6 = "arm"
+
+EXTRA_OEMESON += "--cross-file=${WORKDIR}/meson-${PN}.cross"
+
+do_write_config:append() {
+    cat >${WORKDIR}/meson-${PN}.cross <<EOF
+[binaries]
+gpg2 = '${bindir}/gpg2'
+ssh-add = '${bindir}/ssh-add'
+ssh-agent = '${bindir}/ssh-agent'
+EOF
+}
diff --git a/poky/meta/recipes-gnome/gi-docgen/gi-docgen_git.bb b/poky/meta/recipes-gnome/gi-docgen/gi-docgen_git.bb
index 9e5adca3df..fa41f2ccd2 100644
--- a/poky/meta/recipes-gnome/gi-docgen/gi-docgen_git.bb
+++ b/poky/meta/recipes-gnome/gi-docgen/gi-docgen_git.bb
@@ -19,4 +19,4 @@ inherit setuptools3
 
 RDEPENDS:${PN} += "python3-asyncio python3-core python3-jinja2 python3-json python3-markdown python3-markupsafe python3-pygments python3-toml python3-typogrify python3-xml"
 
-BBCLASSEXTEND = "native"
+BBCLASSEXTEND = "native nativesdk"
diff --git a/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch b/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch
index ba965092e1..030ff17601 100644
--- a/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch
+++ b/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch
@@ -1,4 +1,4 @@
-From 74a0fee892235c722ac60ddea6ee79bc3d7a93f5 Mon Sep 17 00:00:00 2001
+From d396e5126461631e2c73ce98ba034f1e44598f6a Mon Sep 17 00:00:00 2001
 From: Sascha Silbe <x-yo17@se-silbe.de>
 Date: Fri, 8 Jun 2018 13:55:10 +0200
 Subject: [PATCH] Relocate the repository directory for native builds
@@ -21,7 +21,7 @@ Signed-off-by: Sascha Silbe <x-yo17@se-silbe.de>
  2 files changed, 14 insertions(+), 3 deletions(-)
 
 diff --git a/girepository/girepository.c b/girepository/girepository.c
-index 7d03485..20f4813 100644
+index a0754f4..2d456f9 100644
 --- a/girepository/girepository.c
 +++ b/girepository/girepository.c
 @@ -21,6 +21,8 @@
diff --git a/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.72.0.bb b/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.74.0.bb
index d935cbd905..ab9d2d35d9 100644
--- a/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.72.0.bb
+++ b/poky/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.74.0.bb
@@ -17,7 +17,7 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-$
            file://0001-g-ir-tool-template.in-fix-girdir-path.patch \
            "
 
-SRC_URI[sha256sum] = "02fe8e590861d88f83060dd39cda5ccaa60b2da1d21d0f95499301b186beaabc"
+SRC_URI[sha256sum] = "347b3a719e68ba4c69ff2d57ee2689233ea8c07fc492205e573386779e42d653"
 
 SRC_URI:append:class-native = " file://0001-Relocate-the-repository-directory-for-native-builds.patch"
 
diff --git a/poky/meta/recipes-gnome/gtk+/gtk+3.inc b/poky/meta/recipes-gnome/gtk+/gtk+3.inc
index 7d50d7bd2e..1d726b5696 100644
--- a/poky/meta/recipes-gnome/gtk+/gtk+3.inc
+++ b/poky/meta/recipes-gnome/gtk+/gtk+3.inc
@@ -6,12 +6,11 @@ HOMEPAGE = "http://www.gtk.org"
 BUGTRACKER = "https://bugzilla.gnome.org/"
 SECTION = "libs"
 
-DEPENDS = "glib-2.0 cairo pango atk jpeg libpng gdk-pixbuf \
-           gdk-pixbuf-native"
+DEPENDS = "glib-2.0 cairo pango atk jpeg libpng gdk-pixbuf gdk-pixbuf-native"
 
 LICENSE = "LGPL-2.0-only & LGPL-2.0-or-later & LGPL-2.1-or-later"
 
-inherit autotools gettext pkgconfig gtk-doc update-alternatives gtk-immodules-cache gsettings features_check gobject-introspection
+inherit meson gettext pkgconfig gtk-doc update-alternatives gtk-immodules-cache gsettings features_check gobject-introspection
 
 BBCLASSEXTEND = "native nativesdk"
 
@@ -22,43 +21,28 @@ UPSTREAM_CHECK_REGEX = "[^\d\.](?P<pver>3\.([1-8]?[02468])+(\.\d+)+)\.tar"
 
 ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
 
-# This should be in autotools.bbclass, but until something elses uses it putting
-# it here avoids rebuilding everything.
-export PKG_CONFIG_FOR_BUILD = "${STAGING_BINDIR_NATIVE}/pkg-config-native"
-
 do_configure:prepend() {
-    #delete a file that will get confused with generated one in ${B}
-    rm -f ${S}/gtk/gtktypefuncs.c
-
     # These files are generated by wayland-scanner but will race over modification
     # time between the copies in the sysroot from wayland-protocols and the copy
     # in the source tree. Solve the race by deleting so they need to be regenerated.
-    # 3.24.22 will not be shipping these files so this can be deleted then:
-    # https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/2183
-    rm -f ${S}/modules/input/text-input-unstable-v3*.[ch]
+    rm -f ${S}/modules/input/*-text-input-*.[ch]
 }
 
-EXTRA_OECONF += " \
-                 --disable-glibtest \
-                 --disable-xinerama \
-                 --enable-modules \
-                 ${@bb.utils.contains("DISTRO_FEATURES", "x11", "", "--disable-gtk-doc", d)} \
-                 "
+GTKDOC_MESON_OPTION = 'gtk_doc'
 
-do_compile:prepend() {
-        export GIR_EXTRA_LIBS_PATH="${B}/gdk/.libs"
-}
+EXTRA_OEMESON = "-Dxinerama=no -Dtests=false"
+EXTRA_OEMESON:append:class-native = " -Ddemos=false -Dexamples=false"
 
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl wayland x11', d)}"
 PACKAGECONFIG:class-native = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
 PACKAGECONFIG:class-nativesdk = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
 
-PACKAGECONFIG[x11] = "--enable-x11-backend,--disable-x11-backend,at-spi2-atk fontconfig libx11 libxext libxcursor libxi libxdamage libxrandr libxrender libxcomposite libxfixes"
+PACKAGECONFIG[x11] = "-Dx11_backend=true,-Dx11_backend=false,at-spi2-atk fontconfig libx11 libxext libxcursor libxi libxdamage libxrandr libxrender libxcomposite libxfixes"
 # this is provided by oe-core patch that removes epoxy/gl dependency from a X11 build
-PACKAGECONFIG[opengl] = "--enable-opengl,--disable-opengl,libepoxy"
-PACKAGECONFIG[wayland] = "--enable-wayland-backend,--disable-wayland-backend,wayland wayland-protocols libxkbcommon virtual/egl virtual/libgles2 wayland-native"
-PACKAGECONFIG[cups] = "--enable-cups,--disable-cups,cups"
-PACKAGECONFIG[colord] = "--enable-colord,--disable-colord,colord"
+PACKAGECONFIG[opengl] = "-Dopengl=true,-Dopengl=false,libepoxy"
+PACKAGECONFIG[wayland] = "-Dwayland_backend=true,-Dwayland_backend=false,wayland wayland-protocols libxkbcommon virtual/egl virtual/libgles2 wayland-native"
+PACKAGECONFIG[cups] = "-Dprint_backends=cups,-Dprint_backends=file,cups"
+PACKAGECONFIG[colord] = "-Dcolord=yes,-Dcolord=no,colord"
 
 prepare_gtk_scripts() {
     mv ${D}${bindir}/gtk-update-icon-cache ${D}${bindir}/gtk-update-icon-cache-3.0
@@ -101,7 +85,8 @@ FILES:${PN}-demo = "${bindir}/gtk3-demo \
 FILES:${PN}:append = " ${bindir}/gtk-update-icon-cache-3.0 \
                ${bindir}/gtk-query-immodules-3.0 \
                ${bindir}/gtk-launch \
-               ${datadir}/themes ${sysconfdir} ${datadir}/glib-2.0/schemas/ \
+               ${datadir}/themes ${datadir}/gtk-3.0/emoji \
+               ${sysconfdir} ${datadir}/glib-2.0/schemas/ \
                ${libdir}/gtk-3.0/${LIBV}/engines/libpixmap.so \
                ${libdir}/gtk-3.0/modules/*.so"
 
diff --git a/poky/meta/recipes-gnome/gtk+/gtk+3/0001-meson.build-build-introspection-according-to-option-.patch b/poky/meta/recipes-gnome/gtk+/gtk+3/0001-meson.build-build-introspection-according-to-option-.patch
new file mode 100644
index 0000000000..11effd421f
--- /dev/null
+++ b/poky/meta/recipes-gnome/gtk+/gtk+3/0001-meson.build-build-introspection-according-to-option-.patch
@@ -0,0 +1,34 @@
+From 6e533d5598ef875f30b84d931aae11b768465869 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Mon, 2 Jan 2023 15:00:02 +0100
+Subject: [PATCH] meson.build: build introspection according to option only
+
+The way the check is written, if the build is native, then the
+introspection option has no effect.
+
+Particularly yocto project does want to disable introspection in
+native builds and enable it in cross builds (both via the option),
+and without this patch the former is not possible.
+
+Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/5382]
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index bfc33af0f6..94ffaa7769 100644
+--- a/meson.build
++++ b/meson.build
+@@ -854,7 +854,7 @@ endif
+ 
+ # Introspection
+ gir = find_program('g-ir-scanner', required : get_option('introspection'))
+-build_gir = gir.found() and (not meson.is_cross_build() or get_option('introspection'))
++build_gir = gir.found() and get_option('introspection')
+ 
+ subdir('gdk')
+ subdir('gtk')
+-- 
+2.30.2
+
diff --git a/poky/meta/recipes-gnome/gtk+/gtk+3/0002-Do-not-try-to-initialize-GL-without-libGL.patch b/poky/meta/recipes-gnome/gtk+/gtk+3/0002-Do-not-try-to-initialize-GL-without-libGL.patch
deleted file mode 100644
index 80dc2d7a05..0000000000
--- a/poky/meta/recipes-gnome/gtk+/gtk+3/0002-Do-not-try-to-initialize-GL-without-libGL.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 6575ab0f0e8c1bba033ad1616511e37a2ec995ff Mon Sep 17 00:00:00 2001
-From: Jussi Kukkonen <jussi.kukkonen@intel.com>
-Date: Fri, 16 Oct 2015 16:35:16 +0300
-Subject: [PATCH] Do not try to initialize GL without libGL
-
-_gdk_x11_screen_update_visuals_for_gl() will end up calling epoxys
-GLX api which will exit() if libGL.so.1 is not present. We do not
-want that to happen and we don't want every app to have to set
-"GDK_GL=disabled" environment variable: so use #ifdef set based on
-opengl distro feature.
-
-Upstream is not interested in the fix as it is: Either epoxy should be
-fixed (to not exit) or GTK+ possibly could do some additional probing
-before calling epoxy APIs.
-
-Upstream-Status: Denied
-Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
-
----
- configure.ac            | 6 ++++++
- gdk/x11/gdkvisual-x11.c | 5 +++++
- 2 files changed, 11 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index e9f5583..bd651bb 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -346,6 +346,12 @@ AC_ARG_ENABLE(cloudproviders,
-               [AS_HELP_STRING([--enable-cloudproviders],
-                               [enable libcloudproviders integration])],
-                               [cloudproviders_set=yes])
-+AC_ARG_ENABLE(glx,
-+              [AS_HELP_STRING([--enable-glx],
-+                              [When enabled Gdk will try to initialize GLX])])
-+AS_IF([test "x$enable_glx" != "xno"], [
-+  AC_DEFINE([HAVE_GLX], [], [GLX will be available at runtime])
-+])
- 
- AC_ARG_ENABLE(profiler,
-               [AS_HELP_STRING([--enable-profiler],
-diff --git a/gdk/x11/gdkvisual-x11.c b/gdk/x11/gdkvisual-x11.c
-index 81479d8..3c8c5c0 100644
---- a/gdk/x11/gdkvisual-x11.c
-+++ b/gdk/x11/gdkvisual-x11.c
-@@ -306,7 +306,12 @@ _gdk_x11_screen_init_visuals (GdkScreen *screen)
-   /* If GL is available we want to pick better default/rgba visuals,
-      as we care about glx details such as alpha/depth/stencil depth,
-      stereo and double buffering */
-+  /* update_visuals_for_gl() will end up calling epoxy GLX api which
-+     will exit if libgl is not there: so only do this if we know GL
-+     is available */
-+#ifdef HAVE_GLX
-   _gdk_x11_screen_update_visuals_for_gl (screen);
-+#endif
- }
- 
- gint
diff --git a/poky/meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch b/poky/meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch
deleted file mode 100644
index 35cbab8761..0000000000
--- a/poky/meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch
+++ /dev/null
@@ -1,872 +0,0 @@
-From eef50c94587fc30cd624adb5eb213eb9fa663dc1 Mon Sep 17 00:00:00 2001
-From: Jussi Kukkonen <jussi.kukkonen@intel.com>
-Date: Tue, 21 Jun 2016 15:11:39 +0300
-Subject: [PATCH] Add --disable-opengl configure option
-
---disable-opengl will remove the dependency on libepoxy and on the
-OpenGL APIs. This is useful for those who want to keep using gtk+3
-without the "opengl" distro feature.
-
-GtkGLArea is still part of the API (it just doesn't work) even when
-OpenGL is disabled. GdkX11GLContext was removed from the Gtk API
-completely: that object exposes GL API elements so it had to be at
-the very least modified.
-
-The patch is _not_ great from a maintenance point of view and
-modifying the library API is also a fairly nasty thing to do.
-Next long term release (4.0) will require alternative solutions
-as it actually will depend on OpenGL.
-
-Upstream-Status: Inappropriate [Evil eye expected from upstream]
-Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
-
----
- configure.ac                               | 13 ++++-
- demos/gtk-demo/glarea.c                    | 14 ++++++
- docs/tools/Makefile.am                     |  9 +++-
- docs/tools/widgets.c                       |  4 +-
- gdk/Makefile.am                            |  8 ++-
- gdk/gdkdisplay.c                           |  4 +-
- gdk/gdkgl.c                                | 10 ++++
- gdk/gdkglcontext.c                         |  6 +++
- gdk/gdkwindow.c                            | 13 +++++
- gdk/x11/Makefile.am                        | 30 +++++++++--
- gdk/x11/gdkdisplay-x11.c                   |  6 ++-
- gdk/x11/gdkscreen-x11.c                    |  5 ++
- gdk/x11/gdkwindow-x11.c                    |  4 ++
- gdk/x11/gdkx-autocleanups.h                |  2 +
- gdk/x11/{gdkx.h => gdkx-with-gl-context.h} |  1 -
- gdk/x11/gdkx-without-gl-context.h          | 58 ++++++++++++++++++++++
- gtk/Makefile.am                            |  2 +-
- gtk/gtkglarea.c                            | 20 +++++++-
- gtk/inspector/general.c                    |  6 +++
- tests/Makefile.am                          | 10 ++--
- testsuite/gtk/objects-finalize.c           |  2 +
- 21 files changed, 208 insertions(+), 19 deletions(-)
- rename gdk/x11/{gdkx.h => gdkx-with-gl-context.h} (98%)
- create mode 100644 gdk/x11/gdkx-without-gl-context.h
-
-diff --git a/configure.ac b/configure.ac
-index 851bcbf..6cbf6a2 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -346,6 +346,15 @@ AC_ARG_ENABLE(cloudproviders,
-               [AS_HELP_STRING([--enable-cloudproviders],
-                               [enable libcloudproviders integration])],
-                               [cloudproviders_set=yes])
-+AC_ARG_ENABLE(opengl,
-+              [AS_HELP_STRING([--enable-opengl],
-+                              [When enabled, Gtk+ will use libepoxy and exposes GtkGLArea widget ])])
-+AS_IF([test "x$enable_opengl" != "xno"], [
-+  AC_DEFINE([HAVE_OPENGL], [1], [libepoxy and opengl APIs are available at buildtime])
-+  EPOXY_PACKAGES="epoxy >= epoxy_required_version"
-+])
-+AM_CONDITIONAL([HAVE_OPENGL],[test "x$enable_opengl" != "xno"])
-+
- AC_ARG_ENABLE(glx,
-               [AS_HELP_STRING([--enable-glx],
-                               [When enabled Gdk will try to initialize GLX])])
-@@ -1345,7 +1354,7 @@ CFLAGS="$saved_cflags"
- LDFLAGS="$saved_ldflags"
- 
- GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0 >= gdk_pixbuf_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version"
--GDK_PRIVATE_PACKAGES="$GDK_GIO_PACKAGE $X_PACKAGES $WAYLAND_PACKAGES $cairo_backends epoxy >= epoxy_required_version $CLOUDPROVIDER_PACKAGES $PROFILER_PACKAGES fribidi >= fribidi_required_version"
-+GDK_PRIVATE_PACKAGES="$GDK_GIO_PACKAGE $X_PACKAGES $WAYLAND_PACKAGES $cairo_backends $EPOXY_PACKAGES $CLOUDPROVIDER_PACKAGES $PROFILER_PACKAGES fribidi >= fribidi_required_version"
- 
- PKG_CHECK_MODULES(GDK_DEP, $GDK_PACKAGES $GDK_PRIVATE_PACKAGES)
- GDK_DEP_LIBS="$GDK_EXTRA_LIBS $GDK_DEP_LIBS $MATH_LIB"
-@@ -1379,7 +1388,7 @@ fi
- PKG_CHECK_MODULES(ATK, $ATK_PACKAGES)
- 
- GTK_PACKAGES="atk >= atk_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version gdk-pixbuf-2.0 >= gdk_pixbuf_required_version gio-2.0 >= glib_required_version"
--GTK_PRIVATE_PACKAGES="$ATK_PACKAGES $WAYLAND_PACKAGES epoxy >= epoxy_required_version fribidi >= fribidi_required_version"
-+GTK_PRIVATE_PACKAGES="$ATK_PACKAGES $WAYLAND_PACKAGES $EPOXY_PACKAGES fribidi >= fribidi_required_version"
- if test "x$enable_x11_backend" = xyes -o "x$enable_wayland_backend" = xyes; then
-   GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES pangoft2"
- fi
-diff --git a/demos/gtk-demo/glarea.c b/demos/gtk-demo/glarea.c
-index b51e4ae..82409c7 100644
---- a/demos/gtk-demo/glarea.c
-+++ b/demos/gtk-demo/glarea.c
-@@ -3,9 +3,12 @@
-  * GtkGLArea is a widget that allows custom drawing using OpenGL calls.
-  */
- 
-+#include "config.h"
- #include <math.h>
- #include <gtk/gtk.h>
-+#if HAVE_OPENGL
- #include <epoxy/gl.h>
-+#endif
- 
- static GtkWidget *demo_window = NULL;
- 
-@@ -23,6 +26,8 @@ enum {
- /* Rotation angles on each axis */
- static float rotation_angles[N_AXIS] = { 0.0 };
- 
-+#ifdef HAVE_OPENGL
-+
- /* The object we are drawing */
- static const GLfloat vertex_data[] = {
-   0.f,   0.5f,   0.f, 1.f,
-@@ -215,6 +220,7 @@ compute_mvp (float *res,
- static GLuint position_buffer;
- static GLuint program;
- static GLuint mvp_location;
-+#endif
- 
- /* We need to set up our state when we realize the GtkGLArea widget */
- static void
-@@ -241,8 +247,10 @@ realize (GtkWidget *widget)
-       fragment_path = "/glarea/glarea-gl.fs.glsl";
-     }
- 
-+#ifdef HAVE_OPENGL
-   init_buffers (&position_buffer, NULL);
-   init_shaders (vertex_path, fragment_path, &program, &mvp_location);
-+#endif
- }
- 
- /* We should tear down the state when unrealizing */
-@@ -254,10 +262,13 @@ unrealize (GtkWidget *widget)
-   if (gtk_gl_area_get_error (GTK_GL_AREA (widget)) != NULL)
-     return;
- 
-+#ifdef HAVE_OPENGL
-   glDeleteBuffers (1, &position_buffer);
-   glDeleteProgram (program);
-+#endif
- }
- 
-+#ifdef HAVE_OPENGL
- static void
- draw_triangle (void)
- {
-@@ -290,6 +301,7 @@ draw_triangle (void)
-   glBindBuffer (GL_ARRAY_BUFFER, 0);
-   glUseProgram (0);
- }
-+#endif
- 
- static gboolean
- render (GtkGLArea    *area,
-@@ -298,6 +310,7 @@ render (GtkGLArea    *area,
-   if (gtk_gl_area_get_error (area) != NULL)
-     return FALSE;
- 
-+#ifdef HAVE_OPENGL
-   /* Clear the viewport */
-   glClearColor (0.5, 0.5, 0.5, 1.0);
-   glClear (GL_COLOR_BUFFER_BIT);
-@@ -307,6 +320,7 @@ render (GtkGLArea    *area,
- 
-   /* Flush the contents of the pipeline */
-   glFlush ();
-+#endif
- 
-   return TRUE;
- }
-diff --git a/docs/tools/Makefile.am b/docs/tools/Makefile.am
-index bec43e3..189e8fc 100644
---- a/docs/tools/Makefile.am
-+++ b/docs/tools/Makefile.am
-@@ -9,13 +9,18 @@ AM_CPPFLAGS = \
- 	$(GTK_DEBUG_FLAGS)		\
- 	$(GTK_DEP_CFLAGS)
- 
-+if HAVE_OPENGL
-+GEARS_LDADD = $(top_builddir)/tests/gtkgears.o
-+endif
-+
- DEPS = \
--	$(top_builddir)/gtk/libgtk-3.la
-+	$(top_builddir)/gtk/libgtk-3.la	\
-+	$(GEARS_LDADD)
- 
- LDADDS = \
- 	$(top_builddir)/gtk/libgtk-3.la	\
- 	$(top_builddir)/gdk/libgdk-3.la	\
--	$(top_builddir)/tests/gtkgears.o \
-+	$(GEARS_LDADD)			\
- 	$(GTK_DEP_LIBS)			\
- 	$(GDK_DEP_LIBS)			\
- 	-lm
-diff --git a/docs/tools/widgets.c b/docs/tools/widgets.c
-index 932daf1..54239d6 100644
---- a/docs/tools/widgets.c
-+++ b/docs/tools/widgets.c
-@@ -1526,9 +1526,11 @@ create_gl_area (void)
-   widget = gtk_frame_new (NULL);
-   gtk_frame_set_shadow_type (GTK_FRAME (widget), GTK_SHADOW_IN);
- 
-+#ifdef HAVE_OPENGL
-   gears = gtk_gears_new ();
-   gtk_container_add (GTK_CONTAINER (widget), gears);
-- 
-+#endif
-+
-   info = new_widget_info ("glarea", widget, MEDIUM);
- 
-   return info;
-diff --git a/gdk/Makefile.am b/gdk/Makefile.am
-index 710a548..b45f631 100644
---- a/gdk/Makefile.am
-+++ b/gdk/Makefile.am
-@@ -274,7 +274,6 @@ x11_introspection_files = 		\
- 	x11/gdkeventsource.c		\
- 	x11/gdkeventtranslator.c	\
- 	x11/gdkgeometry-x11.c		\
--	x11/gdkglcontext-x11.c		\
- 	x11/gdkkeys-x11.c		\
- 	x11/gdkmain-x11.c		\
- 	x11/gdkmonitor-x11.c		\
-@@ -300,7 +299,6 @@ x11_introspection_files = 		\
- 	x11/gdkx11display.h		\
- 	x11/gdkx11displaymanager.h	\
- 	x11/gdkx11dnd.h			\
--	x11/gdkx11glcontext.h		\
- 	x11/gdkx11keys.h		\
- 	x11/gdkx11monitor.h		\
- 	x11/gdkx11property.h		\
-@@ -310,6 +308,12 @@ x11_introspection_files = 		\
- 	x11/gdkx11visual.h		\
- 	x11/gdkx11window.h
- 
-+if HAVE_OPENGL
-+x11_introspection_files += 		\
-+	x11/gdkglcontext-x11.c		\
-+	x11/gdkx11glcontext.h
-+endif
-+
- GdkX11-3.0.gir: libgdk-3.la Gdk-3.0.gir Makefile
- GdkX11_3_0_gir_SCANNERFLAGS = 		\
- 	--identifier-prefix=Gdk		\
-diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
-index 748f548..911ab2a 100644
---- a/gdk/gdkdisplay.c
-+++ b/gdk/gdkdisplay.c
-@@ -2420,7 +2420,9 @@ gboolean
- gdk_display_make_gl_context_current (GdkDisplay   *display,
-                                      GdkGLContext *context)
- {
--  return GDK_DISPLAY_GET_CLASS (display)->make_gl_context_current (display, context);
-+  if (GDK_DISPLAY_GET_CLASS (display)->make_gl_context_current)
-+    return GDK_DISPLAY_GET_CLASS (display)->make_gl_context_current (display, context);
-+  return FALSE;
- }
- 
- GdkRenderingMode
-diff --git a/gdk/gdkgl.c b/gdk/gdkgl.c
-index 9690077..55f85ef 100644
---- a/gdk/gdkgl.c
-+++ b/gdk/gdkgl.c
-@@ -26,7 +26,9 @@
- # include "win32/gdkwin32.h"
- #endif
- 
-+#ifdef HAVE_OPENGL
- #include <epoxy/gl.h>
-+#endif
- #include <math.h>
- #include <string.h>
- 
-@@ -40,6 +42,7 @@ gdk_cairo_surface_mark_as_direct (cairo_surface_t *surface,
-                                g_object_ref (window),  g_object_unref);
- }
- 
-+#ifdef HAVE_OPENGL
- static const char *
- get_vertex_type_name (int type)
- {
-@@ -212,6 +215,7 @@ use_texture_rect_program (GdkGLContextPaintData *paint_data)
-       glUseProgram (paint_data->current_program->program);
-     }
- }
-+#endif
- 
- void
- gdk_gl_texture_quads (GdkGLContext *paint_context,
-@@ -220,6 +224,7 @@ gdk_gl_texture_quads (GdkGLContext *paint_context,
-                       GdkTexturedQuad *quads,
-                       gboolean flip_colors)
- {
-+#ifdef HAVE_OPENGL
-   GdkGLContextPaintData *paint_data  = gdk_gl_context_get_paint_data (paint_context);
-   GdkGLContextProgram *program;
-   GdkWindow *window = gdk_gl_context_get_window (paint_context);
-@@ -293,6 +298,7 @@ gdk_gl_texture_quads (GdkGLContext *paint_context,
- 
-   glDisableVertexAttribArray (program->position_location);
-   glDisableVertexAttribArray (program->uv_location);
-+#endif
- }
- 
- /* x,y,width,height describes a rectangle in the gl render buffer
-@@ -341,6 +347,7 @@ gdk_cairo_draw_from_gl (cairo_t              *cr,
-                         int                   width,
-                         int                   height)
- {
-+#ifdef HAVE_OPENGL
-   GdkGLContext *paint_context;
-   cairo_surface_t *image;
-   cairo_matrix_t matrix;
-@@ -718,6 +725,7 @@ out:
-   if (clip_region)
-     cairo_region_destroy (clip_region);
- 
-+#endif
- }
- 
- /* This is always called with the paint context current */
-@@ -725,6 +733,7 @@ void
- gdk_gl_texture_from_surface (cairo_surface_t *surface,
- 			     cairo_region_t  *region)
- {
-+#ifdef HAVE_OPENGL
-   GdkGLContext *paint_context;
-   cairo_surface_t *image;
-   double device_x_offset, device_y_offset;
-@@ -825,4 +834,5 @@ gdk_gl_texture_from_surface (cairo_surface_t *surface,
- 
-   glDisable (GL_SCISSOR_TEST);
-   glDeleteTextures (1, &texture_id);
-+#endif
- }
-diff --git a/gdk/gdkglcontext.c b/gdk/gdkglcontext.c
-index 3b23639..1f04f8e 100644
---- a/gdk/gdkglcontext.c
-+++ b/gdk/gdkglcontext.c
-@@ -85,7 +85,9 @@
- #include "gdkintl.h"
- #include "gdk-private.h"
- 
-+#ifdef HAVE_OPENGL
- #include <epoxy/gl.h>
-+#endif
- 
- typedef struct {
-   GdkDisplay *display;
-@@ -243,6 +245,7 @@ gdk_gl_context_upload_texture (GdkGLContext    *context,
-                                int              height,
-                                guint            texture_target)
- {
-+#ifdef HAVE_OPENGL
-   GdkGLContextPrivate *priv = gdk_gl_context_get_instance_private (context);
- 
-   g_return_if_fail (GDK_IS_GL_CONTEXT (context));
-@@ -286,6 +289,7 @@ gdk_gl_context_upload_texture (GdkGLContext    *context,
-             glTexSubImage2D (texture_target, 0, 0, i, width, 1, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, (unsigned char*) data + (i * stride));
-         }
-     }
-+#endif
- }
- 
- static gboolean
-@@ -774,6 +778,7 @@ gdk_gl_context_realize (GdkGLContext  *context,
- static void
- gdk_gl_context_check_extensions (GdkGLContext *context)
- {
-+#ifdef HAVE_OPENGL
-   GdkGLContextPrivate *priv = gdk_gl_context_get_instance_private (context);
-   gboolean has_npot, has_texture_rectangle;
- 
-@@ -853,6 +858,7 @@ gdk_gl_context_check_extensions (GdkGLContext *context)
-                        priv->use_texture_rectangle ? "yes" : "no"));
- 
-   priv->extensions_checked = TRUE;
-+#endif
- }
- 
- /**
-diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
-index 2de8ba4..1883a79 100644
---- a/gdk/gdkwindow.c
-+++ b/gdk/gdkwindow.c
-@@ -45,7 +45,9 @@
- 
- #include <math.h>
- 
-+#ifdef HAVE_OPENGL
- #include <epoxy/gl.h>
-+#endif
- 
- /* for the use of round() */
- #include "fallback-c89.c"
-@@ -2844,6 +2846,13 @@ gdk_window_get_paint_gl_context (GdkWindow  *window,
- {
-   GError *internal_error = NULL;
- 
-+#ifndef HAVE_OPENGL
-+  g_set_error_literal (error, GDK_GL_ERROR,
-+                       GDK_GL_ERROR_NOT_AVAILABLE,
-+                       _("GL support disabled with --disable-opengl"));
-+  return NULL;
-+#endif
-+
-   if (_gdk_gl_flags & GDK_GL_DISABLE)
-     {
-       g_set_error_literal (error, GDK_GL_ERROR,
-@@ -2979,6 +2988,7 @@ gdk_window_begin_paint_internal (GdkWindow            *window,
-         }
-       else
-         {
-+#ifdef HAVE_OPENGL
- 	  gdk_gl_context_make_current (context);
-           /* With gl we always need a surface to combine the gl
-              drawing with the native drawing. */
-@@ -2993,6 +3003,7 @@ gdk_window_begin_paint_internal (GdkWindow            *window,
-           glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
- 
-           glViewport (0, 0, ww, wh);
-+#endif
-         }
-     }
- 
-@@ -3056,6 +3067,7 @@ gdk_window_end_paint_internal (GdkWindow *window)
- 
-           gdk_gl_context_make_current (window->gl_paint_context);
- 
-+#ifdef HAVE_OPENGL
-           if (!cairo_region_is_empty (opaque_region))
-             gdk_gl_texture_from_surface (window->current_paint.surface,
-                                          opaque_region);
-@@ -3066,6 +3078,7 @@ gdk_window_end_paint_internal (GdkWindow *window)
-                                            window->current_paint.need_blend_region);
-               glDisable(GL_BLEND);
-             }
-+#endif
- 
-           cairo_region_destroy (opaque_region);
- 
-diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am
-index 32b1f24..6352313 100644
---- a/gdk/x11/Makefile.am
-+++ b/gdk/x11/Makefile.am
-@@ -40,8 +40,6 @@ libgdk_x11_la_SOURCES = 	\
- 	gdkeventtranslator.c	\
- 	gdkeventtranslator.h	\
- 	gdkgeometry-x11.c  	\
--	gdkglcontext-x11.c	\
--	gdkglcontext-x11.h	\
- 	gdkkeys-x11.c		\
- 	gdkmain-x11.c		\
- 	gdkmonitor-x11.c	\
-@@ -56,14 +54,32 @@ libgdk_x11_la_SOURCES = 	\
- 	gdkwindow-x11.h		\
- 	gdkxftdefaults.c	\
- 	gdkxid.c		\
--	gdkx.h			\
- 	gdkprivate-x11.h	\
- 	xsettings-client.h	\
- 	xsettings-client.c
- 
-+if HAVE_OPENGL
-+libgdk_x11_la_SOURCES +=        \
-+	gdkglcontext-x11.c	\
-+	gdkglcontext-x11.h
-+endif
-+
- libgdkinclude_HEADERS = 	\
- 	gdkx.h
- 
-+if HAVE_OPENGL
-+GDKX_HEADER = gdkx-with-gl-context.h
-+else
-+GDKX_HEADER = gdkx-without-gl-context.h
-+endif
-+
-+BUILT_SOURCES = gdkx.h
-+
-+.PHONY: gdkx.h
-+gdkx.h:
-+	$(AM_V_GEN) cd $(srcdir) \
-+	&& (cmp -s $(GDKX_HEADER) gdkx.h || cp $(GDKX_HEADER) gdkx.h )
-+
- libgdkx11include_HEADERS = 	\
- 	gdkx-autocleanups.h	\
- 	gdkx11applaunchcontext.h \
-@@ -77,7 +93,6 @@ libgdkx11include_HEADERS = 	\
- 	gdkx11display.h		\
- 	gdkx11displaymanager.h	\
- 	gdkx11dnd.h		\
--	gdkx11glcontext.h	\
- 	gdkx11keys.h		\
- 	gdkx11monitor.h		\
- 	gdkx11property.h	\
-@@ -87,10 +102,17 @@ libgdkx11include_HEADERS = 	\
- 	gdkx11visual.h		\
- 	gdkx11window.h
- 
-+if HAVE_OPENGL
-+libgdkx11include_HEADERS += gdkx11glcontext.h
-+endif
-+
- # We need to include all these C files here since the conditionals
- # don't seem to be correctly expanded for the dist files.
- EXTRA_DIST += 			\
-+	gdkx.h			\
- 	gdksettings.c	\
- 	meson.build
- 
-+MAINTAINERCLEANFILES = gdkx.h
-+
- -include $(top_srcdir)/git.mk
-diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
-index 7e08f47..30fd7b6 100644
---- a/gdk/x11/gdkdisplay-x11.c
-+++ b/gdk/x11/gdkdisplay-x11.c
-@@ -37,7 +37,9 @@
- #include "gdkdisplay-x11.h"
- #include "gdkprivate-x11.h"
- #include "gdkscreen-x11.h"
-+#ifdef HAVE_OPENGL
- #include "gdkglcontext-x11.h"
-+#endif
- #include "gdk-private.h"
- #include "gdkprofilerprivate.h"
- 
-@@ -3191,7 +3193,9 @@ gdk_x11_display_class_init (GdkX11DisplayClass * class)
-   display_class->text_property_to_utf8_list = _gdk_x11_display_text_property_to_utf8_list;
-   display_class->utf8_to_string_target = _gdk_x11_display_utf8_to_string_target;
- 
--  display_class->make_gl_context_current = gdk_x11_display_make_gl_context_current;
-+#ifdef HAVE_OPENGL
-+   display_class->make_gl_context_current = gdk_x11_display_make_gl_context_current;
-+#endif
- 
-   display_class->get_default_seat = gdk_x11_display_get_default_seat;
- 
-diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c
-index bb4df05..46f5349 100644
---- a/gdk/x11/gdkscreen-x11.c
-+++ b/gdk/x11/gdkscreen-x11.c
-@@ -1827,3 +1827,8 @@ gdk_x11_screen_get_current_desktop (GdkScreen *screen)
- {
-   return get_netwm_cardinal_property (screen, "_NET_CURRENT_DESKTOP");
- }
-+
-+#ifndef HAVE_OPENGL
-+/* Function from in gdk/x11/gdkglcontext-x11.c */
-+void _gdk_x11_screen_update_visuals_for_gl (GdkScreen *screen) {}
-+#endif
-diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
-index 721d9bb..8e87acc 100644
---- a/gdk/x11/gdkwindow-x11.c
-+++ b/gdk/x11/gdkwindow-x11.c
-@@ -36,7 +36,9 @@
- #include "gdkasync.h"
- #include "gdkeventsource.h"
- #include "gdkdisplay-x11.h"
-+#ifdef HAVE_OPENGL
- #include "gdkglcontext-x11.h"
-+#endif
- #include "gdkprivate-x11.h"
- #include "gdk-private.h"
- 
-@@ -5881,7 +5883,9 @@ gdk_window_impl_x11_class_init (GdkWindowImplX11Class *klass)
-   impl_class->set_opaque_region = gdk_x11_window_set_opaque_region;
-   impl_class->set_shadow_width = gdk_x11_window_set_shadow_width;
-   impl_class->show_window_menu = gdk_x11_window_show_window_menu;
-+#ifdef HAVE_OPENGL
-   impl_class->create_gl_context = gdk_x11_window_create_gl_context;
-   impl_class->invalidate_for_new_frame = gdk_x11_window_invalidate_for_new_frame;
-+#endif
-   impl_class->get_unscaled_size = gdk_x11_window_get_unscaled_size;
- }
-diff --git a/gdk/x11/gdkx-autocleanups.h b/gdk/x11/gdkx-autocleanups.h
-index edb0ea7..a317d61 100644
---- a/gdk/x11/gdkx-autocleanups.h
-+++ b/gdk/x11/gdkx-autocleanups.h
-@@ -30,7 +30,9 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11DeviceXI2, g_object_unref)
- G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11Display, g_object_unref)
- G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11DisplayManager, g_object_unref)
- G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11DragContext, g_object_unref)
-+#ifdef HAVE_OPENGL
- G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11GLContext, g_object_unref)
-+#endif
- G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11Keymap, g_object_unref)
- G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11Screen, g_object_unref)
- G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11Visual, g_object_unref)
-diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx-with-gl-context.h
-similarity index 98%
-rename from gdk/x11/gdkx.h
-rename to gdk/x11/gdkx-with-gl-context.h
-index 1f64bcc..ae05fa6 100644
---- a/gdk/x11/gdkx.h
-+++ b/gdk/x11/gdkx-with-gl-context.h
-@@ -45,7 +45,6 @@
- #include <gdk/x11/gdkx11dnd.h>
- #include <gdk/x11/gdkx11glcontext.h>
- #include <gdk/x11/gdkx11keys.h>
--#include <gdk/x11/gdkx11monitor.h>
- #include <gdk/x11/gdkx11property.h>
- #include <gdk/x11/gdkx11screen.h>
- #include <gdk/x11/gdkx11selection.h>
-diff --git a/gdk/x11/gdkx-without-gl-context.h b/gdk/x11/gdkx-without-gl-context.h
-new file mode 100644
-index 0000000..c9e2617
---- /dev/null
-+++ b/gdk/x11/gdkx-without-gl-context.h
-@@ -0,0 +1,58 @@
-+/* GDK - The GIMP Drawing Kit
-+ * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
-+ */
-+
-+/*
-+ * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
-+ * file for a list of people on the GTK+ Team.  See the ChangeLog
-+ * files for a list of changes.  These files are distributed with
-+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
-+ */
-+
-+#ifndef __GDK_X_H__
-+#define __GDK_X_H__
-+
-+#include <gdk/gdk.h>
-+
-+#include <X11/Xlib.h>
-+#include <X11/Xutil.h>
-+
-+#define __GDKX_H_INSIDE__
-+
-+#include <gdk/x11/gdkx11applaunchcontext.h>
-+#include <gdk/x11/gdkx11cursor.h>
-+#include <gdk/x11/gdkx11device.h>
-+#include <gdk/x11/gdkx11device-core.h>
-+#include <gdk/x11/gdkx11device-xi2.h>
-+#include <gdk/x11/gdkx11devicemanager.h>
-+#include <gdk/x11/gdkx11devicemanager-core.h>
-+#include <gdk/x11/gdkx11devicemanager-xi2.h>
-+#include <gdk/x11/gdkx11display.h>
-+#include <gdk/x11/gdkx11displaymanager.h>
-+#include <gdk/x11/gdkx11dnd.h>
-+#include <gdk/x11/gdkx11keys.h>
-+#include <gdk/x11/gdkx11property.h>
-+#include <gdk/x11/gdkx11screen.h>
-+#include <gdk/x11/gdkx11selection.h>
-+#include <gdk/x11/gdkx11utils.h>
-+#include <gdk/x11/gdkx11visual.h>
-+#include <gdk/x11/gdkx11window.h>
-+
-+#include <gdk/x11/gdkx-autocleanups.h>
-+
-+#undef __GDKX_H_INSIDE__
-+
-+#endif /* __GDK_X_H__ */
-diff --git a/gtk/Makefile.am b/gtk/Makefile.am
-index 074fb35..4fa9eb6 100644
---- a/gtk/Makefile.am
-+++ b/gtk/Makefile.am
-@@ -1457,7 +1457,7 @@ gtktypefuncs.inc: stamp-gtktypebuiltins.h stamp-gtkprivatetypebuiltins.h $(top_s
- 	  ${CPP} $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) xgen-gtfsrc.c | \
- 	  $(GREP) -o '\bg[td]k_[a-zA-Z0-9_]*_get_type\b' | \
- 	  sort | uniq | \
--	  $(SED) '{ s/^/*tp++ = /; s/$$/();/; s/^.*\(gdk_x11\|gtk_plug_\|gtk_socket_\).*$$/#ifdef GDK_WINDOWING_X11\n&\n#endif/; }' >> xgen-gtf \
-+	  $(SED) '{ s/^/*tp++ = /; s/$$/();/; s/^.*\(gdk_x11\|gtk_plug_\|gtk_socket_\).*$$/#ifdef GDK_WINDOWING_X11\n&\n#endif/; s/^.*gdk_x11_gl.*$$/#ifdef HAVE_OPENGL\n&\n#endif/; }' >> xgen-gtf \
- 	&& cp xgen-gtf $@ && rm -f xgen-gtf
- $(srcdir)/gtktestutils.c: gtktypefuncs.inc
- 
-diff --git a/gtk/gtkglarea.c b/gtk/gtkglarea.c
-index 802303e..33001cf 100644
---- a/gtk/gtkglarea.c
-+++ b/gtk/gtkglarea.c
-@@ -29,7 +29,9 @@
- #include "gtkprivate.h"
- #include "gtkrender.h"
- 
-+#ifdef HAVE_OPENGL
- #include <epoxy/gl.h>
-+#endif
- 
- /**
-  * SECTION:gtkglarea
-@@ -369,9 +371,12 @@ gtk_gl_area_real_create_context (GtkGLArea *area)
- static void
- gtk_gl_area_resize (GtkGLArea *area, int width, int height)
- {
-+#ifdef HAVE_OPENGL
-   glViewport (0, 0, width, height);
-+#endif
- }
- 
-+#ifdef HAVE_OPENGL
- /*
-  * Creates all the buffer objects needed for rendering the scene
-  */
-@@ -483,6 +488,7 @@ gtk_gl_area_allocate_buffers (GtkGLArea *area)
- 
-   priv->needs_render = TRUE;
- }
-+#endif
- 
- /**
-  * gtk_gl_area_attach_buffers:
-@@ -501,6 +507,7 @@ gtk_gl_area_allocate_buffers (GtkGLArea *area)
- void
- gtk_gl_area_attach_buffers (GtkGLArea *area)
- {
-+#ifdef HAVE_OPENGL
-   GtkGLAreaPrivate *priv = gtk_gl_area_get_instance_private (area);
- 
-   g_return_if_fail (GTK_IS_GL_AREA (area));
-@@ -533,11 +540,13 @@ gtk_gl_area_attach_buffers (GtkGLArea *area)
-         glFramebufferRenderbuffer (GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT,
-                                    GL_RENDERBUFFER, priv->depth_stencil_buffer);
-     }
-+#endif
- }
- 
- static void
- gtk_gl_area_delete_buffers (GtkGLArea *area)
- {
-+#ifdef HAVE_OPENGL
-   GtkGLAreaPrivate *priv = gtk_gl_area_get_instance_private (area);
- 
-   if (priv->context == NULL)
-@@ -569,6 +578,7 @@ gtk_gl_area_delete_buffers (GtkGLArea *area)
-       glDeleteFramebuffers (1, &priv->frame_buffer);
-       priv->frame_buffer = 0;
-     }
-+#endif
- }
- 
- static void
-@@ -679,6 +689,7 @@ gtk_gl_area_draw (GtkWidget *widget,
-   GtkGLArea *area = GTK_GL_AREA (widget);
-   GtkGLAreaPrivate *priv = gtk_gl_area_get_instance_private (area);
-   gboolean unused;
-+#ifdef HAVE_OPENGL
-   int w, h, scale;
-   GLenum status;
- 
-@@ -690,7 +701,6 @@ gtk_gl_area_draw (GtkWidget *widget,
-                                      gtk_widget_get_allocated_height (widget));
-       return FALSE;
-     }
--
-   if (priv->context == NULL)
-     return FALSE;
- 
-@@ -736,6 +746,14 @@ gtk_gl_area_draw (GtkWidget *widget,
-     }
- 
-   return TRUE;
-+#else
-+  if (priv->error != NULL)
-+      gtk_gl_area_draw_error_screen (area,
-+                                     cr,
-+                                     gtk_widget_get_allocated_width (widget),
-+                                     gtk_widget_get_allocated_height (widget));
-+  return FALSE;
-+#endif
- }
- 
- static gboolean
-diff --git a/gtk/inspector/general.c b/gtk/inspector/general.c
-index 48237d1..1f9b9be 100644
---- a/gtk/inspector/general.c
-+++ b/gtk/inspector/general.c
-@@ -33,8 +33,10 @@
- 
- #ifdef GDK_WINDOWING_X11
- #include "x11/gdkx.h"
-+#ifdef HAVE_OPENGL
- #include <epoxy/glx.h>
- #endif
-+#endif
- 
- #ifdef GDK_WINDOWING_WIN32
- #include "win32/gdkwin32.h"
-@@ -196,6 +198,7 @@ add_label_row (GtkInspectorGeneral *gen,
-   gtk_size_group_add_widget (GTK_SIZE_GROUP (gen->priv->labels), label);
- }
- 
-+#ifdef HAVE_OPENGL
- #ifdef GDK_WINDOWING_X11
- static void
- append_glx_extension_row (GtkInspectorGeneral *gen,
-@@ -205,6 +208,7 @@ append_glx_extension_row (GtkInspectorGeneral *gen,
-   add_check_row (gen, GTK_LIST_BOX (gen->priv->gl_box), ext, epoxy_has_glx_extension (dpy, 0, ext), 0);
- }
- #endif
-+#endif
- 
- #ifdef GDK_WINDOWING_WAYLAND
- static void
-@@ -254,6 +258,7 @@ wayland_get_display (struct wl_display *wl_display)
- static void
- init_gl (GtkInspectorGeneral *gen)
- {
-+#ifdef HAVE_OPENGL
- #ifdef GDK_WINDOWING_X11
-   if (GDK_IS_X11_DISPLAY (gdk_display_get_default ()))
-     {
-@@ -280,6 +285,7 @@ init_gl (GtkInspectorGeneral *gen)
-     }
-   else
- #endif
-+#endif
- #ifdef GDK_WINDOWING_WAYLAND
-   if (GDK_IS_WAYLAND_DISPLAY (gdk_display_get_default ()))
-     {
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index f283e89..5e7180e 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -80,8 +80,6 @@ noinst_PROGRAMS =  $(TEST_PROGS)	\
- 	testfullscreen			\
- 	testgeometry			\
- 	testgiconpixbuf			\
--	testglarea			\
--	testglblending			\
- 	testgrid			\
- 	testgtk				\
- 	testheaderbar			\
-@@ -172,12 +170,18 @@ noinst_PROGRAMS =  $(TEST_PROGS)	\
- 	testactionbar			\
- 	testwindowsize			\
- 	testpopover			\
--	gdkgears			\
- 	listmodel			\
- 	testpopup			\
- 	testpopupat			\
- 	$(NULL)
- 
-+if HAVE_OPENGL
-+noinst_PROGRAMS +=
-+	testglarea			\
-+	testglblending			\
-+	gdkgears
-+endif
-+
- if USE_WAYLAND
- noinst_PROGRAMS += testforeign
- endif
-diff --git a/testsuite/gtk/objects-finalize.c b/testsuite/gtk/objects-finalize.c
-index 24540e3..e0f863a 100644
---- a/testsuite/gtk/objects-finalize.c
-+++ b/testsuite/gtk/objects-finalize.c
-@@ -116,7 +116,9 @@ main (int argc, char **argv)
- 	  all_types[i] != GDK_TYPE_X11_DEVICE_MANAGER_CORE &&
- 	  all_types[i] != GDK_TYPE_X11_DEVICE_MANAGER_XI2 &&
- 	  all_types[i] != GDK_TYPE_X11_DISPLAY_MANAGER &&
-+#ifdef HAVE_OPENGL
- 	  all_types[i] != GDK_TYPE_X11_GL_CONTEXT &&
-+#endif
- #endif
- 	  /* Not allowed to finalize a GdkPixbufLoader without calling gdk_pixbuf_loader_close() */
- 	  all_types[i] != GDK_TYPE_PIXBUF_LOADER &&
diff --git a/poky/meta/recipes-gnome/gtk+/gtk+3/link_fribidi.patch b/poky/meta/recipes-gnome/gtk+/gtk+3/link_fribidi.patch
deleted file mode 100644
index e4bbd799f1..0000000000
--- a/poky/meta/recipes-gnome/gtk+/gtk+3/link_fribidi.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Link with libfribidi, this is to avoid under linking where these functions are
-used but the library is not linked in, and they are marked undefined by BFD linker
-but gold linker refuses to link
-
-| ./.libs/libgdk-3.so: error: undefined reference to 'fribidi_get_bidi_type'
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Upstream-Status: Pending
-
---- a/gdk/Makefile.am
-+++ b/gdk/Makefile.am
-@@ -55,6 +55,7 @@ LDADD = 					\
- 	-version-info $(LT_VERSION_INFO)	\
- 	-export-dynamic 			\
- 	-rpath $(libdir) 			\
-+	-lfribidi	 			\
- 	$(no_undefined)
- 
- #
diff --git a/poky/meta/recipes-gnome/gtk+/gtk+3/opengl.patch b/poky/meta/recipes-gnome/gtk+/gtk+3/opengl.patch
new file mode 100644
index 0000000000..7354265e10
--- /dev/null
+++ b/poky/meta/recipes-gnome/gtk+/gtk+3/opengl.patch
@@ -0,0 +1,737 @@
+From 4a0716f04fb25b51b08e994bd5a900b2e7f7fed5 Mon Sep 17 00:00:00 2001
+From: Jussi Kukkonen <jussi.kukkonen@intel.com>
+Date: Fri, 16 Oct 2015 16:35:16 +0300
+Subject: [PATCH] Do not try to initialize GL without libGL
+
+_gdk_x11_screen_update_visuals_for_gl() will end up calling epoxys
+GLX api which will exit() if libGL.so.1 is not present. We do not
+want that to happen and we don't want every app to have to set
+"GDK_GL=disabled" environment variable: so use #ifdef set based on
+opengl distro feature.
+
+Upstream is not interested in the fix as it is: Either epoxy should be
+fixed (to not exit) or GTK+ possibly could do some additional probing
+before calling epoxy APIs.
+
+Upstream-Status: Denied
+Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
+---
+ demos/gtk-demo/meson.build       |  5 ++++-
+ docs/tools/meson.build           |  7 +++++--
+ docs/tools/widgets.c             |  6 +++++-
+ gdk/gdkconfig.h.meson            |  1 +
+ gdk/gdkdisplay.c                 |  4 ++++
+ gdk/gdkgl.c                      | 10 ++++++++++
+ gdk/gdkglcontext.c               |  6 ++++++
+ gdk/gdkwindow.c                  | 13 +++++++++++++
+ gdk/meson.build                  |  8 +++++++-
+ gdk/x11/gdkdisplay-x11.c         |  6 +++++-
+ gdk/x11/gdkvisual-x11.c          |  5 +++++
+ gdk/x11/gdkwindow-x11.c          |  4 ++++
+ gdk/x11/gdkx-autocleanups.h      |  2 ++
+ gdk/x11/gdkx.h                   |  2 ++
+ gdk/x11/meson.build              |  7 +++++--
+ gtk/gtkglarea.c                  | 19 +++++++++++++++++++
+ gtk/inspector/general.c          |  6 ++++++
+ meson.build                      | 17 ++++++++++++++---
+ meson_options.txt                |  2 ++
+ tests/meson.build                |  9 +++++++--
+ testsuite/gtk/objects-finalize.c |  2 ++
+ 21 files changed, 128 insertions(+), 13 deletions(-)
+
+diff --git a/demos/gtk-demo/meson.build b/demos/gtk-demo/meson.build
+index 252da16d05..4b57cff6ac 100644
+--- a/demos/gtk-demo/meson.build
++++ b/demos/gtk-demo/meson.build
+@@ -28,7 +28,6 @@ demos = files([
+   'fishbowl.c',
+   'foreigndrawing.c',
+   'gestures.c',
+-  'glarea.c',
+   'headerbar.c',
+   'hypertext.c',
+   'iconview.c',
+@@ -87,6 +86,10 @@ elif harfbuzz_dep.found() and pangoft_dep.found()
+   gtkdemo_deps += [harfbuzz_dep, pangoft_dep]
+ endif
+ 
++if opengl_enabled
++  demos += files('glarea.c')
++endif
++
+ if os_unix
+   demos += files('pagesetup.c')
+ endif
+diff --git a/docs/tools/meson.build b/docs/tools/meson.build
+index 05621ee7ed..3d0a333b32 100644
+--- a/docs/tools/meson.build
++++ b/docs/tools/meson.build
+@@ -2,10 +2,13 @@ if x11_enabled
+   doc_shooter_sources = [
+     'shadow.c',
+     'shooter.c',
+-    'widgets.c',
+-    '../../tests/gtkgears.c',
++    'widgets.c'
+   ]
+ 
++  if opengl_enabled
++  doc_shooter_sources += ['../../tests/gtkgears.c']
++  endif
++
+   doc_shooter = executable('doc-shooter', doc_shooter_sources,
+                            include_directories: [ confinc, gdkinc, gtkinc, testinc, ],
+                            dependencies: libgtk_dep)
+diff --git a/docs/tools/widgets.c b/docs/tools/widgets.c
+index 932daf1746..348807e133 100644
+--- a/docs/tools/widgets.c
++++ b/docs/tools/widgets.c
+@@ -8,7 +8,9 @@
+ #include <X11/Xatom.h>
+ #include <gdkx.h>
+ #include "widgets.h"
++#ifdef HAVE_OPENGL
+ #include "gtkgears.h"
++#endif
+ 
+ #define SMALL_WIDTH  240
+ #define SMALL_HEIGHT 75
+@@ -1526,9 +1528,11 @@ create_gl_area (void)
+   widget = gtk_frame_new (NULL);
+   gtk_frame_set_shadow_type (GTK_FRAME (widget), GTK_SHADOW_IN);
+ 
++#ifdef HAVE_OPENGL
+   gears = gtk_gears_new ();
+   gtk_container_add (GTK_CONTAINER (widget), gears);
+- 
++#endif
++
+   info = new_widget_info ("glarea", widget, MEDIUM);
+ 
+   return info;
+diff --git a/gdk/gdkconfig.h.meson b/gdk/gdkconfig.h.meson
+index 7db19e0470..088651bafa 100644
+--- a/gdk/gdkconfig.h.meson
++++ b/gdk/gdkconfig.h.meson
+@@ -15,6 +15,7 @@ G_BEGIN_DECLS
+ #mesondefine GDK_WINDOWING_WAYLAND
+ #mesondefine GDK_WINDOWING_WIN32
+ #mesondefine GDK_WINDOWING_QUARTZ
++#mesondefine GDK_WITH_OPENGL
+ 
+ G_END_DECLS
+ 
+diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
+index 748f54860c..04ef2c09d4 100644
+--- a/gdk/gdkdisplay.c
++++ b/gdk/gdkdisplay.c
+@@ -2420,7 +2420,11 @@ gboolean
+ gdk_display_make_gl_context_current (GdkDisplay   *display,
+                                      GdkGLContext *context)
+ {
++#ifdef HAVE_OPENGL
+   return GDK_DISPLAY_GET_CLASS (display)->make_gl_context_current (display, context);
++#else
++  return FALSE;
++#endif
+ }
+ 
+ GdkRenderingMode
+diff --git a/gdk/gdkgl.c b/gdk/gdkgl.c
+index 9690077cc2..55f85ef605 100644
+--- a/gdk/gdkgl.c
++++ b/gdk/gdkgl.c
+@@ -26,7 +26,9 @@
+ # include "win32/gdkwin32.h"
+ #endif
+ 
++#ifdef HAVE_OPENGL
+ #include <epoxy/gl.h>
++#endif
+ #include <math.h>
+ #include <string.h>
+ 
+@@ -40,6 +42,7 @@ gdk_cairo_surface_mark_as_direct (cairo_surface_t *surface,
+                                g_object_ref (window),  g_object_unref);
+ }
+ 
++#ifdef HAVE_OPENGL
+ static const char *
+ get_vertex_type_name (int type)
+ {
+@@ -212,6 +215,7 @@ use_texture_rect_program (GdkGLContextPaintData *paint_data)
+       glUseProgram (paint_data->current_program->program);
+     }
+ }
++#endif
+ 
+ void
+ gdk_gl_texture_quads (GdkGLContext *paint_context,
+@@ -220,6 +224,7 @@ gdk_gl_texture_quads (GdkGLContext *paint_context,
+                       GdkTexturedQuad *quads,
+                       gboolean flip_colors)
+ {
++#ifdef HAVE_OPENGL
+   GdkGLContextPaintData *paint_data  = gdk_gl_context_get_paint_data (paint_context);
+   GdkGLContextProgram *program;
+   GdkWindow *window = gdk_gl_context_get_window (paint_context);
+@@ -293,6 +298,7 @@ gdk_gl_texture_quads (GdkGLContext *paint_context,
+ 
+   glDisableVertexAttribArray (program->position_location);
+   glDisableVertexAttribArray (program->uv_location);
++#endif
+ }
+ 
+ /* x,y,width,height describes a rectangle in the gl render buffer
+@@ -341,6 +347,7 @@ gdk_cairo_draw_from_gl (cairo_t              *cr,
+                         int                   width,
+                         int                   height)
+ {
++#ifdef HAVE_OPENGL
+   GdkGLContext *paint_context;
+   cairo_surface_t *image;
+   cairo_matrix_t matrix;
+@@ -718,6 +725,7 @@ out:
+   if (clip_region)
+     cairo_region_destroy (clip_region);
+ 
++#endif
+ }
+ 
+ /* This is always called with the paint context current */
+@@ -725,6 +733,7 @@ void
+ gdk_gl_texture_from_surface (cairo_surface_t *surface,
+ 			     cairo_region_t  *region)
+ {
++#ifdef HAVE_OPENGL
+   GdkGLContext *paint_context;
+   cairo_surface_t *image;
+   double device_x_offset, device_y_offset;
+@@ -825,4 +834,5 @@ gdk_gl_texture_from_surface (cairo_surface_t *surface,
+ 
+   glDisable (GL_SCISSOR_TEST);
+   glDeleteTextures (1, &texture_id);
++#endif
+ }
+diff --git a/gdk/gdkglcontext.c b/gdk/gdkglcontext.c
+index 3b23639e1c..1f04f8e0b2 100644
+--- a/gdk/gdkglcontext.c
++++ b/gdk/gdkglcontext.c
+@@ -85,7 +85,9 @@
+ #include "gdkintl.h"
+ #include "gdk-private.h"
+ 
++#ifdef HAVE_OPENGL
+ #include <epoxy/gl.h>
++#endif
+ 
+ typedef struct {
+   GdkDisplay *display;
+@@ -243,6 +245,7 @@ gdk_gl_context_upload_texture (GdkGLContext    *context,
+                                int              height,
+                                guint            texture_target)
+ {
++#ifdef HAVE_OPENGL
+   GdkGLContextPrivate *priv = gdk_gl_context_get_instance_private (context);
+ 
+   g_return_if_fail (GDK_IS_GL_CONTEXT (context));
+@@ -286,6 +289,7 @@ gdk_gl_context_upload_texture (GdkGLContext    *context,
+             glTexSubImage2D (texture_target, 0, 0, i, width, 1, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, (unsigned char*) data + (i * stride));
+         }
+     }
++#endif
+ }
+ 
+ static gboolean
+@@ -774,6 +778,7 @@ gdk_gl_context_realize (GdkGLContext  *context,
+ static void
+ gdk_gl_context_check_extensions (GdkGLContext *context)
+ {
++#ifdef HAVE_OPENGL
+   GdkGLContextPrivate *priv = gdk_gl_context_get_instance_private (context);
+   gboolean has_npot, has_texture_rectangle;
+ 
+@@ -853,6 +858,7 @@ gdk_gl_context_check_extensions (GdkGLContext *context)
+                        priv->use_texture_rectangle ? "yes" : "no"));
+ 
+   priv->extensions_checked = TRUE;
++#endif
+ }
+ 
+ /**
+diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
+index 727b0cf1f4..d4d91b0d16 100644
+--- a/gdk/gdkwindow.c
++++ b/gdk/gdkwindow.c
+@@ -45,7 +45,9 @@
+ 
+ #include <math.h>
+ 
++#ifdef HAVE_OPENGL
+ #include <epoxy/gl.h>
++#endif
+ 
+ /* for the use of round() */
+ #include "fallback-c89.c"
+@@ -2844,6 +2846,13 @@ gdk_window_get_paint_gl_context (GdkWindow  *window,
+ {
+   GError *internal_error = NULL;
+ 
++#ifndef HAVE_OPENGL
++  g_set_error_literal (error, GDK_GL_ERROR,
++                       GDK_GL_ERROR_NOT_AVAILABLE,
++                       _("GL support disabled with --disable-opengl"));
++  return NULL;
++#endif
++
+   if (_gdk_gl_flags & GDK_GL_DISABLE)
+     {
+       g_set_error_literal (error, GDK_GL_ERROR,
+@@ -2979,6 +2988,7 @@ gdk_window_begin_paint_internal (GdkWindow            *window,
+         }
+       else
+         {
++#ifdef HAVE_OPENGL
+ 	  gdk_gl_context_make_current (context);
+           /* With gl we always need a surface to combine the gl
+              drawing with the native drawing. */
+@@ -2993,6 +3003,7 @@ gdk_window_begin_paint_internal (GdkWindow            *window,
+           glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+ 
+           glViewport (0, 0, ww, wh);
++#endif
+         }
+     }
+ 
+@@ -3056,6 +3067,7 @@ gdk_window_end_paint_internal (GdkWindow *window)
+ 
+           gdk_gl_context_make_current (window->gl_paint_context);
+ 
++#ifdef HAVE_OPENGL
+           if (!cairo_region_is_empty (opaque_region))
+             gdk_gl_texture_from_surface (window->current_paint.surface,
+                                          opaque_region);
+@@ -3066,6 +3078,7 @@ gdk_window_end_paint_internal (GdkWindow *window)
+                                            window->current_paint.need_blend_region);
+               glDisable(GL_BLEND);
+             }
++#endif
+ 
+           cairo_region_destroy (opaque_region);
+ 
+diff --git a/gdk/meson.build b/gdk/meson.build
+index 4bb1bf2b6c..64172b8d3e 100644
+--- a/gdk/meson.build
++++ b/gdk/meson.build
+@@ -56,7 +56,6 @@ gdk_gir_public_headers = files(
+   'gdkdrawingcontext.h',
+   'gdkevents.h',
+   'gdkframetimings.h',
+-  'gdkglcontext.h',
+   'gdkkeys.h',
+   'gdkkeysyms.h',
+   'gdkmain.h',
+@@ -78,6 +77,12 @@ gdk_gir_public_headers = files(
+   'gdkwindow.h',
+ )
+ gdk_nogir_public_headers = [files('gdkkeysyms-compat.h')]
++if opengl_enabled
++gdk_gir_public_headers += files('gdkglcontext.h')
++else
++gdk_nogir_public_headers += files('gdkglcontext.h')
++endif
++
+ gdk_public_headers = gdk_gir_public_headers + gdk_nogir_public_headers
+ install_headers(gdk_public_headers, subdir : 'gtk-3.0/gdk')
+ 
+@@ -166,6 +171,7 @@ gdkconfig_cdata.set('GDK_WINDOWING_WAYLAND', wayland_enabled)
+ gdkconfig_cdata.set('GDK_WINDOWING_WIN32', win32_enabled)
+ gdkconfig_cdata.set('GDK_WINDOWING_BROADWAY', broadway_enabled)
+ gdkconfig_cdata.set('GDK_WINDOWING_QUARTZ', quartz_enabled)
++gdkconfig_cdata.set('GDK_WITH_OPENGL', opengl_enabled)
+ 
+ gdkconfig = configure_file(
+   input  : 'gdkconfig.h.meson',
+diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
+index 7e08f472cc..30fd7b6089 100644
+--- a/gdk/x11/gdkdisplay-x11.c
++++ b/gdk/x11/gdkdisplay-x11.c
+@@ -37,7 +37,9 @@
+ #include "gdkdisplay-x11.h"
+ #include "gdkprivate-x11.h"
+ #include "gdkscreen-x11.h"
++#ifdef HAVE_OPENGL
+ #include "gdkglcontext-x11.h"
++#endif
+ #include "gdk-private.h"
+ #include "gdkprofilerprivate.h"
+ 
+@@ -3191,7 +3193,9 @@ gdk_x11_display_class_init (GdkX11DisplayClass * class)
+   display_class->text_property_to_utf8_list = _gdk_x11_display_text_property_to_utf8_list;
+   display_class->utf8_to_string_target = _gdk_x11_display_utf8_to_string_target;
+ 
+-  display_class->make_gl_context_current = gdk_x11_display_make_gl_context_current;
++#ifdef HAVE_OPENGL
++   display_class->make_gl_context_current = gdk_x11_display_make_gl_context_current;
++#endif
+ 
+   display_class->get_default_seat = gdk_x11_display_get_default_seat;
+ 
+diff --git a/gdk/x11/gdkvisual-x11.c b/gdk/x11/gdkvisual-x11.c
+index 81479d81f4..3c8c5c02ff 100644
+--- a/gdk/x11/gdkvisual-x11.c
++++ b/gdk/x11/gdkvisual-x11.c
+@@ -306,7 +306,12 @@ _gdk_x11_screen_init_visuals (GdkScreen *screen)
+   /* If GL is available we want to pick better default/rgba visuals,
+      as we care about glx details such as alpha/depth/stencil depth,
+      stereo and double buffering */
++  /* update_visuals_for_gl() will end up calling epoxy GLX api which
++     will exit if libgl is not there: so only do this if we know GL
++     is available */
++#ifdef HAVE_GLX
+   _gdk_x11_screen_update_visuals_for_gl (screen);
++#endif
+ }
+ 
+ gint
+diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
+index 194bc82e29..0302bb68d4 100644
+--- a/gdk/x11/gdkwindow-x11.c
++++ b/gdk/x11/gdkwindow-x11.c
+@@ -36,7 +36,9 @@
+ #include "gdkasync.h"
+ #include "gdkeventsource.h"
+ #include "gdkdisplay-x11.h"
++#ifdef HAVE_OPENGL
+ #include "gdkglcontext-x11.h"
++#endif
+ #include "gdkprivate-x11.h"
+ #include "gdk-private.h"
+ 
+@@ -5888,7 +5890,9 @@ gdk_window_impl_x11_class_init (GdkWindowImplX11Class *klass)
+   impl_class->set_opaque_region = gdk_x11_window_set_opaque_region;
+   impl_class->set_shadow_width = gdk_x11_window_set_shadow_width;
+   impl_class->show_window_menu = gdk_x11_window_show_window_menu;
++#ifdef HAVE_OPENGL
+   impl_class->create_gl_context = gdk_x11_window_create_gl_context;
+   impl_class->invalidate_for_new_frame = gdk_x11_window_invalidate_for_new_frame;
++#endif
+   impl_class->get_unscaled_size = gdk_x11_window_get_unscaled_size;
+ }
+diff --git a/gdk/x11/gdkx-autocleanups.h b/gdk/x11/gdkx-autocleanups.h
+index edb0ea7dbf..a317d61cca 100644
+--- a/gdk/x11/gdkx-autocleanups.h
++++ b/gdk/x11/gdkx-autocleanups.h
+@@ -30,7 +30,9 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11DeviceXI2, g_object_unref)
+ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11Display, g_object_unref)
+ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11DisplayManager, g_object_unref)
+ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11DragContext, g_object_unref)
++#ifdef HAVE_OPENGL
+ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11GLContext, g_object_unref)
++#endif
+ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11Keymap, g_object_unref)
+ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11Screen, g_object_unref)
+ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11Visual, g_object_unref)
+diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx.h
+index 1f64bccb6d..4db6c18351 100644
+--- a/gdk/x11/gdkx.h
++++ b/gdk/x11/gdkx.h
+@@ -43,7 +43,9 @@
+ #include <gdk/x11/gdkx11display.h>
+ #include <gdk/x11/gdkx11displaymanager.h>
+ #include <gdk/x11/gdkx11dnd.h>
++#ifdef GDK_WITH_OPENGL
+ #include <gdk/x11/gdkx11glcontext.h>
++#endif
+ #include <gdk/x11/gdkx11keys.h>
+ #include <gdk/x11/gdkx11monitor.h>
+ #include <gdk/x11/gdkx11property.h>
+diff --git a/gdk/x11/meson.build b/gdk/x11/meson.build
+index 754ae0a615..0318c83877 100644
+--- a/gdk/x11/meson.build
++++ b/gdk/x11/meson.build
+@@ -14,7 +14,6 @@ gdk_x11_sources = files(
+   'gdkeventsource.c',
+   'gdkeventtranslator.c',
+   'gdkgeometry-x11.c',
+-  'gdkglcontext-x11.c',
+   'gdkkeys-x11.c',
+   'gdkmain-x11.c',
+   'gdkproperty-x11.c',
+@@ -42,7 +41,6 @@ gdk_x11_public_headers = files(
+   'gdkx11display.h',
+   'gdkx11displaymanager.h',
+   'gdkx11dnd.h',
+-  'gdkx11glcontext.h',
+   'gdkx11keys.h',
+   'gdkx11monitor.h',
+   'gdkx11property.h',
+@@ -53,6 +51,11 @@ gdk_x11_public_headers = files(
+   'gdkx11window.h',
+ )
+ 
++if opengl_enabled
++  gdk_x11_sources += files('gdkglcontext-x11.c')
++  gdk_x11_public_headers += files('gdkx11glcontext.h')
++endif
++
+ install_headers(gdk_x11_public_headers, subdir: 'gtk-3.0/gdk/x11/')
+ install_headers('gdkx.h', subdir: 'gtk-3.0/gdk/')
+ 
+diff --git a/gtk/gtkglarea.c b/gtk/gtkglarea.c
+index 802303ea9f..6439d7745d 100644
+--- a/gtk/gtkglarea.c
++++ b/gtk/gtkglarea.c
+@@ -29,7 +29,9 @@
+ #include "gtkprivate.h"
+ #include "gtkrender.h"
+ 
++#ifdef HAVE_OPENGL
+ #include <epoxy/gl.h>
++#endif
+ 
+ /**
+  * SECTION:gtkglarea
+@@ -369,9 +371,12 @@ gtk_gl_area_real_create_context (GtkGLArea *area)
+ static void
+ gtk_gl_area_resize (GtkGLArea *area, int width, int height)
+ {
++#ifdef HAVE_OPENGL
+   glViewport (0, 0, width, height);
++#endif
+ }
+ 
++#ifdef HAVE_OPENGL
+ /*
+  * Creates all the buffer objects needed for rendering the scene
+  */
+@@ -483,6 +488,7 @@ gtk_gl_area_allocate_buffers (GtkGLArea *area)
+ 
+   priv->needs_render = TRUE;
+ }
++#endif
+ 
+ /**
+  * gtk_gl_area_attach_buffers:
+@@ -501,6 +507,7 @@ gtk_gl_area_allocate_buffers (GtkGLArea *area)
+ void
+ gtk_gl_area_attach_buffers (GtkGLArea *area)
+ {
++#ifdef HAVE_OPENGL
+   GtkGLAreaPrivate *priv = gtk_gl_area_get_instance_private (area);
+ 
+   g_return_if_fail (GTK_IS_GL_AREA (area));
+@@ -533,11 +540,13 @@ gtk_gl_area_attach_buffers (GtkGLArea *area)
+         glFramebufferRenderbuffer (GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT,
+                                    GL_RENDERBUFFER, priv->depth_stencil_buffer);
+     }
++#endif
+ }
+ 
+ static void
+ gtk_gl_area_delete_buffers (GtkGLArea *area)
+ {
++#ifdef HAVE_OPENGL
+   GtkGLAreaPrivate *priv = gtk_gl_area_get_instance_private (area);
+ 
+   if (priv->context == NULL)
+@@ -569,6 +578,7 @@ gtk_gl_area_delete_buffers (GtkGLArea *area)
+       glDeleteFramebuffers (1, &priv->frame_buffer);
+       priv->frame_buffer = 0;
+     }
++#endif
+ }
+ 
+ static void
+@@ -679,6 +689,7 @@ gtk_gl_area_draw (GtkWidget *widget,
+   GtkGLArea *area = GTK_GL_AREA (widget);
+   GtkGLAreaPrivate *priv = gtk_gl_area_get_instance_private (area);
+   gboolean unused;
++#ifdef HAVE_OPENGL
+   int w, h, scale;
+   GLenum status;
+ 
+@@ -736,6 +747,14 @@ gtk_gl_area_draw (GtkWidget *widget,
+     }
+ 
+   return TRUE;
++#else
++  if (priv->error != NULL)
++      gtk_gl_area_draw_error_screen (area,
++                                     cr,
++                                     gtk_widget_get_allocated_width (widget),
++                                     gtk_widget_get_allocated_height (widget));
++  return FALSE;
++#endif
+ }
+ 
+ static gboolean
+diff --git a/gtk/inspector/general.c b/gtk/inspector/general.c
+index 4fd0c3039c..a8e59ed077 100644
+--- a/gtk/inspector/general.c
++++ b/gtk/inspector/general.c
+@@ -33,8 +33,10 @@
+ 
+ #ifdef GDK_WINDOWING_X11
+ #include "x11/gdkx.h"
++#ifdef HAVE_OPENGL
+ #include <epoxy/glx.h>
+ #endif
++#endif
+ 
+ #ifdef GDK_WINDOWING_WIN32
+ #include "win32/gdkwin32.h"
+@@ -217,6 +219,7 @@ add_label_row (GtkInspectorGeneral *gen,
+   gtk_size_group_add_widget (GTK_SIZE_GROUP (gen->priv->labels), label);
+ }
+ 
++#ifdef HAVE_OPENGL
+ #ifdef GDK_WINDOWING_X11
+ static void
+ append_glx_extension_row (GtkInspectorGeneral *gen,
+@@ -226,6 +229,7 @@ append_glx_extension_row (GtkInspectorGeneral *gen,
+   add_check_row (gen, GTK_LIST_BOX (gen->priv->gl_box), ext, epoxy_has_glx_extension (dpy, 0, ext), 0);
+ }
+ #endif
++#endif
+ 
+ #ifdef GDK_WINDOWING_WAYLAND
+ static void
+@@ -275,6 +279,7 @@ wayland_get_display (struct wl_display *wl_display)
+ static void
+ init_gl (GtkInspectorGeneral *gen)
+ {
++#ifdef HAVE_OPENGL
+ #ifdef GDK_WINDOWING_X11
+   if (GDK_IS_X11_DISPLAY (gdk_display_get_default ()))
+     {
+@@ -301,6 +306,7 @@ init_gl (GtkInspectorGeneral *gen)
+     }
+   else
+ #endif
++#endif
+ #ifdef GDK_WINDOWING_WAYLAND
+   if (GDK_IS_WAYLAND_DISPLAY (gdk_display_get_default ()))
+     {
+diff --git a/meson.build b/meson.build
+index aed48fc3f6..bfc33af0f6 100644
+--- a/meson.build
++++ b/meson.build
+@@ -137,6 +137,7 @@ wayland_enabled        = get_option('wayland_backend')
+ broadway_enabled       = get_option('broadway_backend')
+ quartz_enabled         = get_option('quartz_backend')
+ win32_enabled          = get_option('win32_backend')
++opengl_enabled         = get_option('opengl')
+ 
+ os_unix   = false
+ os_linux  = false
+@@ -430,7 +431,7 @@ pangocairo_dep = dependency('pangocairo', version: cairo_req,
+                             fallback : ['pango', 'libpangocairo_dep'])
+ pixbuf_dep     = dependency('gdk-pixbuf-2.0', version: gdk_pixbuf_req,
+                             fallback : ['gdk-pixbuf', 'gdkpixbuf_dep'])
+-epoxy_dep      = dependency('epoxy', version: epoxy_req,
++epoxy_dep      = dependency('epoxy', version: epoxy_req, required: opengl_enabled,
+                             fallback: ['libepoxy', 'libepoxy_dep'])
+ atk_dep        = dependency('atk', version: atk_req,
+                             fallback : ['atk', 'libatk_dep'])
+@@ -476,6 +477,10 @@ if tracker3_enabled
+   endif
+ endif
+ 
++if opengl_enabled
++  cdata.set('HAVE_OPENGL', 1)
++endif
++
+ if iso_codes_dep.found()
+   cdata.set_quoted('ISO_CODES_PREFIX', iso_codes_dep.get_variable(pkgconfig: 'prefix'))
+ else
+@@ -912,9 +917,15 @@ else
+   gio_packages = ['gio-2.0', glib_req]
+ endif
+ 
++if opengl_enabled
++  epoxy_packages = ['epoxy', epoxy_req]
++else
++  epoxy_packages = []
++endif
++
+ pkgconf.set('GDK_PRIVATE_PACKAGES',
+             ' '.join(gio_packages + x11_pkgs + wayland_pkgs + cairo_backends +
+-                     ['epoxy', epoxy_req] + cloudproviders_packages +
++                     epoxy_packages + cloudproviders_packages +
+                      ['fribidi', fribidi_req]))
+ 
+ gtk_packages = ' '.join([
+@@ -928,7 +939,7 @@ pkgconf.set('GTK_PACKAGES', gtk_packages)
+ # Requires.private
+ pc_gdk_extra_libs += cairo_libs
+ 
+-gtk_private_packages = atk_pkgs + wayland_pkgs + ['epoxy', epoxy_req, 'fribidi', fribidi_req]
++gtk_private_packages = atk_pkgs + wayland_pkgs + epoxy_packages + ['fribidi', fribidi_req]
+ if wayland_enabled or x11_enabled
+   gtk_private_packages += ['pangoft2']
+ endif
+diff --git a/meson_options.txt b/meson_options.txt
+index 94099aa01e..8bd096896d 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -19,6 +19,8 @@ option('profiler', type: 'boolean', value: false,
+   description : 'Enable profiler support')
+ option('tracker3', type: 'boolean', value: false,
+   description : 'Enable Tracker3 filechooser search')
++option('opengl', type: 'boolean', value: true,
++  description : 'Enable use of GL')
+ 
+ # Print backends
+ option('print_backends', type : 'string', value : 'auto',
+diff --git a/tests/meson.build b/tests/meson.build
+index 586fe2f45e..6ecf317dde 100644
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -5,7 +5,6 @@ gtk_tests = [
+   ['scrolling-performance', ['frame-stats.c', 'variable.c']],
+   ['blur-performance', ['../gtk/gtkcairoblur.c']],
+   ['flicker'],
+-  ['gdkgears', ['gtkgears.c']],
+   ['listmodel'],
+   ['motion-compression'],
+   ['styleexamples'],
+@@ -54,7 +53,6 @@ gtk_tests = [
+   ['testfullscreen'],
+   ['testgeometry'],
+   ['testgiconpixbuf'],
+-  ['testglblending', ['gtkgears.c']],
+   ['testgmenu'],
+   ['testgrid'],
+   ['testgrouping'],
+@@ -137,6 +135,13 @@ if x11_enabled
+   ]
+ endif
+ 
++if opengl_enabled
++  gtk_tests += [
++    ['gdkgears', ['gtkgears.c']],
++    ['testglblending', ['gtkgears.c']],
++  ]
++endif
++
+ if os_linux
+   gtk_tests += [['testfontchooserdialog']]
+ endif
+diff --git a/testsuite/gtk/objects-finalize.c b/testsuite/gtk/objects-finalize.c
+index 24540e313f..e0f863ab6a 100644
+--- a/testsuite/gtk/objects-finalize.c
++++ b/testsuite/gtk/objects-finalize.c
+@@ -116,7 +116,9 @@ main (int argc, char **argv)
+ 	  all_types[i] != GDK_TYPE_X11_DEVICE_MANAGER_CORE &&
+ 	  all_types[i] != GDK_TYPE_X11_DEVICE_MANAGER_XI2 &&
+ 	  all_types[i] != GDK_TYPE_X11_DISPLAY_MANAGER &&
++#ifdef HAVE_OPENGL
+ 	  all_types[i] != GDK_TYPE_X11_GL_CONTEXT &&
++#endif
+ #endif
+ 	  /* Not allowed to finalize a GdkPixbufLoader without calling gdk_pixbuf_loader_close() */
+ 	  all_types[i] != GDK_TYPE_PIXBUF_LOADER &&
+-- 
+2.30.2
+
diff --git a/poky/meta/recipes-gnome/gtk+/gtk+3_3.24.34.bb b/poky/meta/recipes-gnome/gtk+/gtk+3_3.24.36.bb
index f862e143d4..41c189d7f1 100644
--- a/poky/meta/recipes-gnome/gtk+/gtk+3_3.24.34.bb
+++ b/poky/meta/recipes-gnome/gtk+/gtk+3_3.24.36.bb
@@ -3,11 +3,10 @@ require gtk+3.inc
 MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
 
 SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz \
-           file://0002-Do-not-try-to-initialize-GL-without-libGL.patch \
-           file://0003-Add-disable-opengl-configure-option.patch \
-           file://link_fribidi.patch \
+           file://opengl.patch \
+           file://0001-meson.build-build-introspection-according-to-option-.patch \
            "
-SRC_URI[sha256sum] = "dbc69f90ddc821b8d1441f00374dc1da4323a2eafa9078e61edbe5eeefa852ec"
+SRC_URI[sha256sum] = "27a6ef157743350c807ffea59baa1d70226dbede82a5e953ffd58ea6059fe691"
 
 S = "${WORKDIR}/gtk+-${PV}"
 
diff --git a/poky/meta/recipes-gnome/gtk+/gtk4_4.8.3.bb b/poky/meta/recipes-gnome/gtk+/gtk4_4.8.3.bb
new file mode 100644
index 0000000000..6101905128
--- /dev/null
+++ b/poky/meta/recipes-gnome/gtk+/gtk4_4.8.3.bb
@@ -0,0 +1,128 @@
+SUMMARY = "Multi-platform toolkit for creating GUIs"
+DESCRIPTION = "GTK is a multi-platform toolkit for creating graphical user interfaces. Offering a complete \
+set of widgets, GTK is suitable for projects ranging from small one-off projects to complete application suites."
+HOMEPAGE = "http://www.gtk.org"
+BUGTRACKER = "https://bugzilla.gnome.org/"
+SECTION = "libs"
+
+DEPENDS = " \
+    atk \
+    cairo \
+    fribidi \
+    gdk-pixbuf \
+    gdk-pixbuf-native \
+    gi-docgen \
+    glib-2.0 \
+    graphene \
+    harfbuzz \
+    jpeg \
+    libepoxy \
+    libpng \
+    librsvg \
+    libxkbcommon \
+    pango \
+    tiff \
+"
+
+LICENSE = "LGPL-2.0-only & LGPL-2.0-or-later & LGPL-2.1-or-later"
+LIC_FILES_CHKSUM = " \
+    file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
+    file://gtk/gtk.h;endline=25;md5=1d8dc0fccdbfa26287a271dce88af737 \
+    file://gdk/gdk.h;endline=25;md5=c920ce39dc88c6f06d3e7c50e08086f2 \
+    file://tests/testgtk.c;endline=25;md5=49d06770681b8322466b52ed19d29fb2 \
+"
+
+MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
+
+UPSTREAM_CHECK_REGEX = "gtk-(?P<pver>\d+\.(\d*[02468])+(\.\d+)+)\.tar.xz"
+
+SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk/${MAJ_VER}/gtk-${PV}.tar.xz"
+SRC_URI[sha256sum] = "b362f968d085b4d3d9340d4d38c706377ded9d5374e694a2b6b7e6292e3cba74"
+
+S = "${WORKDIR}/gtk-${PV}"
+
+inherit meson gettext pkgconfig gi-docgen update-alternatives gsettings features_check gobject-introspection
+
+# TBD: nativesdk
+# gobject-introspection.bbclass pins introspection off for nativesk. As long as
+# we do not remove this wisdom or hack gtk4, it is not possible to build
+# nativesdk-gtk4
+BBCLASSEXTEND = "native"
+
+GSETTINGS_PACKAGE:class-native = ""
+
+ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
+REQUIRED_DISTRO_FEATURES = "opengl"
+GTKDOC_MESON_OPTION = "gtk_doc"
+GIR_MESON_ENABLE_FLAG = 'enabled'
+GIR_MESON_DISABLE_FLAG = 'disabled'
+
+EXTRA_OEMESON = " -Dbuild-tests=false -Ddemos=false"
+
+PACKAGECONFIG ??= "gstreamer ${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11 vulkan', d)}"
+PACKAGECONFIG:class-native = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
+PACKAGECONFIG:class-nativesdk = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
+
+PACKAGECONFIG[x11] = "-Dx11-backend=true,-Dx11-backend=false,at-spi2-atk fontconfig libx11 libxext libxcursor libxi libxdamage libxrandr libxrender libxcomposite libxfixes xinerama"
+PACKAGECONFIG[wayland] = "-Dwayland-backend=true,-Dwayland-backend=false,wayland wayland-protocols virtual/egl virtual/libgles2 wayland-native"
+PACKAGECONFIG[cups] = "-Dprint-cups=enabled,-Dprint-cups=disabled,cups"
+PACKAGECONFIG[colord] = "-Dcolord=enabled,-Dcolord=disabled,colord"
+PACKAGECONFIG[iso-codes] = ",,iso-codes,iso-codes"
+PACKAGECONFIG[ffmpeg] = "-Dmedia-ffmpeg=enabled,-Dmedia-ffmpeg=disabled,ffmpeg"
+# gtk4 wants gstreamer-player-1.0 -> gstreamer1.0-plugins-bad
+PACKAGECONFIG[gstreamer] = "-Dmedia-gstreamer=enabled,-Dmedia-gstreamer=disabled,gstreamer1.0-plugins-bad"
+PACKAGECONFIG[tracker] = "-Dtracker=enabled,-Dtracker=disabled,tracker,tracker-miners"
+PACKAGECONFIG[vulkan] = "-Dvulkan=enabled,-Dvulkan=disabled, vulkan-loader vulkan-headers shaderc-native"
+
+LIBV = "4.0.0"
+
+FILES:${PN}:append = " \
+    ${datadir}/glib-2.0/schemas/ \
+    ${datadir}/gtk-4.0/emoji/ \
+    ${datadir}/metainfo/ \
+    ${datadir}/icons/hicolor/*/apps/org.gtk.PrintEditor4*.* \
+    ${libdir}/gtk-4.0/${LIBV}/media \
+    ${bindir}/gtk4-update-icon-cache \
+    ${bindir}/gtk4-launch \
+"
+
+FILES:${PN}-dev += " \
+    ${datadir}/gtk-4.0/gtk4builder.rng \
+    ${datadir}/gtk-4.0/include \
+    ${datadir}/gtk-4.0/valgrind \
+    ${datadir}/gettext/its \
+    ${bindir}/gtk4-builder-tool \
+    ${bindir}/gtk4-encode-symbolic-svg \
+    ${bindir}/gtk4-query-settings \
+"
+
+GTKBASE_RRECOMMENDS ?= " \
+    liberation-fonts \
+    gdk-pixbuf-loader-png \
+    gdk-pixbuf-loader-jpeg \
+    gdk-pixbuf-loader-gif \
+    gdk-pixbuf-loader-xpm \
+    shared-mime-info \
+    adwaita-icon-theme-symbolic \
+"
+
+GTKBASE_RRECOMMENDS:class-native ?= ""
+
+GTKGLIBC_RRECOMMENDS ?= "${GTKBASE_RRECOMMENDS} glibc-gconv-iso8859-1"
+
+RRECOMMENDS:${PN} = "${GTKBASE_RRECOMMENDS}"
+RRECOMMENDS:${PN}:libc-glibc = "${GTKGLIBC_RRECOMMENDS}"
+RDEPENDS:${PN}-dev += "${@bb.utils.contains("PACKAGECONFIG", "wayland", "wayland-protocols", "", d)}"
+
+PACKAGES_DYNAMIC += "^gtk4-printbackend-.*"
+python populate_packages:prepend () {
+    import os.path
+
+    gtk_libdir = d.expand('${libdir}/gtk-4.0/${LIBV}')
+    printmodules_root = os.path.join(gtk_libdir, 'printbackends');
+
+    do_split_packages(d, printmodules_root, r'^libprintbackend-(.*)\.so$', 'gtk4-printbackend-%s', 'GTK printbackend module for %s')
+
+    if (d.getVar('DEBIAN_NAMES')):
+        d.setVar(d.expand('PKG:${PN}'), '${MLPREFIX}libgtk-4.0')
+}
diff --git a/poky/meta/recipes-gnome/libhandy/libhandy_1.6.3.bb b/poky/meta/recipes-gnome/libhandy/libhandy_1.8.0.bb
index 01ca699d04..2f7d47290c 100644
--- a/poky/meta/recipes-gnome/libhandy/libhandy_1.6.3.bb
+++ b/poky/meta/recipes-gnome/libhandy/libhandy_1.8.0.bb
@@ -9,8 +9,8 @@ BUGTRACKER = "https://gitlab.gnome.org/GNOME/libhandy/-/issues"
 LICENSE = "LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 
-SRC_URI = "git://gitlab.gnome.org/GNOME/libhandy.git;protocol=https;branch=libhandy-1-6"
-SRCREV = "2885c314c9c84037b6fe55ead6a232e60ebfc9c5"
+SRC_URI = "git://gitlab.gnome.org/GNOME/libhandy.git;protocol=https;branch=main"
+SRCREV = "fce63fcc85621c33dab85e32b349d707bf6d1552"
 S = "${WORKDIR}/git"
 
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.(\d*[02468])+(\.\d+))"
diff --git a/poky/meta/recipes-gnome/libportal/libportal_0.6.bb b/poky/meta/recipes-gnome/libportal/libportal_0.6.bb
new file mode 100644
index 0000000000..ca58ef4138
--- /dev/null
+++ b/poky/meta/recipes-gnome/libportal/libportal_0.6.bb
@@ -0,0 +1,20 @@
+SUMMARY = "libportal provides GIO-style async APIs for most Flatpak portals."
+DESCRIPTION = "It provides simple asynchronous wrappers for most Flatpak portals \
+with a familiar GObject API along side the D-Bus API"
+HOMEPAGE = "https://github.com/flatpak/libportal"
+BUGTRACKER = "https://github.com/flatpak/libportal/issues"
+LICENSE = "LGPL-3.0-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=3000208d539ec061b899bce1d9ce9404"
+
+SRC_URI = "git://github.com/flatpak/${BPN}.git;protocol=https;branch=main"
+SRCREV = "13df0b887a7eb7b0f9b14069561a41f62e813155"
+S = "${WORKDIR}/git"
+
+inherit meson gi-docgen gobject-introspection vala features_check pkgconfig
+GIDOCGEN_MESON_OPTION = 'docs'
+
+ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
+
+DEPENDS += "glib-2.0 glib-2.0-native gtk+3 gtk4"
+
+EXTRA_OEMESON = "-Dbackends=gtk3,gtk4"
diff --git a/poky/meta/recipes-gnome/librsvg/librsvg_2.54.5.bb b/poky/meta/recipes-gnome/librsvg/librsvg_2.54.5.bb
index fc52ae61c5..b2e93a2684 100644
--- a/poky/meta/recipes-gnome/librsvg/librsvg_2.54.5.bb
+++ b/poky/meta/recipes-gnome/librsvg/librsvg_2.54.5.bb
@@ -42,6 +42,8 @@ do_configure[postfuncs] += "cargo_common_do_configure"
 
 inherit rust-target-config
 
+EXTRA_OECONF:class-target = "--enable-vala"
+
 # rust-cross writes the target linker binary into target json definition without any flags.
 # This breaks here because the linker isn't going to work without at least knowing where
 # the sysroot is. So copy the json to workdir, and patch in the path to wrapper from rust class