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

Update Mesa to 21.3.9 #17259

Merged
merged 1 commit into from
Jun 3, 2024

Conversation

Toasterson
Copy link
Contributor

As discussed on Sunday, I was trying to get this working cleanly but I can't get pkgdepend to find libraries inside /usr/lib/64, any suggestions?

@mtelka
Copy link
Contributor

mtelka commented May 21, 2024

Hm, meson. Maybe this is related: mesonbuild/meson#6541

@AndWac
Copy link
Contributor

AndWac commented May 22, 2024

╰─➤ ldd libEGL.so.1.0.0
libssp.so.0 => /usr/gcc/13/lib/amd64/libssp.so.0
libgbm.so.1 => /usr/lib/64/libgbm.so.1
libglapi.so.0 => /usr/lib/64/libglapi.so.0
libexpat.so.1 => /usr/lib/64/libexpat.so.1
libX11-xcb.so.1 => /usr/lib/64/libX11-xcb.so.1
libxcb.so.1 => /usr/lib/64/libxcb.so.1
libxcb-dri2.so.0 => /usr/lib/64/libxcb-dri2.so.0
libxcb-xfixes.so.0 => /usr/lib/64/libxcb-xfixes.so.0
libdrm.so.2 => (file not found)
^^^^

@Toasterson
Copy link
Contributor Author

Ok, I got it to the point where ldd finds all libs on my system pkgdepend still complains about libs in /usr/lib/64 for some reason but that might be a bug on my system.

@Toasterson Toasterson force-pushed the components/update/mesa branch 4 times, most recently from 700df95 to 8af2ffa Compare May 23, 2024 18:33
@Toasterson
Copy link
Contributor Author

So I've somehow managed to fix my pkgdepend finally... I'll merge in geoff's changes, cleanup the patches and sources, then I can start doing some tests

@Toasterson Toasterson force-pushed the components/update/mesa branch 2 times, most recently from 9f28f9b to f7aa38b Compare May 26, 2024 18:32
@Toasterson Toasterson marked this pull request as ready for review May 26, 2024 18:32
@Toasterson
Copy link
Contributor Author

Ok, this is now slowly ready to test. Probably not perfect but let's start testing on devices of ours.

@Toasterson Toasterson requested a review from AndWac May 26, 2024 18:34
@Toasterson Toasterson changed the title Draft Mesa update Update Mesa to 21.3.9 May 26, 2024
@AndWac
Copy link
Contributor

AndWac commented May 26, 2024

openindiana.org
x11/library/mesa
13.0.6-2024.0.0.9 -> 21.3.9-2024.0.0.0

pkg update: The following packages deliver conflicting action types to usr/include/GL/gl.h:

link:
pkg://openindiana.org/service/opengl/[email protected],5.11-2020.0.1.5:20200330T163649Z
file:
pkg://openindiana.org/x11/library/[email protected],5.11-2024.0.0.0:20240526T185943Z

These packages cannot be installed together. Any non-conflicting subset
of the above packages can be installed.

The following packages deliver conflicting action types to usr/include/GL/glext.h:

link:
pkg://openindiana.org/service/opengl/[email protected],5.11-2020.0.1.5:20200330T163649Z
file:
pkg://openindiana.org/x11/library/[email protected],5.11-2024.0.0.0:20240526T185943Z

These packages cannot be installed together. Any non-conflicting subset
of the above packages can be installed.

The following packages deliver conflicting action types to usr/include/GL/glx.h:

link:
pkg://openindiana.org/service/opengl/[email protected],5.11-2020.0.1.5:20200330T163649Z
file:
pkg://openindiana.org/x11/library/[email protected],5.11-2024.0.0.0:20240526T185943Z

These packages cannot be installed together. Any non-conflicting subset
of the above packages can be installed.

The following packages deliver conflicting action types to usr/include/GL/glxext.h:

link:
pkg://openindiana.org/service/opengl/[email protected],5.11-2020.0.1.5:20200330T163649Z
file:
pkg://openindiana.org/x11/library/[email protected],5.11-2024.0.0.0:20240526T185943Z

These packages cannot be installed together. Any non-conflicting subset
of the above packages can be installed.

@Toasterson
Copy link
Contributor Author

Found a missing dependency while packaging on another machine

Signed-off-by: Till Wegmueller <[email protected]>
@Toasterson
Copy link
Contributor Author

thread local storage fixed now. People can test with https://dlc.openindiana.org/testing/mesa.p5p

@AndWac AndWac merged commit 7defdf1 into OpenIndiana:oi/hipster Jun 3, 2024
1 check passed
@Toasterson Toasterson deleted the components/update/mesa branch June 5, 2024 17:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants