* Re: [PR PATCH] [Updated] mesa: update to 20.3.1.
2020-12-20 3:37 [PR PATCH] mesa: update to 20.3.1 ericonr
@ 2020-12-20 3:57 ` ericonr
2020-12-20 11:45 ` [PR REVIEW] " st3r4g
` (30 subsequent siblings)
31 siblings, 0 replies; 41+ messages in thread
From: ericonr @ 2020-12-20 3:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 722 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages mesa
https://github.com/void-linux/void-packages/pull/27291
mesa: update to 20.3.1.
- removed drm and surfaceless from platforms since they're determined
automatically now.
- fix driver search path to use /usr/lib${wordsize}; see
https://github.com/void-linux/void-packages/pull/27269
- remove transitional dummy packages that only depend on mesa-dri
Closes: #27214 [via git-merge-pr]
I'm not sure if the issue here https://gitlab.freedesktop.org/mesa/mesa/-/issues/3989 matters for us.
A patch file from https://github.com/void-linux/void-packages/pull/27291.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mesa-27291.patch --]
[-- Type: text/x-diff, Size: 7709 bytes --]
From fab2167e72c6ff6d733af385e4e15a6d3808ac09 Mon Sep 17 00:00:00 2001
From: HadetTheUndying <hadet@protonmail.com>
Date: Wed, 16 Dec 2020 20:55:08 -0600
Subject: [PATCH] mesa: update to 20.3.1.
- removed drm and surfaceless from platforms since they're determined
automatically now.
- fix driver search path to use /usr/lib${wordsize}; see
https://github.com/void-linux/void-packages/pull/27269
- remove transitional dummy packages that only depend on mesa-dri
Closes: #27214 [via git-merge-pr]
---
srcpkgs/mesa-etnaviv-dri | 1 -
srcpkgs/mesa-freedreno-dri | 1 -
srcpkgs/mesa-kmsro-dri | 1 -
srcpkgs/mesa-lima-dri | 1 -
srcpkgs/mesa-panfrost-dri | 1 -
srcpkgs/mesa-tegra-dri | 1 -
srcpkgs/mesa-v3d-dri | 1 -
srcpkgs/mesa-vc4-dri | 1 -
srcpkgs/mesa-vmwgfx-dri | 1 -
srcpkgs/mesa/template | 87 ++++++--------------------------------
10 files changed, 13 insertions(+), 83 deletions(-)
delete mode 120000 srcpkgs/mesa-etnaviv-dri
delete mode 120000 srcpkgs/mesa-freedreno-dri
delete mode 120000 srcpkgs/mesa-kmsro-dri
delete mode 120000 srcpkgs/mesa-lima-dri
delete mode 120000 srcpkgs/mesa-panfrost-dri
delete mode 120000 srcpkgs/mesa-tegra-dri
delete mode 120000 srcpkgs/mesa-v3d-dri
delete mode 120000 srcpkgs/mesa-vc4-dri
delete mode 120000 srcpkgs/mesa-vmwgfx-dri
diff --git a/srcpkgs/mesa-etnaviv-dri b/srcpkgs/mesa-etnaviv-dri
deleted file mode 120000
index 1ad1bbec7ab..00000000000
--- a/srcpkgs/mesa-etnaviv-dri
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa-freedreno-dri b/srcpkgs/mesa-freedreno-dri
deleted file mode 120000
index 1ad1bbec7ab..00000000000
--- a/srcpkgs/mesa-freedreno-dri
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa-kmsro-dri b/srcpkgs/mesa-kmsro-dri
deleted file mode 120000
index 1ad1bbec7ab..00000000000
--- a/srcpkgs/mesa-kmsro-dri
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa-lima-dri b/srcpkgs/mesa-lima-dri
deleted file mode 120000
index 1ad1bbec7ab..00000000000
--- a/srcpkgs/mesa-lima-dri
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa-panfrost-dri b/srcpkgs/mesa-panfrost-dri
deleted file mode 120000
index 1ad1bbec7ab..00000000000
--- a/srcpkgs/mesa-panfrost-dri
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa-tegra-dri b/srcpkgs/mesa-tegra-dri
deleted file mode 120000
index 1ad1bbec7ab..00000000000
--- a/srcpkgs/mesa-tegra-dri
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa-v3d-dri b/srcpkgs/mesa-v3d-dri
deleted file mode 120000
index 1ad1bbec7ab..00000000000
--- a/srcpkgs/mesa-v3d-dri
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa-vc4-dri b/srcpkgs/mesa-vc4-dri
deleted file mode 120000
index 1ad1bbec7ab..00000000000
--- a/srcpkgs/mesa-vc4-dri
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa-vmwgfx-dri b/srcpkgs/mesa-vmwgfx-dri
deleted file mode 120000
index 1ad1bbec7ab..00000000000
--- a/srcpkgs/mesa-vmwgfx-dri
+++ /dev/null
@@ -1 +0,0 @@
-mesa
\ No newline at end of file
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 5bc5a611f38..da8aa2c1134 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,19 +1,20 @@
# Template file for 'mesa'
pkgname=mesa
-version=20.2.3
+version=20.3.1
revision=1
wrksrc="mesa-${version}"
build_style=meson
configure_args="-Dglvnd=true -Dshared-glapi=true -Dgbm=true -Degl=true
-Dosmesa=gallium -Dgles1=true -Dgles2=true -Dglx=dri -Ddri3=true
- -Dlmsensors=true -Dplatforms=x11,drm,$(vopt_if wayland wayland,)surfaceless
- -Dllvm=true -Db_lto=false -Dcpp_std=gnu++14"
+ -Dlmsensors=true -Dplatforms=x11$(vopt_if wayland ',wayland')
+ -Dllvm=true -Db_lto=false -Dcpp_std=gnu++14
+ -Ddri-drivers-path=/usr/lib${XBPS_TARGET_WORDSIZE}"
hostmakedepends="gettext flex llvm pkg-config python3-Mako glslang gzip
- $(vopt_if wayland 'wayland-protocols wayland-devel')"
+ wayland-protocols wayland-devel"
makedepends="elfutils-devel expat-devel libXdamage-devel libXvMC-devel
libXxf86vm-devel libatomic-devel libdrm-devel libffi-devel libva-devel
libvdpau-devel libxshmfence-devel ncurses-devel zlib-devel
- $(vopt_if wayland 'wayland-devel wayland-protocols') llvm libsensors-devel
+ wayland-devel wayland-protocols llvm libsensors-devel
libXrandr-devel libglvnd-devel libzstd-devel libxml2-devel lua53-devel
libarchive-devel"
depends="libglvnd"
@@ -23,10 +24,11 @@ license="MIT, LGPL-2.1-or-later"
homepage="https://www.mesa3d.org/"
changelog="https://docs.mesa3d.org/relnotes/${version}.html"
distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=ae1b240e11531df528d14dc214d2dc4d2b4f2e835c6230ba0b492b171eceb82b
+checksum=af751b49bb2ab0264d58c31e73d869e80333de02b2d1becc93f1b28c67aa780f
+provides="mesa-etnaviv-dri>=0 mesa-freedreno-dri>=0 mesa-kmsro-dri>=0
+ mesa-lima-dri>=0 mesa-panfrost-dri>=0 mesa-tegra-dri>=0 mesa-v3d-dri>=0
+ mesa-vc4-dri>=0 mesa-vmwgfx-dri>=0"
-build_options="wayland"
-build_options_default="wayland"
# Set subpackages manually to set proper rdeps in 32bit pkgs.
subpackages="libglapi libgbm libOSMesa"
@@ -337,89 +339,26 @@ mesa-vulkan-overlay-layer_package() {
mesa-ati-dri_package() {
build_style=meta
lib32mode=full
- short_desc="Mesa DRI drivers for ATI GPUs (transitional dummy package)"
+ short_desc="Mesa DRI drivers for ATI GPUs"
depends="mesa-dri mesa-vulkan-radeon"
if [ "$_have_hwdec" ]; then
depends+=" mesa-vaapi mesa-vdpau mesa-XvMC"
fi
}
-mesa-etnaviv-dri_package() {
- build_style=meta
- lib32mode=full
- short_desc="Mesa DRI drivers for Vivante GPUs (transitional dummy package)"
- depends="mesa-dri"
-}
-
-mesa-freedreno-dri_package() {
- build_style=meta
- lib32mode=full
- short_desc="Mesa DRI drivers for Adreno GPUs (transitional dummy package)"
- depends="mesa-dri"
-}
-
mesa-intel-dri_package() {
build_style=meta
lib32mode=full
- short_desc="Mesa DRI drivers for Intel GPUs (transitional dummy package)"
+ short_desc="Mesa DRI drivers for Intel GPUs"
depends="mesa-dri mesa-vulkan-intel"
}
-mesa-kmsro-dri_package() {
- build_style=meta
- lib32mode=full
- short_desc="KMS Render-only Mesa DRI drivers (transitional dummy package)"
- depends="mesa-dri"
-}
-
-mesa-lima-dri_package() {
- build_style=meta
- lib32mode=full
- short_desc="Mesa DRI drivers for Mali GPUs (Utgard) (transitional dummy package)"
- depends="mesa-dri"
-}
-
mesa-nouveau-dri_package() {
build_style=meta
lib32mode=full
- short_desc="Mesa DRI drivers for NVIDIA GPUs (transitional dummy package)"
+ short_desc="Mesa DRI drivers for NVIDIA GPUs"
depends="mesa-dri"
if [ "$_have_hwdec" ]; then
depends+=" mesa-vaapi mesa-vdpau mesa-XvMC"
fi
}
-
-mesa-panfrost-dri_package() {
- build_style=meta
- lib32mode=full
- short_desc="Mesa DRI drivers for Mali GPUs (Midgard/Bifrost) (dummy package)"
- depends="mesa-dri"
-}
-
-mesa-tegra-dri_package() {
- build_style=meta
- lib32mode=full
- short_desc="Mesa DRI drivers for Tegra GPU (transitional dummy package)"
- depends="mesa-dri"
-}
-
-mesa-v3d-dri_package() {
- build_style=meta
- lib32mode=full
- short_desc="Mesa DRI drivers for Videocore VI GPU (transitional dummy package)"
- depends="mesa-dri"
-}
-
-mesa-vmwgfx-dri_package() {
- build_style=meta
- lib32mode=full
- short_desc="Mesa DRI drivers for VMware (transitional dummy package)"
- depends="mesa-dri"
-}
-
-mesa-vc4-dri_package() {
- build_style=meta
- lib32mode=full
- short_desc="Mesa DRI drivers for Videocore IV GPU (transitional dummy package)"
- depends="mesa-dri"
-}
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PR REVIEW] mesa: update to 20.3.1.
2020-12-20 3:37 [PR PATCH] mesa: update to 20.3.1 ericonr
2020-12-20 3:57 ` [PR PATCH] [Updated] " ericonr
@ 2020-12-20 11:45 ` st3r4g
2020-12-20 12:08 ` st3r4g
` (29 subsequent siblings)
31 siblings, 0 replies; 41+ messages in thread
From: st3r4g @ 2020-12-20 11:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 219 bytes --]
New review comment by st3r4g on void-packages repository
https://github.com/void-linux/void-packages/pull/27291#discussion_r546365342
Comment:
I think this should be `replaces=` and should be in the `mesa-dri` subpkg
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PR REVIEW] mesa: update to 20.3.1.
2020-12-20 3:37 [PR PATCH] mesa: update to 20.3.1 ericonr
2020-12-20 3:57 ` [PR PATCH] [Updated] " ericonr
2020-12-20 11:45 ` [PR REVIEW] " st3r4g
@ 2020-12-20 12:08 ` st3r4g
2020-12-20 13:18 ` st3r4g
` (28 subsequent siblings)
31 siblings, 0 replies; 41+ messages in thread
From: st3r4g @ 2020-12-20 12:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 309 bytes --]
New review comment by st3r4g on void-packages repository
https://github.com/void-linux/void-packages/pull/27291#discussion_r546365342
Comment:
I think this should be `replaces=` and should be in the `mesa-dri` subpkg. Or maybe both `replaces=` and `provides=`. Also, it should be `provides="$pkg-$version"`
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PR REVIEW] mesa: update to 20.3.1.
2020-12-20 3:37 [PR PATCH] mesa: update to 20.3.1 ericonr
` (2 preceding siblings ...)
2020-12-20 12:08 ` st3r4g
@ 2020-12-20 13:18 ` st3r4g
2020-12-20 13:19 ` st3r4g
` (27 subsequent siblings)
31 siblings, 0 replies; 41+ messages in thread
From: st3r4g @ 2020-12-20 13:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 280 bytes --]
New review comment by st3r4g on void-packages repository
https://github.com/void-linux/void-packages/pull/27291#discussion_r546365342
Comment:
I think this should be `replaces=` and should be in the `mesa-dri` subpkg. Also, the syntax for provides is `provides="$pkg-$version"`
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PR REVIEW] mesa: update to 20.3.1.
2020-12-20 3:37 [PR PATCH] mesa: update to 20.3.1 ericonr
` (3 preceding siblings ...)
2020-12-20 13:18 ` st3r4g
@ 2020-12-20 13:19 ` st3r4g
2020-12-20 14:44 ` ericonr
` (26 subsequent siblings)
31 siblings, 0 replies; 41+ messages in thread
From: st3r4g @ 2020-12-20 13:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 281 bytes --]
New review comment by st3r4g on void-packages repository
https://github.com/void-linux/void-packages/pull/27291#discussion_r546365342
Comment:
I think this should be `replaces=` and should be in the `mesa-dri` subpkg. Also, the syntax for provides is `provides="$vpkg-$version"`
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PR REVIEW] mesa: update to 20.3.1.
2020-12-20 3:37 [PR PATCH] mesa: update to 20.3.1 ericonr
` (4 preceding siblings ...)
2020-12-20 13:19 ` st3r4g
@ 2020-12-20 14:44 ` ericonr
2020-12-20 14:52 ` st3r4g
` (25 subsequent siblings)
31 siblings, 0 replies; 41+ messages in thread
From: ericonr @ 2020-12-20 14:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 221 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27291#discussion_r546386243
Comment:
q66 asked not to remove the sub packages, so I will just revert this part.
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PR REVIEW] mesa: update to 20.3.1.
2020-12-20 3:37 [PR PATCH] mesa: update to 20.3.1 ericonr
` (5 preceding siblings ...)
2020-12-20 14:44 ` ericonr
@ 2020-12-20 14:52 ` st3r4g
2020-12-20 16:33 ` st3r4g
` (24 subsequent siblings)
31 siblings, 0 replies; 41+ messages in thread
From: st3r4g @ 2020-12-20 14:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 148 bytes --]
New review comment by st3r4g on void-packages repository
https://github.com/void-linux/void-packages/pull/27291#discussion_r546387220
Comment:
ok
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PR REVIEW] mesa: update to 20.3.1.
2020-12-20 3:37 [PR PATCH] mesa: update to 20.3.1 ericonr
` (6 preceding siblings ...)
2020-12-20 14:52 ` st3r4g
@ 2020-12-20 16:33 ` st3r4g
2020-12-20 16:38 ` st3r4g
` (23 subsequent siblings)
31 siblings, 0 replies; 41+ messages in thread
From: st3r4g @ 2020-12-20 16:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 202 bytes --]
New review comment by st3r4g on void-packages repository
https://github.com/void-linux/void-packages/pull/27291#discussion_r546399453
Comment:
shouldn't this be `/usr/lib${XBPS_TARGET_WORDSIZE}/dri`?
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PR REVIEW] mesa: update to 20.3.1.
2020-12-20 3:37 [PR PATCH] mesa: update to 20.3.1 ericonr
` (7 preceding siblings ...)
2020-12-20 16:33 ` st3r4g
@ 2020-12-20 16:38 ` st3r4g
2020-12-20 16:42 ` st3r4g
` (22 subsequent siblings)
31 siblings, 0 replies; 41+ messages in thread
From: st3r4g @ 2020-12-20 16:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 278 bytes --]
New review comment by st3r4g on void-packages repository
https://github.com/void-linux/void-packages/pull/27291#discussion_r546400078
Comment:
Also remove the block
```
case "$XBPS_TARGET_MACHINE" in
i686) configure_args+=" -Ddri-drivers-path=/usr/lib32/dri";;
esac
```
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PR REVIEW] mesa: update to 20.3.1.
2020-12-20 3:37 [PR PATCH] mesa: update to 20.3.1 ericonr
` (8 preceding siblings ...)
2020-12-20 16:38 ` st3r4g
@ 2020-12-20 16:42 ` st3r4g
2020-12-20 23:01 ` q66
` (21 subsequent siblings)
31 siblings, 0 replies; 41+ messages in thread
From: st3r4g @ 2020-12-20 16:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 198 bytes --]
New review comment by st3r4g on void-packages repository
https://github.com/void-linux/void-packages/pull/27291#discussion_r546399453
Comment:
this should be `/usr/lib${XBPS_TARGET_WORDSIZE}/dri`
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PR REVIEW] mesa: update to 20.3.1.
2020-12-20 3:37 [PR PATCH] mesa: update to 20.3.1 ericonr
` (9 preceding siblings ...)
2020-12-20 16:42 ` st3r4g
@ 2020-12-20 23:01 ` q66
2020-12-20 23:24 ` st3r4g
` (20 subsequent siblings)
31 siblings, 0 replies; 41+ messages in thread
From: q66 @ 2020-12-20 23:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 213 bytes --]
New review comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/27291#discussion_r546449075
Comment:
yes, sorry, i accidentally wrote the wrong argument in the previous PR
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PR REVIEW] mesa: update to 20.3.1.
2020-12-20 3:37 [PR PATCH] mesa: update to 20.3.1 ericonr
` (10 preceding siblings ...)
2020-12-20 23:01 ` q66
@ 2020-12-20 23:24 ` st3r4g
2020-12-20 23:36 ` q66
` (19 subsequent siblings)
31 siblings, 0 replies; 41+ messages in thread
From: st3r4g @ 2020-12-20 23:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 240 bytes --]
New review comment by st3r4g on void-packages repository
https://github.com/void-linux/void-packages/pull/27291#discussion_r546451622
Comment:
xorg also uses this path (via `/usr/lib/pkgconfig/dri.pc`) don't we need to rebuild xorg too?
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PR REVIEW] mesa: update to 20.3.1.
2020-12-20 3:37 [PR PATCH] mesa: update to 20.3.1 ericonr
` (11 preceding siblings ...)
2020-12-20 23:24 ` st3r4g
@ 2020-12-20 23:36 ` q66
2020-12-20 23:37 ` q66
` (18 subsequent siblings)
31 siblings, 0 replies; 41+ messages in thread
From: q66 @ 2020-12-20 23:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 156 bytes --]
New review comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/27291#discussion_r546453069
Comment:
does it? how?
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PR REVIEW] mesa: update to 20.3.1.
2020-12-20 3:37 [PR PATCH] mesa: update to 20.3.1 ericonr
` (12 preceding siblings ...)
2020-12-20 23:36 ` q66
@ 2020-12-20 23:37 ` q66
2020-12-21 2:27 ` [PR PATCH] [Updated] " ericonr
` (17 subsequent siblings)
31 siblings, 0 replies; 41+ messages in thread
From: q66 @ 2020-12-20 23:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 206 bytes --]
New review comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/27291#discussion_r546453069
Comment:
~~does it? how?~~ oh, yeah, it does, let's rebuild xorg as well
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PR PATCH] [Updated] mesa: update to 20.3.1.
2020-12-20 3:37 [PR PATCH] mesa: update to 20.3.1 ericonr
` (13 preceding siblings ...)
2020-12-20 23:37 ` q66
@ 2020-12-21 2:27 ` ericonr
2020-12-21 2:29 ` [PR REVIEW] " ericonr
` (16 subsequent siblings)
31 siblings, 0 replies; 41+ messages in thread
From: ericonr @ 2020-12-21 2:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 722 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages mesa
https://github.com/void-linux/void-packages/pull/27291
mesa: update to 20.3.1.
- removed drm and surfaceless from platforms since they're determined
automatically now.
- fix driver search path to use /usr/lib${wordsize}; see
https://github.com/void-linux/void-packages/pull/27269
- remove transitional dummy packages that only depend on mesa-dri
Closes: #27214 [via git-merge-pr]
I'm not sure if the issue here https://gitlab.freedesktop.org/mesa/mesa/-/issues/3989 matters for us.
A patch file from https://github.com/void-linux/void-packages/pull/27291.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mesa-27291.patch --]
[-- Type: text/x-diff, Size: 4940 bytes --]
From 9872d096d7a9b788c54711974fe8bcc1da3ffcdc Mon Sep 17 00:00:00 2001
From: HadetTheUndying <hadet@protonmail.com>
Date: Wed, 16 Dec 2020 20:55:08 -0600
Subject: [PATCH 1/2] mesa: update to 20.3.1.
- removed drm and surfaceless from platforms since they're determined
automatically now.
- fix driver search path to use /usr/lib${wordsize}; see
https://github.com/void-linux/void-packages/pull/27269
- remove "(transitional dummy package)" from description for subpacakges
that didn't depend only on mesa-dri.
Closes: #27214 [via git-merge-pr]
---
srcpkgs/mesa/template | 32 +++++++++++++-------------------
1 file changed, 13 insertions(+), 19 deletions(-)
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 5bc5a611f38..b698951c7d8 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,19 +1,20 @@
# Template file for 'mesa'
pkgname=mesa
-version=20.2.3
+version=20.3.1
revision=1
wrksrc="mesa-${version}"
build_style=meson
configure_args="-Dglvnd=true -Dshared-glapi=true -Dgbm=true -Degl=true
-Dosmesa=gallium -Dgles1=true -Dgles2=true -Dglx=dri -Ddri3=true
- -Dlmsensors=true -Dplatforms=x11,drm,$(vopt_if wayland wayland,)surfaceless
- -Dllvm=true -Db_lto=false -Dcpp_std=gnu++14"
+ -Dlmsensors=true -Dplatforms=x11,wayland
+ -Dllvm=true -Db_lto=false -Dcpp_std=gnu++14
+ -Ddri-drivers-path=/usr/lib${XBPS_TARGET_WORDSIZE}/dri"
hostmakedepends="gettext flex llvm pkg-config python3-Mako glslang gzip
- $(vopt_if wayland 'wayland-protocols wayland-devel')"
+ wayland-protocols wayland-devel"
makedepends="elfutils-devel expat-devel libXdamage-devel libXvMC-devel
libXxf86vm-devel libatomic-devel libdrm-devel libffi-devel libva-devel
libvdpau-devel libxshmfence-devel ncurses-devel zlib-devel
- $(vopt_if wayland 'wayland-devel wayland-protocols') llvm libsensors-devel
+ wayland-devel wayland-protocols llvm libsensors-devel
libXrandr-devel libglvnd-devel libzstd-devel libxml2-devel lua53-devel
libarchive-devel"
depends="libglvnd"
@@ -23,10 +24,11 @@ license="MIT, LGPL-2.1-or-later"
homepage="https://www.mesa3d.org/"
changelog="https://docs.mesa3d.org/relnotes/${version}.html"
distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=ae1b240e11531df528d14dc214d2dc4d2b4f2e835c6230ba0b492b171eceb82b
+checksum=af751b49bb2ab0264d58c31e73d869e80333de02b2d1becc93f1b28c67aa780f
-build_options="wayland"
-build_options_default="wayland"
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+ configure_args+=" -Duse-elf-tls=false"
+fi
# Set subpackages manually to set proper rdeps in 32bit pkgs.
subpackages="libglapi libgbm libOSMesa"
@@ -166,14 +168,6 @@ case "$XBPS_TARGET_MACHINE" in
ppc*) configure_args+=" -Dpower8=false" ;;
esac
-case "$XBPS_TARGET_MACHINE" in
- i686) configure_args+=" -Ddri-drivers-path=/usr/lib32/dri";;
-esac
-
-if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
- configure_args+=" -Duse-elf-tls=false"
-fi
-
post_configure() {
if [ "$CROSS_BUILD" ]; then
find -iname "*.ninja" -exec sed -i "{}" \
@@ -337,7 +331,7 @@ mesa-vulkan-overlay-layer_package() {
mesa-ati-dri_package() {
build_style=meta
lib32mode=full
- short_desc="Mesa DRI drivers for ATI GPUs (transitional dummy package)"
+ short_desc="Mesa DRI drivers for ATI GPUs"
depends="mesa-dri mesa-vulkan-radeon"
if [ "$_have_hwdec" ]; then
depends+=" mesa-vaapi mesa-vdpau mesa-XvMC"
@@ -361,7 +355,7 @@ mesa-freedreno-dri_package() {
mesa-intel-dri_package() {
build_style=meta
lib32mode=full
- short_desc="Mesa DRI drivers for Intel GPUs (transitional dummy package)"
+ short_desc="Mesa DRI drivers for Intel GPUs"
depends="mesa-dri mesa-vulkan-intel"
}
@@ -382,7 +376,7 @@ mesa-lima-dri_package() {
mesa-nouveau-dri_package() {
build_style=meta
lib32mode=full
- short_desc="Mesa DRI drivers for NVIDIA GPUs (transitional dummy package)"
+ short_desc="Mesa DRI drivers for NVIDIA GPUs"
depends="mesa-dri"
if [ "$_have_hwdec" ]; then
depends+=" mesa-vaapi mesa-vdpau mesa-XvMC"
From deb33b7fbe7bbeeaabde5a3da7a8f0b47f143629 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 20 Dec 2020 23:26:21 -0300
Subject: [PATCH 2/2] xorg-server: revbump for location of dri drivers.
The previous commit moves dri drivers to /usr/lib${wordsize}/dri,
instead of simply /usr/lib/dri. It is necessary to rebuild xorg for
correctness when accessing these drivers.
---
srcpkgs/xorg-server/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 56607094648..a6a7ca7f4d7 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,7 +1,7 @@
# Template file for 'xorg-server'
pkgname=xorg-server
version=1.20.10
-revision=1
+revision=2
build_style=meson
configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
-Dxvfb=true -Dhal=false -Dudev=true -Dxkb_dir=/usr/share/X11/xkb
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PR REVIEW] mesa: update to 20.3.1.
2020-12-20 3:37 [PR PATCH] mesa: update to 20.3.1 ericonr
` (14 preceding siblings ...)
2020-12-21 2:27 ` [PR PATCH] [Updated] " ericonr
@ 2020-12-21 2:29 ` ericonr
2020-12-21 12:35 ` ericonr
` (15 subsequent siblings)
31 siblings, 0 replies; 41+ messages in thread
From: ericonr @ 2020-12-21 2:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 192 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27291#discussion_r546479565
Comment:
Revbumped and fixed the dri location, thanks!
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PR REVIEW] mesa: update to 20.3.1.
2020-12-20 3:37 [PR PATCH] mesa: update to 20.3.1 ericonr
` (15 preceding siblings ...)
2020-12-21 2:29 ` [PR REVIEW] " ericonr
@ 2020-12-21 12:35 ` ericonr
2020-12-21 14:52 ` st3r4g
` (14 subsequent siblings)
31 siblings, 0 replies; 41+ messages in thread
From: ericonr @ 2020-12-21 12:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 184 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27291#discussion_r546681988
Comment:
Missing the fix for thw build option.
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PR REVIEW] mesa: update to 20.3.1.
2020-12-20 3:37 [PR PATCH] mesa: update to 20.3.1 ericonr
` (16 preceding siblings ...)
2020-12-21 12:35 ` ericonr
@ 2020-12-21 14:52 ` st3r4g
2020-12-21 14:53 ` st3r4g
` (13 subsequent siblings)
31 siblings, 0 replies; 41+ messages in thread
From: st3r4g @ 2020-12-21 14:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 293 bytes --]
New review comment by st3r4g on void-packages repository
https://github.com/void-linux/void-packages/pull/27291#discussion_r546748865
Comment:
If you want to make this a legit metapackage, I'd change `short_desc` to a more generic "Mesa drivers for ATI GPUs", and same for Intel and Nouveau
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: mesa: update to 20.3.1.
2020-12-20 3:37 [PR PATCH] mesa: update to 20.3.1 ericonr
` (17 preceding siblings ...)
2020-12-21 14:52 ` st3r4g
@ 2020-12-21 14:53 ` st3r4g
2020-12-21 14:56 ` st3r4g
` (12 subsequent siblings)
31 siblings, 0 replies; 41+ messages in thread
From: st3r4g @ 2020-12-21 14:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 315 bytes --]
New comment by st3r4g on void-packages repository
https://github.com/void-linux/void-packages/pull/27291#issuecomment-749013565
Comment:
I can't put a comment in the non diff part, but the dri drivers path needs to be adjusted also in the mesa-dri subpkg (2 occurrences). Also a lint rule is disallowing `lib64`.
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: mesa: update to 20.3.1.
2020-12-20 3:37 [PR PATCH] mesa: update to 20.3.1 ericonr
` (18 preceding siblings ...)
2020-12-21 14:53 ` st3r4g
@ 2020-12-21 14:56 ` st3r4g
2020-12-21 14:57 ` ericonr
` (11 subsequent siblings)
31 siblings, 0 replies; 41+ messages in thread
From: st3r4g @ 2020-12-21 14:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 352 bytes --]
New comment by st3r4g on void-packages repository
https://github.com/void-linux/void-packages/pull/27291#issuecomment-749013565
Comment:
I can't put a comment in the non diff part, but the dri drivers path needs to be adjusted also in the mesa-dri subpkg (2 occurrences). Also a lint rule (`hooks/pre-pkg/99-pkglint.sh`) is disallowing `/usr/lib64`.
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: mesa: update to 20.3.1.
2020-12-20 3:37 [PR PATCH] mesa: update to 20.3.1 ericonr
` (19 preceding siblings ...)
2020-12-21 14:56 ` st3r4g
@ 2020-12-21 14:57 ` ericonr
2020-12-21 15:01 ` st3r4g
` (10 subsequent siblings)
31 siblings, 0 replies; 41+ messages in thread
From: ericonr @ 2020-12-21 14:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 247 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27291#issuecomment-749015180
Comment:
Should we fix this by moving the installed drivers into `/usr/lib` or is it a matter of removing the lint?
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: mesa: update to 20.3.1.
2020-12-20 3:37 [PR PATCH] mesa: update to 20.3.1 ericonr
` (20 preceding siblings ...)
2020-12-21 14:57 ` ericonr
@ 2020-12-21 15:01 ` st3r4g
2020-12-21 15:02 ` st3r4g
` (9 subsequent siblings)
31 siblings, 0 replies; 41+ messages in thread
From: st3r4g @ 2020-12-21 15:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 251 bytes --]
New comment by st3r4g on void-packages repository
https://github.com/void-linux/void-packages/pull/27291#issuecomment-749017501
Comment:
If q66 wants to change the path from `/usr/lib/dri` to `/usr/lib${wordsize}/dri`, the lint has to be removed...
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: mesa: update to 20.3.1.
2020-12-20 3:37 [PR PATCH] mesa: update to 20.3.1 ericonr
` (21 preceding siblings ...)
2020-12-21 15:01 ` st3r4g
@ 2020-12-21 15:02 ` st3r4g
2020-12-21 17:48 ` [PR REVIEW] " q66
` (8 subsequent siblings)
31 siblings, 0 replies; 41+ messages in thread
From: st3r4g @ 2020-12-21 15:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 261 bytes --]
New comment by st3r4g on void-packages repository
https://github.com/void-linux/void-packages/pull/27291#issuecomment-749017501
Comment:
If q66 wants to change the path from `/usr/lib/dri` (default) to `/usr/lib${wordsize}/dri`, the lint has to be removed...
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PR REVIEW] mesa: update to 20.3.1.
2020-12-20 3:37 [PR PATCH] mesa: update to 20.3.1 ericonr
` (22 preceding siblings ...)
2020-12-21 15:02 ` st3r4g
@ 2020-12-21 17:48 ` q66
2020-12-21 17:50 ` q66
` (7 subsequent siblings)
31 siblings, 0 replies; 41+ messages in thread
From: q66 @ 2020-12-21 17:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 375 bytes --]
New review comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/27291#discussion_r546843701
Comment:
let's not make it legit metapackages
they are still transitional dummy packages that people should not install by default, they should just remain there since they cause no harm and removing them would break upgrading old systems
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: mesa: update to 20.3.1.
2020-12-20 3:37 [PR PATCH] mesa: update to 20.3.1 ericonr
` (23 preceding siblings ...)
2020-12-21 17:48 ` [PR REVIEW] " q66
@ 2020-12-21 17:50 ` q66
2020-12-21 17:50 ` q66
` (6 subsequent siblings)
31 siblings, 0 replies; 41+ messages in thread
From: q66 @ 2020-12-21 17:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 366 bytes --]
New comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/27291#issuecomment-749108429
Comment:
why? the lint checks existence of these directories as far as i can tell, and `base-files` is installed in the chroot, so the directory should not exist (it should get installed into `/usr/lib` through the `lib64 -> lib` symlink)
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: mesa: update to 20.3.1.
2020-12-20 3:37 [PR PATCH] mesa: update to 20.3.1 ericonr
` (24 preceding siblings ...)
2020-12-21 17:50 ` q66
@ 2020-12-21 17:50 ` q66
2020-12-21 17:57 ` [PR REVIEW] " ericonr
` (5 subsequent siblings)
31 siblings, 0 replies; 41+ messages in thread
From: q66 @ 2020-12-21 17:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 439 bytes --]
New comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/27291#issuecomment-749108429
Comment:
~~why? the lint checks existence of these directories as far as i can tell, and `base-files` is installed in the chroot, so the directory should not exist (it should get installed into `/usr/lib` through the `lib64 -> lib` symlink)~~
oh, nevermind, i understand now
hmmm, let me think about it...
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PR REVIEW] mesa: update to 20.3.1.
2020-12-20 3:37 [PR PATCH] mesa: update to 20.3.1 ericonr
` (25 preceding siblings ...)
2020-12-21 17:50 ` q66
@ 2020-12-21 17:57 ` ericonr
2020-12-22 4:39 ` [PR PATCH] [Updated] " ericonr
` (4 subsequent siblings)
31 siblings, 0 replies; 41+ messages in thread
From: ericonr @ 2020-12-21 17:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 260 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27291#discussion_r546847970
Comment:
Thing is that they install packages other than only `mesa-dri`... They provide a certain convenience factor, imo.
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PR PATCH] [Updated] mesa: update to 20.3.1.
2020-12-20 3:37 [PR PATCH] mesa: update to 20.3.1 ericonr
` (26 preceding siblings ...)
2020-12-21 17:57 ` [PR REVIEW] " ericonr
@ 2020-12-22 4:39 ` ericonr
2020-12-22 5:25 ` ericonr
` (3 subsequent siblings)
31 siblings, 0 replies; 41+ messages in thread
From: ericonr @ 2020-12-22 4:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 722 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages mesa
https://github.com/void-linux/void-packages/pull/27291
mesa: update to 20.3.1.
- removed drm and surfaceless from platforms since they're determined
automatically now.
- fix driver search path to use /usr/lib${wordsize}; see
https://github.com/void-linux/void-packages/pull/27269
- remove transitional dummy packages that only depend on mesa-dri
Closes: #27214 [via git-merge-pr]
I'm not sure if the issue here https://gitlab.freedesktop.org/mesa/mesa/-/issues/3989 matters for us.
A patch file from https://github.com/void-linux/void-packages/pull/27291.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mesa-27291.patch --]
[-- Type: text/x-diff, Size: 4940 bytes --]
From 75f446ca76b4df04404e1870bd7d48c1b5aaa9d4 Mon Sep 17 00:00:00 2001
From: HadetTheUndying <hadet@protonmail.com>
Date: Wed, 16 Dec 2020 20:55:08 -0600
Subject: [PATCH 1/2] mesa: update to 20.3.1.
- removed drm and surfaceless from platforms since they're determined
automatically now.
- fix driver search path to use /usr/lib${wordsize}; see
https://github.com/void-linux/void-packages/pull/27269
- remove "(transitional dummy package)" from description for subpacakges
that didn't depend only on mesa-dri.
Closes: #27214 [via git-merge-pr]
---
srcpkgs/mesa/template | 32 +++++++++++++-------------------
1 file changed, 13 insertions(+), 19 deletions(-)
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 5bc5a611f38..b698951c7d8 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,19 +1,20 @@
# Template file for 'mesa'
pkgname=mesa
-version=20.2.3
+version=20.3.1
revision=1
wrksrc="mesa-${version}"
build_style=meson
configure_args="-Dglvnd=true -Dshared-glapi=true -Dgbm=true -Degl=true
-Dosmesa=gallium -Dgles1=true -Dgles2=true -Dglx=dri -Ddri3=true
- -Dlmsensors=true -Dplatforms=x11,drm,$(vopt_if wayland wayland,)surfaceless
- -Dllvm=true -Db_lto=false -Dcpp_std=gnu++14"
+ -Dlmsensors=true -Dplatforms=x11,wayland
+ -Dllvm=true -Db_lto=false -Dcpp_std=gnu++14
+ -Ddri-drivers-path=/usr/lib${XBPS_TARGET_WORDSIZE}/dri"
hostmakedepends="gettext flex llvm pkg-config python3-Mako glslang gzip
- $(vopt_if wayland 'wayland-protocols wayland-devel')"
+ wayland-protocols wayland-devel"
makedepends="elfutils-devel expat-devel libXdamage-devel libXvMC-devel
libXxf86vm-devel libatomic-devel libdrm-devel libffi-devel libva-devel
libvdpau-devel libxshmfence-devel ncurses-devel zlib-devel
- $(vopt_if wayland 'wayland-devel wayland-protocols') llvm libsensors-devel
+ wayland-devel wayland-protocols llvm libsensors-devel
libXrandr-devel libglvnd-devel libzstd-devel libxml2-devel lua53-devel
libarchive-devel"
depends="libglvnd"
@@ -23,10 +24,11 @@ license="MIT, LGPL-2.1-or-later"
homepage="https://www.mesa3d.org/"
changelog="https://docs.mesa3d.org/relnotes/${version}.html"
distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=ae1b240e11531df528d14dc214d2dc4d2b4f2e835c6230ba0b492b171eceb82b
+checksum=af751b49bb2ab0264d58c31e73d869e80333de02b2d1becc93f1b28c67aa780f
-build_options="wayland"
-build_options_default="wayland"
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+ configure_args+=" -Duse-elf-tls=false"
+fi
# Set subpackages manually to set proper rdeps in 32bit pkgs.
subpackages="libglapi libgbm libOSMesa"
@@ -166,14 +168,6 @@ case "$XBPS_TARGET_MACHINE" in
ppc*) configure_args+=" -Dpower8=false" ;;
esac
-case "$XBPS_TARGET_MACHINE" in
- i686) configure_args+=" -Ddri-drivers-path=/usr/lib32/dri";;
-esac
-
-if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
- configure_args+=" -Duse-elf-tls=false"
-fi
-
post_configure() {
if [ "$CROSS_BUILD" ]; then
find -iname "*.ninja" -exec sed -i "{}" \
@@ -337,7 +331,7 @@ mesa-vulkan-overlay-layer_package() {
mesa-ati-dri_package() {
build_style=meta
lib32mode=full
- short_desc="Mesa DRI drivers for ATI GPUs (transitional dummy package)"
+ short_desc="Mesa DRI drivers for ATI GPUs"
depends="mesa-dri mesa-vulkan-radeon"
if [ "$_have_hwdec" ]; then
depends+=" mesa-vaapi mesa-vdpau mesa-XvMC"
@@ -361,7 +355,7 @@ mesa-freedreno-dri_package() {
mesa-intel-dri_package() {
build_style=meta
lib32mode=full
- short_desc="Mesa DRI drivers for Intel GPUs (transitional dummy package)"
+ short_desc="Mesa DRI drivers for Intel GPUs"
depends="mesa-dri mesa-vulkan-intel"
}
@@ -382,7 +376,7 @@ mesa-lima-dri_package() {
mesa-nouveau-dri_package() {
build_style=meta
lib32mode=full
- short_desc="Mesa DRI drivers for NVIDIA GPUs (transitional dummy package)"
+ short_desc="Mesa DRI drivers for NVIDIA GPUs"
depends="mesa-dri"
if [ "$_have_hwdec" ]; then
depends+=" mesa-vaapi mesa-vdpau mesa-XvMC"
From 21d24cad773c1b92a1babf16c3e5f624143593ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 20 Dec 2020 23:26:21 -0300
Subject: [PATCH 2/2] xorg-server: revbump for location of dri drivers.
The previous commit moves dri drivers to /usr/lib${wordsize}/dri,
instead of simply /usr/lib/dri. It is necessary to rebuild xorg for
correctness when accessing these drivers.
---
srcpkgs/xorg-server/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 56607094648..a6a7ca7f4d7 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,7 +1,7 @@
# Template file for 'xorg-server'
pkgname=xorg-server
version=1.20.10
-revision=1
+revision=2
build_style=meson
configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
-Dxvfb=true -Dhal=false -Dudev=true -Dxkb_dir=/usr/share/X11/xkb
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: mesa: update to 20.3.1.
2020-12-20 3:37 [PR PATCH] mesa: update to 20.3.1 ericonr
` (27 preceding siblings ...)
2020-12-22 4:39 ` [PR PATCH] [Updated] " ericonr
@ 2020-12-22 5:25 ` ericonr
2020-12-22 5:25 ` ericonr
` (2 subsequent siblings)
31 siblings, 0 replies; 41+ messages in thread
From: ericonr @ 2020-12-22 5:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 412 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27291#issuecomment-749346169
Comment:
```
case "$XBPS_TARGET_MACHINE" in
i686*)
vsed -e 's#/usr/lib/#/usr/lib32/#g' \
-i ${DESTDIR}/usr/share/vulkan/icd.d/radeon_icd.i686.json \
-i ${DESTDIR}/usr/share/vulkan/icd.d/intel_icd.i686.json
;;
esac
```
I can probably remove this block?
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: mesa: update to 20.3.1.
2020-12-20 3:37 [PR PATCH] mesa: update to 20.3.1 ericonr
` (28 preceding siblings ...)
2020-12-22 5:25 ` ericonr
@ 2020-12-22 5:25 ` ericonr
2020-12-22 21:50 ` [PR PATCH] [Updated] " ericonr
2020-12-22 23:44 ` st3r4g
31 siblings, 0 replies; 41+ messages in thread
From: ericonr @ 2020-12-22 5:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 447 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27291#issuecomment-749346169
Comment:
```
case "$XBPS_TARGET_MACHINE" in
i686*)
vsed -e 's#/usr/lib/#/usr/lib32/#g' \
-i ${DESTDIR}/usr/share/vulkan/icd.d/radeon_icd.i686.json \
-i ${DESTDIR}/usr/share/vulkan/icd.d/intel_icd.i686.json
;;
esac
```
I can probably remove this block? Or instead fix it for all targets.
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: [PR PATCH] [Updated] mesa: update to 20.3.1.
2020-12-20 3:37 [PR PATCH] mesa: update to 20.3.1 ericonr
` (29 preceding siblings ...)
2020-12-22 5:25 ` ericonr
@ 2020-12-22 21:50 ` ericonr
2020-12-22 23:44 ` st3r4g
31 siblings, 0 replies; 41+ messages in thread
From: ericonr @ 2020-12-22 21:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 722 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages mesa
https://github.com/void-linux/void-packages/pull/27291
mesa: update to 20.3.1.
- removed drm and surfaceless from platforms since they're determined
automatically now.
- fix driver search path to use /usr/lib${wordsize}; see
https://github.com/void-linux/void-packages/pull/27269
- remove transitional dummy packages that only depend on mesa-dri
Closes: #27214 [via git-merge-pr]
I'm not sure if the issue here https://gitlab.freedesktop.org/mesa/mesa/-/issues/3989 matters for us.
A patch file from https://github.com/void-linux/void-packages/pull/27291.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mesa-27291.patch --]
[-- Type: text/x-diff, Size: 5517 bytes --]
From d7a99cc22ad2cb9aede1d33aced039c5b94f2d49 Mon Sep 17 00:00:00 2001
From: HadetTheUndying <hadet@protonmail.com>
Date: Wed, 16 Dec 2020 20:55:08 -0600
Subject: [PATCH 1/3] mesa: update to 20.3.1.
- removed drm and surfaceless from platforms since they're determined
automatically now.
- removed wayland build option
- fix vulkan driver search path; see
87d28506e10bf6f89dbf8c1250bde0fcb3e8eba4.
- remove special casing for drive location in i686.
Closes: #27214 [via git-merge-pr]
---
srcpkgs/mesa/template | 35 +++++++++++++----------------------
1 file changed, 13 insertions(+), 22 deletions(-)
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 5bc5a611f38..dd6cb063d9b 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,19 +1,19 @@
# Template file for 'mesa'
pkgname=mesa
-version=20.2.3
+version=20.3.1
revision=1
wrksrc="mesa-${version}"
build_style=meson
configure_args="-Dglvnd=true -Dshared-glapi=true -Dgbm=true -Degl=true
-Dosmesa=gallium -Dgles1=true -Dgles2=true -Dglx=dri -Ddri3=true
- -Dlmsensors=true -Dplatforms=x11,drm,$(vopt_if wayland wayland,)surfaceless
+ -Dlmsensors=true -Dplatforms=x11,wayland
-Dllvm=true -Db_lto=false -Dcpp_std=gnu++14"
hostmakedepends="gettext flex llvm pkg-config python3-Mako glslang gzip
- $(vopt_if wayland 'wayland-protocols wayland-devel')"
+ wayland-protocols wayland-devel"
makedepends="elfutils-devel expat-devel libXdamage-devel libXvMC-devel
libXxf86vm-devel libatomic-devel libdrm-devel libffi-devel libva-devel
libvdpau-devel libxshmfence-devel ncurses-devel zlib-devel
- $(vopt_if wayland 'wayland-devel wayland-protocols') llvm libsensors-devel
+ wayland-devel wayland-protocols llvm libsensors-devel
libXrandr-devel libglvnd-devel libzstd-devel libxml2-devel lua53-devel
libarchive-devel"
depends="libglvnd"
@@ -23,10 +23,11 @@ license="MIT, LGPL-2.1-or-later"
homepage="https://www.mesa3d.org/"
changelog="https://docs.mesa3d.org/relnotes/${version}.html"
distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
-checksum=ae1b240e11531df528d14dc214d2dc4d2b4f2e835c6230ba0b492b171eceb82b
+checksum=af751b49bb2ab0264d58c31e73d869e80333de02b2d1becc93f1b28c67aa780f
-build_options="wayland"
-build_options_default="wayland"
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+ configure_args+=" -Duse-elf-tls=false"
+fi
# Set subpackages manually to set proper rdeps in 32bit pkgs.
subpackages="libglapi libgbm libOSMesa"
@@ -166,14 +167,6 @@ case "$XBPS_TARGET_MACHINE" in
ppc*) configure_args+=" -Dpower8=false" ;;
esac
-case "$XBPS_TARGET_MACHINE" in
- i686) configure_args+=" -Ddri-drivers-path=/usr/lib32/dri";;
-esac
-
-if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
- configure_args+=" -Duse-elf-tls=false"
-fi
-
post_configure() {
if [ "$CROSS_BUILD" ]; then
find -iname "*.ninja" -exec sed -i "{}" \
@@ -185,14 +178,12 @@ post_configure() {
}
post_install() {
+ local arch=${XBPS_TARGET_MACHINE%-*}
vlicense docs/license.rst
- case "$XBPS_TARGET_MACHINE" in
- i686*)
- vsed -e 's#/usr/lib/#/usr/lib32/#g' \
- -i ${DESTDIR}/usr/share/vulkan/icd.d/radeon_icd.i686.json \
- -i ${DESTDIR}/usr/share/vulkan/icd.d/intel_icd.i686.json
- ;;
- esac
+ # XXX: for the 'multiarch' setup to work, these files should go
+ # in /usr/lib*; vulkan-loader needs to be fixed for it
+ vsed -e "s#/usr/lib/#/usr/lib${XBPS_TARGET_WORDSIZE}/#g" \
+ -i ${DESTDIR}/usr/share/vulkan/icd.d/*_icd.${arch}.json
}
libglapi_package() {
From 2612f23eef64816ec7cde354f62a74b0425eb320 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 20 Dec 2020 23:26:21 -0300
Subject: [PATCH 2/3] xorg-server: revbump for location of dri drivers.
The previous commit moves dri drivers to /usr/lib${wordsize}/dri,
instead of simply /usr/lib/dri. It is necessary to rebuild xorg for
correctness when accessing these drivers.
---
srcpkgs/xorg-server/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 56607094648..a6a7ca7f4d7 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,7 +1,7 @@
# Template file for 'xorg-server'
pkgname=xorg-server
version=1.20.10
-revision=1
+revision=2
build_style=meson
configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
-Dxvfb=true -Dhal=false -Dudev=true -Dxkb_dir=/usr/share/X11/xkb
From 7baec52d8af0da625a348f8892824fcb7849a494 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Tue, 22 Dec 2020 18:35:11 -0300
Subject: [PATCH 3/3] libva: revbump for driver location.
Correct driver location is now taken care of by
87d28506e10bf6f89dbf8c1250bde0fcb3e8eba4.
---
srcpkgs/libva/template | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/srcpkgs/libva/template b/srcpkgs/libva/template
index 1b57fdead1d..1514b24c6c2 100644
--- a/srcpkgs/libva/template
+++ b/srcpkgs/libva/template
@@ -1,7 +1,7 @@
# Template file for 'libva'
pkgname=libva
version=2.9.1
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith_glx=no $(vopt_if wayland -Dwith_wayland=yes)"
hostmakedepends="pkg-config wayland-devel"
@@ -18,10 +18,6 @@ checksum=4e8640f65ad659332c5d24b7715703c95e820083ee11126c9cd051d418e3d9e0
build_options="wayland"
build_options_default="wayland"
-case "$XBPS_TARGET_MACHINE" in
- i686*) configure_args+=" -Ddriverdir=/usr/lib32/dri";;
-esac
-
post_install() {
vlicense COPYING
}
^ permalink raw reply [flat|nested] 41+ messages in thread
* Re: mesa: update to 20.3.1.
2020-12-20 3:37 [PR PATCH] mesa: update to 20.3.1 ericonr
` (30 preceding siblings ...)
2020-12-22 21:50 ` [PR PATCH] [Updated] " ericonr
@ 2020-12-22 23:44 ` st3r4g
31 siblings, 0 replies; 41+ messages in thread
From: st3r4g @ 2020-12-22 23:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 678 bytes --]
New comment by st3r4g on void-packages repository
https://github.com/void-linux/void-packages/pull/27291#issuecomment-749838640
Comment:
```
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -196,6 +196,9 @@ post_install() {
}
libglapi_package() {
+ # this dependency is wrong, it was added as a hack to allow updating
+ # systems with libglapi-32bit after the switch to glvnd
+ # see 927f17347f9c646047c65312c8e8ce1ad88b7832 commit message
depends="libglvnd"
short_desc="Free implementation of the GL API - shared library"
pkg_install() {
```
I would like to remove this if/when current multilib goes away
^ permalink raw reply [flat|nested] 41+ messages in thread