summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Schoenick2019-07-08 13:58:56 -0700
committerJohn Schoenick2019-07-08 13:58:56 -0700
commit13c873020f6082f619de3f38b279de51ff322825 (patch)
treede468407144f68d3f7d6624724683c2eb3c1e68f
parent74030e4f2fc59bd5bfc70604f17e0f3e8ad10b88 (diff)
downloadaur-13c873020f6082f619de3f38b279de51ff322825.tar.gz
Also conflict/provide with vulkan-mesa-layer
Which was renamed from the previous AUR mesa-vulkan-layer
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
2 files changed, 6 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2c9431531de5..15fcea7eda62 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Sat Jul 6 00:19:30 UTC 2019
+# Mon Jul 8 20:58:45 UTC 2019
pkgbase = mesa-aco-git
pkgdesc = Mesa with the ACO compiler patchset, git version
pkgver = 19.2.0_devel.113503.0ba58be607f
@@ -49,6 +49,7 @@ pkgbase = mesa-aco-git
provides = vulkan-driver=19.2.0_devel.113503.0ba58be607f-1
provides = opencl-mesa=19.2.0_devel.113503.0ba58be607f-1
provides = mesa-vulkan-layer=19.2.0_devel.113503.0ba58be607f-1
+ provides = vulkan-mesa-layer=19.2.0_devel.113503.0ba58be607f-1
provides = opengl-driver
provides = opencl-driver
conflicts = mesa
@@ -59,6 +60,7 @@ pkgbase = mesa-aco-git
conflicts = libva-mesa-driver
conflicts = mesa-vdpau
conflicts = mesa-vulkan-layer
+ conflicts = vulkan-mesa-layer
source = mesa-aco::git+https://github.com/daniel-schuermann/mesa
source = LICENSE
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 954c410458c0..65e5f27f65aa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -29,10 +29,12 @@ provides=("mesa=$pkgver-$pkgrel"
"mesa-vdpau=$pkgver-$pkgrel"
"vulkan-driver=$pkgver-$pkgrel"
"opencl-mesa=$pkgver-$pkgrel"
+ # mesa-vulkan-layer was renamed as it was brought in from AUR
"mesa-vulkan-layer=$pkgver-$pkgrel"
+ "vulkan-mesa-layer=$pkgver-$pkgrel"
"opengl-driver"
"opencl-driver")
-conflicts=('mesa' 'mesa-git' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'libva-mesa-driver' 'mesa-vdpau' 'mesa-vulkan-layer')
+conflicts=('mesa' 'mesa-git' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'libva-mesa-driver' 'mesa-vdpau' 'mesa-vulkan-layer' 'vulkan-mesa-layer')
url="https://www.mesa3d.org"
license=('custom')
source=('mesa-aco::git+https://github.com/daniel-schuermann/mesa'