diff options
| author | John Schoenick | 2019-07-23 13:16:48 -0700 |
|---|---|---|
| committer | John Schoenick | 2019-07-23 13:16:48 -0700 |
| commit | 3306f3306a8fc08f8290fa69b266f68f32fd199a (patch) | |
| tree | e96b333d60061c6717f691d6ee37dea5745bb6cf | |
| parent | 24b09163da7c2e03ab7c0bdbef1b906e6d0a1df9 (diff) | |
| download | aur-3306f3306a8fc08f8290fa69b266f68f32fd199a.tar.gz | |
Remove egl.pc to avoid conflict, bump
| -rw-r--r-- | .SRCINFO | 18 | ||||
| -rw-r--r-- | PKGBUILD | 7 |
2 files changed, 15 insertions, 10 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Tue Jul 23 01:38:19 UTC 2019 +# Tue Jul 23 20:16:40 UTC 2019 pkgbase = lib32-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 @@ -40,13 +40,13 @@ pkgbase = lib32-mesa-aco-git depends = lib32-llvm-libs>=8.0.0 depends = lib32-llvm-libs<8.1 optdepends = opengl-man-pages: for the OpenGL API man pages - provides = lib32-mesa=19.2.0_devel.113862.3f3665b8d52-1 - provides = lib32-mesa-git=19.2.0_devel.113862.3f3665b8d52-1 - provides = lib32-vulkan-intel=19.2.0_devel.113862.3f3665b8d52-1 - provides = lib32-vulkan-radeon=19.2.0_devel.113862.3f3665b8d52-1 - provides = lib32-libva-mesa-driver=19.2.0_devel.113862.3f3665b8d52-1 - provides = lib32-vulkan-mesa-layer=19.2.0_devel.113862.3f3665b8d52-1 - provides = lib32-mesa-vdpau=19.2.0_devel.113862.3f3665b8d52-1 + provides = lib32-mesa=19.2.0_devel.114249.17d9490cef1-1 + provides = lib32-mesa-git=19.2.0_devel.114249.17d9490cef1-1 + provides = lib32-vulkan-intel=19.2.0_devel.114249.17d9490cef1-1 + provides = lib32-vulkan-radeon=19.2.0_devel.114249.17d9490cef1-1 + provides = lib32-libva-mesa-driver=19.2.0_devel.114249.17d9490cef1-1 + provides = lib32-vulkan-mesa-layer=19.2.0_devel.114249.17d9490cef1-1 + provides = lib32-mesa-vdpau=19.2.0_devel.114249.17d9490cef1-1 provides = lib32-opengl-driver conflicts = lib32-mesa conflicts = lib32-mesa-git @@ -12,7 +12,7 @@ pkgname=lib32-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=('python-mako' 'lib32-libxml2' 'lib32-libx11' 'xorgproto' @@ -162,6 +162,11 @@ package() { rm -rf "$pkgdir"/usr/share/drirc.d/ rm -rf "$pkgdir"/usr/share/vulkan/explicit_layer.d/ + # 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/lib32/pkgconfig/egl.pc + # indirect rendering ln -s /usr/lib32/libGLX_mesa.so.0 "${pkgdir}/usr/lib32/libGLX_indirect.so.0" install -Dt "$pkgdir"/usr/share/licenses/$pkgbase/ -m644 "$srcdir"/LICENSE |