update to 2.0.r58.g387b9778

* update patch

3 files changed, 62 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f79fcefa0d4b..d9b40216422b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = libretro-flycast-git
 	pkgdesc = Sega Dreamcast core
-	pkgver = 2.0.r53.gd22fa54f
+	pkgver = 2.0.r58.g387b9778
 	pkgrel = 1
 	url = https://github.com/flyinghead/flycast
 	arch = aarch64
@@ -32,7 +32,7 @@ pkgbase = libretro-flycast-git
 	b2sums = SKIP
 	b2sums = SKIP
 	b2sums = SKIP
-	b2sums = 2f2edc320cd63737a9fcdfa90265a8003a576e3797b43291b44c567eb189253bb0b48c7a5e7bc5b36d89c2889a064ecbd9c0deac6d8df526289de8cd0e2349a8
+	b2sums = 667b64dab77b80d6091028d28b1c13e1e8f70d352d7d7f4fecb7f54a5db604f741a85d1e2e26ddef6be4e401a4d33209b7d919521452d81b169bf268759e75c2
 
 pkgname = libretro-flycast-git
 	depends = libretro-core-info
diff --git a/PKGBUILD b/PKGBUILD
index 753d80366b3e..2dc7099874a8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 _reponame=flycast
 _pkgname=libretro-$_reponame
 pkgname=$_pkgname-git
-pkgver=2.0.r53.gd22fa54f
+pkgver=2.0.r58.g387b9778
 pkgrel=1
 pkgdesc="Sega Dreamcast core"
 arch=('aarch64' 'armv7h' 'i486' 'i686' 'pentium4' 'x86_64')
@@ -36,7 +36,7 @@ b2sums=(
 	'SKIP'
 	'SKIP'
 	'SKIP'
-	'2f2edc320cd63737a9fcdfa90265a8003a576e3797b43291b44c567eb189253bb0b48c7a5e7bc5b36d89c2889a064ecbd9c0deac6d8df526289de8cd0e2349a8'
+	'667b64dab77b80d6091028d28b1c13e1e8f70d352d7d7f4fecb7f54a5db604f741a85d1e2e26ddef6be4e401a4d33209b7d919521452d81b169bf268759e75c2'
 )
 
 pkgver() {
@@ -54,8 +54,7 @@ prepare() {
 }
 
 build() {
-	cd $_reponame
-	cmake -B ../build \
+	cmake -S $_reponame -B build \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_C_FLAGS_RELEASE="-DNDEBUG" \
 		-DCMAKE_CXX_FLAGS_RELEASE="-DNDEBUG" \
@@ -63,7 +62,7 @@ build() {
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DLIBRETRO=ON \
 		-Wno-dev
-	cmake --build ../build
+	cmake --build build
 }
 
 package() {
diff --git a/unbundle-libs.patch b/unbundle-libs.patch
index 08b9b9ec7d9a..bc0c2d9500ea 100644
--- a/unbundle-libs.patch
+++ b/unbundle-libs.patch
@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1e839478..7684357d 100644
+index f6993613..ce9897d3 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -286,12 +286,13 @@ endif()
+@@ -284,12 +284,13 @@ endif()
  
  option(BUILD_SHARED_LIBS "Build shared library" OFF)
  set(XXHASH_BUILD_XXHSUM OFF CACHE BOOL "Build the xxhsum binary")
@@ -20,35 +20,34 @@ index 1e839478..7684357d 100644
  
  if(USE_VULKAN)
  	option(BUILD_EXTERNAL "Build external dependencies in /External" OFF)
-@@ -300,8 +301,9 @@ if(USE_VULKAN)
+@@ -298,8 +299,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(glslang)
-+	target_include_directories(glslang::SPIRV INTERFACE /usr/include/glslang)
 +	target_link_libraries(${PROJECT_NAME} PRIVATE glslang::SPIRV)
  endif()
  
  if(NOT LIBRETRO)
-@@ -342,13 +344,13 @@ if(NOT LIBRETRO)
+@@ -340,13 +341,13 @@ if(NOT LIBRETRO)
  			target_link_libraries(${PROJECT_NAME} PRIVATE CURL::libcurl)
  		endif()
  	endif()
--	
+-
 +endif()
  	find_package(ZLIB)
  	if(TARGET ZLIB::ZLIB AND NOT ANDROID AND (NOT WIN32 OR WINDOWS_STORE))
- 	    set(WITH_SYSTEM_ZLIB ON CACHE BOOL "Use system provided zlib library")
- 	    target_link_libraries(${PROJECT_NAME} PRIVATE ZLIB::ZLIB)
+ 		set(WITH_SYSTEM_ZLIB ON CACHE BOOL "Use system provided zlib library")
+ 		target_link_libraries(${PROJECT_NAME} PRIVATE ZLIB::ZLIB)
  	endif()
--	
+-
 +if(FALSE)
  	find_package(Lua)
  	if(NOT APPLE AND LUA_FOUND)
  		target_compile_definitions(${PROJECT_NAME} PRIVATE USE_LUA)
-@@ -358,9 +360,9 @@ if(NOT LIBRETRO)
+@@ -356,9 +357,9 @@ if(NOT LIBRETRO)
  	endif()
  endif()
  
@@ -60,11 +59,11 @@ index 1e839478..7684357d 100644
 +target_link_libraries(${PROJECT_NAME} PRIVATE PkgConfig::chdr)
  
  if(NOT WITH_SYSTEM_ZLIB)
-     target_include_directories(${PROJECT_NAME} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/core/deps/libchdr/deps/zlib-1.2.11")
-@@ -399,25 +401,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()
+ 	target_include_directories(${PROJECT_NAME} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/core/deps/libchdr/deps/zlib-1.2.11")
+@@ -397,25 +398,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()
 -
 +endif()
  	if(USE_HOST_LIBZIP)
@@ -72,25 +71,25 @@ index 1e839478..7684357d 100644
  		if(LIBZIP_FOUND)
  			target_link_libraries(${PROJECT_NAME} PRIVATE PkgConfig::LIBZIP)
  		endif()
-     endif()
+ 	endif()
 -
 +if(FALSE)
-     if(ENABLE_OPROFILE)
-         target_compile_definitions(${PROJECT_NAME} PRIVATE DYNA_OPROF)
-         target_link_libraries(${PROJECT_NAME} PRIVATE opagent)
-     endif()
+ 	if(ENABLE_OPROFILE)
+ 		target_compile_definitions(${PROJECT_NAME} PRIVATE DYNA_OPROF)
+ 		target_link_libraries(${PROJECT_NAME} PRIVATE opagent)
+ 	endif()
 -
 +endif()
-     find_package(MiniUPnPc)
-     if (MINIUPNP_FOUND)
+ 	find_package(MiniUPnPc)
+ 	if(MINIUPNP_FOUND)
  		target_include_directories(${PROJECT_NAME} PRIVATE ${MINIUPNP_INCLUDE_DIRS})
  		target_link_libraries(${PROJECT_NAME} PRIVATE ${MINIUPNP_LIBRARIES})
-     endif()
+ 	endif()
 -endif()
  
  if(NINTENDO_SWITCH AND USE_GLES)
  	pkg_check_modules(GLESV2 IMPORTED_TARGET glesv2)
-@@ -1070,7 +1071,7 @@ if(NOT LIBRETRO)
+@@ -1068,7 +1068,7 @@ if(NOT LIBRETRO)
  endif()
  
  if(USE_VULKAN)
@@ -99,12 +98,38 @@ index 1e839478..7684357d 100644
  	target_link_libraries(${PROJECT_NAME} PRIVATE Vulkan::Headers)
  
  	add_library(VulkanMemoryAllocator INTERFACE)
-@@ -1293,7 +1294,7 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*|arm64.*)" OR CMAKE_OSX_
-     set(KNOWN_ARCHITECTURE_DETECTED ON)
+@@ -1291,7 +1291,7 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*|arm64.*)" OR CMAKE_OSX_
+ 	set(KNOWN_ARCHITECTURE_DETECTED ON)
  endif()
  if(CMAKE_SYSTEM_PROCESSOR MATCHES "i686.*|i386.*|x86.*|amd64.*|x86_64.*|AMD64.*" OR CMAKE_OSX_ARCHITECTURES MATCHES "x86_64")
--    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
+-	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
+--- 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>
+ #include "vulkan_context.h"
+ 
+ static const TBuiltInResource DefaultTBuiltInResource = {
+diff --git a/core/rend/vulkan/shaders.h b/core/rend/vulkan/shaders.h
+index f58ac0d4..bdbc98ad 100644
+--- a/core/rend/vulkan/shaders.h
++++ b/core/rend/vulkan/shaders.h
+@@ -20,7 +20,7 @@
+ */
+ #pragma once
+ #include "vulkan.h"
+-#include "SPIRV/GlslangToSpv.h"
++#include <glslang/SPIRV/GlslangToSpv.h>
+ 
+ #include <glm/glm.hpp>
+ #include <map>