archlinuxarm/PKGBUILDs
1
0
Fork 0
mirror of https://github.com/archlinuxarm/PKGBUILDs.git synced 2024-11-08 22:45:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

extra/mesa to 24.2.1-1

Browse source
This commit is contained in:
Kevin Mihelich 2024-08-29 18:11:18 +00:00
parent 9dad0e9f01
commit f094349c2e
4 changed files with 161 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
extra/mesa/.SRCINFO
View file

@ -1,6 +1,6 @@
pkgbase = mesa
pkgdesc = Open-source OpenGL drivers
pkgver = 24.1.6
pkgver = 24.2.1
pkgrel = 1
epoch = 1
url = https://www.mesa3d.org/
@ -45,40 +45,76 @@ pkgbase = mesa
makedepends = python-mako
makedepends = python-packaging
makedepends = python-ply
makedepends = python-yaml
makedepends = rust-bindgen
makedepends = wayland-protocols
makedepends = xorgproto
makedepends = valgrind
makedepends = directx-headers
makedepends = libomxil-bellagio
makedepends = python-sphinx
makedepends = python-sphinx-hawkmoth
options = !lto
source = https://mesa.freedesktop.org/archive/mesa-24.1.6.tar.xz
source = https://mesa.freedesktop.org/archive/mesa-24.1.6.tar.xz.sig
source = proc-macro2-1.0.70.tar.gz::https://crates.io/api/v1/crates/proc-macro2/1.0.70/download
source = https://mesa.freedesktop.org/archive/mesa-24.2.1.tar.xz
source = https://mesa.freedesktop.org/archive/mesa-24.2.1.tar.xz.sig
source = 0001-rusticl-do-not-use-CL-vector-types-in-bindings-and-c.patch
source = ucd-trie-0.1.6.tar.gz::https://crates.io/api/v1/crates/ucd-trie/0.1.6/download
source = pest_meta-2.7.11.tar.gz::https://crates.io/api/v1/crates/pest_meta/2.7.11/download
source = indexmap-2.2.6.tar.gz::https://crates.io/api/v1/crates/indexmap/2.2.6/download
source = hashbrown-0.14.1.tar.gz::https://crates.io/api/v1/crates/hashbrown/0.14.1/download
source = proc-macro2-1.0.86.tar.gz::https://crates.io/api/v1/crates/proc-macro2/1.0.86/download
source = pest_derive-2.7.11.tar.gz::https://crates.io/api/v1/crates/pest_derive/2.7.11/download
source = unicode-ident-1.0.12.tar.gz::https://crates.io/api/v1/crates/unicode-ident/1.0.12/download
source = quote-1.0.33.tar.gz::https://crates.io/api/v1/crates/quote/1.0.33/download
source = roxmltree-0.20.0.tar.gz::https://crates.io/api/v1/crates/roxmltree/0.20.0/download
source = paste-1.0.14.tar.gz::https://crates.io/api/v1/crates/paste/1.0.14/download
source = syn-2.0.39.tar.gz::https://crates.io/api/v1/crates/syn/2.0.39/download
source = pest-2.7.11.tar.gz::https://crates.io/api/v1/crates/pest/2.7.11/download
source = equivalent-1.0.1.tar.gz::https://crates.io/api/v1/crates/equivalent/1.0.1/download
source = pest_generator-2.7.11.tar.gz::https://crates.io/api/v1/crates/pest_generator/2.7.11/download
source = once_cell-1.8.0.tar.gz::https://crates.io/api/v1/crates/once_cell/1.8.0/download
source = syn-2.0.68.tar.gz::https://crates.io/api/v1/crates/syn/2.0.68/download
validpgpkeys = 946D09B5E4C9845E63075FF1D961C596A7203456
validpgpkeys = 71C4B75620BC75708B4BDB254C95FAAB3EB073EC
validpgpkeys = 8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D
validpgpkeys = 57551DE15B968F6341C248F68D8E31AFC32428A6
validpgpkeys = A5CC9FEC93F2F837CB044912336909B6B25FADFA
validpgpkeys = E3E8F480C52ADD73B278EE78E1ECBE07D7D70895
sha256sums = da94c0908d5662467369b69ed8236da1e1577141a6e7d25171a9bf56383b34e8
sha256sums = fc9a495f3a9af906838be89367564e10ef335e058f88965ad49ccc3e9a3b420b
sha256sums = SKIP
sha256sums = 39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b
sha256sums = 26402e3e1c7efed6dced9d4989d8c79e5a57ad5f802e56b77e18d394b27a8580
sha256sums = ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9
sha256sums = a941429fea7e08bedec25e4f6785b6ffaacc6b755da98df5ef3e7dcf4a124c4f
sha256sums = 168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26
sha256sums = 7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12
sha256sums = 5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77
sha256sums = 2a548d2beca6773b1c244554d36fcf8548a8a58e74156968211567250e48e49a
sha256sums = 3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b
sha256sums = 5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae
sha256sums = 6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97
sha256sums = de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c
sha256sums = 23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a
b2sums = 295634438e1a2ae64bd1c5b0309a253e72a4d95e559cabad72f94aa2b91e5b05179c69cce5e371b69707419399dae0bfe808cb16b2e9ee112277e18b8f0f31f9
sha256sums = cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95
sha256sums = 5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5
sha256sums = 3c93a82e8d145725dcbaf44e5ea887c8a869efdcc28706df2d08c69e17077183
sha256sums = 692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56
sha256sums = 901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9
b2sums = f4ef9fd08bbf16551498a8edce1e19e594a0b85ee1f05f8f7c80fcf12ec7ac4cb5947b713791f5202201f8cfc48773507d869dbd239e6fc3dcf2c3a621892327
b2sums = SKIP
b2sums = fff0dec06b21e391783cc136790238acb783780eaedcf14875a350e7ceb46fdc100c8b9e3f09fb7f4c2196c25d4c6b61e574c0dad762d94533b628faab68cf5c
b2sums = 251a228c47c1d91a2063defbd5dda07deff6d763a2de5ed6c01e514b0f2326f2550b6174e0e98c2161971dbb888f5028243fe9645f9dea4b54308f0ae68e4e17
b2sums = a6d47c903be6094423d89b8ec3ca899d0a84df6dbd6e76632bb6c9b9f40ad9c216f8fa400310753d392f85072756b43ac3892e0a2c4d55f87ab6463002554823
b2sums = 9c34f1ab14ad5ae124882513e0f14b1d731d06a43203bdc37fa3b202dd3ce93dbe8ebb554d01bab475689fe6ffd3ec0cbc0d5365c9b984cb83fb34ea3e9e732e
b2sums = fac5cf6339dc3c0a40b100035a5c874cc7b2efeafeb31c51488d25156e392dc9db86a497e76eead351d2126f69d060422faa9c55d73407a0de9f5be18d234123
b2sums = afa9268513caa93fb141e69d27e7d65e72b9232b57d91e499f36ea4ec89d65bc6c8cbb37753ed59d149be5a2d349028b1fb0414c6223914366d6f3f31619855f
b2sums = 4b89e07f23af8328dbb34fe2b3f1b202f1e6a3885a6269740a23359b41bb4099ac2484565d3b2b0936261689ca525785ac620c766997234fd8d0f409e80e5ea3
b2sums = e81ed8b60492da9612d2208c6cfa712ebf8c6ed7993642bfc4fadeaba10a0bc16700bce012d34d955104041ed8bbf659d16d9b86eab52342875d4c6148e7f60d
b2sums = 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac
b2sums = 77c4b166f1200e1ee2ab94a5014acd334c1fe4b7d72851d73768d491c56c6779a0882a304c1f30c88732a6168351f0f786b10516ae537cff993892a749175848
b2sums = 9605ca407af248c71e0d2bc24d213aa6ff08a14eb548b85de16de7e172a617cdf12c2e4c686f6dd1c80455448a313f6e7d760885f189ae726934efbe06fb5603
b2sums = 35e8548611c51ee75f4d04926149e5e54870d7073d9b635d550a6fa0f85891f57f326bdbcff3dd8618cf40f8e08cf903ef87d9c034d5921d8b91e1db842cdd7c
b2sums = 2cff6626624d03f70f1662af45a8644c28a9f92e2dfe38999bef3ba4a4c1ce825ae598277e9cb7abd5585eebfb17b239effc8d0bbf1c6ac196499f0d288e5e01
b2sums = 23bb1f3453d5d839dba7b3292806eb2d327ccafb1b1472fd970262a44c0abbabfbf3316ca16dd5526177bcb67a701cf79fa86b68fd1e57a3d875cb4b7ff89ad9
b2sums = 302d78069d9df05e78b53f0488a9e4eb98fa2bc1e21893dc8a0acf2234347ba7c4df4b9d6b380ae77d8ffb1074b9c790460fe2dae47318aa1c4fe4208244540a
b2sums = dd65c69d8d0ff343d36e31e6a4f4e11aeb01b1fd23d0db06d90f506ec2f2bb2c50422f6a73b48780e16e07c8d0addb374dd09cfabaf6230d5b2ba409dd3fa6cd
b2sums = 7681b1a7497b5711e663773c1a7e076f333c06c10d3f289079a781c36f050c1620cc279742ea8e5b15ec48f3d6038a6079bbda7fee3ae8e1128bd916d53ed43a
b2sums = 8bc6f68ed286bea617a2cfaf3949bb699d3a0466faeca735314a51596ce950e4ee57eda88154bd562c1728cfaff4cdb5bc1ba701b9d47a9c50d4c4f011bee975
pkgname = mesa
depends = expat
@ -278,3 +314,6 @@ pkgname = vulkan-virtio
depends = zstd
optdepends = vulkan-mesa-layers: additional vulkan layers
provides = vulkan-driver
pkgname = mesa-docs
pkgdesc = Mesa's documentation

5
extra/mesa/.nvchecker.toml Normal file
View file

@ -0,0 +1,5 @@
[mesa]
source = "git"
git = "https://gitlab.freedesktop.org/mesa/mesa.git"
include_regex = 'mesa-.*'
prefix = "mesa-"

40
extra/mesa/0001-rusticl-do-not-use-CL-vector-types-in-bindings-and-c.patch Normal file
View file

@ -0,0 +1,40 @@
From 0000000000000000000000000000000000000000 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 7aca92527a4e..c4b2b0bc7423 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 9cf603c6a6d4..459b94cf17a1 100644
--- a/src/gallium/frontends/rusticl/meson.build
+++ b/src/gallium/frontends/rusticl/meson.build
@@ -157,6 +157,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

79
extra/mesa/PKGBUILD
View file

@ -29,8 +29,9 @@ pkgname=(
vulkan-broadcom
vulkan-panfrost
vulkan-freedreno
mesa-docs
)
pkgver=24.1.6
pkgver=24.2.1
pkgrel=1
epoch=1
pkgdesc="Open-source OpenGL drivers"
@ -79,6 +80,7 @@ makedepends=(
python-mako
python-packaging
python-ply
python-yaml
rust-bindgen
wayland-protocols
xorgproto
@ -92,6 +94,10 @@ makedepends=(
# gallium-omx deps
libomxil-bellagio
# html-docs
python-sphinx
python-sphinx-hawkmoth
# etnaviv deps
python-pycparser
)
@ -104,6 +110,7 @@ options=(
)
source=(
"https://mesa.freedesktop.org/archive/mesa-$pkgver.tar.xz"{,.sig}
0001-rusticl-do-not-use-CL-vector-types-in-bindings-and-c.patch
)
validpgpkeys=(
946D09B5E4C9845E63075FF1D961C596A7203456 # Andres Gomez <tanty@igalia.com>
@ -116,11 +123,21 @@ validpgpkeys=(
# Rust crates for NVK, used as Meson subprojects
declare -A _crates=(
paste 1.0.14
proc-macro2 1.0.70
quote 1.0.33
syn 2.0.39
unicode-ident 1.0.12
equivalent 1.0.1
hashbrown 0.14.1
indexmap 2.2.6
once_cell 1.8.0
paste 1.0.14
pest 2.7.11
pest_derive 2.7.11
pest_generator 2.7.11
pest_meta 2.7.11
proc-macro2 1.0.86
quote 1.0.33
roxmltree 0.20.0
syn 2.0.68
ucd-trie 0.1.6
unicode-ident 1.0.12
)
for _crate in "${!_crates[@]}"; do
@ -130,26 +147,51 @@ for _crate in "${!_crates[@]}"; do
)
done
b2sums=('295634438e1a2ae64bd1c5b0309a253e72a4d95e559cabad72f94aa2b91e5b05179c69cce5e371b69707419399dae0bfe808cb16b2e9ee112277e18b8f0f31f9'
b2sums=('f4ef9fd08bbf16551498a8edce1e19e594a0b85ee1f05f8f7c80fcf12ec7ac4cb5947b713791f5202201f8cfc48773507d869dbd239e6fc3dcf2c3a621892327'
'SKIP'
'fff0dec06b21e391783cc136790238acb783780eaedcf14875a350e7ceb46fdc100c8b9e3f09fb7f4c2196c25d4c6b61e574c0dad762d94533b628faab68cf5c'
'251a228c47c1d91a2063defbd5dda07deff6d763a2de5ed6c01e514b0f2326f2550b6174e0e98c2161971dbb888f5028243fe9645f9dea4b54308f0ae68e4e17'
'a6d47c903be6094423d89b8ec3ca899d0a84df6dbd6e76632bb6c9b9f40ad9c216f8fa400310753d392f85072756b43ac3892e0a2c4d55f87ab6463002554823'
'9c34f1ab14ad5ae124882513e0f14b1d731d06a43203bdc37fa3b202dd3ce93dbe8ebb554d01bab475689fe6ffd3ec0cbc0d5365c9b984cb83fb34ea3e9e732e'
'fac5cf6339dc3c0a40b100035a5c874cc7b2efeafeb31c51488d25156e392dc9db86a497e76eead351d2126f69d060422faa9c55d73407a0de9f5be18d234123'
'afa9268513caa93fb141e69d27e7d65e72b9232b57d91e499f36ea4ec89d65bc6c8cbb37753ed59d149be5a2d349028b1fb0414c6223914366d6f3f31619855f'
'4b89e07f23af8328dbb34fe2b3f1b202f1e6a3885a6269740a23359b41bb4099ac2484565d3b2b0936261689ca525785ac620c766997234fd8d0f409e80e5ea3'
'e81ed8b60492da9612d2208c6cfa712ebf8c6ed7993642bfc4fadeaba10a0bc16700bce012d34d955104041ed8bbf659d16d9b86eab52342875d4c6148e7f60d'
'4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac'
'77c4b166f1200e1ee2ab94a5014acd334c1fe4b7d72851d73768d491c56c6779a0882a304c1f30c88732a6168351f0f786b10516ae537cff993892a749175848'
'9605ca407af248c71e0d2bc24d213aa6ff08a14eb548b85de16de7e172a617cdf12c2e4c686f6dd1c80455448a313f6e7d760885f189ae726934efbe06fb5603'
'35e8548611c51ee75f4d04926149e5e54870d7073d9b635d550a6fa0f85891f57f326bdbcff3dd8618cf40f8e08cf903ef87d9c034d5921d8b91e1db842cdd7c'
'2cff6626624d03f70f1662af45a8644c28a9f92e2dfe38999bef3ba4a4c1ce825ae598277e9cb7abd5585eebfb17b239effc8d0bbf1c6ac196499f0d288e5e01')
'23bb1f3453d5d839dba7b3292806eb2d327ccafb1b1472fd970262a44c0abbabfbf3316ca16dd5526177bcb67a701cf79fa86b68fd1e57a3d875cb4b7ff89ad9'
'302d78069d9df05e78b53f0488a9e4eb98fa2bc1e21893dc8a0acf2234347ba7c4df4b9d6b380ae77d8ffb1074b9c790460fe2dae47318aa1c4fe4208244540a'
'dd65c69d8d0ff343d36e31e6a4f4e11aeb01b1fd23d0db06d90f506ec2f2bb2c50422f6a73b48780e16e07c8d0addb374dd09cfabaf6230d5b2ba409dd3fa6cd'
'7681b1a7497b5711e663773c1a7e076f333c06c10d3f289079a781c36f050c1620cc279742ea8e5b15ec48f3d6038a6079bbda7fee3ae8e1128bd916d53ed43a'
'8bc6f68ed286bea617a2cfaf3949bb699d3a0466faeca735314a51596ce950e4ee57eda88154bd562c1728cfaff4cdb5bc1ba701b9d47a9c50d4c4f011bee975')
# https://docs.mesa3d.org/relnotes.html
sha256sums=('da94c0908d5662467369b69ed8236da1e1577141a6e7d25171a9bf56383b34e8'
sha256sums=('fc9a495f3a9af906838be89367564e10ef335e058f88965ad49ccc3e9a3b420b'
'SKIP'
'39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b'
'26402e3e1c7efed6dced9d4989d8c79e5a57ad5f802e56b77e18d394b27a8580'
'ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9'
'a941429fea7e08bedec25e4f6785b6ffaacc6b755da98df5ef3e7dcf4a124c4f'
'168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26'
'7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12'
'5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77'
'2a548d2beca6773b1c244554d36fcf8548a8a58e74156968211567250e48e49a'
'3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b'
'5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae'
'6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97'
'de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c'
'23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a')
'cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95'
'5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5'
'3c93a82e8d145725dcbaf44e5ea887c8a869efdcc28706df2d08c69e17077183'
'692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56'
'901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9')
prepare() {
cd mesa-$pkgver
# Unbreak build with bindgen 0.70.1
patch -Np1 -i ../0001-rusticl-do-not-use-CL-vector-types-in-bindings-and-c.patch
# Include package release in version string so Chromium invalidates
# its GPU cache; otherwise it can cause pages to render incorrectly.
# https://bugs.launchpad.net/ubuntu/+source/chromium-browser/+bug/2020604
@ -170,7 +212,7 @@ build() {
-D android-libbacktrace=disabled
#-D b_lto=$([[ $CARCH == aarch64 ]] && echo true || echo false)
-D b_ndebug=true
-D gallium-drivers=r300,r600,radeonsi,freedreno,nouveau,swrast,virgl,zink,d3d12${GALLIUM}
-D gallium-drivers=r300,r600,radeonsi,freedreno,nouveau,llvmpipe,softpipe,virgl,zink,d3d12${GALLIUM}
-D gallium-extra-hud=true
-D gallium-nine=true
-D gallium-omx=bellagio
@ -179,6 +221,7 @@ build() {
-D gallium-xa=disabled
-D gles1=disabled
-D glx=dri
-D html-docs=enabled
-D intel-clc=enabled
-D intel-rt=disabled
-D libunwind=disabled
@ -287,6 +330,8 @@ package_mesa() {
_pick vkfreedreno $icddir/freedreno_icd*.json
_pick vkfreedreno $libdir/libvulkan_freedreno.so
_pick docs usr/share/doc
# indirect rendering
ln -sr $libdir/libGLX_{mesa,indirect}.so.0
)
@ -564,4 +609,12 @@ package_vulkan-freedreno() {
install -Dm644 mesa-$pkgver/docs/license.rst -t "$pkgdir/usr/share/licenses/$pkgname"
}
package_mesa-docs() {
pkgdesc="Mesa's documentation"
mv docs/* "$pkgdir"
install -Dm644 mesa-$pkgver/docs/license.rst -t "$pkgdir/usr/share/licenses/$pkgname"
}
# vim:set sw=2 sts=-1 et: