disabled clover opencl, corrected provides/conflicts/deps

2 files changed, 23 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c7a2f4d06f6b..5f3f0ff8ce69 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mesa-git
 	pkgdesc = an open-source implementation of the OpenGL specification, git version
-	pkgver = 24.0.0_devel.179834.47398c65ee7.d41d8cd
+	pkgver = 24.0.0_devel.179925.0e481bf4632.d41d8cd
 	pkgrel = 1
 	url = https://www.mesa3d.org
 	arch = x86_64
@@ -9,7 +9,6 @@ pkgbase = mesa-git
 	makedepends = python-mako
 	makedepends = xorgproto
 	makedepends = libxml2
-	makedepends = libx11
 	makedepends = libvdpau
 	makedepends = libva
 	makedepends = elfutils
@@ -19,8 +18,6 @@ pkgbase = mesa-git
 	makedepends = ninja
 	makedepends = glslang
 	makedepends = directx-headers
-	makedepends = libclc
-	makedepends = spirv-llvm-translator
 	makedepends = llvm=16.0.6
 	makedepends = clang=16.0.6
 	depends = libdrm
@@ -33,31 +30,37 @@ pkgbase = mesa-git
 	depends = libglvnd
 	depends = wayland
 	depends = lm_sensors
-	depends = libclc
 	depends = vulkan-icd-loader
 	depends = zstd
 	depends = expat
+	depends = gcc-libs
+	depends = libxfixes
+	depends = libx11
+	depends = systemd-libs
+	depends = libxext
+	depends = libxcb
+	depends = glibc
+	depends = zlib
 	depends = llvm-libs=16.0.6
 	optdepends = opengl-man-pages: for the OpenGL API man pages
 	optdepends = clang: opencl
 	optdepends = compiler-rt: opencl
 	provides = mesa
-	provides = opencl-mesa
 	provides = vulkan-intel
 	provides = vulkan-radeon
-	provides = vulkan-mesa-layer
+	provides = vulkan-mesa-layers
 	provides = libva-mesa-driver
 	provides = mesa-vdpau
 	provides = vulkan-swrast
 	provides = vulkan-driver
 	provides = mesa-libgl
 	provides = opengl-driver
-	provides = opencl-driver
 	conflicts = mesa
-	conflicts = opencl-mesa
+	conflicts = opencl-clover-mesa
+	conflicts = opencl-rusticl-mesa
 	conflicts = vulkan-intel
 	conflicts = vulkan-radeon
-	conflicts = vulkan-mesa-layer
+	conflicts = vulkan-mesa-layers
 	conflicts = libva-mesa-driver
 	conflicts = mesa-vdpau
 	conflicts = vulkan-swrast
diff --git a/PKGBUILD b/PKGBUILD
index f7485ee78146..b2075de96b4a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,18 +12,21 @@
 
 pkgname=mesa-git
 pkgdesc="an open-source implementation of the OpenGL specification, git version"
-pkgver=24.0.0_devel.179834.47398c65ee7.d41d8cd
+pkgver=24.0.0_devel.179925.0e481bf4632.d41d8cd
 pkgrel=1
 arch=('x86_64')
 makedepends=('git' 'python-mako' 'xorgproto'
-              'libxml2' 'libx11'  'libvdpau' 'libva' 'elfutils' 'libxrandr'
+              'libxml2' 'libvdpau' 'libva' 'elfutils' 'libxrandr'
               'wayland-protocols' 'meson' 'ninja' 'glslang' 'directx-headers'
-              'libclc' 'spirv-llvm-translator')
+)
 depends=('libdrm' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'libelf'
-         'libomxil-bellagio' 'libunwind' 'libglvnd' 'wayland' 'lm_sensors' 'libclc' 'vulkan-icd-loader' 'zstd' 'expat')
+         'libomxil-bellagio' 'libunwind' 'libglvnd' 'wayland' 'lm_sensors' 
+         'vulkan-icd-loader' 'zstd' 'expat' 'gcc-libs' 'libxfixes' 'libx11' 'systemd-libs' 'libxext' 'libxcb'
+         'glibc' 'zlib'
+)
 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' 'vulkan-intel' 'vulkan-radeon' 'vulkan-mesa-layers' 'libva-mesa-driver' 'mesa-vdpau' 'vulkan-swrast' 'vulkan-driver' 'mesa-libgl' 'opengl-driver')
+conflicts=('mesa' 'opencl-clover-mesa' 'opencl-rusticl-mesa' 'vulkan-intel' 'vulkan-radeon' 'vulkan-mesa-layers' 'libva-mesa-driver' 'mesa-vdpau' 'vulkan-swrast' 'mesa-libgl')
 url="https://www.mesa3d.org"
 license=('custom')
 source=('mesa::git+https://gitlab.freedesktop.org/mesa/mesa.git#branch=main'
@@ -128,7 +131,7 @@ build () {
        -D gallium-extra-hud=true \
        -D gallium-nine=true \
        -D gallium-omx=bellagio \
-       -D gallium-opencl=icd \
+       -D gallium-opencl=disabled \
        -D gallium-va=enabled \
        -D gallium-vdpau=enabled \
        -D gallium-xa=enabled \