update to 2.1.r286.gf679fd9ba

3 files changed, 35 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 918044cbc946..82a31201a406 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = libretro-flycast-git
 	pkgdesc = Sega Dreamcast/NAOMI/NAOMI 2/Atomiswave core (fork of reicast)
-	pkgver = 2.1.r70.g415d8c2ea
+	pkgver = 2.1.r286.gf679fd9ba
 	pkgrel = 1
 	url = https://github.com/flyinghead/flycast
 	arch = aarch64
@@ -14,32 +14,31 @@ pkgbase = libretro-flycast-git
 	makedepends = cmake
 	makedepends = git
 	makedepends = glm
+	makedepends = glslang>=12.1
 	makedepends = libchdr
 	makedepends = libgl
 	makedepends = libzip
 	makedepends = miniupnpc
-	makedepends = vulkan-headers>=1:1.3.236
+	makedepends = vulkan-headers>=1:1.3.250
 	makedepends = vulkan-icd-loader
 	makedepends = xbyak
 	makedepends = xxhash
 	depends = gcc-libs
 	depends = glibc
-	depends = glslang>=11.13
 	depends = libretro-core-info
 	depends = zlib
 	provides = libretro-flycast
 	conflicts = libretro-flycast
 	source = flycast::git+https://github.com/flyinghead/flycast.git
 	source = VulkanMemoryAllocator::git+https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git
-	source = unbundle-libs.patch
+	source = use-system-libs.patch
 	b2sums = SKIP
 	b2sums = SKIP
-	b2sums = 46548c4be0e6bdebaece4b3484fd6d05015a7cb07cef5054d25fe8df95ef1855eceea39ec3becd13e64e4753c7badcfb18a1b1f5eeedbb720f3c38c1cb0dc996
+	b2sums = c226d68266b6a1bd6e59f0c9d1e6ba5299945b2282673839c76d738d16c14e4e5e6a45b930d7ba8a14edbe1aa7c5ea053243895db6ccfca4ae1164008fe4334f
 
 pkgname = libretro-flycast-git
 	depends = gcc-libs
 	depends = glibc
-	depends = glslang>=11.13
 	depends = libretro-core-info
 	depends = zlib
 	depends = libchdr.so
diff --git a/PKGBUILD b/PKGBUILD
index fb6a54963eaa..474edfd76aa8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,23 +3,24 @@
 _reponame=flycast
 _pkgname=libretro-$_reponame
 pkgname=$_pkgname-git
-pkgver=2.1.r70.g415d8c2ea
+pkgver=2.1.r286.gf679fd9ba
 pkgrel=1
 pkgdesc="Sega Dreamcast/NAOMI/NAOMI 2/Atomiswave core (fork of reicast)"
 arch=('aarch64' 'armv7h' 'i486' 'i686' 'pentium4' 'x86_64')
 url="https://github.com/flyinghead/flycast"
 license=('GPL2')
 groups=('libretro')
-depends=('gcc-libs' 'glibc' 'glslang>=11.13' 'libretro-core-info' 'zlib')
+depends=('gcc-libs' 'glibc' 'libretro-core-info' 'zlib')
 makedepends=(
 	'cmake'
 	'git'
 	'glm'
+	'glslang>=12.1'
 	'libchdr'
 	'libgl'
 	'libzip'
 	'miniupnpc'
-	'vulkan-headers>=1:1.3.236'
+	'vulkan-headers>=1:1.3.250'
 	'vulkan-icd-loader'
 	'xbyak'
 	'xxhash'
@@ -29,12 +30,12 @@ conflicts=("$_pkgname")
 source=(
 	"$_reponame::git+$url.git"
 	'VulkanMemoryAllocator::git+https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git'
-	'unbundle-libs.patch'
+	'use-system-libs.patch'
 )
 b2sums=(
 	'SKIP'
 	'SKIP'
-	'46548c4be0e6bdebaece4b3484fd6d05015a7cb07cef5054d25fe8df95ef1855eceea39ec3becd13e64e4753c7badcfb18a1b1f5eeedbb720f3c38c1cb0dc996'
+	'c226d68266b6a1bd6e59f0c9d1e6ba5299945b2282673839c76d738d16c14e4e5e6a45b930d7ba8a14edbe1aa7c5ea053243895db6ccfca4ae1164008fe4334f'
 )
 
 pkgver() {
@@ -46,8 +47,7 @@ prepare() {
 	cd $_reponame
 	git config submodule.core/deps/VulkanMemoryAllocator.url ../VulkanMemoryAllocator
 	git -c protocol.file.allow=always submodule update
-	git revert -n 8d0654c323028d9d31f67c51d65e99b410a91750
-	patch -Np1 < ../unbundle-libs.patch
+	patch -Np1 < ../use-system-libs.patch
 	rm -r core/deps/libretro-common/include/libchdr
 }
 
diff --git a/unbundle-libs.patch b/use-system-libs.patch
index 3c15a21cc3cf..77b1c82bdc0f 100644
--- a/unbundle-libs.patch
+++ b/use-system-libs.patch
@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a1134312..064bc623 100644
+index 1962e6955..ca9f97e85 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -305,12 +305,13 @@ endif()
+@@ -360,12 +360,13 @@ endif()
  
  option(BUILD_SHARED_LIBS "Build shared library" OFF)
  set(XXHASH_BUILD_XXHSUM OFF CACHE BOOL "Build the xxhsum binary")
@@ -20,18 +20,18 @@ index a1134312..064bc623 100644
  
  if(USE_VULKAN)
  	option(BUILD_EXTERNAL "Build external dependencies in /External" OFF)
-@@ -319,8 +320,8 @@ if(USE_VULKAN)
+@@ -374,8 +375,8 @@ if(USE_VULKAN)
  	option(ENABLE_GLSLANG_BINARIES "Builds glslangValidator and spirv-remap" OFF)
  	option(ENABLE_HLSL "Enables HLSL input support" OFF)
  	option(ENABLE_PCH "Enables Precompiled header" OFF)
 -	add_subdirectory(core/deps/glslang EXCLUDE_FROM_ALL)
--	target_link_libraries(${PROJECT_NAME} PRIVATE SPIRV)
-+	find_package(Vulkan COMPONENTS glslang)
-+	target_link_libraries(${PROJECT_NAME} PRIVATE Vulkan::glslang-spirv)
+-	target_link_libraries(${PROJECT_NAME} PRIVATE glslang-default-resource-limits SPIRV)
++	find_package(glslang)
++	target_link_libraries(${PROJECT_NAME} PRIVATE glslang::glslang-default-resource-limits glslang::SPIRV)
  endif()
  
  if(NOT LIBRETRO)
-@@ -361,13 +362,13 @@ if(NOT LIBRETRO)
+@@ -422,13 +423,13 @@ if(NOT LIBRETRO)
  			target_link_libraries(${PROJECT_NAME} PRIVATE CURL::libcurl)
  		endif()
  	endif()
@@ -47,7 +47,7 @@ index a1134312..064bc623 100644
  	find_package(Lua)
  	if(NOT APPLE AND LUA_FOUND)
  		target_compile_definitions(${PROJECT_NAME} PRIVATE USE_LUA)
-@@ -377,9 +378,9 @@ if(NOT LIBRETRO)
+@@ -438,9 +439,9 @@ if(NOT LIBRETRO)
  	endif()
  endif()
  
@@ -60,7 +60,7 @@ index a1134312..064bc623 100644
  
  if(NOT WITH_SYSTEM_ZLIB)
  	target_include_directories(${PROJECT_NAME} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/core/deps/libchdr/deps/zlib-1.2.11")
-@@ -418,25 +419,24 @@ if(PKG_CONFIG_FOUND AND NOT ANDROID AND NOT APPLE AND NOT LIBRETRO)
+@@ -479,25 +480,24 @@ if(PKG_CONFIG_FOUND AND NOT ANDROID AND NOT APPLE AND NOT LIBRETRO)
  		target_compile_definitions(${PROJECT_NAME} PRIVATE USE_PULSEAUDIO)
  		target_link_libraries(${PROJECT_NAME} PRIVATE PkgConfig::LIBPULSE)
  	endif()
@@ -89,7 +89,7 @@ index a1134312..064bc623 100644
  
  if(NINTENDO_SWITCH AND USE_GLES)
  	pkg_check_modules(GLESV2 IMPORTED_TARGET glesv2)
-@@ -1100,7 +1100,7 @@ if(USE_VULKAN)
+@@ -1248,7 +1248,7 @@ if(USE_VULKAN)
  		target_compile_definitions(${PROJECT_NAME} PUBLIC VK_USE_PLATFORM_MACOS_MVK)
  	endif()
  
@@ -97,31 +97,31 @@ index a1134312..064bc623 100644
 +	find_package(Vulkan)
  	target_link_libraries(${PROJECT_NAME} PRIVATE Vulkan::Headers)
  
- 	add_library(VulkanMemoryAllocator INTERFACE)
-@@ -1306,7 +1306,7 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*|arm64.*)" OR CMAKE_OSX_
- 	set(KNOWN_ARCHITECTURE_DETECTED ON)
+ 	if (APPLE)
+@@ -1468,7 +1468,7 @@ if("arm64" IN_LIST ARCHITECTURE)
+ 	target_sources(${PROJECT_NAME} PRIVATE core/rec-ARM64/rec_arm64.cpp core/rec-ARM64/arm64_regalloc.h)
  endif()
- if(CMAKE_SYSTEM_PROCESSOR MATCHES "i686.*|i386.*|x86.*|amd64.*|x86_64.*|AMD64.*" OR CMAKE_OSX_ARCHITECTURES MATCHES "x86_64")
+ if("x86" IN_LIST ARCHITECTURE OR "x86_64" IN_LIST ARCHITECTURE)
 -	add_subdirectory(core/deps/xbyak EXCLUDE_FROM_ALL)
 +	find_package(xbyak)
  	target_link_libraries(${PROJECT_NAME} PRIVATE xbyak::xbyak)
  	if(CMAKE_SIZEOF_VOID_P EQUAL 4)
  		target_sources(${PROJECT_NAME} PRIVATE
 diff --git a/core/rend/vulkan/compiler.cpp b/core/rend/vulkan/compiler.cpp
-index 8c017b32..986676b5 100644
+index a1619f310..de4ee10de 100644
 --- a/core/rend/vulkan/compiler.cpp
 +++ b/core/rend/vulkan/compiler.cpp
-@@ -19,7 +19,7 @@
-     along with Flycast.  If not, see <https://www.gnu.org/licenses/>.
- */
- #include "compiler.h"
--#include "SPIRV/GlslangToSpv.h"
-+#include <glslang/SPIRV/GlslangToSpv.h>
+@@ -22,7 +22,7 @@
  #include "vulkan_context.h"
  
- static const TBuiltInResource DefaultTBuiltInResource = {
+ #include <glslang/Public/ResourceLimits.h>
+-#include <SPIRV/GlslangToSpv.h>
++#include <glslang/SPIRV/GlslangToSpv.h>
+ 
+ int ShaderCompiler::initCount;
+ 
 diff --git a/core/rend/vulkan/shaders.h b/core/rend/vulkan/shaders.h
-index f58ac0d4..bdbc98ad 100644
+index 148122335..5761a4f35 100644
 --- a/core/rend/vulkan/shaders.h
 +++ b/core/rend/vulkan/shaders.h
 @@ -20,7 +20,7 @@