1
0
Fork 0
mirror of git://slackware.nl/current.git synced 2025-01-14 08:01:11 +01:00
slackware-current/source/x/mesa/patches/30710.patch
Patrick J Volkerding e1b9937c81 Fri Aug 30 17:52:19 UTC 2024
a/aaa_glibc-solibs-2.40-x86_64-5.txz:  Rebuilt.
a/kernel-firmware-20240828_335a1de-noarch-1.txz:  Upgraded.
a/kernel-generic-6.10.7-x86_64-1.txz:  Upgraded.
a/kernel-huge-6.10.7-x86_64-1.txz:  Upgraded.
a/kernel-modules-6.10.7-x86_64-1.txz:  Upgraded.
a/userspace-rcu-0.14.1-x86_64-1.txz:  Upgraded.
ap/man-db-2.13.0-x86_64-1.txz:  Upgraded.
ap/screen-5.0.0-x86_64-1.txz:  Upgraded.
ap/vim-9.1.0702-x86_64-1.txz:  Upgraded.
d/cmake-3.30.3-x86_64-1.txz:  Upgraded.
d/gcc-14.2.0-x86_64-2.txz:  Rebuilt.
  Merge in parts of alienBOB's multilib build script, generalize the script
  to work with both --enable-multilib and --disable-multilib, and otherwise
  clean things up. Go ahead and build it multilib on 64-bit, because why not?
  It's worth the bit of bloat to no longer have this package need to be
  maintained separately and kept in sync. Thanks to alienBOB.
d/gcc-g++-14.2.0-x86_64-2.txz:  Rebuilt.
d/gcc-gdc-14.2.0-x86_64-2.txz:  Rebuilt.
d/gcc-gfortran-14.2.0-x86_64-2.txz:  Rebuilt.
d/gcc-gm2-14.2.0-x86_64-2.txz:  Rebuilt.
d/gcc-gnat-14.2.0-x86_64-2.txz:  Rebuilt.
d/gcc-go-14.2.0-x86_64-2.txz:  Rebuilt.
d/gcc-objc-14.2.0-x86_64-2.txz:  Rebuilt.
d/gcc-rust-14.2.0-x86_64-2.txz:  Rebuilt.
d/kernel-headers-6.10.7-x86-1.txz:  Upgraded.
d/python-setuptools-73.0.1-x86_64-1.txz:  Rebuilt.
  Reverted due to regression: breaks g-ir-scanner
k/kernel-source-6.10.7-noarch-1.txz:  Upgraded.
l/glibc-2.40-x86_64-5.txz:  Rebuilt.
  Enable multilib on 64-bit. Thanks to alienBOB.
  Note that Slackware 64-bit can now run a 32-bit "Hello World!" but there
  are no immediate plans to add additional multilib support by default.
  Maybe down the road when bare metal 32-bit support goes away.
l/glibc-i18n-2.40-x86_64-5.txz:  Rebuilt.
l/glibc-profile-2.40-x86_64-5.txz:  Rebuilt.
l/gtk4-4.15.6-x86_64-1.txz:  Upgraded.
l/libssh-0.11.1-x86_64-1.txz:  Upgraded.
l/protobuf-28.0-x86_64-1.txz:  Upgraded.
  Shared library .so-version bump.
l/python-certifi-2024.8.30-x86_64-1.txz:  Upgraded.
l/qt6-6.7.2_20240610_3f005f1e-x86_64-6.txz:  Rebuilt.
  Recompiled against protobuf-28.0.
n/ca-certificates-20240830-noarch-1.txz:  Upgraded.
  This update provides the latest CA certificates to check for the
  authenticity of SSL connections.
n/mosh-1.4.0-x86_64-4.txz:  Rebuilt.
  Recompiled against protobuf-28.0.
n/php-8.3.11-x86_64-1.txz:  Upgraded.
  This is a bugfix release.
  For more information, see:
    https://www.php.net/ChangeLog-8.php#8.3.11
x/mesa-24.2.1-x86_64-1.txz:  Upgraded.
  Thanks to lucabon for the rust-bindgen patch.
xap/vim-gvim-9.1.0702-x86_64-1.txz:  Upgraded.
isolinux/initrd.img:  Rebuilt.
kernels/*:  Upgraded.
usb-and-pxe-installers/usbboot.img:  Rebuilt.
2024-08-30 20:49:55 +02:00

43 lines
2 KiB
Diff

From 93e96da9458c9d0348f2390dc0bea67cf140b1a0 Mon Sep 17 00:00:00 2001
From: Karol Herbst <kherbst@redhat.com>
Date: Sun, 18 Aug 2024 00:08:50 +0200
Subject: [PATCH] rusticl: do not use CL vector types in bindings and code
Bindgen seems to miscompile them and I kinda thought I've done this
already in the past, but apparently not.
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/11722
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30710>
---
src/gallium/frontends/rusticl/api/device.rs | 2 +-
src/gallium/frontends/rusticl/meson.build | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/gallium/frontends/rusticl/api/device.rs b/src/gallium/frontends/rusticl/api/device.rs
index 9793092db5ad4..c1cb7902e0371 100644
--- a/src/gallium/frontends/rusticl/api/device.rs
+++ b/src/gallium/frontends/rusticl/api/device.rs
@@ -196,7 +196,7 @@ impl CLInfo<cl_device_info> for cl_device_id {
// TODO proper retrival from devices
CL_DEVICE_MEM_BASE_ADDR_ALIGN => cl_prop::<cl_uint>(0x1000),
CL_DEVICE_MIN_DATA_TYPE_ALIGN_SIZE => {
- cl_prop::<cl_uint>(size_of::<cl_ulong16>() as cl_uint)
+ cl_prop::<cl_uint>(16 * size_of::<cl_ulong>() as cl_uint)
}
CL_DEVICE_NAME => cl_prop::<&str>(&dev.screen().name()),
CL_DEVICE_NATIVE_VECTOR_WIDTH_CHAR => cl_prop::<cl_uint>(1),
diff --git a/src/gallium/frontends/rusticl/meson.build b/src/gallium/frontends/rusticl/meson.build
index 612e47bfe88e1..1fe75a611444d 100644
--- a/src/gallium/frontends/rusticl/meson.build
+++ b/src/gallium/frontends/rusticl/meson.build
@@ -146,6 +146,7 @@ rusticl_opencl_bindings_rs = rust.bindgen(
'--raw-line', 'unsafe impl std::marker::Send for _cl_image_desc {}',
'--raw-line', 'unsafe impl std::marker::Sync for _cl_image_desc {}',
'--allowlist-type', 'cl_.*',
+ '--blocklist-type', '(__)?cl_.*[2348(16)]',
'--allowlist-type', 'cl.*_fn',
'--allowlist-var', 'CL_.*',
# needed for gl_sharing extension
--
GitLab