update to 2.0.r53.gd22fa54f

* update patch

3 files changed, 56 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index eaece305d0c3..f79fcefa0d4b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = libretro-flycast-git
 	pkgdesc = Sega Dreamcast core
-	pkgver = 2.0.r0.gaa97a6d6
+	pkgver = 2.0.r53.gd22fa54f
 	pkgrel = 1
 	url = https://github.com/flyinghead/flycast
 	arch = aarch64
@@ -14,26 +14,30 @@ pkgbase = libretro-flycast-git
 	makedepends = cmake
 	makedepends = git
 	makedepends = glm
+	makedepends = glslang>=11.11
 	makedepends = libchdr
-	makedepends = libglvnd
+	makedepends = libgl
 	makedepends = libzip
 	makedepends = miniupnpc
 	makedepends = xbyak
 	makedepends = xxhash
 	makedepends = zlib
-	depends = libgl
 	depends = libretro-core-info
 	provides = libretro-flycast
 	conflicts = libretro-flycast
 	source = flycast::git+https://github.com/flyinghead/flycast.git
+	source = Vulkan-Headers::git+https://github.com/KhronosGroup/Vulkan-Headers.git
+	source = VulkanMemoryAllocator::git+https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git
 	source = unbundle-libs.patch
 	b2sums = SKIP
-	b2sums = e958858e145819df2156856b55b441b960716403c140cf79c6bbec5fbfae06303e27ea42f9fa4d58250046c9700ac04e5d26feb6a469ea9cd9cdda4c471ad896
+	b2sums = SKIP
+	b2sums = SKIP
+	b2sums = 2f2edc320cd63737a9fcdfa90265a8003a576e3797b43291b44c567eb189253bb0b48c7a5e7bc5b36d89c2889a064ecbd9c0deac6d8df526289de8cd0e2349a8
 
 pkgname = libretro-flycast-git
-	depends = libgl
 	depends = libretro-core-info
 	depends = libchdr.so
+	depends = libGL.so
 	depends = libminiupnpc.so
 	depends = libxxhash.so
 	depends = libzip.so
diff --git a/PKGBUILD b/PKGBUILD
index 575e70475267..753d80366b3e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,20 +3,21 @@
 _reponame=flycast
 _pkgname=libretro-$_reponame
 pkgname=$_pkgname-git
-pkgver=2.0.r0.gaa97a6d6
+pkgver=2.0.r53.gd22fa54f
 pkgrel=1
 pkgdesc="Sega Dreamcast core"
 arch=('aarch64' 'armv7h' 'i486' 'i686' 'pentium4' 'x86_64')
 url="https://github.com/flyinghead/flycast"
 license=('GPL2')
 groups=('libretro')
-depends=('libgl' 'libretro-core-info')
+depends=('libretro-core-info')
 makedepends=(
 	'cmake'
 	'git'
 	'glm'
+	'glslang>=11.11'
 	'libchdr'
-	'libglvnd'
+	'libgl'
 	'libzip'
 	'miniupnpc'
 	'xbyak'
@@ -27,11 +28,15 @@ provides=("$_pkgname")
 conflicts=("$_pkgname")
 source=(
 	"$_reponame::git+$url.git"
+	'Vulkan-Headers::git+https://github.com/KhronosGroup/Vulkan-Headers.git'
+	'VulkanMemoryAllocator::git+https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git'
 	'unbundle-libs.patch'
 )
 b2sums=(
 	'SKIP'
-	'e958858e145819df2156856b55b441b960716403c140cf79c6bbec5fbfae06303e27ea42f9fa4d58250046c9700ac04e5d26feb6a469ea9cd9cdda4c471ad896'
+	'SKIP'
+	'SKIP'
+	'2f2edc320cd63737a9fcdfa90265a8003a576e3797b43291b44c567eb189253bb0b48c7a5e7bc5b36d89c2889a064ecbd9c0deac6d8df526289de8cd0e2349a8'
 )
 
 pkgver() {
@@ -41,6 +46,9 @@ pkgver() {
 
 prepare() {
 	cd $_reponame
+	git config submodule.core/deps/Vulkan-Headers.url ../Vulkan-Headers
+	git config submodule.core/deps/VulkanMemoryAllocator.url ../VulkanMemoryAllocator
+	git submodule update
 	patch -Np1 < ../unbundle-libs.patch
 	rm -r core/deps/libretro-common/include/libchdr
 }
@@ -61,6 +69,7 @@ build() {
 package() {
 	depends+=(
 		'libchdr.so'
+		'libGL.so'
 		'libminiupnpc.so'
 		'libxxhash.so'
 		'libzip.so'
diff --git a/unbundle-libs.patch b/unbundle-libs.patch
index 1331c8dcdaa3..08b9b9ec7d9a 100644
--- a/unbundle-libs.patch
+++ b/unbundle-libs.patch
@@ -1,20 +1,18 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 151dc653..3e18378d 100644
+index 1e839478..7684357d 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -217,14 +212,12 @@ else()
-     target_compile_definitions(${PROJECT_NAME} PRIVATE TARGET_NO_OPENMP)
- endif()
+@@ -286,12 +286,13 @@ endif()
  
--option(BUILD_SHARED_LIBS "Build shared library" OFF)
--set(XXHASH_BUILD_XXHSUM OFF CACHE BOOL "Build the xxhsum binary")
+ option(BUILD_SHARED_LIBS "Build shared library" OFF)
+ set(XXHASH_BUILD_XXHSUM OFF CACHE BOOL "Build the xxhsum binary")
 -add_subdirectory(core/deps/xxHash/cmake_unofficial)
 -target_link_libraries(${PROJECT_NAME} PRIVATE xxHash::xxhash)
 +find_package(PkgConfig)
-+pkg_check_modules(xxhash IMPORTED_TARGET libxxhash)
++pkg_search_module(xxhash IMPORTED_TARGET libxxhash)
 +target_link_libraries(${PROJECT_NAME} PRIVATE PkgConfig::xxhash)
  
--option(BUILD_SHARED_LIBS "Build shared library" OFF)
+ option(BUILD_SHARED_LIBS "Build shared library" OFF)
 -add_subdirectory(core/deps/glm)
 -target_link_libraries(${PROJECT_NAME} PRIVATE glm::glm)
 +find_package(glm)
@@ -22,9 +20,21 @@ index 151dc653..3e18378d 100644
  
  if(USE_VULKAN)
  	option(BUILD_EXTERNAL "Build external dependencies in /External" OFF)
-@@ -272,13 +265,13 @@ if(NOT LIBRETRO)
- 		target_compile_definitions(${PROJECT_NAME} PRIVATE USE_SDL USE_SDL_AUDIO)
- 		target_sources(${PROJECT_NAME} PRIVATE core/sdl/sdl.cpp core/sdl/sdl.h core/sdl/sdl_gamepad.h core/sdl/sdl_keyboard.h)
+@@ -300,8 +301,9 @@ 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)
+ 			target_link_libraries(${PROJECT_NAME} PRIVATE CURL::libcurl)
+ 		endif()
  	endif()
 -	
 +endif()
@@ -38,7 +48,7 @@ index 151dc653..3e18378d 100644
  	find_package(Lua)
  	if(NOT APPLE AND LUA_FOUND)
  		target_compile_definitions(${PROJECT_NAME} PRIVATE USE_LUA)
-@@ -288,9 +281,9 @@ if(NOT LIBRETRO)
+@@ -358,9 +360,9 @@ if(NOT LIBRETRO)
  	endif()
  endif()
  
@@ -46,12 +56,12 @@ index 151dc653..3e18378d 100644
 -target_link_libraries(${PROJECT_NAME} PRIVATE chdr-static)
 -target_include_directories(${PROJECT_NAME} PRIVATE core/deps/libchdr/include)
 +find_package(PkgConfig)
-+pkg_check_modules(chdr IMPORTED_TARGET libchdr)
++pkg_search_module(chdr IMPORTED_TARGET libchdr)
 +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")
-@@ -329,25 +322,24 @@ if(PKG_CONFIG_FOUND AND NOT ANDROID AND NOT APPLE AND NOT LIBRETRO)
+@@ -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()
@@ -80,7 +90,16 @@ index 151dc653..3e18378d 100644
  
  if(NINTENDO_SWITCH AND USE_GLES)
  	pkg_check_modules(GLESV2 IMPORTED_TARGET glesv2)
-@@ -1202,7 +1194,7 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*|arm64.*)" OR CMAKE_OSX_
+@@ -1070,7 +1071,7 @@ if(NOT LIBRETRO)
+ endif()
+ 
+ if(USE_VULKAN)
+-	add_subdirectory(core/deps/Vulkan-Headers)
++	add_subdirectory(core/deps/Vulkan-Headers EXCLUDE_FROM_ALL)
+ 	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)
  endif()
  if(CMAKE_SYSTEM_PROCESSOR MATCHES "i686.*|i386.*|x86.*|amd64.*|x86_64.*|AMD64.*" OR CMAKE_OSX_ARCHITECTURES MATCHES "x86_64")