summaryrefslogtreecommitdiff
path: root/poky/meta/recipes-graphics/mesa
diff options
context:
space:
mode:
authorAndrew Geissler <geissonator@yahoo.com>2023-01-28 01:10:19 +0300
committerAndrew Geissler <geissonator@yahoo.com>2023-01-28 01:19:05 +0300
commitc5535c91408e2c3f8231c10f6b00eaaee7c88717 (patch)
tree9ec42908f2cb40cc01d8a1b17487da2b106e6946 /poky/meta/recipes-graphics/mesa
parentea144b037776e892b9e05c4d22be842901e2138c (diff)
downloadopenbmc-c5535c91408e2c3f8231c10f6b00eaaee7c88717.tar.xz
subtree updates:openembedded:poky: Jan 27 2023
poky: 0ce159991d..5e249ec855: Alex Kiernan (2): rust: Upgrade 1.66.0 -> 1.66.1 rust: Remove CARGO_VERSION Alexander Kanavin (7): selftest/virgl: use pkg-config from the host ethtool: upgrade 6.0 -> 6.1 man-pages: upgrade 6.01 -> 6.02 mesa: update 22.2.3 -> 22.3.3 webkitgtk: submit a patch upstream python3-sphinxcontrib-applehelp: update 1.0.2 -> 1.0.3 vulkan-samples: branch rename master -> main Benoît Mauduit (1): lib/oe/reproducible: Use git log without gpg signature Bruce Ashfield (6): linux-yocto/6.1: edgerouter: Replace OCTEON_USB with USB_OCTEON_HCD linux-yocto/6.1: qemuriscv32: Enable CONFIG_NONPORTABLE linux-yocto/6.1: update to v6.1.5 linux-yocto/5.15: update to v5.15.87 conf/qemu: bump preferred kernel version to 6.1 poky/poky-tiny: bump preferred version to 6.1 Changqing Li (1): cmake-native: use internal cmcurl library Chen Qi (2): file: export MAGIC in SDK rpm: do not export MAGIC in SDK Chuck Wolber (1): scripts/oe-setup-layers: Make efficiently idempotent Fabio Estevam (2): u-boot: Upgrade to 2023.01 u-boot: Update Upstream-Status He Zhe (1): lttng-modules: update 2.13.7 -> 2.13.8 Jan Luebbe (1): p11-kit: add native to BBCLASSEXTEND Jermain Horsman (1): cve-check: write the cve manifest to IMGDEPLOYDIR Kevin Hao (1): meta-yocto-bsp: Update the default kernel to 6.1 Khem Raj (31): createrepo-c: Include missing rpm/rpmstring.h libglu: Remove deprecated register in C++17 cpio: Do not use _Noreturn in gnulib groff: Drop use of `register` storage class vulkan-samples: Update to the tip of trunk unfs3: Fix implicit function declarations of fix_dir_times() gperf: Make the code C++17 compliant libxcb: Fixed c2x standard undefined behaviour dbus: Use Alignof when using C11 or newer standard m4: Define alignof_slot using _Alignof when using C11 or newer opkg: Define alignof using _Alignof when using C11 or newer cpio: Fix gnulib alignof implementation on clang python3-numpy: Define _ALIGN using _Alignof when using C11 or newer vulkan-samples: Drop using u8string_view musl-obstack: Update to 1.2.3 mdadm: Define alignof using _Alignof when using C11 or newer lttng-tools: Switch to alternative upstream submitted patch libtirpc: Check if file exists before operating on it ruby: Use C11 _Alignof to define ALIGN_OF when possible libusb1: Link with latomic only if compiler has no atomic builtins libusb1: Strip trailing whitespaces elfutils: Fix build with libcurl >= 7.87 stress-ng: Robustify test-float test harfbuzz: Add missing <cstdio> and <cstdlib> includes apt: add missing <cstdint> for uint16_t vulkan-samples: Include missing header cstdint for uint32_t ruby: Update the patch status systemd: Add another fix for using XSI strerror_r elfutils: Remove funcretval test from run-native-test.sh for now binutils: Upgrade to 2.40 release binutils: Package libsframe Lee Chee Yang (1): migration-guides: add release-notes for 4.1.2 Luca Boccassi (1): systemd: add PACKAGECONFIG to select default compression format Luca Ceresoli (1): manuals: fix typo in the MLPREFIX description Markus Volk (3): gptfdisk: add follow-up patch to fix with current popt gtk+3: add PACKAGECONFIG for libcloudservice and tracker; fix cups backend gtk4: add PACKAGECONFIG for cloudproviders Martin Jansa (1): mesa: update submitted patch with backported version Michael Opdenacker (3): rust-bin.bbclass: remove unused class meta/classes-global: remove package_tar.bbclass ref-manual: initial documentation for go and go-mod classes Mikko Rapeli (1): kmod: enable openssl support by default Niko Mauno (1): Fix missing leading whitespace with ':append' Ovidiu Panait (1): webkitgtk: fix perl-native dependency Paulo Neves (1): bitbake: bitbake-getvar: Add a quiet command line argument Pavel Zhukov (3): bitbake: fetch2: kill parameters in uri_find_decoded bitbake: fetch2/tests: Add test for Mercurial bitbake: fetch2/tests: Add parameter to recipe_uri Pawel Zalewski (1): classes/fs-uuid: Fix command output decoding issue Peter Kjellerstedt (2): librsvg: Only enable the Vala bindings if GObject Introspection is enabled cargo-update-recipe-crates.bbclass: Mark the update_crates task as nostamp Peter Marko (1): iproute2: separate routel and add python dependency Quentin Schulz (1): packagegroup-core-boot: make init-ifupdown package a recommendation Randy MacLeod (1): vim: upgrade 9.0.0947 -> 9.0.1211 Richard Purdie (23): bitbake: server/process: Improve lockfile handling at exit pseudo: Update to pull in linux-libc-headers race fix pseudo: Switch back to the master branch insane: Improve patch warning/error handling poky: Set INIT_MANAGER by a separate variable bitbake: server/process: Fix lockfile contents check bug bitbake: cooker: Fix siggen recipe cache race issue bitbake: cache: Only write files if we have data bitbake: cooker: Fix parsing race around cache handling bitbake: data: Add support for new BB_HASH_CODEPARSER_VALS for cache optimisation bitbake: data_smart: Small optimisation to _findVar() native: Drop special variable handling bitbake.conf: Add BB_HASH_CODEPARSER_VALS pseudo: Update to include logic fix bitbake.conf: Add METADATA_REVISION to BB_HASH_CODEPARSER_VALS native: Implement BBCLASSEXTEND PACKAGES_DYNAMIC handling conf/sdk/x86-64: Set march specifically bitbake: cache/codeparser: Switch to a new BB_CACHEDIR variable for cache location oeqa/selftest/devtool: Fix for linux 6.1 versions onwards wic/efi-bootdisk.wks: Fix for 6.1 kernel versions kernel/linux-kernel-base: Fix kernel build artefact determinism issues build-appliance-image: Update to master head revision build-appliance: Fix merge error Ross Burton (12): python3-pyproject-hooks: add new recipe python3-build: add 0.10.0 python_pep517: use python3-build, not picobuild python3-picobuild: remove cve-update-db-native: show IP on failure quilt: rewrite ptest glue quilt: fix intermittent failure in faildiff.test spirv-headers/spirv-tools: set correct branch name quilt: use upstreamed faildiff.test fix ppp: backport fix for CVE-2022-4603 bitbake: bb/utils: include SSL certificate paths in export_proxies buildtools-tarball: set pkg-config search path Thomas Roos (1): devtool: fix devtool finish when gitmodules file is empty Tim Orling (3): bitbake: bitbake: fix deprecated threading.Thread.setDaemon python3-cryptography{-vectors}: 38.0.4 -> 39.0.0 bitbake: toaster: update fixtures Tom Hochstein (1): gstreamer1.0-plugins-good: Fix libsoup runtime dependency Vincent Davis Jr (1): mesa: allow mesa (gbm) to compile without backend Wang Mingyu (20): btrfs-tools: upgrade 6.1 -> 6.1.2 libpcap: upgrade 1.10.2 -> 1.10.3 libwebp: upgrade 1.2.4 -> 1.3.0 man-db: upgrade 2.11.1 -> 2.11.2 dpkg: upgrade 1.21.17 -> 1.21.18 ed: upgrade 1.18 -> 1.19 gi-docgen: upgrade 2022.2 -> 2023.1 python3-alabaster: upgrade 0.7.12 -> 0.7.13 python3-setuptools: upgrade 65.6.3 -> 65.7.0 patchelf: upgrade 0.17.0 -> 0.17.2 python3-cython: upgrade 0.29.32 -> 0.29.33 python3-dbusmock: upgrade 0.28.6 -> 0.28.7 python3-hatchling: upgrade 1.12.1 -> 1.12.2 python3-hypothesis: upgrade 6.61.0 -> 6.62.0 python3-importlib-metadata: upgrade 5.2.0 -> 6.0.0 python3-packaging: upgrade 22.0 -> 23.0 python3-pbr: upgrade 5.11.0 -> 5.11.1 python3-pygments: upgrade 2.13.0 -> 2.14.0 stress-ng: upgrade 0.15.01 -> 0.15.02 xz: upgrade 5.4.0 -> 5.4.1 Xiangyu Chen (4): numactl: skip test case when target platform doesn't have 2 CPU node qemuboot.bbclass: add QB_NFSROOTFS_EXTRA_OPT for nfs rootfs extra option runqemu: add process of option QB_NFSROOTFS_EXTRA_OPT qemuppc64: set the qemuppc64 nfs r/wsize mount options to 524288 Yoann Congal (2): bitbake: persist_data: Handle sqlite error when cachefile path is too long sanity: Fix small typos meta-openembedded: cd13881611..2ab113e8be: Alejandro Enedino Hernandez Samaniego (1): weechat: Update 3.4.1 -> 3.8 Alex Kiernan (4): dnsmasq: Merge .inc into .bb dnsmasq: Expand configuration options ntpsec: Upgrade 1.2.1 -> 1.2.2 keyutils: Upgrade 1.6.1 -> 1.6.3 Archana Polampalli (1): Nodejs: Upgrade to 18.12.1 Bartosz Golaszewski (1): libgpiod: fix python bindings build Chee Yang Lee (5): opencv: fix reproducible builds xerces-c: upgrade to 3.2.4 zsh: Fix CVE-2021-45444 redis: Upgrade to 7.0.8 redis: Upgrade to 6.2.9 Dmitry Baryshkov (1): edid-decode: an utility to parse EDID information Etienne Cordonnier (1): uutils-coreutils: upgrade 0.0.16 -> 0.0.17 Fabio Estevam (1): lvgl-demo-fb: Add recipe Gianfranco Costamagna (1): boinc-client: Update boinc from 7.20.4 to 7.20.5 Hermes Zhang (1): kernel_add_regdb: Change the task order Jan Luebbe (3): pcsc-lite: fix native build pcsc-lite: fix homepage URL opensc: fix homepage URL Kai Kang (2): mozjs: fix compile error for arm crda: 3.18 -> 4.15 Khem Raj (65): packagegroup-meta-oe: Remove boost-url from comments trace-cmd: Update to upstream submitted patches packagegroup-meta-oe: Update to reflect latest recipes freeglut: Add packageconfigs for x11/wayland/gles xdg-desktop-portal-wlr: Add wayland to REQUIRED_DISTRO_FEATURES ipmitool: Remove unneeded patch dibbler: Fix build with c++17 and newer std libtevent: Package cmocka tests into ptest package netkit-telnet: Drop using register storage class keyword libxml-libxml-perl: Fix function pointer types fatcat: Fix build with std=c++17 ncmpc: Upgrade to 0.47 python3-matplotlib: Upgrade to 3.6.3 python3-matplotlib: Fix build with c++17 python3-greenlet: Drop using register keyword libmodplug: Fix build with c++17 xmlrpc-c: Upgrade to 1.54.06 satyr: Fix build with musl p8platform: Fix build with c++17 clang freerdp: Fix incompatible function pointer type libtorrent: Update to tip of trunk gnuchess: Fix build with c++17 ippool: Use unsigned int type for 1-bit integer bitfield audiofile: Stick to c++14 std ssiapi: Use c++14 standard log4cpp: Keep using std=c++14 gengetopt: Use std=c++14 libmimetic: Pin to using -std=c++14 ace: Upgrade to 6.5.19 pipewire-media-session: Use PW_ENABLE_DEPRECATED rtorrent: Update to latest tip of trunk nspr: Fix build with clang16 net-snmp: Fix build with clang16 xmlstarlet: Fix build with clang16 libol: Drop recipe hplip: Update to 3.22.10 espeak: Drop using 'register' keyword for storage classifier uw-imap: Fix build with clang 16 xmlsec1: Include xmlsec/parser.h for xmlSecParserSetDefaultOptions() exiv2: Upgrade to 0.27.6 packagegroup-meta-oe: Remove mongodb for upsupported arches rtorrent: Add missing dependency on autoconf-archive thrift: Fix c++ and system header include order problem libcereal: Use -idirafter instead of -isystem poppler: cmake: Do not use -isystem uftreace: Fix a build race sdbus-c++: Disable ccache libcamera: Fix build with gcc-13 mariadb: Fix build with gcc-13 vulkan-cts,opengl-es-cts: Fix build with gcc-13 rocksdb: Fix build with gcc13 rocksdb: Upgrade to 7.9.2 redis-plus-plus: Upgrade to 1.3.7 redis-plus-plus: Fix build with gcc13 rdfind: Upgrade to 1.5.0 release rdfind: Fix build with gcc13 libiodbc: Fix SRC_URI to not use gitlab archives opensaf: Fix build with gcc13 crossguid: Fix build with gcc13 dbus-cxx: Fix build with gcc13 dbus-cxx: Upgrade to 2.3.1 msktutil: Upgrade to 1.2.1 hiredis: Enable SSL/TLS support by default redis-plus-plus: Enable SSL/TLS by default rocksdb: Fix build with clang compiler Lei Maohui (2): biodbc: Added a new recipe. trace-cmd: Fix QA Issue of do_package when enable multilib: Leon Anavi (14): python3-traitlets: Upgrade 5.8.0 -> 5.8.1 python3-prettytable: Upgrade 3.4.1 -> 3.6.0 python3-cantools: Upgrade 38.0.0 -> 38.0.1 python3-imageio: Upgrade 2.23.0 -> 2.24.0 python3-astroid: Upgrade 2.12.13 -> 2.13.2 python3-alembic: Upgrade 1.9.1 -> 1.9.2 python3-autobahn: Upgrade 22.12.1 -> 23.1.1 python3-eventlet: Upgrade 0.33.2 -> 0.33.3 python3-configobj: Upgrade 5.0.6 -> 5.0.8 python3-nocaselist: Upgrade 1.0.6 -> 1.1.0 python3-nocasedict: Upgrade 1.0.4 -> 1.1.0 python3-email-validator: Upgrade 1.3.0 -> 1.3.1 python3-imageio: Upgrade 2.24.0 -> 2.25.0 python3-cachetools: Upgrade 5.2.1 -> 5.3.0 Markus Volk (8): webp-pixbuf-loader: add recipe freerdp: build the rdp server nv-codec-headers: add recipe gnome-chess: import recipe gnome-shell: update 43.1 -> 43.2 pipewire: update 0.3.63 -> 0.3.64 cups-filters: build with dbus support cups-pk-helper: add recipe Martin Jansa (3): s-nail: fix Upstream-Status format smartmontools: fix Upstream-Status format htop: fix Upstream-Status format Niko Mauno (2): Fix missing leading whitespace with ':append' nftables: Fix missing leading whitespace with ':append' Peter Bašista (1): Make tvheadend recipe compatible with the latest tvheadend version Quentin Schulz (1): python3-reedsolo: Add recipe Randy MacLeod (2): librelp: update to 1.11.0 rsyslog: update to 8.2212.0 Richard Hughes (1): fwupd: Upgrade to 1.8.9 Robert Yang (1): tftpy: Add it for python tftp server and client Ross Burton (3): khronos-cts: fix build when python3-build-native is present python3-pytest-forked: update for move from picobuild to build mbedtls: add option to use PSA for X.509/TLS operations Stefan Ghinea (1): mbedtls: upgrade to 2.28.2 to fix CVE-2022-46392, CVE-2022-46393 Trevor Woerner (1): psqlodbc: fix HOMEPAGE Wang Mingyu (62): ctags: upgrade 6.0.20230101.0 -> 6.0.20230108.0 flatbuffers: upgrade 22.12.06 -> 23.1.4 libadwaita: upgrade 1.2.0 -> 1.2.1 hwdata: upgrade 0.365 -> 0.366 libmoo-perl: upgrade 2.005004 -> 2.005005 evolution-data-server-native: upgrade 3.46.2 -> 3.46.3 cli11: upgrade 2.3.1 -> 2.3.2 imapfilter: upgrade 2.7.6 -> 2.8.1 libcgi-perl: upgrade 4.54 -> 4.55 hidapi: upgrade 0.12.0 -> 0.13.0 python3-lazy-object-proxy: upgrade 1.8.0 -> 1.9.0 xfsprogs: upgrade 6.0.0 -> 6.1.0 tbb: upgrade 2021.7.0 -> 2021.8.0 python3-networkx: upgrade 2.8.8 -> 3.0 python3-sqlalchemy: upgrade 1.4.45 -> 1.4.46 python3-aiohue: upgrade 4.5.0 -> 4.6.1 python3-cachetools: upgrade 5.2.0 -> 5.2.1 python3-google-api-python-client: upgrade 2.70.0 -> 2.71.0 python3-flask-migrate: upgrade 4.0.0 -> 4.0.1 python3-coverage: upgrade 7.0.3 -> 7.0.4 python3-googleapis-common-protos: upgrade 1.57.0 -> 1.58.0 python3-ipython: upgrade 8.7.0 -> 8.8.0 python3-redis: upgrade 4.4.0 -> 4.4.1 python3-robotframework: upgrade 6.0.1 -> 6.0.2 python3-uefi-firmware: upgrade 1.9 -> 1.10 python3-ujson: upgrade 5.6.0 -> 5.7.0 python3-xlsxwriter: upgrade 3.0.5 -> 3.0.6 xfsprogs: upgrade 6.1.0 -> 6.1.1 xfstests: upgrade 2022.12.18 -> 2023.01.01 eog: upgrade 43.1 -> 43.2 gvfs: upgrade 1.50.2 -> 1.50.3 libnma: upgrade 1.10.4 -> 1.10.6 nautilus: upgrade 43.1 -> 43.2 nbdkit: upgrade 1.33.4 -> 1.33.7 networkmanager: upgrade 1.40.0 -> 1.40.10 tcpdump: upgrade 4.99.2 -> 4.99.3 unbound: upgrade 1.17.0 -> 1.17.1 ctags: upgrade 6.0.20230108.0 -> 6.0.20230115.0 dnfdragora: upgrade 2.1.3 -> 2.1.4 gensio: upgrade 2.6.1 -> 2.6.2 hidapi: upgrade 0.13.0 -> 0.13.1 librelp: upgrade 1.10.0 -> 1.11.0 libtraceevent: upgrade 1.7.0 -> 1.7.1 libtracefs: upgrade 1.6.3 -> 1.6.4 uftrace: upgrade 0.12 -> 0.13 xterm: upgrade 377 -> 378 python3-absl: upgrade 1.3.0 -> 1.4.0 python3-coverage: upgrade 7.0.4 -> 7.0.5 python3-dateparser: upgrade 1.1.5 -> 1.1.6 python3-decouple: upgrade 3.6 -> 3.7 python3-dnspython: upgrade 2.2.1 -> 2.3.0 python3-flask-wtf: upgrade 1.0.1 -> 1.1.0 python3-future: upgrade 0.18.2 -> 0.18.3 python3-google-api-python-client: upgrade 2.71.0 -> 2.72.0 python3-google-auth: upgrade 2.15.0 -> 2.16.0 python3-mock: upgrade 5.0.0 -> 5.0.1 python3-pymodbus: upgrade 3.0.2 -> 3.1.0 python3-pyzmq: upgrade 24.0.1 -> 25.0.0 python3-redis: upgrade 4.4.1 -> 4.4.2 python3-sentry-sdk: upgrade 1.12.1 -> 1.13.0 python3-txaio: upgrade 22.2.1 -> 23.1.1 python3-xlsxwriter: upgrade 3.0.6 -> 3.0.7 Yi Zhao (2): freeradius: upgrade 3.0.21 -> 3.0.26 strongswan: upgrade 5.9.8 -> 5.9.9 Signed-off-by: Andrew Geissler <geissonator@yahoo.com> Change-Id: I625cfaa0bd5052cd72a121f010db3ecd2f274caf
Diffstat (limited to 'poky/meta/recipes-graphics/mesa')
-rw-r--r--poky/meta/recipes-graphics/mesa/files/0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch34
-rw-r--r--poky/meta/recipes-graphics/mesa/files/0001-gbm-backend-fix-gbm-compile-without-dri.patch65
-rw-r--r--poky/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch14
-rw-r--r--poky/meta/recipes-graphics/mesa/files/0001-nir-nir_opt_move-fix-ALWAYS_INLINE-compiler-error.patch81
-rw-r--r--poky/meta/recipes-graphics/mesa/libglu/0001-Remove-deprecated-register-in-C-17.patch32
-rw-r--r--poky/meta/recipes-graphics/mesa/libglu_9.0.2.bb4
-rw-r--r--poky/meta/recipes-graphics/mesa/mesa-gl_22.3.3.bb (renamed from poky/meta/recipes-graphics/mesa/mesa-gl_22.2.3.bb)2
-rw-r--r--poky/meta/recipes-graphics/mesa/mesa.inc10
-rw-r--r--poky/meta/recipes-graphics/mesa/mesa_22.3.3.bb (renamed from poky/meta/recipes-graphics/mesa/mesa_22.2.3.bb)0
9 files changed, 137 insertions, 105 deletions
diff --git a/poky/meta/recipes-graphics/mesa/files/0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch b/poky/meta/recipes-graphics/mesa/files/0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch
deleted file mode 100644
index e7d92197be..0000000000
--- a/poky/meta/recipes-graphics/mesa/files/0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 859bfc342d1db9b61c43f30d9aa27cea35ca7599 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 16 Oct 2020 11:03:47 -0700
-Subject: [PATCH] futex.h: Define __NR_futex if it does not exist
-
-__NR_futex is not defines by newer architectures e.g. arc, riscv32 as
-they only have 64bit variant of time_t. Glibc defines SYS_futex interface based on
-__NR_futex, since this is used in applications, such applications start
-to fail to build for these newer architectures. This patch defines a
-fallback to alias __NR_futex to __NR_futex_tim64 so SYS_futex keeps
-working
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
----
- src/util/futex.h | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/util/futex.h b/src/util/futex.h
-index 2a2a00c..92fc123 100644
---- a/src/util/futex.h
-+++ b/src/util/futex.h
-@@ -38,6 +38,10 @@
- #define SYS_futex SYS_futex_time64
- #endif
-
-+#if !defined(SYS_futex) && defined(SYS_futex_time64)
-+# define SYS_futex SYS_futex_time64
-+#endif
-+
- static inline long sys_futex(void *addr1, int op, int val1, const struct timespec *timeout, void *addr2, int val3)
- {
- return syscall(SYS_futex, addr1, op, val1, timeout, addr2, val3);
diff --git a/poky/meta/recipes-graphics/mesa/files/0001-gbm-backend-fix-gbm-compile-without-dri.patch b/poky/meta/recipes-graphics/mesa/files/0001-gbm-backend-fix-gbm-compile-without-dri.patch
new file mode 100644
index 0000000000..6541671b7a
--- /dev/null
+++ b/poky/meta/recipes-graphics/mesa/files/0001-gbm-backend-fix-gbm-compile-without-dri.patch
@@ -0,0 +1,65 @@
+From 25946100e21cf2095bea334e8d7096798561d0b7 Mon Sep 17 00:00:00 2001
+From: Vincent Davis Jr <vince@underview.tech>
+Date: Wed, 28 Dec 2022 16:28:01 -0600
+Subject: [PATCH] gbm/backend: fix gbm compile without dri
+
+Upstream-Status: Backport
+
+https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20447
+https://gitlab.freedesktop.org/mesa/mesa/-/commit/842ca284650f066e58706741a7d22d67b5088e60
+
+At mesa version 22.2.3 patch wasn't introduced until after.
+
+Commit introduces a fix that allows for gbm to be built with an empty
+backend. There are situation especially in a Yocto/OE cross compilation
+environment where you want to build with an empty backend. The particular
+situation is as such:
+
+The mesa-gl recipe is the preferred provider for virtual/libgbm, virtual/libgl,
+virtual/mesa, etc... But the x11 DISTRO_FEATURE in't included this leads to build
+errors such as:
+
+| /../../../ld: src/gbm/libgbm.so.1.0.0.p/main_backend.c.o: in function `find_backend':
+| backend.c:(.text.find_backend+0xa4): undefined reference to `gbm_dri_backend'
+| /../../../ld: src/gbm/libgbm.so.1.0.0.p/main_backend.c.o:(.data.rel.ro.builtin_backends+0x4):
+ undefined reference to `gbm_dri_backend'
+| collect2: error: ld returned 1 exit status
+
+Issue should be replicable by setting -Ddri3=disabled and -Dgbm=enabled
+
+Add fix to bypasses compilation issue by excluding gbm dri backend. If
+HAVE_DRI || HAVE_DRIX not specified.
+
+Acked-by: David Heidelberg <david.heidelberg@collabora.com>
+Signed-off-by: Vincent Davis Jr <vince@underview.tech>
+---
+ src/gbm/main/backend.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/gbm/main/backend.c b/src/gbm/main/backend.c
+index 974d0a76a4e..feee0703495 100644
+--- a/src/gbm/main/backend.c
++++ b/src/gbm/main/backend.c
+@@ -42,7 +42,9 @@
+ #define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0]))
+ #define VER_MIN(a, b) ((a) < (b) ? (a) : (b))
+
++#if defined(HAVE_DRI) || defined(HAVE_DRI2) || defined(HAVE_DRI3)
+ extern const struct gbm_backend gbm_dri_backend;
++#endif
+
+ struct gbm_backend_desc {
+ const char *name;
+@@ -51,7 +53,9 @@ struct gbm_backend_desc {
+ };
+
+ static const struct gbm_backend_desc builtin_backends[] = {
++#if defined(HAVE_DRI) || defined(HAVE_DRI2) || defined(HAVE_DRI3)
+ { "dri", &gbm_dri_backend },
++#endif
+ };
+
+ #define BACKEND_LIB_SUFFIX "_gbm"
+--
+2.34.1
+
diff --git a/poky/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch b/poky/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch
index ec263ce479..36c33f889b 100644
--- a/poky/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch
+++ b/poky/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch
@@ -1,4 +1,4 @@
-From d092a9000da62dfccca5b58fca56b94eb9989c48 Mon Sep 17 00:00:00 2001
+From 3b4d6b89f644b43e507c08181fef06db4326f9da Mon Sep 17 00:00:00 2001
From: Alistair Francis <alistair@alistair23.me>
Date: Thu, 14 Nov 2019 13:04:49 -0800
Subject: [PATCH] meson.build: check for all linux host_os combinations
@@ -20,19 +20,19 @@ Signed-off-by: Alistair Francis <alistair@alistair23.me>
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meson.build b/meson.build
-index 250b528..b5c98f8 100644
+index 172c64a..9b5294c 100644
--- a/meson.build
+++ b/meson.build
@@ -173,7 +173,7 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2
# Only build shared_glapi if at least one OpenGL API is enabled
with_shared_glapi = with_shared_glapi and with_any_opengl
--system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux', 'sunos'].contains(host_machine.system())
-+system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'dragonfly'].contains(host_machine.system()) or host_machine.system().startswith('linux')
+-system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux', 'sunos', 'android'].contains(host_machine.system())
++system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux', 'sunos', 'android'].contains(host_machine.system()) or host_machine.system().startswith('linux')
- dri_drivers = get_option('dri-drivers')
- if dri_drivers.length() != 0
-@@ -1091,7 +1091,7 @@ if cc.has_function('reallocarray')
+ with_freedreno_kgsl = get_option('freedreno-kgsl')
+ if with_freedreno_kgsl
+@@ -1076,7 +1076,7 @@ if cc.has_function('reallocarray')
endif
# TODO: this is very incomplete
diff --git a/poky/meta/recipes-graphics/mesa/files/0001-nir-nir_opt_move-fix-ALWAYS_INLINE-compiler-error.patch b/poky/meta/recipes-graphics/mesa/files/0001-nir-nir_opt_move-fix-ALWAYS_INLINE-compiler-error.patch
index 7989843eb4..1cf23492fe 100644
--- a/poky/meta/recipes-graphics/mesa/files/0001-nir-nir_opt_move-fix-ALWAYS_INLINE-compiler-error.patch
+++ b/poky/meta/recipes-graphics/mesa/files/0001-nir-nir_opt_move-fix-ALWAYS_INLINE-compiler-error.patch
@@ -1,67 +1,36 @@
-From da6e47f1717f34c73de388c56ffaf4861a07fdc5 Mon Sep 17 00:00:00 2001
-From: t bettler <thomas.bettler@gmail.com>
-Date: Sat, 9 Jul 2022 09:28:51 +0000
+From 267dd1f4d571ee606141aa66f1665aa152b4e911 Mon Sep 17 00:00:00 2001
+From: t0b3 <thomas.bettler@gmail.com>
+Date: Sat, 10 Dec 2022 14:32:53 +0100
Subject: [PATCH] nir/nir_opt_move: fix ALWAYS_INLINE compiler error
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-Backport merge request to fix mesa compile error when debug build
-enabled.
-
-Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17439]
-
-Signed-off-by: Kai Kang <kai.kang@windriver.com>
-
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-fix call to ‘always_inline’ ‘src_is_ssa’
-
-Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/6825
-Fixes: f1d20ec67c3f186886b97de94f74484650f8fda1 ("nir/nir_opt_move: handle non-SSA defs ")
+Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
+Reviewed-by: Adam Jackson <ajax@redhat.com>
+Closes: #6825
+Fixes: f1d20ec6 ("nir/nir_opt_move: handle non-SSA defs ")
+Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17439>
+Upstream-Status: Backport [https://gitlab.freedesktop.org/mesa/mesa/-/commit/267dd1f4d571ee606141aa66f1665aa152b4e911]
---
- src/compiler/nir/nir_inline_helpers.h | 10 ++++++++--
- src/compiler/nir/nir_opt_move.c | 2 +-
- 2 files changed, 9 insertions(+), 3 deletions(-)
+ src/compiler/nir/nir_opt_move.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
-diff --git a/src/compiler/nir/nir_inline_helpers.h b/src/compiler/nir/nir_inline_helpers.h
-index 125dd8a..ec33f05 100644
---- a/src/compiler/nir/nir_inline_helpers.h
-+++ b/src/compiler/nir/nir_inline_helpers.h
-@@ -73,8 +73,8 @@ nir_foreach_dest(nir_instr *instr, nir_foreach_dest_cb cb, void *state)
- return _nir_foreach_dest(instr, cb, state);
- }
-
--static inline bool
--nir_foreach_src(nir_instr *instr, nir_foreach_src_cb cb, void *state)
-+static ALWAYS_INLINE bool
-+_nir_foreach_src(nir_instr *instr, nir_foreach_src_cb cb, void *state)
- {
- switch (instr->type) {
- case nir_instr_type_alu: {
-@@ -162,3 +162,9 @@ nir_foreach_src(nir_instr *instr, nir_foreach_src_cb cb, void *state)
- dest_state.cb = cb;
- return _nir_foreach_dest(instr, _nir_visit_dest_indirect, &dest_state);
- }
-+
-+static inline bool
-+nir_foreach_src(nir_instr *instr, nir_foreach_src_cb cb, void *state)
-+{
-+ return _nir_foreach_src(instr, cb, state);
-+}
diff --git a/src/compiler/nir/nir_opt_move.c b/src/compiler/nir/nir_opt_move.c
-index 81bcde5..051c3cc 100644
+index 81bcde5c436..9aeb9f4cf86 100644
--- a/src/compiler/nir/nir_opt_move.c
+++ b/src/compiler/nir/nir_opt_move.c
-@@ -60,7 +60,7 @@ src_is_ssa(nir_src *src, void *state)
- static ALWAYS_INLINE bool
- instr_reads_register(nir_instr *instr)
+@@ -51,13 +51,13 @@
+ * lower register pressure.
+ */
+
+-static ALWAYS_INLINE bool
++static inline bool
+ src_is_ssa(nir_src *src, void *state)
{
-- return !nir_foreach_src(instr, src_is_ssa, NULL);
-+ return !_nir_foreach_src(instr, src_is_ssa, NULL);
+ return src->is_ssa;
}
- static bool
+-static ALWAYS_INLINE bool
++static inline bool
+ instr_reads_register(nir_instr *instr)
+ {
+ return !nir_foreach_src(instr, src_is_ssa, NULL);
diff --git a/poky/meta/recipes-graphics/mesa/libglu/0001-Remove-deprecated-register-in-C-17.patch b/poky/meta/recipes-graphics/mesa/libglu/0001-Remove-deprecated-register-in-C-17.patch
new file mode 100644
index 0000000000..95d56e9573
--- /dev/null
+++ b/poky/meta/recipes-graphics/mesa/libglu/0001-Remove-deprecated-register-in-C-17.patch
@@ -0,0 +1,32 @@
+From 1910b3a83a7e5aa1a31c4325829c94134fafce76 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 13 Jan 2023 20:58:07 -0800
+Subject: [PATCH] Remove deprecated register in C++17
+
+Fixes errors like
+
+src/libnurbs/internals/varray.cc:76:5: error: ISO C++17 does not allow 'register' storage class specifier [-Wregister]
+ register long ds = sgn(arc->tail()[0] - arc->prev->tail()[0]);
+ ^~~~~~~~~
+
+Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/glu/-/merge_requests/10]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/libnurbs/internals/varray.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/libnurbs/internals/varray.cc b/src/libnurbs/internals/varray.cc
+index 1cb2354..41b3b18 100644
+--- a/src/libnurbs/internals/varray.cc
++++ b/src/libnurbs/internals/varray.cc
+@@ -73,8 +73,8 @@ Varray::~Varray( void )
+ inline void
+ Varray::update( Arc_ptr arc, long dir[2], REAL val )
+ {
+- register long ds = sgn(arc->tail()[0] - arc->prev->tail()[0]);
+- register long dt = sgn(arc->tail()[1] - arc->prev->tail()[1]);
++ long ds = sgn(arc->tail()[0] - arc->prev->tail()[0]);
++ long dt = sgn(arc->tail()[1] - arc->prev->tail()[1]);
+
+ if( dir[0] != ds || dir[1] != dt ) {
+ dir[0] = ds;
diff --git a/poky/meta/recipes-graphics/mesa/libglu_9.0.2.bb b/poky/meta/recipes-graphics/mesa/libglu_9.0.2.bb
index 0d27dd116b..525d631611 100644
--- a/poky/meta/recipes-graphics/mesa/libglu_9.0.2.bb
+++ b/poky/meta/recipes-graphics/mesa/libglu_9.0.2.bb
@@ -11,7 +11,9 @@ LIC_FILES_CHKSUM = "file://include/GL/glu.h;endline=29;md5=6b79c570f644363b35645
# Epoch as this used to be part of mesa
PE = "2"
-SRC_URI = "https://mesa.freedesktop.org/archive/glu/glu-${PV}.tar.gz"
+SRC_URI = "https://mesa.freedesktop.org/archive/glu/glu-${PV}.tar.gz \
+ file://0001-Remove-deprecated-register-in-C-17.patch \
+ "
SRC_URI[sha256sum] = "24effdfb952453cc00e275e1c82ca9787506aba0282145fff054498e60e19a65"
diff --git a/poky/meta/recipes-graphics/mesa/mesa-gl_22.2.3.bb b/poky/meta/recipes-graphics/mesa/mesa-gl_22.3.3.bb
index c7c7aa7ac3..ca160f1bfc 100644
--- a/poky/meta/recipes-graphics/mesa/mesa-gl_22.2.3.bb
+++ b/poky/meta/recipes-graphics/mesa/mesa-gl_22.3.3.bb
@@ -6,6 +6,8 @@ PROVIDES = "virtual/libgl virtual/mesa"
S = "${WORKDIR}/mesa-${PV}"
+TARGET_CFLAGS = "-I${STAGING_INCDIR}/drm"
+
# At least one DRI rendering engine is required to build mesa.
# When no X11 is available, use osmesa for the rendering engine.
PACKAGECONFIG ??= "opengl gallium ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'osmesa', d)}"
diff --git a/poky/meta/recipes-graphics/mesa/mesa.inc b/poky/meta/recipes-graphics/mesa/mesa.inc
index 77aa97069a..0ec681cf20 100644
--- a/poky/meta/recipes-graphics/mesa/mesa.inc
+++ b/poky/meta/recipes-graphics/mesa/mesa.inc
@@ -17,15 +17,12 @@ PE = "2"
SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
file://0001-meson.build-check-for-all-linux-host_os-combinations.patch \
file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \
- file://0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch \
file://0001-util-format-Check-for-NEON-before-using-it.patch \
- ${NATIVE_PATCHES} \
+ file://0001-gbm-backend-fix-gbm-compile-without-dri.patch \
+ file://0001-nir-nir_opt_move-fix-ALWAYS_INLINE-compiler-error.patch \
"
-NATIVE_PATCHES ?= ""
-# required by mesa-native on Ubuntu 18.04 with gcc 7.5 when DEBUG_BUILD enabled
-NATIVE_PATCHES:class-native = "file://0001-nir-nir_opt_move-fix-ALWAYS_INLINE-compiler-error.patch"
-SRC_URI[sha256sum] = "ee7d026f7b1991dbae0861d359b671145c3a86f2a731353b885d2ea2d5c098d6"
+SRC_URI[sha256sum] = "bed799788bf2bd9ef079d97cd8e09348bf53cb086818578e40773b2b17812922"
UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)"
@@ -97,7 +94,6 @@ PACKAGECONFIG[gbm] = "-Dgbm=enabled,-Dgbm=disabled"
X11_DEPS = "xorgproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes xrandr"
# "x11" requires "opengl"
PACKAGECONFIG[x11] = ",-Dglx=disabled,${X11_DEPS}"
-PACKAGECONFIG[xvmc] = "-Dgallium-xvmc=enabled,-Dgallium-xvmc=disabled,libxvmc"
PACKAGECONFIG[wayland] = ",,wayland-native wayland libdrm wayland-protocols"
PACKAGECONFIG[dri3] = "-Ddri3=enabled, -Ddri3=disabled, xorgproto libxshmfence"
diff --git a/poky/meta/recipes-graphics/mesa/mesa_22.2.3.bb b/poky/meta/recipes-graphics/mesa/mesa_22.3.3.bb
index 96e8aa38d6..96e8aa38d6 100644
--- a/poky/meta/recipes-graphics/mesa/mesa_22.2.3.bb
+++ b/poky/meta/recipes-graphics/mesa/mesa_22.3.3.bb