mirror of
https://git.savannah.gnu.org/git/guix.git
synced 2026-04-29 05:30:32 +02:00
186a9714a3
* gnu/packages/emulators.scm (dolphin-emu): Update to 2506-0.79a3af2.
[source] {patches}: Update patches.
(dolphin-rcheevos-submodule): New variable.
[source]: Refine and update snippet.
[#:phases] {remove-unittests-target-post-build-command}: Delete.
{generate-fonts&hardcode-libvulkan-path}: Fix typo in phase name. Remove
obsolete cstdint patching.
{post-check}: Delete.
[#:configure-flags]: Streamline. Add -DUSE_DISCORD_PRESENCE=OFF.
[native-inputs]: Add googletest
[inputs]: Replace ffmpeg-4 with ffmpeg. Replace fmt-7 with fmt-11. Replace
gtk+-2 with gtk+ and minizip-ng-compat with minizip-ng. Add lz4,
mgba-for-dolphin, qtsvg, spirv-cross, spng, tinygltf, vulkan-headers,
vulkan-memory-allocator and watcher. Replace qtbase-5 with qtbase. Replace
sdl2 with sdl3. Replace sfml-2 with sfml. Remove soundtouch-1/integer-samples.
(libretro-dolphin-emu): Update to 5.0-1.a09f78f.
[source]: Break inheritance with dolphin-emu, adjusting snippet for its older
code base.
[patches]: Apply libretro-dolphin-emu-libusb-assert.patch and
libretro-dolphin-emu-vulkan-headers.patch.
[#:phases] {link-unittest-to-gtest}: New phase.
[inputs]: Do not inherit from dolphin-emu. Replace fmt-7 with fmt. Replace
minizip-ng with minizip-ng-compat.
googletest, vulkan-headers.
* gnu/packages/patches/dolphin-emu-data.patch: Delete file.
* gnu/packages/patches/dolphin-emu-unbundle-tinygltf.patch
* gnu/packages/patches/dolphin-emu-unbundle-watcher.patch
* gnu/packages/patches/libretro-dolphin-emu-gc-font-tool.patch
* gnu/packages/patches/libretro-dolphin-emu-libusb-assert.patch
* gnu/packages/patches/libretro-dolphin-emu-vulkan-headers.patch: New files.
* gnu/local.mk (dist_patch_DATA): Update accordingly.
Fixes: #1327
Change-Id: I5a870a5e29c1ca243fb1d5e049ee06c5e254a04f
51 lines
2.1 KiB
Diff
51 lines
2.1 KiB
Diff
Upstream-status: https://github.com/dolphin-emu/dolphin/pull/13823
|
|
|
|
diff --git a/CMake/DolphinLibraryTools.cmake b/CMake/DolphinLibraryTools.cmake
|
|
index 4c395a8ef9..fb806b1b90 100644
|
|
--- a/CMake/DolphinLibraryTools.cmake
|
|
+++ b/CMake/DolphinLibraryTools.cmake
|
|
@@ -92,3 +92,30 @@ function(dolphin_find_optional_system_library_pkgconfig library search alias bun
|
|
set(${library}_TYPE "Bundled" PARENT_SCOPE)
|
|
endif()
|
|
endfunction()
|
|
+
|
|
+# This can be used for header-only libraries that doesn't offer a
|
|
+# pkg-config or CMake file. It uses CMake's find_file. LIBRARY is the
|
|
+# name of the library providing it, INCLUDE is the header file name
|
|
+# without its installation prefix (e.g. "wtr/watcher.hpp") while
|
|
+# BUNDLED_PATH is the root directory of the bundled library.
|
|
+function(dolphin_find_optional_system_include library include bundled_path)
|
|
+ dolphin_optional_system_library(use_system ${library})
|
|
+ string(TOUPPER ${library} upperlib)
|
|
+ if(use_system)
|
|
+ find_file(${library}_INCLUDE ${include})
|
|
+ if((NOT ${library}_INCLUDE) AND (NOT ${use_system} STREQUAL "AUTO"))
|
|
+ message(FATAL_ERROR "No system ${library} headers found. \
|
|
+Please install it or set USE_SYSTEM_${upperlib} to AUTO or OFF.")
|
|
+ endif()
|
|
+ endif()
|
|
+ if(${library}_INCLUDE)
|
|
+ message(STATUS "Using system ${library} headers")
|
|
+ set(${library}_TYPE "System" PARENT_SCOPE)
|
|
+ add_library(${library} INTERFACE IMPORTED GLOBAL)
|
|
+ set_target_properties(${library} PROPERTIES
|
|
+ INTERFACE_INCLUDE_DIRECTORIES ${${library}_INCLUDE})
|
|
+ else()
|
|
+ dolphin_add_bundled_library(${library} ${use_system} ${bundled_path})
|
|
+ set(${library}_TYPE "Bundled" PARENT_SCOPE)
|
|
+ endif()
|
|
+endfunction()
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index c277e2a10a..12b1c36ef0 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -786,7 +786,7 @@ if (USE_RETRO_ACHIEVEMENTS)
|
|
add_subdirectory(Externals/rcheevos)
|
|
endif()
|
|
|
|
-add_subdirectory(Externals/watcher)
|
|
+dolphin_find_optional_system_include(watcher wtr/watcher.hpp Externals/watcher)
|
|
|
|
########################################
|
|
# Pre-build events: Define configuration variables and write SCM info header
|