update

4 files changed, 27 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b9a1ca885d4d..281b5aa61811 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.3.0_devel.160940.edb89ae6094.d41d8cd98f00b204e9800998ecf8427e
+	pkgver = 22.3.0_devel.161123.fa759185850.61f1b507eb56fc13a58fe7134d95cdc5
 	pkgrel = 1
 	url = https://www.mesa3d.org
 	arch = x86_64
@@ -61,11 +61,11 @@ pkgbase = mesa-rusticl-git
 	depends = llvm-libs
 	depends = compiler-rt
 	depends = spirv-llvm-translator
-	depends = vulkan-radeon
 	optdepends = opencl-headers: headers necessary for OpenCL development
 	optdepends = opengl-man-pages: for the OpenGL API man pages
 	provides = mesa
 	provides = opencl-mesa
+	provides = vulkan-radeon
 	provides = vulkan-intel
 	provides = vulkan-swrast
 	provides = vulkan-mesa-layers
@@ -78,6 +78,7 @@ pkgbase = mesa-rusticl-git
 	provides = vulkan-driver
 	conflicts = mesa
 	conflicts = opencl-mesa
+	conflicts = vulkan-radeon
 	conflicts = vulkan-intel
 	conflicts = vulkan-swrast
 	conflicts = vulkan-mesa-layers
@@ -88,9 +89,12 @@ pkgbase = mesa-rusticl-git
 	conflicts = vulkan-mesa
 	source = mesa::git+https://gitlab.freedesktop.org/karolherbst/mesa.git#branch=rusticl/zink
 	source = LICENSE
+	source = zink_hack.patch
 	md5sums = SKIP
 	md5sums = 5c65a0fe315dd347e09b1f2826a1df5a
+	md5sums = dda07c53ad6d2e1341d4d71a71e7092d
 	sha512sums = SKIP
 	sha512sums = 25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2
+	sha512sums = 6e879dd0436e5a28c11244d99935951b22dda7c3b2413942c4a97d4b763c63d25eee31112eaed2a91e9b866058ad53e981ff7ac2d44172d8c09c25209f72a6ca
 
 pkgname = mesa-rusticl-git
diff --git a/PKGBUILD b/PKGBUILD
index 90d480d0bb70..bbfca2a83f55 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=mesa-rusticl-git
 pkgdesc="An open-source implementation of the OpenGL specification, with Rusticl"
-pkgver=22.3.0_devel.160940.edb89ae6094.d41d8cd98f00b204e9800998ecf8427e
+pkgver=22.3.0_devel.161123.fa759185850.61f1b507eb56fc13a58fe7134d95cdc5
 pkgrel=1
 arch=('x86_64')
 makedepends=('python-mako' 'libxml2' 'libx11' 'xorgproto' 'libdrm' 'libxshmfence' 'libxxf86vm'
@@ -11,32 +11,30 @@ makedepends=('python-mako' 'libxml2' 'libx11' 'xorgproto' 'libdrm' 'libxshmfence
              'systemd' 'valgrind' 'glslang' 'vulkan-icd-loader' 'cmake' 'meson'
              'git' 'ninja'
              'directx-headers-git' 'rust' 'rust-bindgen')
-# vulkan-radeonはビルドできないため公式リポジトリのものを使用
 depends=('libdrm' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'libelf'
          'libomxil-bellagio' 'libunwind' 'libglvnd' 'wayland' 'lm_sensors' 'libclc' 'vulkan-icd-loader' 'zstd' 'expat'
          'libxcb' 'python' 'libclc' 'clang' 'libx11' 'systemd-libs' 'llvm-libs' 'compiler-rt'
-         'spirv-llvm-translator' 'vulkan-radeon')
+         'spirv-llvm-translator')
 optdepends=('opencl-headers: headers necessary for OpenCL development'
             'opengl-man-pages: for the OpenGL API man pages')
-# vulkan-radeonをこのパッケージでビルドできないため､ここから外す
-provides=('mesa' 'opencl-mesa' 'vulkan-intel' 'vulkan-swrast' 'vulkan-mesa-layers' 'libva-mesa-driver' 'mesa-vdpau'
+provides=('mesa' 'opencl-mesa' 'vulkan-radeon' 'vulkan-intel' 'vulkan-swrast' 'vulkan-mesa-layers' 'libva-mesa-driver' 'mesa-vdpau'
           'vulkan-mesa-layer' 'mesa-libgl' 'opengl-driver' 'opencl-driver' 'vulkan-driver')
-conflicts=('mesa' 'opencl-mesa' 'vulkan-intel' 'vulkan-swrast' 'vulkan-mesa-layers' 'libva-mesa-driver' 'mesa-vdpau'
+conflicts=('mesa' 'opencl-mesa' 'vulkan-radeon' 'vulkan-intel' 'vulkan-swrast' 'vulkan-mesa-layers' 'libva-mesa-driver' 'mesa-vdpau'
            'vulkan-mesa-layer' 'mesa-libgl' 'vulkan-mesa')
 
 url="https://www.mesa3d.org"
 license=('custom')
 source=('mesa::git+https://gitlab.freedesktop.org/karolherbst/mesa.git#branch=rusticl/zink'
         'LICENSE'
-#        'eglapi_hack.patch'
+        'zink_hack.patch'
         )
 md5sums=('SKIP'
          '5c65a0fe315dd347e09b1f2826a1df5a'
-#         '83448b54dfea2e53891476fe3d6657e3'
+         'dda07c53ad6d2e1341d4d71a71e7092d'
          )
 sha512sums=('SKIP'
             '25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2'
-#            '2cf8ef08c5ac02e5a795c37a67a12547ab752620b2c2a3f34ff53195f50e1758ebc8004f0b356d99255f2c9af19815e6ac61d66aaebecebe5d1d00578d1f412d'
+            '6e879dd0436e5a28c11244d99935951b22dda7c3b2413942c4a97d4b763c63d25eee31112eaed2a91e9b866058ad53e981ff7ac2d44172d8c09c25209f72a6ca'
             )
 
 # NINJAFLAGS is an env var used to pass commandline options to ninja
@@ -81,7 +79,6 @@ build () {
     export CC="clang"
     export CXX="clang++"
 
-    # ビルドできないためvulkan-driversからamdを外す(vulkan-radeon)
     meson setup mesa _build \
        --wrap-mode=nofallback \
        -D prefix=/usr \
@@ -91,7 +88,7 @@ build () {
        -D b_ndebug=true \
        -D platforms=auto \
        -D gallium-drivers=r300,r600,radeonsi,nouveau,virgl,svga,swrast,iris,crocus,i915,zink \
-       -D vulkan-drivers=intel,intel_hasvk,swrast \
+       -D vulkan-drivers=auto \
        -D vulkan-rt-drivers=auto \
        -D vulkan-layers=device-select,intel-nullhw,overlay \
        -D dri3=enabled \
diff --git a/eglapi_hack.patch b/eglapi_hack.patch
deleted file mode 100755
index b6fc7ebafb6a..000000000000
--- a/eglapi_hack.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/src/egl/main/eglapi.c
-+++ b/src/egl/main/eglapi.c
-@@ -86,5 +86,3 @@
- #ifdef USE_LIBGLVND
- #define EGLAPI
--#undef PUBLIC
--#define PUBLIC
- #endif
diff --git a/zink_hack.patch b/zink_hack.patch
new file mode 100755
index 000000000000..506f1e3f7d63
--- /dev/null
+++ b/zink_hack.patch
@@ -0,0 +1,13 @@
+--- a/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c
++++ b/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c
+@@ -1075,8 +1075,8 @@
+          ctx->int_samplers[index] = var_id;
+       }
+       BITSET_SET(ctx->samplers_used, index);
+-      if (mediump)
+-         ctx->samplers_used_mediump |= 1 << index;
++      // if (mediump)
++      //    ctx->samplers_used_mediump |= 1 << index;
+    } else {
+       ctx->image_types[index] = image_type;
+       ctx->images[index] = var_id;
\ No newline at end of file