summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorFranc[e]sco2018-10-16 04:44:51 +0200
committerFranc[e]sco2018-10-16 04:46:26 +0200
commit849c458c66f3bf01284e6878b4c910dc39dbac63 (patch)
tree906fa3726f18b55198b33898c396b874cdf79194
parenteb747e52272a2780bed1b1a5304a9403d621ff1f (diff)
downloadaur-849c458c66f3bf01284e6878b4c910dc39dbac63.tar.gz
don't conflict with mesa-git, mesa is enough
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD4
2 files changed, 3 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 475597b3ed49..f5dc7f1c70ee 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = mesa-transform-feedback-git
pkgdesc = mesa with the RADV patches for VK_EXT_transform_feedback.
pkgver = 18.3.0_devel.105152.ff281e6204
- pkgrel = 1
+ pkgrel = 2
url = https://www.mesa3d.org
arch = x86_64
license = custom
@@ -44,7 +44,6 @@ pkgbase = mesa-transform-feedback-git
provides = opencl-mesa
provides = opengl-driver
provides = opencl-driver
- conflicts = mesa-git
conflicts = mesa
conflicts = opencl-mesa
conflicts = vulkan-intel
diff --git a/PKGBUILD b/PKGBUILD
index 97f706694824..017d5d659fe5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,7 +14,7 @@ pkgbase=mesa-transform-feedback-git
pkgname=('mesa-transform-feedback-git')
pkgdesc="mesa with the RADV patches for VK_EXT_transform_feedback."
pkgver=18.3.0_devel.105152.ff281e6204
-pkgrel=1
+pkgrel=2
arch=('x86_64')
makedepends=('git' 'python-mako' 'llvm-svn' 'clang-svn' 'xorgproto'
'libxml2' 'libx11' 'libvdpau' 'libva' 'elfutils' 'libomxil-bellagio'
@@ -23,7 +23,7 @@ depends=('libdrm' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'libelf'
'libomxil-bellagio' 'llvm-libs-svn' 'libunwind' 'libglvnd' 'wayland' 'lm_sensors' 'libclc')
optdepends=('opengl-man-pages: for the OpenGL API man pages')
provides=('mesa' 'vulkan-intel' 'vulkan-radeon' 'libva-mesa-driver' 'mesa-vdpau' 'vulkan-driver' 'opencl-mesa' 'opengl-driver' 'opencl-driver')
-conflicts=('mesa-git' 'mesa' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'libva-mesa-driver' 'mesa-vdpau')
+conflicts=('mesa' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'libva-mesa-driver' 'mesa-vdpau')
url="https://www.mesa3d.org"
license=('custom')
source=(