Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mesa: update to 20.3.1. #27291

Merged
merged 3 commits into from
Dec 23, 2020
Merged

mesa: update to 20.3.1. #27291

merged 3 commits into from
Dec 23, 2020

Conversation

ericonr
Copy link
Member

@ericonr ericonr commented Dec 20, 2020

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.

srcpkgs/mesa/template Outdated Show resolved Hide resolved
srcpkgs/mesa/template Outdated Show resolved Hide resolved
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
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing the fix for thw build option.

@@ -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"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thing is that they install packages other than only mesa-dri... They provide a certain convenience factor, imo.

@st3r4g
Copy link
Contributor

st3r4g commented Dec 21, 2020

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.

@ericonr
Copy link
Member Author

ericonr commented Dec 21, 2020

Should we fix this by moving the installed drivers into /usr/lib or is it a matter of removing the lint?

@st3r4g
Copy link
Contributor

st3r4g commented Dec 21, 2020

If q66 wants to change the path from /usr/lib/dri (default) to /usr/lib${wordsize}/dri, the lint has to be removed...

@q66
Copy link
Contributor

q66 commented Dec 21, 2020

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...

@ericonr
Copy link
Member Author

ericonr commented Dec 22, 2020

	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.

@st3r4g
Copy link
Contributor

st3r4g commented Dec 22, 2020

--- 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

HadetTheUndying and others added 3 commits December 23, 2020 00:42
- removed drm and surfaceless from platforms since they're determined
automatically now.
- removed wayland build option.

Additional changes:

- fix vulkan driver search path; see
87d2850.
- remove special casing for driver location in i686.
- add comment in libglapi dependency - @st3r4g
- install multilib vulkan icd files into native package; this allows the
new multilib approach to work without messing with vulkan-loader config
paths or including the icd files into -32bit packages - @q66
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.
Correct driver location is now taken care of by
87d2850.
@q66 q66 merged commit 1b27974 into void-linux:master Dec 23, 2020
@ericonr ericonr deleted the mesa branch December 23, 2020 04:33
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 24, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants