update

3 files changed, 11 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 29996e7a8dac..63a9183606a4 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mesa-rusticl-git
 	pkgdesc = An open-source implementation of the OpenGL specification, with Rusticl
-	pkgver = 22.2.0_devel.153993.93f0ddd51b4.02359b69dbf79b2bb68700002ba384ab
+	pkgver = 22.2.0_devel.157580.e67468c2a71.d41d8cd98f00b204e9800998ecf8427e
 	pkgrel = 1
 	url = https://www.mesa3d.org
 	arch = x86_64
@@ -30,11 +30,11 @@ pkgbase = mesa-rusticl-git
 	makedepends = valgrind
 	makedepends = glslang
 	makedepends = vulkan-icd-loader
-	makedepends = directx-headers
 	makedepends = cmake
 	makedepends = meson
 	makedepends = rust
 	makedepends = rust-bindgen
+	makedepends = directx-headers-git
 	depends = libdrm
 	depends = libxcb
 	depends = wayland
@@ -82,14 +82,11 @@ pkgbase = mesa-rusticl-git
 	conflicts = vulkan-mesa-layer
 	conflicts = vulkan-mesa
 	conflicts = mesa-libgl
-	source = mesa::git+https://gitlab.freedesktop.org/karolherbst/mesa.git#branch=rusticl/wip_nv
+	source = mesa::git+https://gitlab.freedesktop.org/karolherbst/mesa.git#branch=rusticl/wip
 	source = LICENSE
-	source = eglapi_hack.patch
 	md5sums = SKIP
 	md5sums = 5c65a0fe315dd347e09b1f2826a1df5a
-	md5sums = 83448b54dfea2e53891476fe3d6657e3
 	sha512sums = SKIP
 	sha512sums = 25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2
-	sha512sums = 2cf8ef08c5ac02e5a795c37a67a12547ab752620b2c2a3f34ff53195f50e1758ebc8004f0b356d99255f2c9af19815e6ac61d66aaebecebe5d1d00578d1f412d
 
 pkgname = mesa-rusticl-git
diff --git a/PKGBUILD b/PKGBUILD
index d80734641cd8..13722f873314 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,14 +2,14 @@
 
 pkgname=mesa-rusticl-git
 pkgdesc="An open-source implementation of the OpenGL specification, with Rusticl"
-pkgver=22.2.0_devel.153993.93f0ddd51b4.02359b69dbf79b2bb68700002ba384ab
+pkgver=22.2.0_devel.157580.e67468c2a71.d41d8cd98f00b204e9800998ecf8427e
 pkgrel=1
 arch=('x86_64')
 makedepends=('python-mako' 'libxml2' 'libx11' 'xorgproto' 'libdrm' 'libxshmfence' 'libxxf86vm'
              'libxdamage' 'libvdpau' 'libva' 'wayland' 'wayland-protocols' 'zstd' 'elfutils' 'llvm'
              'libomxil-bellagio' 'libclc' 'clang' 'libglvnd' 'libunwind' 'lm_sensors' 'libxrandr'
-             'valgrind' 'glslang' 'vulkan-icd-loader' 'directx-headers' 'cmake' 'meson'
-             'rust' 'rust-bindgen')
+             'valgrind' 'glslang' 'vulkan-icd-loader' 'cmake' 'meson'
+             'rust' 'rust-bindgen' 'directx-headers-git')
 depends=('libdrm' 'libxcb' 'wayland' 'python'
          'libclc' 'clang'
          'libx11' 'libxshmfence' 'zstd'
@@ -26,17 +26,17 @@ conflicts=('vulkan-mesa-layers' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'vu
            'vulkan-mesa-layer' 'vulkan-mesa' 'mesa-libgl')
 url="https://www.mesa3d.org"
 license=('custom')
-source=('mesa::git+https://gitlab.freedesktop.org/karolherbst/mesa.git#branch=rusticl/wip_nv'
+source=('mesa::git+https://gitlab.freedesktop.org/karolherbst/mesa.git#branch=rusticl/wip'
         'LICENSE'
-        'eglapi_hack.patch'
+#        'eglapi_hack.patch'
         )
 md5sums=('SKIP'
          '5c65a0fe315dd347e09b1f2826a1df5a'
-         '83448b54dfea2e53891476fe3d6657e3'
+#         '83448b54dfea2e53891476fe3d6657e3'
          )
 sha512sums=('SKIP'
             '25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2'
-            '2cf8ef08c5ac02e5a795c37a67a12547ab752620b2c2a3f34ff53195f50e1758ebc8004f0b356d99255f2c9af19815e6ac61d66aaebecebe5d1d00578d1f412d'
+#            '2cf8ef08c5ac02e5a795c37a67a12547ab752620b2c2a3f34ff53195f50e1758ebc8004f0b356d99255f2c9af19815e6ac61d66aaebecebe5d1d00578d1f412d'
             )
 
 # NINJAFLAGS is an env var used to pass commandline options to ninja
@@ -114,8 +114,7 @@ build () {
         -D gallium-rusticl=true \
         -D opencl-spirv=true \
         -D shader-cache=enabled \
-        -D rust_std=2021 \
-        -D c_args="-Wno-error=incompatible-pointer-types-discards-qualifiers"
+        -D rust_std=2021
        
     meson configure _build
     
diff --git a/eglapi_hack.patch b/eglapi_hack.patch
index b6fc7ebafb6a..b6fc7ebafb6a 100644..100755
--- a/eglapi_hack.patch
+++ b/eglapi_hack.patch