bump to 20241104 + refactor (fixes emacs, xeyes, gitk) #12
Conversation
| _install fakeinstall/usr/lib/dri/*.so | ||
| _install fakeinstall/usr/lib/vdpau | ||
| _install fakeinstall/usr/lib/gallium-pipe | ||
|
|
||
| _install fakeinstall/usr/lib/libMesa* | ||
| _install fakeinstall/usr/lib/libRusticl* | ||
| _install fakeinstall/usr/lib/lib{gbm,glapi}.so* | ||
| _install fakeinstall/usr/lib/gbm/dri_gbm.so* |
There was a problem hiding this comment.
See second commit of this PR this line is needed otherwise won't build. Was also added in Fedora mesa yesterday: https://copr-dist-git.fedorainfracloud.org/cgit/@asahi/mesa/mesa.git/commit/?id=1475782c41a1c26ae3c66e809454bd93e2778c1d
| @@ -45,8 +47,9 @@ build() { | |||
| -D b_ndebug=false \ | |||
| -D b_lto=false \ | |||
| -D platforms=x11,wayland \ | |||
| -D gallium-drivers=swrast,virgl,asahi \ | |||
| -D gallium-drivers=swrast,virgl,asahi,zink \ | |||
There was a problem hiding this comment.
Added zink here, also present in the fedora asahi spec.
| -D vulkan-drivers=swrast,asahi \ | ||
| -D vulkan-layers=device-select \ |
There was a problem hiding this comment.
Also present in the fedora asahi spec.
| -D intel-rt=disabled | ||
| -D intel-rt=disabled \ | ||
| -D shared-llvm=enabled \ | ||
| -D build-tests=false |
There was a problem hiding this comment.
These two are also present in the fedora asahi spec.
| _install fakeinstall/usr/share/vulkan | ||
| _install fakeinstall/usr/lib/libvulkan* | ||
| _install fakeinstall/usr/lib/libgallium* | ||
| _install fakeinstall/usr/lib/libVkLayer* |
There was a problem hiding this comment.
This last line is needed because of -D vulkan-layers=device-select above.
|
|
||
| _install fakeinstall/usr/share/vulkan | ||
| _install fakeinstall/usr/lib/libvulkan* | ||
| _install fakeinstall/usr/lib/libgallium* |
| pkgname=( | ||
| "vulkan$_suffix" | ||
| "mesa$_suffix" | ||
| ) |
There was a problem hiding this comment.
Just mesa-asahi package, no more vulkan-asahi anymore.
| optdepends=('opengl-man-pages: for the OpenGL API man pages') | ||
| provides=('mesa-libgl' 'opengl-driver' 'mesa') | ||
| conflicts=('mesa-libgl' 'mesa' 'mesa-asahi-edge') | ||
| replaces=('mesa-libgl') |
There was a problem hiding this comment.
From line 110 onwards moved to top.
Changes: Added egl-wayland and 'python-packaging' 'python-pyaml'as dependency
optdepends=('opengl-man-pages: for the OpenGL API man pages') was changed to optdepends=('vulkan-mesa-layers: additional vulkan layers') (but its optional and should not matter anyway)
provides added 'mesa-asahi-edge' 'vulkan-asahi' 'vulkan-swrast'
| @@ -91,42 +96,20 @@ _install() { | |||
| done | |||
| } | |||
|
|
|||
| _package_vulkan() { | |||
There was a problem hiding this comment.
_package_vulkan was more or less removed.
|
@joske Please let me know what you think specially of the |
|
If you want we can also keep your "layout" - I was just working on this yesterday before you pushed this is why my layout difers from yours... |
Signed-off-by: Matthias Kurz <[email protected]>
Signed-off-by: Matthias Kurz <[email protected]>
Signed-off-by: Matthias Kurz <[email protected]>
|
(signed off all commits) |
|
I'll look at it tonight, don't have the MBA with me now. |
|
Since i was working on pkgbuilds for rockchip at the same time, and there we got a package mesa-panvk-git that has vulkan built in the same package, i made the mesa-asahi package that way when enabling vulkan, it could be more convenience to distribute and would potentially prevent some issues (user forgot to install vulkan-asahi or compatibility issues (for example when i was installing gnome i found either vulkan-swrast or vulkan-asahi is somehow required, or it would probably stuck at boot) |
| #depends+=('libsensors.so' 'libexpat.so' 'libvulkan.so') | ||
| optdepends=('vulkan-mesa-layers: additional vulkan layers') | ||
| provides=('mesa-libgl' 'opengl-driver' 'mesa' 'mesa-asahi-edge' 'vulkan-asahi' 'vulkan-swrast') | ||
| conflicts=('mesa-libgl' 'mesa' 'mesa-asahi-edge') |
There was a problem hiding this comment.
should we not add vulkan-swrast to conflicts so it gets removed?
There was a problem hiding this comment.
Feel free to push, I am busy right now.
|
@joske What do you think if we ask the Asahi team if you and me can get maintainer permissions for the https://github.com/AsahiLinux/PKGBUILDs repo? Just to merge the pull requests and clean up the repo a bit? Edit: I think write access would be it: https://docs.github.com/en/organizations/managing-user-access-to-your-organizations-repositories/managing-repository-roles/repository-roles-for-an-organization#permissions-for-each-role |
Bumps to 20241104 which fixes some problems, see
In the third commit of this PR I added some build flags which are also present in the asahi fedora spec file.
@joske I was working on this yesterday, before you pushed AsahiLinux@1d85a76 so I was using @kwankiu's PKGBUILD file as template (see comment) - this one: https://github.com/1usOS/PKGBUILDs/tree/asahi/mesa-asahi
So I refactored the
PKGBUILDthat way now. Is that ok for you? So basically there is just the generatedmesa-asahipackage now, but no morevulkan-asahiwhich you introduced in your commit (so vulkan is contained in themesa-asahipackage).What do you prefer? If you diff this pull request, you can see I more or less moved things around.