From 96f5ef21f9092b8d60c6cf89ba356a9b6a395b9e Mon Sep 17 00:00:00 2001 From: Ophestra Date: Fri, 28 Aug 2026 12:57:18 +0900 Subject: internal/rosa/package/mesa: include missing headers These rely on transitive includes which changed in the new toolchain. Signed-off-by: Ophestra --- internal/rosa/package/mesa.az | 139 ------------------------------ internal/rosa/package/mesa/include.patch | 36 ++++++++ internal/rosa/package/mesa/package.az | 140 +++++++++++++++++++++++++++++++ 3 files changed, 176 insertions(+), 139 deletions(-) delete mode 100644 internal/rosa/package/mesa.az create mode 100644 internal/rosa/package/mesa/include.patch create mode 100644 internal/rosa/package/mesa/package.az diff --git a/internal/rosa/package/mesa.az b/internal/rosa/package/mesa.az deleted file mode 100644 index dd1aada1..00000000 --- a/internal/rosa/package/mesa.az +++ /dev/null @@ -1,139 +0,0 @@ -package mesa { - description = "open source implementations of OpenGL, OpenGL ES, Vulkan, OpenCL, and more"; - website = "https://mesa3d.org"; - anitya = 1970; - latest = anityaFallback; - - version# = "26.2.1"; - source = remoteGitLab { - domain = "gitlab.freedesktop.org"; - suffix = "mesa/mesa"; - ref = "mesa-"+version; - checksum = "WZYAysQFZt8KMFAxQheKFZHarR1isgOeSw4LyfqAcmaHwXMCLiVao6eGuEuhJTJv"; - }; - - exec = meson { - setup = { - "platforms": "x11,wayland"; - "video-codecs": "all"; - - "glvnd": "enabled"; - "gbm": "enabled"; - "egl": "enabled"; - - "gallium-drivers": join { - elems = [ - "asahi", // Apple AGX - "crocus", // Intel legacy - "etnaviv", // Vivante GPU designs (mostly NXP/Marvell SoCs) - "freedreno", // Qualcomm Adreno (all Qualcomm SoCs) - "i915", // Intel extra legacy - "iris", // new Intel (Broadwell+) - "lima", // ARM Mali 4xx - "llvmpipe", // software renderer - "nouveau", // Nvidia - "panfrost", // ARM Mali Midgard and up (T/G series) - "r300", // very old AMD - "r600", // less old AMD - "radeonsi", // new AMD (GCN+) - "softpipe", // older software renderer - "svga", // VMWare virtualized GPU - "tegra", // Nvidia Tegra SoCs - "v3d", // Broadcom VC5 (Raspberry Pi 4) - "vc4", // Broadcom VC4 (Raspberry Pi 0-3) - "virgl", // QEMU virtualized GPU (aka VirGL) - "zink", // generic OpenGL over Vulkan, experimental - - // d3d12: WSL emulated GPU (aka Dozen) - // ethosu: accelerator - // rocket: accelerator - ]; - sep = ","; - }; - - "vulkan-drivers": join { - elems = [ - "amd", // AMD (aka RADV) - "broadcom", // Broadcom VC5 (Raspberry Pi 4, aka V3D) - "freedreno", // Qualcomm Adreno (all Qualcomm SoCs) - "intel", // new Intel (aka ANV) - "intel_hasvk", // Intel Haswell/Broadwell, "legacy" Vulkan driver (https://www.phoronix.com/news/Intel-HasVK-Drop-Dead-Code) - "panfrost", // ARM Mali Midgard and up (T/G series) - "swrast", // software renderer (aka Lavapipe) - "virtio", // QEMU virtualized GPU (aka VirGL) - "imagination", // PowerVR Rogue - "asahi", // Apple AGX - "gfxstream", // Android virtualized GPU - - // nouveau: Nouveau (aka NVK), requires rust - // microsoft-experimental: WSL virtualized GPU (aka DZN/Dozen) - // kosmickrisp: macOS-specific - ]; - sep = ","; - }; - - "vulkan-layers": join { - elems = [ - "device-select", - "intel-nullhw", - "overlay", - "screenshot", - "anti-lag", - "vram-report-limit", - ]; - sep = ","; - }; - - "freedreno-kmds": "msm,virtio"; - "amdgpu-virtio": "true"; - }; - }; - - inputs = [ - m4, - python-packaging, - python-mako, - python-pyyaml, - python-pycparser, - glslang, - spirv-llvm-translator, - - zlib, - zstd, - gzip, - ncurses, - libglvnd, - libexpat, - libva, - libdrm, - elfutils, - bison, - flex, - lm_sensors, - libconfig, - libdisplay-info, - wayland, - wayland-protocols, - libxshmfence, - libXxf86vm, - libXrandr, - libxcb-keysyms, - libpng, - libarchive, - kernel-headers, - ]; - - runtime = [ - llvm, - libdrm, - elfutils, - lm_sensors, - libdisplay-info, - wayland, - libxshmfence, - libXxf86vm, - libXrandr, - libxcb-keysyms, - libpng, - ]; -} diff --git a/internal/rosa/package/mesa/include.patch b/internal/rosa/package/mesa/include.patch new file mode 100644 index 00000000..b1942625 --- /dev/null +++ b/internal/rosa/package/mesa/include.patch @@ -0,0 +1,36 @@ +diff --git a/src/amd/compiler/aco_util.h b/src/amd/compiler/aco_util.h +index 82d754f155a..9f20e80a554 100644 +--- a/src/amd/compiler/aco_util.h ++++ b/src/amd/compiler/aco_util.h +@@ -12,6 +12,7 @@ + #include "util/macros.h" + #include "util/u_math.h" + ++#include + #include + #include + #include +diff --git a/src/freedreno/common/freedreno_common.h b/src/freedreno/common/freedreno_common.h +index 36dea4e12b5..cfa243c270f 100644 +--- a/src/freedreno/common/freedreno_common.h ++++ b/src/freedreno/common/freedreno_common.h +@@ -12,6 +12,7 @@ + #ifdef __cplusplus + + #include ++#include + + #define __FD_GPU_GENS A6XX, A7XX, A8XX + +diff --git a/src/gfxstream/guest/vulkan_enc/ResourceTracker.h b/src/gfxstream/guest/vulkan_enc/ResourceTracker.h +index f739749e27d..aaa9e39eabe 100644 +--- a/src/gfxstream/guest/vulkan_enc/ResourceTracker.h ++++ b/src/gfxstream/guest/vulkan_enc/ResourceTracker.h +@@ -13,6 +13,7 @@ + #include + #include + #include ++#include + + #include "CommandBufferStagingStream.h" + #include "GfxStreamConnectionManager.h" diff --git a/internal/rosa/package/mesa/package.az b/internal/rosa/package/mesa/package.az new file mode 100644 index 00000000..7967e3d7 --- /dev/null +++ b/internal/rosa/package/mesa/package.az @@ -0,0 +1,140 @@ +package mesa { + description = "open source implementations of OpenGL, OpenGL ES, Vulkan, OpenCL, and more"; + website = "https://mesa3d.org"; + anitya = 1970; + latest = anityaFallback; + + version# = "26.2.1"; + source = remoteGitLab { + domain = "gitlab.freedesktop.org"; + suffix = "mesa/mesa"; + ref = "mesa-"+version; + checksum = "WZYAysQFZt8KMFAxQheKFZHarR1isgOeSw4LyfqAcmaHwXMCLiVao6eGuEuhJTJv"; + }; + patches = [ "include.patch" ]; + + exec = meson { + setup = { + "platforms": "x11,wayland"; + "video-codecs": "all"; + + "glvnd": "enabled"; + "gbm": "enabled"; + "egl": "enabled"; + + "gallium-drivers": join { + elems = [ + "asahi", // Apple AGX + "crocus", // Intel legacy + "etnaviv", // Vivante GPU designs (mostly NXP/Marvell SoCs) + "freedreno", // Qualcomm Adreno (all Qualcomm SoCs) + "i915", // Intel extra legacy + "iris", // new Intel (Broadwell+) + "lima", // ARM Mali 4xx + "llvmpipe", // software renderer + "nouveau", // Nvidia + "panfrost", // ARM Mali Midgard and up (T/G series) + "r300", // very old AMD + "r600", // less old AMD + "radeonsi", // new AMD (GCN+) + "softpipe", // older software renderer + "svga", // VMWare virtualized GPU + "tegra", // Nvidia Tegra SoCs + "v3d", // Broadcom VC5 (Raspberry Pi 4) + "vc4", // Broadcom VC4 (Raspberry Pi 0-3) + "virgl", // QEMU virtualized GPU (aka VirGL) + "zink", // generic OpenGL over Vulkan, experimental + + // d3d12: WSL emulated GPU (aka Dozen) + // ethosu: accelerator + // rocket: accelerator + ]; + sep = ","; + }; + + "vulkan-drivers": join { + elems = [ + "amd", // AMD (aka RADV) + "broadcom", // Broadcom VC5 (Raspberry Pi 4, aka V3D) + "freedreno", // Qualcomm Adreno (all Qualcomm SoCs) + "intel", // new Intel (aka ANV) + "intel_hasvk", // Intel Haswell/Broadwell, "legacy" Vulkan driver (https://www.phoronix.com/news/Intel-HasVK-Drop-Dead-Code) + "panfrost", // ARM Mali Midgard and up (T/G series) + "swrast", // software renderer (aka Lavapipe) + "virtio", // QEMU virtualized GPU (aka VirGL) + "imagination", // PowerVR Rogue + "asahi", // Apple AGX + "gfxstream", // Android virtualized GPU + + // nouveau: Nouveau (aka NVK), requires rust + // microsoft-experimental: WSL virtualized GPU (aka DZN/Dozen) + // kosmickrisp: macOS-specific + ]; + sep = ","; + }; + + "vulkan-layers": join { + elems = [ + "device-select", + "intel-nullhw", + "overlay", + "screenshot", + "anti-lag", + "vram-report-limit", + ]; + sep = ","; + }; + + "freedreno-kmds": "msm,virtio"; + "amdgpu-virtio": "true"; + }; + }; + + inputs = [ + m4, + python-packaging, + python-mako, + python-pyyaml, + python-pycparser, + glslang, + spirv-llvm-translator, + + zlib, + zstd, + gzip, + ncurses, + libglvnd, + libexpat, + libva, + libdrm, + elfutils, + bison, + flex, + lm_sensors, + libconfig, + libdisplay-info, + wayland, + wayland-protocols, + libxshmfence, + libXxf86vm, + libXrandr, + libxcb-keysyms, + libpng, + libarchive, + kernel-headers, + ]; + + runtime = [ + llvm, + libdrm, + elfutils, + lm_sensors, + libdisplay-info, + wayland, + libxshmfence, + libXxf86vm, + libXrandr, + libxcb-keysyms, + libpng, + ]; +} -- cgit v1.3.1