From edac4920e0a19b7c6979fb2b4a891418d2fbd871 Mon Sep 17 00:00:00 2001 From: yzrh Date: Sat, 25 May 2024 21:24:48 +0200 Subject: multimedia/kodi: Update to 21.0 PR: 278334 --- .../files/patch-cmake_modules_FindCrossGUID.cmake | 37 ++++++++-------------- 1 file changed, 14 insertions(+), 23 deletions(-) (limited to 'multimedia/kodi/files/patch-cmake_modules_FindCrossGUID.cmake') diff --git a/multimedia/kodi/files/patch-cmake_modules_FindCrossGUID.cmake b/multimedia/kodi/files/patch-cmake_modules_FindCrossGUID.cmake index 4fd05dca7c94..9abea5170820 100644 --- a/multimedia/kodi/files/patch-cmake_modules_FindCrossGUID.cmake +++ b/multimedia/kodi/files/patch-cmake_modules_FindCrossGUID.cmake @@ -1,29 +1,20 @@ ---- cmake/modules/FindCrossGUID.cmake.orig 2022-07-08 10:04:52 UTC +--- cmake/modules/FindCrossGUID.cmake.orig 2024-03-04 21:39:38 UTC +++ cmake/modules/FindCrossGUID.cmake -@@ -45,7 +45,7 @@ else() - endif() +@@ -45,7 +45,7 @@ if(NOT TARGET CrossGUID::CrossGUID) + set(CROSSGUID_VERSION ${PC_CROSSGUID_VERSION}) + endif() - if(CROSSGUID_FOUND) - find_path(CROSSGUID_INCLUDE_DIR NAMES crossguid/guid.hpp guid.h + find_path(CROSSGUID_INCLUDE_DIR NAMES guid.hpp guid.h - PATHS ${PC_CROSSGUID_INCLUDEDIR}) - - find_library(CROSSGUID_LIBRARY_RELEASE NAMES crossguid -@@ -53,7 +53,7 @@ else() - find_library(CROSSGUID_LIBRARY_DEBUG NAMES crossguidd crossguid-dgb - PATHS ${PC_CROSSGUID_LIBDIR}) - else() -- find_path(CROSSGUID_INCLUDE_DIR NAMES crossguid/guid.hpp guid.h) -+ find_path(CROSSGUID_INCLUDE_DIR NAMES guid.hpp guid.h) - find_library(CROSSGUID_LIBRARY_RELEASE NAMES crossguid) - find_library(CROSSGUID_LIBRARY_DEBUG NAMES crossguidd) - endif() -@@ -73,7 +73,7 @@ if(CROSSGUID_FOUND) - set(CROSSGUID_INCLUDE_DIRS ${CROSSGUID_INCLUDE_DIR}) + HINTS ${DEPENDS_PATH}/include ${PC_CROSSGUID_INCLUDEDIR} + ${${CORE_PLATFORM_LC}_SEARCH_CONFIG} + NO_CACHE) +@@ -59,7 +59,7 @@ if(NOT TARGET CrossGUID::CrossGUID) + NO_CACHE) - # NEW_CROSSGUID >= 0.2.0 release -- if(EXISTS "${CROSSGUID_INCLUDE_DIR}/crossguid/guid.hpp") -+ if(EXISTS "${CROSSGUID_INCLUDE_DIR}/guid.hpp") - list(APPEND CROSSGUID_DEFINITIONS -DHAVE_NEW_CROSSGUID) + # NEW_CROSSGUID >= 0.2.0 release +- if(EXISTS "${CROSSGUID_INCLUDE_DIR}/crossguid/guid.hpp") ++ if(EXISTS "${CROSSGUID_INCLUDE_DIR}/guid.hpp") + list(APPEND _crossguid_definitions HAVE_NEW_CROSSGUID) + endif() endif() - -- cgit v1.2.3