summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorReza Jahanbakhshi2021-10-22 13:58:12 +0200
committerReza Jahanbakhshi2021-10-22 13:58:12 +0200
commit11d6391cac03583ae59237e3809ca85cf93c4e6e (patch)
treec50bec08ba52958fbd62ae7c8dc78c987fcc38dd
parent1d1f1c1816b4ed87da19504b3a288bea7f12432d (diff)
downloadaur-11d6391cac03583ae59237e3809ca85cf93c4e6e.tar.gz
Reverted mesa-libgl addition to the required and conflicts list.
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD6
2 files changed, 4 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ecb0d8a38950..d853820ef71e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = mesa-git
pkgdesc = an open-source implementation of the OpenGL specification, git version
- pkgver = 22.0.0_devel.146426.75bd37dc6a3
+ pkgver = 22.0.0_devel.146467.8ec68243357
pkgrel = 1
url = https://www.mesa3d.org
arch = x86_64
@@ -48,7 +48,6 @@ pkgbase = mesa-git
provides = mesa-vdpau
provides = vulkan-swrast
provides = vulkan-driver
- provides = mesa-libgl
provides = opengl-driver
provides = opencl-driver
conflicts = mesa
@@ -59,7 +58,6 @@ pkgbase = mesa-git
conflicts = libva-mesa-driver
conflicts = mesa-vdpau
conflicts = vulkan-swrast
- conflicts = mesa-libgl
source = mesa::git+https://gitlab.freedesktop.org/mesa/mesa.git#branch=main
source = LICENSE
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index cd36e80566b1..e77503e2a9c9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@
pkgname=mesa-git
pkgdesc="an open-source implementation of the OpenGL specification, git version"
-pkgver=22.0.0_devel.146467.8ec68243357
+pkgver=22.0.0_devel.146476.2822b1345cf
pkgrel=1
arch=('x86_64')
makedepends=('git' 'python-mako' 'xorgproto'
@@ -21,8 +21,8 @@ makedepends=('git' 'python-mako' 'xorgproto'
depends=('libdrm' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'libelf'
'libomxil-bellagio' 'libunwind' 'libglvnd' 'wayland' 'lm_sensors' 'libclc' 'vulkan-icd-loader' 'zstd' 'expat')
optdepends=('opengl-man-pages: for the OpenGL API man pages')
-provides=('mesa' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'vulkan-mesa-layer' 'libva-mesa-driver' 'mesa-vdpau' 'vulkan-swrast' 'vulkan-driver' 'mesa-libgl' 'opengl-driver' 'opencl-driver')
-conflicts=('mesa' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'vulkan-mesa-layer' 'libva-mesa-driver' 'mesa-vdpau' 'vulkan-swrast' 'mesa-libgl')
+provides=('mesa' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'vulkan-mesa-layer' 'libva-mesa-driver' 'mesa-vdpau' 'vulkan-swrast' 'vulkan-driver' 'opengl-driver' 'opencl-driver')
+conflicts=('mesa' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'vulkan-mesa-layer' 'libva-mesa-driver' 'mesa-vdpau' 'vulkan-swrast')
url="https://www.mesa3d.org"
license=('custom')
source=('mesa::git+https://gitlab.freedesktop.org/mesa/mesa.git#branch=main'