update to 2.1.r286.gf679fd9ba

1 files changed, 135 insertions, 0 deletions

diff --git a/use-system-libs.patch b/use-system-libs.patch
new file mode 100644
index 000000000000..77b1c82bdc0f
--- /dev/null
+++ b/use-system-libs.patch
@@ -0,0 +1,135 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1962e6955..ca9f97e85 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -360,12 +360,13 @@ endif()
+ 
+ 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_search_module(xxhash IMPORTED_TARGET libxxhash)
++target_link_libraries(${PROJECT_NAME} PRIVATE PkgConfig::xxhash)
+ 
+ option(BUILD_SHARED_LIBS "Build shared library" OFF)
+-add_subdirectory(core/deps/glm)
+-target_link_libraries(${PROJECT_NAME} PRIVATE glm::glm)
++find_package(glm)
++target_link_libraries(${PROJECT_NAME} PRIVATE glm)
+ 
+ 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)
+ 	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)
++	target_link_libraries(${PROJECT_NAME} PRIVATE glslang::glslang-default-resource-limits glslang::SPIRV)
+ endif()
+ 
+ if(NOT LIBRETRO)
+@@ -422,13 +423,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)
+ 	endif()
+-
++if(FALSE)
+ 	find_package(Lua)
+ 	if(NOT APPLE AND LUA_FOUND)
+ 		target_compile_definitions(${PROJECT_NAME} PRIVATE USE_LUA)
+@@ -438,9 +439,9 @@ if(NOT LIBRETRO)
+ 	endif()
+ endif()
+ 
+-add_subdirectory(core/deps/libchdr EXCLUDE_FROM_ALL)
+-target_link_libraries(${PROJECT_NAME} PRIVATE chdr-static)
+-target_include_directories(${PROJECT_NAME} PRIVATE core/deps/libchdr/include)
++find_package(PkgConfig)
++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")
+@@ -479,25 +480,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)
+ 		pkg_check_modules(LIBZIP IMPORTED_TARGET libzip)
+ 		if(LIBZIP_FOUND)
+ 			target_link_libraries(${PROJECT_NAME} PRIVATE PkgConfig::LIBZIP)
+ 		endif()
+ 	endif()
+-
++if(FALSE)
+ 	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)
+ 		target_include_directories(${PROJECT_NAME} PRIVATE ${MINIUPNP_INCLUDE_DIRS})
+ 		target_link_libraries(${PROJECT_NAME} PRIVATE ${MINIUPNP_LIBRARIES})
+ 	endif()
+-endif()
+ 
+ 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(Vulkan)
+ 	target_link_libraries(${PROJECT_NAME} PRIVATE Vulkan::Headers)
+ 
+ 	if (APPLE)
+@@ -1468,7 +1468,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)
+-	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 a1619f310..de4ee10de 100644
+--- a/core/rend/vulkan/compiler.cpp
++++ b/core/rend/vulkan/compiler.cpp
+@@ -22,7 +22,7 @@
+ #include "vulkan_context.h"
+ 
+ #include <glslang/Public/ResourceLimits.h>
+-#include <SPIRV/GlslangToSpv.h>
++#include <glslang/SPIRV/GlslangToSpv.h>
+ 
+ int ShaderCompiler::initCount;
+ 
+diff --git a/core/rend/vulkan/shaders.h b/core/rend/vulkan/shaders.h
+index 148122335..5761a4f35 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>