* [PR PATCH] mesa: update to 20.3.1.
@ 2020-12-17 2:57 HadetTheUndying
2020-12-17 14:06 ` [PR REVIEW] " ericonr
` (16 more replies)
0 siblings, 17 replies; 19+ messages in thread
From: HadetTheUndying @ 2020-12-17 2:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 414 bytes --]
There is a new pull request by HadetTheUndying against master on the void-packages repository
https://github.com/HadetTheUndying/void-packages mesa-20.3.1
https://github.com/void-linux/void-packages/pull/27214
mesa: update to 20.3.1.
removed drm and surfaceless from platforms since they're determined automatically now.
A patch file from https://github.com/void-linux/void-packages/pull/27214.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mesa-20.3.1-27214.patch --]
[-- Type: text/x-diff, Size: 1473 bytes --]
From 80e60f640687eca44fb641b02b3a7daa2f7505cd 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.
---
srcpkgs/mesa/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 5bc5a611f38..e009bb24cd1 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,12 +1,12 @@
# 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,$(vopt_if wayland 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')"
@@ -23,7 +23,7 @@ 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"
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR REVIEW] mesa: update to 20.3.1.
2020-12-17 2:57 [PR PATCH] mesa: update to 20.3.1 HadetTheUndying
@ 2020-12-17 14:06 ` ericonr
2020-12-17 14:07 ` ericonr
` (15 subsequent siblings)
16 siblings, 0 replies; 19+ messages in thread
From: ericonr @ 2020-12-17 14:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 203 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27214#discussion_r545114239
Comment:
Will this still build if one removes the wayland option?
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR REVIEW] mesa: update to 20.3.1.
2020-12-17 2:57 [PR PATCH] mesa: update to 20.3.1 HadetTheUndying
2020-12-17 14:06 ` [PR REVIEW] " ericonr
@ 2020-12-17 14:07 ` ericonr
2020-12-17 14:08 ` ericonr
` (14 subsequent siblings)
16 siblings, 0 replies; 19+ messages in thread
From: ericonr @ 2020-12-17 14:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 323 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27214#discussion_r545116046
Comment:
Yeah, it fails
> meson.build:21:0: ERROR: Options "" are not in allowed choices: "auto, x11, wayland, haiku, android, windows"
I'm okay with removing the build option :P
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR REVIEW] mesa: update to 20.3.1.
2020-12-17 2:57 [PR PATCH] mesa: update to 20.3.1 HadetTheUndying
2020-12-17 14:06 ` [PR REVIEW] " ericonr
2020-12-17 14:07 ` ericonr
@ 2020-12-17 14:08 ` ericonr
2020-12-17 14:08 ` ericonr
` (13 subsequent siblings)
16 siblings, 0 replies; 19+ messages in thread
From: ericonr @ 2020-12-17 14:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 348 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27214#discussion_r545116046
Comment:
Yeah, it fails
> meson.build:21:0: ERROR: Options "" are not in allowed choices: "auto, x11, wayland, haiku, android, windows"
I'm okay with removing the build option and always enabling wayland.
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR REVIEW] mesa: update to 20.3.1.
2020-12-17 2:57 [PR PATCH] mesa: update to 20.3.1 HadetTheUndying
` (2 preceding siblings ...)
2020-12-17 14:08 ` ericonr
@ 2020-12-17 14:08 ` ericonr
2020-12-17 20:50 ` [PR PATCH] [Updated] " HadetTheUndying
` (12 subsequent siblings)
16 siblings, 0 replies; 19+ messages in thread
From: ericonr @ 2020-12-17 14:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 190 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27214#discussion_r545116619
Comment:
Otherwise, `x11$(vopt_if wayland ,wayland)`
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] mesa: update to 20.3.1.
2020-12-17 2:57 [PR PATCH] mesa: update to 20.3.1 HadetTheUndying
` (3 preceding siblings ...)
2020-12-17 14:08 ` ericonr
@ 2020-12-17 20:50 ` HadetTheUndying
2020-12-17 20:51 ` HadetTheUndying
` (11 subsequent siblings)
16 siblings, 0 replies; 19+ messages in thread
From: HadetTheUndying @ 2020-12-17 20:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 419 bytes --]
There is an updated pull request by HadetTheUndying against master on the void-packages repository
https://github.com/HadetTheUndying/void-packages mesa-20.3.1
https://github.com/void-linux/void-packages/pull/27214
mesa: update to 20.3.1.
removed drm and surfaceless from platforms since they're determined automatically now.
A patch file from https://github.com/void-linux/void-packages/pull/27214.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mesa-20.3.1-27214.patch --]
[-- Type: text/x-diff, Size: 1454 bytes --]
From 0a8a760fecf99e7f79c70c41c3633b34f68e8fb5 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.
---
srcpkgs/mesa/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 5bc5a611f38..01c46b374ef 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,12 +1,12 @@
# 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')"
@@ -23,7 +23,7 @@ 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"
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: mesa: update to 20.3.1.
2020-12-17 2:57 [PR PATCH] mesa: update to 20.3.1 HadetTheUndying
` (4 preceding siblings ...)
2020-12-17 20:50 ` [PR PATCH] [Updated] " HadetTheUndying
@ 2020-12-17 20:51 ` HadetTheUndying
2020-12-17 20:51 ` [PR REVIEW] " HadetTheUndying
` (10 subsequent siblings)
16 siblings, 0 replies; 19+ messages in thread
From: HadetTheUndying @ 2020-12-17 20:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 154 bytes --]
New comment by HadetTheUndying on void-packages repository
https://github.com/void-linux/void-packages/pull/27214#issuecomment-747694377
Comment:
Done.
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR REVIEW] mesa: update to 20.3.1.
2020-12-17 2:57 [PR PATCH] mesa: update to 20.3.1 HadetTheUndying
` (5 preceding siblings ...)
2020-12-17 20:51 ` HadetTheUndying
@ 2020-12-17 20:51 ` HadetTheUndying
2020-12-17 21:05 ` ericonr
` (9 subsequent siblings)
16 siblings, 0 replies; 19+ messages in thread
From: HadetTheUndying @ 2020-12-17 20:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 262 bytes --]
New review comment by HadetTheUndying on void-packages repository
https://github.com/void-linux/void-packages/pull/27214#discussion_r545395740
Comment:
Woops commented in the wrong spot. Yeah i thought about that too. Went ahead and did it. Should be good now
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR REVIEW] mesa: update to 20.3.1.
2020-12-17 2:57 [PR PATCH] mesa: update to 20.3.1 HadetTheUndying
` (6 preceding siblings ...)
2020-12-17 20:51 ` [PR REVIEW] " HadetTheUndying
@ 2020-12-17 21:05 ` ericonr
2020-12-18 2:49 ` [PR PATCH] [Updated] " HadetTheUndying
` (8 subsequent siblings)
16 siblings, 0 replies; 19+ messages in thread
From: ericonr @ 2020-12-17 21:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 273 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27214#discussion_r545403175
Comment:
You need to remove the build option from here, then. Also from the dependencies.
Might be simpler to still use `vopt_if` :P
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Updated] mesa: update to 20.3.1.
2020-12-17 2:57 [PR PATCH] mesa: update to 20.3.1 HadetTheUndying
` (7 preceding siblings ...)
2020-12-17 21:05 ` ericonr
@ 2020-12-18 2:49 ` HadetTheUndying
2020-12-19 5:25 ` q66
` (7 subsequent siblings)
16 siblings, 0 replies; 19+ messages in thread
From: HadetTheUndying @ 2020-12-18 2:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 419 bytes --]
There is an updated pull request by HadetTheUndying against master on the void-packages repository
https://github.com/HadetTheUndying/void-packages mesa-20.3.1
https://github.com/void-linux/void-packages/pull/27214
mesa: update to 20.3.1.
removed drm and surfaceless from platforms since they're determined automatically now.
A patch file from https://github.com/void-linux/void-packages/pull/27214.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mesa-20.3.1-27214.patch --]
[-- Type: text/x-diff, Size: 2055 bytes --]
From 0b103987a6e3964bc122ad14ed573bc775dac137 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.
---
srcpkgs/mesa/template | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 5bc5a611f38..4b1495c64d7 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,8 @@ 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"
# Set subpackages manually to set proper rdeps in 32bit pkgs.
subpackages="libglapi libgbm libOSMesa"
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: mesa: update to 20.3.1.
2020-12-17 2:57 [PR PATCH] mesa: update to 20.3.1 HadetTheUndying
` (8 preceding siblings ...)
2020-12-18 2:49 ` [PR PATCH] [Updated] " HadetTheUndying
@ 2020-12-19 5:25 ` q66
2020-12-20 1:47 ` travankor
` (6 subsequent siblings)
16 siblings, 0 replies; 19+ messages in thread
From: q66 @ 2020-12-19 5:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 477 bytes --]
New comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/27214#issuecomment-748422197
Comment:
we should fix the driver search path according to https://github.com/void-linux/void-packages/pull/27269 while at it
basically remove
```
case "$XBPS_TARGET_MACHINE" in
i686) configure_args+=" -Ddri-drivers-path=/usr/lib32/dri";;
esac
```
and add `-Ddri-drivers-path=/usr/lib${XBPS_TARGET_WORDSIZE}` to `configure_args`
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: mesa: update to 20.3.1.
2020-12-17 2:57 [PR PATCH] mesa: update to 20.3.1 HadetTheUndying
` (9 preceding siblings ...)
2020-12-19 5:25 ` q66
@ 2020-12-20 1:47 ` travankor
2020-12-20 1:51 ` HadetTheUndying
` (5 subsequent siblings)
16 siblings, 0 replies; 19+ messages in thread
From: travankor @ 2020-12-20 1:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 214 bytes --]
New comment by travankor on void-packages repository
https://github.com/void-linux/void-packages/pull/27214#issuecomment-748550924
Comment:
the transitional dummy packages can be removed, too (it's been a year)
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: mesa: update to 20.3.1.
2020-12-17 2:57 [PR PATCH] mesa: update to 20.3.1 HadetTheUndying
` (10 preceding siblings ...)
2020-12-20 1:47 ` travankor
@ 2020-12-20 1:51 ` HadetTheUndying
2020-12-20 1:58 ` ericonr
` (4 subsequent siblings)
16 siblings, 0 replies; 19+ messages in thread
From: HadetTheUndying @ 2020-12-20 1:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 426 bytes --]
New comment by HadetTheUndying on void-packages repository
https://github.com/void-linux/void-packages/pull/27214#issuecomment-748551205
Comment:
Hey guys I'm going through a family crisis right now. Is there any way i can hand this off, or should I close my PR and let someone else submit a new one? I'm on mobile for the time being so i cannot make any of the suggested changes and don't want to hold things up.
Thanks
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: mesa: update to 20.3.1.
2020-12-17 2:57 [PR PATCH] mesa: update to 20.3.1 HadetTheUndying
` (11 preceding siblings ...)
2020-12-20 1:51 ` HadetTheUndying
@ 2020-12-20 1:58 ` ericonr
2020-12-20 2:07 ` HadetTheUndying
` (3 subsequent siblings)
16 siblings, 0 replies; 19+ messages in thread
From: ericonr @ 2020-12-20 1:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 265 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27214#issuecomment-748551715
Comment:
@HadetTheUndying good luck out there.
Someone else can work on another PR that "closes" this one. Thank you for the work.
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: mesa: update to 20.3.1.
2020-12-17 2:57 [PR PATCH] mesa: update to 20.3.1 HadetTheUndying
` (12 preceding siblings ...)
2020-12-20 1:58 ` ericonr
@ 2020-12-20 2:07 ` HadetTheUndying
2020-12-20 3:37 ` ericonr
` (2 subsequent siblings)
16 siblings, 0 replies; 19+ messages in thread
From: HadetTheUndying @ 2020-12-20 2:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 304 bytes --]
New comment by HadetTheUndying on void-packages repository
https://github.com/void-linux/void-packages/pull/27214#issuecomment-748552508
Comment:
Okay I will leave the PR open until another PR addresses it. If i have free time during the week and no one has gotten to it, I will wrap it up. Thank you.
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: mesa: update to 20.3.1.
2020-12-17 2:57 [PR PATCH] mesa: update to 20.3.1 HadetTheUndying
` (13 preceding siblings ...)
2020-12-20 2:07 ` HadetTheUndying
@ 2020-12-20 3:37 ` ericonr
2020-12-20 3:45 ` HadetTheUndying
2020-12-20 3:45 ` [PR PATCH] [Closed]: " HadetTheUndying
16 siblings, 0 replies; 19+ messages in thread
From: ericonr @ 2020-12-20 3:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 193 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27214#issuecomment-748558281
Comment:
I opened #27291 that applies the comments from here.
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: mesa: update to 20.3.1.
2020-12-17 2:57 [PR PATCH] mesa: update to 20.3.1 HadetTheUndying
` (14 preceding siblings ...)
2020-12-20 3:37 ` ericonr
@ 2020-12-20 3:45 ` HadetTheUndying
2020-12-20 3:45 ` [PR PATCH] [Closed]: " HadetTheUndying
16 siblings, 0 replies; 19+ messages in thread
From: HadetTheUndying @ 2020-12-20 3:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 228 bytes --]
New comment by HadetTheUndying on void-packages repository
https://github.com/void-linux/void-packages/pull/27214#issuecomment-748558860
Comment:
I'll update my 21.0.0 sometime this week with the updates. Closing now. Thanks.
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PR PATCH] [Closed]: mesa: update to 20.3.1.
2020-12-17 2:57 [PR PATCH] mesa: update to 20.3.1 HadetTheUndying
` (15 preceding siblings ...)
2020-12-20 3:45 ` HadetTheUndying
@ 2020-12-20 3:45 ` HadetTheUndying
16 siblings, 0 replies; 19+ messages in thread
From: HadetTheUndying @ 2020-12-20 3:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 243 bytes --]
There's a closed pull request on the void-packages repository
mesa: update to 20.3.1.
https://github.com/void-linux/void-packages/pull/27214
Description:
removed drm and surfaceless from platforms since they're determined automatically now.
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PR PATCH] mesa: update to 20.3.1.
@ 2020-12-20 3:37 ericonr
0 siblings, 0 replies; 19+ messages in thread
From: ericonr @ 2020-12-20 3:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 717 bytes --]
There is a new 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 ae3026fc521c41f37fb8486247f5dcc967bb002e 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] 19+ messages in thread
end of thread, other threads:[~2020-12-20 3:45 UTC | newest]
Thread overview: 19+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-17 2:57 [PR PATCH] mesa: update to 20.3.1 HadetTheUndying
2020-12-17 14:06 ` [PR REVIEW] " ericonr
2020-12-17 14:07 ` ericonr
2020-12-17 14:08 ` ericonr
2020-12-17 14:08 ` ericonr
2020-12-17 20:50 ` [PR PATCH] [Updated] " HadetTheUndying
2020-12-17 20:51 ` HadetTheUndying
2020-12-17 20:51 ` [PR REVIEW] " HadetTheUndying
2020-12-17 21:05 ` ericonr
2020-12-18 2:49 ` [PR PATCH] [Updated] " HadetTheUndying
2020-12-19 5:25 ` q66
2020-12-20 1:47 ` travankor
2020-12-20 1:51 ` HadetTheUndying
2020-12-20 1:58 ` ericonr
2020-12-20 2:07 ` HadetTheUndying
2020-12-20 3:37 ` ericonr
2020-12-20 3:45 ` HadetTheUndying
2020-12-20 3:45 ` [PR PATCH] [Closed]: " HadetTheUndying
2020-12-20 3:37 [PR PATCH] " ericonr
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).