diff options
| author | John Schoenick | 2019-07-23 13:17:26 -0700 |
|---|---|---|
| committer | John Schoenick | 2019-07-23 13:17:26 -0700 |
| commit | aa395ca1975a079ce89041770d959e95f6f74f3e (patch) | |
| tree | 0465e5be30a3b8767aa1812e99e33db45bb8bd92 | |
| parent | c1ad361e418042a1cd27d7eefd62c5cde9f80665 (diff) | |
| download | aur-aa395ca1975a079ce89041770d959e95f6f74f3e.tar.gz | |
Remove egl.pc to avoid conflict, bump
| -rw-r--r-- | .SRCINFO | 24 | ||||
| -rw-r--r-- | PKGBUILD | 9 |
2 files changed, 19 insertions, 14 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Tue Jul 23 01:38:03 UTC 2019 +# Tue Jul 23 20:16:23 UTC 2019 pkgbase = mesa-aco-git pkgdesc = Mesa with the ACO compiler patchset, git version - pkgver = 19.2.0_devel.113862.3f3665b8d52 + pkgver = 19.2.0_devel.114249.17d9490cef1 pkgrel = 1 url = https://www.mesa3d.org arch = x86_64 @@ -43,16 +43,16 @@ pkgbase = mesa-aco-git depends = llvm-libs>=8.0.0 depends = llvm-libs<8.1 optdepends = opengl-man-pages: for the OpenGL API man pages - provides = mesa=19.2.0_devel.113862.3f3665b8d52-1 - provides = mesa-git=19.2.0_devel.113862.3f3665b8d52-1 - provides = vulkan-intel=19.2.0_devel.113862.3f3665b8d52-1 - provides = vulkan-radeon=19.2.0_devel.113862.3f3665b8d52-1 - provides = libva-mesa-driver=19.2.0_devel.113862.3f3665b8d52-1 - provides = mesa-vdpau=19.2.0_devel.113862.3f3665b8d52-1 - provides = vulkan-driver=19.2.0_devel.113862.3f3665b8d52-1 - provides = opencl-mesa=19.2.0_devel.113862.3f3665b8d52-1 - provides = mesa-vulkan-layer=19.2.0_devel.113862.3f3665b8d52-1 - provides = vulkan-mesa-layer=19.2.0_devel.113862.3f3665b8d52-1 + provides = mesa=19.2.0_devel.114249.17d9490cef1-1 + provides = mesa-git=19.2.0_devel.114249.17d9490cef1-1 + provides = vulkan-intel=19.2.0_devel.114249.17d9490cef1-1 + provides = vulkan-radeon=19.2.0_devel.114249.17d9490cef1-1 + provides = libva-mesa-driver=19.2.0_devel.114249.17d9490cef1-1 + provides = mesa-vdpau=19.2.0_devel.114249.17d9490cef1-1 + provides = vulkan-driver=19.2.0_devel.114249.17d9490cef1-1 + provides = opencl-mesa=19.2.0_devel.114249.17d9490cef1-1 + provides = mesa-vulkan-layer=19.2.0_devel.114249.17d9490cef1-1 + provides = vulkan-mesa-layer=19.2.0_devel.114249.17d9490cef1-1 provides = opengl-driver provides = opencl-driver conflicts = mesa @@ -12,7 +12,7 @@ pkgname=mesa-aco-git pkgdesc="Mesa with the ACO compiler patchset, git version" -pkgver=19.2.0_devel.113862.3f3665b8d52 +pkgver=19.2.0_devel.114249.17d9490cef1 pkgrel=1 arch=('x86_64') makedepends=('git' 'python-mako' 'xorgproto' @@ -153,7 +153,12 @@ package() { DESTDIR="$pkgdir" ninja $NINJAFLAGS -C _build install # indirect rendering - ln -s /usr/lib/libGLX_mesa.so.0 ${pkgdir}/usr/lib/libGLX_indirect.so.0 + ln -s /usr/lib/libGLX_mesa.so.0 "${pkgdir}"/usr/lib/libGLX_indirect.so.0 + + # drop egl.pc -- upstream mesa has dropped this to fix confusion over who should provide it (conclusion: libglvnd), + # but as of 7/23 the ACO upstream doesn't have that patch. Drop it now so we don't conflict with the libglvnd + # provider, next ACO rebase should remove this file when they pick up c7831b604063 + rm -f "$pkgdir"/usr/lib/pkgconfig/egl.pc install -Dt "$pkgdir"/usr/share/licenses/$pkgname "$srcdir"/LICENSE } |