update to 2.1.r384.ge8e382372

3 files changed, 40 insertions, 97 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a2223c5c6a19..50a92dde8e88 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.r297.g3bf817aea
+	pkgver = 2.1.r384.ge8e382372
 	pkgrel = 1
 	url = https://github.com/flyinghead/flycast
 	arch = aarch64
@@ -14,33 +14,34 @@ pkgbase = libretro-flycast-git
 	makedepends = cmake
 	makedepends = git
 	makedepends = glm
-	makedepends = glslang>=12.2
+	makedepends = glslang>=12.3.1
 	makedepends = libchdr
 	makedepends = libgl
 	makedepends = libzip
 	makedepends = miniupnpc
-	makedepends = vulkan-headers>=1:1.3.256
 	makedepends = vulkan-memory-allocator
 	makedepends = xbyak
 	makedepends = xxhash
+	makedepends = zlib
 	depends = gcc-libs
 	depends = glibc
 	depends = libretro-core-info
-	depends = zlib
 	provides = libretro-flycast
 	conflicts = libretro-flycast
-	source = flycast::git+https://github.com/flyinghead/flycast.git
+	source = git+https://github.com/flyinghead/flycast.git
+	source = git+https://github.com/KhronosGroup/Vulkan-Headers.git
 	source = use-system-libs.patch
 	b2sums = SKIP
-	b2sums = ad0de164a518b93a684fc52be3b848719f80888f7fe89c1c64301aa312da8cf5a2951c4a735809d7ce39ea8f23d8b4e8d1ab88011827a2b1c63b8fd5afc3c943
+	b2sums = SKIP
+	b2sums = a0de47f7f43450f50f993e891ae74ebad433ef52559e24751ba83e58706699da0ab0a6b7631bf8c5dd5f13a687a163ad3daa64049771fad09045721bc7b993df
 
 pkgname = libretro-flycast-git
 	depends = gcc-libs
 	depends = glibc
 	depends = libretro-core-info
-	depends = zlib
 	depends = libchdr.so
 	depends = libGL.so
 	depends = libminiupnpc.so
 	depends = libxxhash.so
 	depends = libzip.so
+	depends = libz.so
diff --git a/PKGBUILD b/PKGBUILD
index 64ce5ddc1d94..cfdf4458d072 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,59 +1,60 @@
 # Maintainer: Alexandre Bouvier <contact@amb.tf>
 # Contributor: Maxime Gauduin <alucryd@archlinux.org>
-_reponame=flycast
-_pkgname=libretro-$_reponame
+_pkgname=libretro-flycast
 pkgname=$_pkgname-git
-pkgver=2.1.r297.g3bf817aea
+pkgver=2.1.r384.ge8e382372
 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' 'libretro-core-info' 'zlib')
+depends=('gcc-libs' 'glibc' 'libretro-core-info')
 makedepends=(
 	'cmake'
 	'git'
 	'glm'
-	'glslang>=12.2'
+	'glslang>=12.3.1'
 	'libchdr'
 	'libgl'
 	'libzip'
 	'miniupnpc'
-	'vulkan-headers>=1:1.3.256'
 	'vulkan-memory-allocator'
 	'xbyak'
 	'xxhash'
+	'zlib'
 )
 provides=("$_pkgname")
 conflicts=("$_pkgname")
 source=(
-	"$_reponame::git+$url.git"
+	"git+$url.git"
+	'git+https://github.com/KhronosGroup/Vulkan-Headers.git'
 	'use-system-libs.patch'
 )
 b2sums=(
 	'SKIP'
-	'ad0de164a518b93a684fc52be3b848719f80888f7fe89c1c64301aa312da8cf5a2951c4a735809d7ce39ea8f23d8b4e8d1ab88011827a2b1c63b8fd5afc3c943'
+	'SKIP'
+	'a0de47f7f43450f50f993e891ae74ebad433ef52559e24751ba83e58706699da0ab0a6b7631bf8c5dd5f13a687a163ad3daa64049771fad09045721bc7b993df'
 )
 
 pkgver() {
-	cd $_reponame
+	cd flycast
 	git describe --long --tags | sed 's/^v//i;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 prepare() {
-	cd $_reponame
+	cd flycast
+	git config submodule.core/deps/Vulkan-Headers.url ../Vulkan-Headers
+	git -c protocol.file.allow=always submodule update
 	patch -Np1 < ../use-system-libs.patch
 	rm -r core/deps/libretro-common/include/libchdr
 }
 
 build() {
-	cmake -S $_reponame -B build \
+	cmake -S flycast -B build \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_C_FLAGS_RELEASE="-DNDEBUG" \
 		-DCMAKE_CXX_FLAGS_RELEASE="-DNDEBUG" \
-		-DCMAKE_INSTALL_BINDIR=lib/libretro \
-		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DLIBRETRO=ON \
 		-Wno-dev
 	cmake --build build
@@ -66,7 +67,8 @@ package() {
 		'libminiupnpc.so'
 		'libxxhash.so'
 		'libzip.so'
+		'libz.so'
 	)
 	# shellcheck disable=SC2154
-	DESTDIR="$pkgdir" cmake --install build
+	install -D -t "$pkgdir"/usr/lib/libretro build/flycast_libretro.so
 }
diff --git a/use-system-libs.patch b/use-system-libs.patch
index bc6c23e6f727..7084e85254d4 100644
--- a/use-system-libs.patch
+++ b/use-system-libs.patch
@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1962e6955..31401f8dc 100644
+index dce5cd161..100980dd5 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -360,12 +360,13 @@ endif()
+@@ -366,12 +366,13 @@ endif()
  
  option(BUILD_SHARED_LIBS "Build shared library" OFF)
  set(XXHASH_BUILD_XXHSUM OFF CACHE BOOL "Build the xxhsum binary")
@@ -20,8 +20,8 @@ index 1962e6955..31401f8dc 100644
  
  if(USE_VULKAN)
  	option(BUILD_EXTERNAL "Build external dependencies in /External" OFF)
-@@ -374,8 +375,8 @@ if(USE_VULKAN)
- 	option(ENABLE_GLSLANG_BINARIES "Builds glslangValidator and spirv-remap" OFF)
+@@ -380,8 +381,8 @@ if(USE_VULKAN)
+ 	option(ENABLE_GLSLANG_BINARIES "Builds glslang 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)
@@ -31,7 +31,7 @@ index 1962e6955..31401f8dc 100644
  endif()
  
  if(NOT LIBRETRO)
-@@ -422,13 +423,13 @@ if(NOT LIBRETRO)
+@@ -428,13 +429,13 @@ if(NOT LIBRETRO)
  			target_link_libraries(${PROJECT_NAME} PRIVATE CURL::libcurl)
  		endif()
  	endif()
@@ -47,7 +47,7 @@ index 1962e6955..31401f8dc 100644
  	find_package(Lua)
  	if(NOT APPLE AND LUA_FOUND)
  		target_compile_definitions(${PROJECT_NAME} PRIVATE USE_LUA)
-@@ -438,9 +439,9 @@ if(NOT LIBRETRO)
+@@ -444,9 +445,9 @@ if(NOT LIBRETRO)
  	endif()
  endif()
  
@@ -60,7 +60,7 @@ index 1962e6955..31401f8dc 100644
  
  if(NOT WITH_SYSTEM_ZLIB)
  	target_include_directories(${PROJECT_NAME} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/core/deps/libchdr/deps/zlib-1.2.11")
-@@ -479,25 +480,24 @@ if(PKG_CONFIG_FOUND AND NOT ANDROID AND NOT APPLE AND NOT LIBRETRO)
+@@ -485,25 +486,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,29 +89,20 @@ index 1962e6955..31401f8dc 100644
  
  if(NINTENDO_SWITCH AND USE_GLES)
  	pkg_check_modules(GLESV2 IMPORTED_TARGET glesv2)
-@@ -1248,7 +1248,7 @@ if(USE_VULKAN)
- 		target_compile_definitions(${PROJECT_NAME} PUBLIC VK_USE_PLATFORM_MACOS_MVK)
- 	endif()
- 
--	add_subdirectory(core/deps/Vulkan-Headers)
-+	find_package(VulkanHeaders)
+@@ -1267,9 +1267,9 @@ if(USE_VULKAN)
+ 	add_subdirectory(core/deps/Vulkan-Headers)
  	target_link_libraries(${PROJECT_NAME} PRIVATE Vulkan::Headers)
  
- 	if (APPLE)
-@@ -1256,10 +1256,8 @@ if(USE_VULKAN)
- 		target_compile_definitions(${PROJECT_NAME} PRIVATE VMA_USE_STL_SHARED_MUTEX=0)
- 	endif()
- 	
--	add_library(VulkanMemoryAllocator INTERFACE)
+-	add_subdirectory(core/deps/VulkanMemoryAllocator)
+-	target_compile_definitions(VulkanMemoryAllocator INTERFACE $<$<BOOL:${APPLE}>:VMA_USE_STL_SHARED_MUTEX=0>) # Only available on macOS 10.12+
 -	target_compile_options(VulkanMemoryAllocator INTERFACE $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CXX_COMPILER_ID:AppleClang,Clang>>:-Wno-nullability-completeness>)
--	target_include_directories(VulkanMemoryAllocator INTERFACE core/deps/VulkanMemoryAllocator/include)
--	target_link_libraries(${PROJECT_NAME} PRIVATE VulkanMemoryAllocator)
 +	find_package(VulkanMemoryAllocator)
-+	target_link_libraries(${PROJECT_NAME} PRIVATE GPUOpen::VulkanMemoryAllocator)
++	target_compile_definitions(GPUOpen::VulkanMemoryAllocator INTERFACE $<$<BOOL:${APPLE}>:VMA_USE_STL_SHARED_MUTEX=0>) # Only available on macOS 10.12+
++	target_compile_options(GPUOpen::VulkanMemoryAllocator INTERFACE $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CXX_COMPILER_ID:AppleClang,Clang>>:-Wno-nullability-completeness>)
+ 	target_link_libraries(${PROJECT_NAME} PRIVATE GPUOpen::VulkanMemoryAllocator)
  
  	target_compile_definitions(${PROJECT_NAME} PRIVATE USE_VULKAN HAVE_VULKAN)
- 	target_sources(${PROJECT_NAME} PRIVATE
-@@ -1468,7 +1466,7 @@ if("arm64" IN_LIST ARCHITECTURE)
+@@ -1474,7 +1474,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("x86" IN_LIST ARCHITECTURE OR "x86_64" IN_LIST ARCHITECTURE)
@@ -134,7 +125,7 @@ index a1619f310..de4ee10de 100644
  int ShaderCompiler::initCount;
  
 diff --git a/core/rend/vulkan/shaders.h b/core/rend/vulkan/shaders.h
-index 148122335..5761a4f35 100644
+index e53311b18..8c5439a22 100644
 --- a/core/rend/vulkan/shaders.h
 +++ b/core/rend/vulkan/shaders.h
 @@ -20,7 +20,7 @@
@@ -146,54 +137,3 @@ index 148122335..5761a4f35 100644
  
  #include <glm/glm.hpp>
  #include <map>
-diff --git a/core/rend/vulkan/vmallocator.cpp b/core/rend/vulkan/vmallocator.cpp
-index 6a441d2c5..9b288e05a 100644
---- a/core/rend/vulkan/vmallocator.cpp
-+++ b/core/rend/vulkan/vmallocator.cpp
-@@ -70,5 +70,5 @@ void VMAllocator::Init(vk::PhysicalDevice physicalDevice, vk::Device device, vk:
- 
- 	VkResult rc = vmaCreateAllocator(&allocatorInfo, &allocator);
- 	if (rc != VK_SUCCESS)
--		vk::throwResultException((vk::Result)rc, "vmaCreateAllocator failed");
-+		vk::detail::throwResultException((vk::Result)rc, "vmaCreateAllocator failed");
- }
-diff --git a/core/rend/vulkan/vmallocator.h b/core/rend/vulkan/vmallocator.h
-index 4d61d4f10..b9b0746d9 100644
---- a/core/rend/vulkan/vmallocator.h
-+++ b/core/rend/vulkan/vmallocator.h
-@@ -65,7 +65,7 @@ public:
- 		void *p;
- 		VkResult res = vmaMapMemory(allocator, allocation, &p);
- 		if (res != VK_SUCCESS)
--			vk::throwResultException((vk::Result)res, "vmaMapMemory failed");
-+			vk::detail::throwResultException((vk::Result)res, "vmaMapMemory failed");
- 		VkMemoryPropertyFlags flags;
- 		vmaGetMemoryTypeProperties(allocator, allocInfo.memoryType, &flags);
- 		if ((flags & VK_MEMORY_PROPERTY_HOST_CACHED_BIT) && (flags & VK_MEMORY_PROPERTY_HOST_COHERENT_BIT) == 0)
-@@ -116,7 +116,7 @@ public:
- 		VmaAllocationInfo allocInfo;
- 		VkResult rc = vmaAllocateMemory(allocator, (VkMemoryRequirements*)&memoryRequirements, &allocCreateInfo, &vmaAllocation, &allocInfo);
- 		if (rc != VK_SUCCESS)
--			vk::throwResultException((vk::Result)rc, "vmaAllocateMemory failed");
-+			vk::detail::throwResultException((vk::Result)rc, "vmaAllocateMemory failed");
- 		return Allocation(allocator, vmaAllocation, allocInfo);
- 	}
- 
-@@ -126,7 +126,7 @@ public:
- 		VmaAllocationInfo allocInfo;
- 		VkResult rc = vmaAllocateMemoryForImage(allocator, (VkImage)image, &allocCreateInfo, &vmaAllocation, &allocInfo);
- 		if (rc != VK_SUCCESS)
--			vk::throwResultException((vk::Result)rc, "vmaAllocateMemoryForImage failed");
-+			vk::detail::throwResultException((vk::Result)rc, "vmaAllocateMemoryForImage failed");
- 		vmaBindImageMemory(allocator, vmaAllocation, (VkImage)image);
- 
- 		return Allocation(allocator, vmaAllocation, allocInfo);
-@@ -138,7 +138,7 @@ public:
- 		VmaAllocationInfo allocInfo;
- 		VkResult rc = vmaAllocateMemoryForBuffer(allocator, (VkBuffer)buffer, &allocCreateInfo, &vmaAllocation, &allocInfo);
- 		if (rc != VK_SUCCESS)
--			vk::throwResultException((vk::Result)rc, "vmaAllocateMemoryForBuffer failed");
-+			vk::detail::throwResultException((vk::Result)rc, "vmaAllocateMemoryForBuffer failed");
- 		vmaBindBufferMemory(allocator, vmaAllocation, (VkBuffer)buffer);
- 
- 		return Allocation(allocator, vmaAllocation, allocInfo);