diff options
| -rw-r--r-- | .SRCINFO | 11 | ||||
| -rw-r--r-- | PKGBUILD | 12 | ||||
| -rw-r--r-- | unbundle-libs.patch | 26 |
3 files changed, 24 insertions, 25 deletions
@@ -1,6 +1,6 @@ pkgbase = libretro-flycast-git pkgdesc = Sega Dreamcast/NAOMI/NAOMI 2/Atomiswave core - pkgver = 2.0.r75.gc15f446f + pkgver = 2.0.r77.g993b705d pkgrel = 1 url = https://github.com/flyinghead/flycast arch = aarch64 @@ -14,27 +14,28 @@ pkgbase = libretro-flycast-git makedepends = cmake makedepends = git makedepends = glm - makedepends = glslang>=11.11 makedepends = libchdr makedepends = libgl makedepends = libzip makedepends = miniupnpc + makedepends = vulkan-headers + makedepends = vulkan-icd-loader makedepends = xbyak makedepends = xxhash makedepends = zlib + depends = glslang>=11.11 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 = SKIP - b2sums = SKIP - b2sums = 667b64dab77b80d6091028d28b1c13e1e8f70d352d7d7f4fecb7f54a5db604f741a85d1e2e26ddef6be4e401a4d33209b7d919521452d81b169bf268759e75c2 + b2sums = 46548c4be0e6bdebaece4b3484fd6d05015a7cb07cef5054d25fe8df95ef1855eceea39ec3becd13e64e4753c7badcfb18a1b1f5eeedbb720f3c38c1cb0dc996 pkgname = libretro-flycast-git + depends = glslang>=11.11 depends = libretro-core-info depends = libchdr.so depends = libGL.so @@ -3,23 +3,24 @@ _reponame=flycast _pkgname=libretro-$_reponame pkgname=$_pkgname-git -pkgver=2.0.r75.gc15f446f +pkgver=2.0.r77.g993b705d pkgrel=1 pkgdesc="Sega Dreamcast/NAOMI/NAOMI 2/Atomiswave core" arch=('aarch64' 'armv7h' 'i486' 'i686' 'pentium4' 'x86_64') url="https://github.com/flyinghead/flycast" license=('GPL2') groups=('libretro') -depends=('libretro-core-info') +depends=('glslang>=11.11' 'libretro-core-info') makedepends=( 'cmake' 'git' 'glm' - 'glslang>=11.11' 'libchdr' 'libgl' 'libzip' 'miniupnpc' + 'vulkan-headers' + 'vulkan-icd-loader' 'xbyak' 'xxhash' 'zlib' @@ -28,15 +29,13 @@ 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' 'SKIP' - 'SKIP' - '667b64dab77b80d6091028d28b1c13e1e8f70d352d7d7f4fecb7f54a5db604f741a85d1e2e26ddef6be4e401a4d33209b7d919521452d81b169bf268759e75c2' + '46548c4be0e6bdebaece4b3484fd6d05015a7cb07cef5054d25fe8df95ef1855eceea39ec3becd13e64e4753c7badcfb18a1b1f5eeedbb720f3c38c1cb0dc996' ) pkgver() { @@ -46,7 +45,6 @@ pkgver() { prepare() { cd $_reponame - git config submodule.core/deps/Vulkan-Headers.url ../Vulkan-Headers git config submodule.core/deps/VulkanMemoryAllocator.url ../VulkanMemoryAllocator git -c protocol.file.allow=always submodule update patch -Np1 < ../unbundle-libs.patch diff --git a/unbundle-libs.patch b/unbundle-libs.patch index bc0c2d9500ea..3c15a21cc3cf 100644 --- a/unbundle-libs.patch +++ b/unbundle-libs.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index f6993613..ce9897d3 100644 +index a1134312..064bc623 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -284,12 +284,13 @@ endif() +@@ -305,12 +305,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 f6993613..ce9897d3 100644 if(USE_VULKAN) option(BUILD_EXTERNAL "Build external dependencies in /External" OFF) -@@ -298,8 +299,8 @@ if(USE_VULKAN) +@@ -319,8 +320,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_link_libraries(${PROJECT_NAME} PRIVATE glslang::SPIRV) ++ find_package(Vulkan COMPONENTS glslang) ++ target_link_libraries(${PROJECT_NAME} PRIVATE Vulkan::glslang-spirv) endif() if(NOT LIBRETRO) -@@ -340,13 +341,13 @@ if(NOT LIBRETRO) +@@ -361,13 +362,13 @@ if(NOT LIBRETRO) target_link_libraries(${PROJECT_NAME} PRIVATE CURL::libcurl) endif() endif() @@ -47,7 +47,7 @@ index f6993613..ce9897d3 100644 find_package(Lua) if(NOT APPLE AND LUA_FOUND) target_compile_definitions(${PROJECT_NAME} PRIVATE USE_LUA) -@@ -356,9 +357,9 @@ if(NOT LIBRETRO) +@@ -377,9 +378,9 @@ if(NOT LIBRETRO) endif() endif() @@ -60,7 +60,7 @@ index f6993613..ce9897d3 100644 if(NOT WITH_SYSTEM_ZLIB) 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) +@@ -418,25 +419,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,16 +89,16 @@ index f6993613..ce9897d3 100644 if(NINTENDO_SWITCH AND USE_GLES) pkg_check_modules(GLESV2 IMPORTED_TARGET glesv2) -@@ -1068,7 +1068,7 @@ if(NOT LIBRETRO) - endif() +@@ -1100,7 +1100,7 @@ if(USE_VULKAN) + target_compile_definitions(${PROJECT_NAME} PUBLIC VK_USE_PLATFORM_MACOS_MVK) + endif() - if(USE_VULKAN) - add_subdirectory(core/deps/Vulkan-Headers) -+ add_subdirectory(core/deps/Vulkan-Headers EXCLUDE_FROM_ALL) ++ find_package(Vulkan) target_link_libraries(${PROJECT_NAME} PRIVATE Vulkan::Headers) add_library(VulkanMemoryAllocator INTERFACE) -@@ -1291,7 +1291,7 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*|arm64.*)" OR CMAKE_OSX_ +@@ -1306,7 +1306,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") |