From 11d19253b22268c3e2d0b0e1c604f079151ec36e Mon Sep 17 00:00:00 2001 From: Tim Biermann Date: Wed, 10 Jul 2024 20:35:50 +0200 Subject: [PATCH] [notify] mesa-32: 24.0.8 -> 24.1.3; iris driver and vulkan currently not available due to a lack of 32bit clang libs, check Pkgfile for changes --- mesa-32/.signature | 10 +++++----- mesa-32/Pkgfile | 11 +++++------ mesa-32/x86-linux-gnu | 18 +++++++++--------- mesa-32/x86-linux-gnu-ccache | 5 +++-- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/mesa-32/.signature b/mesa-32/.signature index 14ce2f1b..c42bcfc9 100644 --- a/mesa-32/.signature +++ b/mesa-32/.signature @@ -1,7 +1,7 @@ untrusted comment: verify with /etc/ports/compat-32.pub -RWSwxGo/zH7eXTsHjWIhimpN7g98+If8dpxF5IU/4qNetSABlr/CVuwtuoqlFt6m+q8szjzLGfFu7igxiU2lmZxpRl97hutnYwQ= -SHA256 (Pkgfile) = 6d7dca4c3a9ae30ab5a30e82ee6af9e1e32558b9a8ad69bd74828caa431b6856 +RWSwxGo/zH7eXT0acurfMNcmEN/zOLedibRGy26Z8UoIIsvNrW45shUcy07AODIfihhYYDAKze3FzoWxP1BC9w/sXBkHtEWy7Aw= +SHA256 (Pkgfile) = 5243c7d2ea93e1594efe6c3accee598ca061fa88e51e38d9e332310a5930d4ed SHA256 (.footprint) = 09078f852951a6a7ed572c23d8dd0b7c1f623f5753587a29611309f1bff12622 -SHA256 (mesa-24.0.8.tar.xz) = d1ed86a266d5b7b8c136ae587ef5618ed1a9837a43440f3713622bf0123bf5c1 -SHA256 (x86-linux-gnu) = 448877bbe3efe8bdfe6282c8e730fe8a8b6bf3c07f659e71b7292aceca22d8bd -SHA256 (x86-linux-gnu-ccache) = 7b435803071fa5d72668eeae1a15c4e4dfca7847349de6f4ede0282b85faaac8 +SHA256 (mesa-24.1.3.tar.xz) = 63236426b25a745ba6aa2d6daf8cd769d5ea01887b0745ab7124d2ef33a9020d +SHA256 (x86-linux-gnu) = 866e56da6164785120e4cee5ed2f44f0f7e5a5db9b34242332286754638dbdde +SHA256 (x86-linux-gnu-ccache) = 91649ec781699a1cbebfa812ffe707b668f3990be3914b8febcd542f110f12a8 diff --git a/mesa-32/Pkgfile b/mesa-32/Pkgfile index 45ea347f..2e96bc62 100644 --- a/mesa-32/Pkgfile +++ b/mesa-32/Pkgfile @@ -2,10 +2,10 @@ # URL: https://www.mesa3d.org/ # Maintainer: CRUX compat-32 Team, compat-32-ports at crux dot nu # Depends on: elfutils-32 expat-32 libdrm-32 libglvnd-32 llvm-32 mesa xorg-libxdamage-32 xorg-libxrandr-32 xorg-libxshmfence-32 xorg-libxvmc-32 xorg-libxxf86vm-32 -# Optional: glslang libclc libva-32 libvdpau-32 vulkan-loader-32 wayland-protocols +# Optional: clang-32 glslang libclc libva-32 libvdpau-32 spirv-llvm-translator-32 vulkan-loader-32 wayland-protocols name=mesa-32 -version=24.0.8 +version=24.1.3 release=1 source=(https://archive.mesa3d.org/mesa-$version.tar.xz x86-linux-gnu x86-linux-gnu-ccache) @@ -14,8 +14,8 @@ build() { export PKG_CONFIG_LIBDIR='/usr/lib32/pkgconfig:/usr/share/pkgconfig' prt-get isinst ccache && local _cross_file='x86-linux-gnu-ccache' || local _cross_file='x86-linux-gnu' - prt-get isinst glslang && PKGMK_MESA+=' -D vulkan-drivers=auto -D vulkan-layers=device-select,intel-nullhw,overlay' || PKGMK_MESA+=' -D vulkan-drivers=' - prt-get isinst libclc && PKGMK_MESA_GALLIUM+='iris,' + prt-get isinst glslang spirv-llvm-translator-32 clang-32 && PKGMK_MESA+=' -D vulkan-drivers=auto -D vulkan-layers=device-select,intel-nullhw,overlay' || PKGMK_MESA+=' -D vulkan-drivers=' + prt-get isinst libclc clang-32 && PKGMK_MESA_GALLIUM+='iris,' prt-get isinst libva-32 && PKGMK_MESA+=' -D gallium-va=enabled' || PKGMK_MESA+=' -D gallium-va=disabled' prt-get isinst libvdpau-32 && PKGMK_MESA+=' -D gallium-vdpau=enabled' || PKGMK_MESA+=' -D gallium-vdpau=disabled' prt-get isinst vulkan-loader-32 && PKGMK_MESA_GALLIUM+='zink,' @@ -30,7 +30,6 @@ build() { --libdir=/usr/lib32 \ --sysconfdir=/etc \ --buildtype=plain \ - --wrap-mode nodownload \ -D b_lto=false \ -D b_pie=true \ -D dri3=enabled \ @@ -47,7 +46,7 @@ build() { -D platforms=${PKGMK_MESA_PLATFORMS#,} \ -D shared-glapi=enabled \ -D video-codecs=vc1dec,h264dec,h264enc,h265dec,h265enc \ - -D glvnd=true + -D glvnd=enabled meson compile -C build -j ${JOBS:-1} DESTDIR=$PKG meson install -C build diff --git a/mesa-32/x86-linux-gnu b/mesa-32/x86-linux-gnu index 8cd252e5..21975735 100644 --- a/mesa-32/x86-linux-gnu +++ b/mesa-32/x86-linux-gnu @@ -1,19 +1,19 @@ [binaries] -c = '/usr/bin/gcc' -cpp = '/usr/bin/g++' -ar = '/usr/bin/gcc-ar' -strip = '/usr/bin/strip' +c = ['gcc', '-m32'] +cpp = ['g++', '-m32'] +rust = ['rustc', '--target', 'i686-unknown-linux-gnu'] pkgconfig = '/usr/bin/pkg-config' +cups-config = '/usr/bin/cups-config' llvm-config = '/usr/bin/llvm-config-32' +strip = 'strip' -[properties] -c_args = ['-m32'] -c_link_args = ['-m32'] -cpp_args = ['-m32'] -cpp_link_args = ['-m32'] +[built-in options] +libdir = 'lib32' [host_machine] system = 'linux' +subsystem = 'linux' +kernel = 'linux' cpu_family = 'x86' cpu = 'i686' endian = 'little' diff --git a/mesa-32/x86-linux-gnu-ccache b/mesa-32/x86-linux-gnu-ccache index 998b4774..8cb4f130 100644 --- a/mesa-32/x86-linux-gnu-ccache +++ b/mesa-32/x86-linux-gnu-ccache @@ -1,10 +1,11 @@ [binaries] c = '/usr/lib/ccache/gcc' cpp = '/usr/lib/ccache/g++' -ar = '/usr/bin/gcc-ar' -strip = '/usr/bin/strip' +rust = ['rustc', '--target', 'i686-unknown-linux-gnu'] pkgconfig = '/usr/bin/pkg-config' +cups-config = '/usr/bin/cups-config' llvm-config = '/usr/bin/llvm-config-32' +strip = '/usr/bin/strip' [properties] c_args = ['-m32']