diff options
author | Alexandre Bouvier | 2024-03-19 18:16:22 +0100 |
---|---|---|
committer | Alexandre Bouvier | 2024-03-19 18:16:22 +0100 |
commit | 539f7ac60e0208e7a49a26ee55fcc5cc6fd31e44 (patch) | |
tree | 1d9ce38ba40268bd87b9b94af8707412fecbcbb0 /use-system-libs.patch | |
parent | f78ed0af5c294c824432600001f57751625a8e3f (diff) | |
download | aur-539f7ac60e0208e7a49a26ee55fcc5cc6fd31e44.tar.gz |
update to 2.3.r2.g40cdef6c1
Diffstat (limited to 'use-system-libs.patch')
-rw-r--r-- | use-system-libs.patch | 52 |
1 files changed, 7 insertions, 45 deletions
diff --git a/use-system-libs.patch b/use-system-libs.patch index ee0635061fa4..87f45ac26298 100644 --- a/use-system-libs.patch +++ b/use-system-libs.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 49f312f2e..4ff7a560f 100644 +index ddb66d711..aa2a26b25 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -375,11 +375,13 @@ endif() +@@ -376,11 +376,13 @@ endif() option(BUILD_SHARED_LIBS "Build shared library" OFF) set(XXHASH_BUILD_XXHSUM OFF CACHE BOOL "Build the xxhsum binary") @@ -19,18 +19,7 @@ index 49f312f2e..4ff7a560f 100644 target_link_libraries(${PROJECT_NAME} PRIVATE glm::glm) if(USE_VULKAN) -@@ -389,8 +391,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) -- target_link_libraries(${PROJECT_NAME} PRIVATE glslang-default-resource-limits SPIRV) -+ find_package(glslang REQUIRED) -+ target_link_libraries(${PROJECT_NAME} PRIVATE glslang::glslang-default-resource-limits glslang::SPIRV) - endif() - - if(NOT LIBRETRO) -@@ -437,13 +439,13 @@ if(NOT LIBRETRO) +@@ -445,13 +447,13 @@ if(NOT LIBRETRO) target_link_libraries(${PROJECT_NAME} PRIVATE CURL::libcurl) endif() endif() @@ -46,7 +35,7 @@ index 49f312f2e..4ff7a560f 100644 find_package(Lua 5.2) if(NOT APPLE AND LUA_FOUND) target_compile_definitions(${PROJECT_NAME} PRIVATE USE_LUA) -@@ -453,9 +455,9 @@ if(NOT LIBRETRO) +@@ -461,9 +463,9 @@ if(NOT LIBRETRO) endif() endif() @@ -59,7 +48,7 @@ index 49f312f2e..4ff7a560f 100644 if(NOT WITH_SYSTEM_ZLIB) set(ZLIB_RELATIVE_PATH "core/deps/libchdr/deps/zlib-1.3.1") -@@ -496,25 +498,24 @@ if(PKG_CONFIG_FOUND AND NOT ANDROID AND NOT APPLE AND NOT LIBRETRO) +@@ -504,25 +506,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() @@ -88,7 +77,7 @@ index 49f312f2e..4ff7a560f 100644 if(UNIX AND NOT APPLE AND NOT ANDROID) add_definitions( -@@ -1267,9 +1268,9 @@ if(USE_VULKAN) +@@ -1275,9 +1276,9 @@ if(USE_VULKAN) add_subdirectory(core/deps/Vulkan-Headers) target_link_libraries(${PROJECT_NAME} PRIVATE Vulkan::Headers) @@ -101,7 +90,7 @@ index 49f312f2e..4ff7a560f 100644 target_link_libraries(${PROJECT_NAME} PRIVATE GPUOpen::VulkanMemoryAllocator) target_compile_definitions(${PROJECT_NAME} PRIVATE USE_VULKAN HAVE_VULKAN) -@@ -1467,7 +1468,7 @@ if("arm64" IN_LIST ARCHITECTURE) +@@ -1475,7 +1476,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) @@ -110,30 +99,3 @@ index 49f312f2e..4ff7a560f 100644 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 a1619f310..a58394e53 100644 ---- a/core/rend/vulkan/compiler.cpp -+++ b/core/rend/vulkan/compiler.cpp -@@ -22,7 +22,8 @@ - #include "vulkan_context.h" - - #include <glslang/Public/ResourceLimits.h> --#include <SPIRV/GlslangToSpv.h> -+#include <glslang/Public/ShaderLang.h> -+#include <glslang/SPIRV/GlslangToSpv.h> - - int ShaderCompiler::initCount; - -diff --git a/core/rend/vulkan/shaders.h b/core/rend/vulkan/shaders.h -index 10f5c91e2..426081381 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> |