diff options
| author | Adriaan de Groot <adridg@FreeBSD.org> | 2020-08-13 10:05:49 +0000 |
|---|---|---|
| committer | Adriaan de Groot <adridg@FreeBSD.org> | 2020-08-13 10:05:49 +0000 |
| commit | be60128ad397f66b7c917d88cf87a8538f4c4888 (patch) | |
| tree | accab6514f968726be4841d9e589bfb88fe07532 /games/easyrpg-player | |
| parent | 5dfc6dc36807c2c653987b7a235900242a5cf29d (diff) | |
| download | ports-be60128ad397f66b7c917d88cf87a8538f4c4888.tar.gz ports-be60128ad397f66b7c917d88cf87a8538f4c4888.zip | |
Fix games/easyrpg-player in advance of CMake 3.18 landing
- This (still) builds with CMake 3.17
- Circular dependency between harfbuzz and freetype causes
build (configure) failures with CMake 3.18, although I don't
see why CMake 3.17 doesn't fall over (it might be due to
recent CMake module additions)
- Reported upstream with alternate fix at
https://github.com/EasyRPG/Player/pull/2274
PR: 248003
Notes
Notes:
svn path=/head/; revision=544796
Diffstat (limited to 'games/easyrpg-player')
| -rw-r--r-- | games/easyrpg-player/Makefile | 1 | ||||
| -rw-r--r-- | games/easyrpg-player/files/patch-builds_cmake_Modules_FindHarfbuzz.cmake | 17 |
2 files changed, 18 insertions, 0 deletions
diff --git a/games/easyrpg-player/Makefile b/games/easyrpg-player/Makefile index 9cfe324fa9c7..38e94cff0929 100644 --- a/games/easyrpg-player/Makefile +++ b/games/easyrpg-player/Makefile @@ -3,6 +3,7 @@ PORTNAME= easyrpg-player PORTVERSION= 0.6.2.1 +PORTREVISION= 1 CATEGORIES= games MAINTAINER= amdmi3@FreeBSD.org diff --git a/games/easyrpg-player/files/patch-builds_cmake_Modules_FindHarfbuzz.cmake b/games/easyrpg-player/files/patch-builds_cmake_Modules_FindHarfbuzz.cmake new file mode 100644 index 000000000000..8fc843a48f2f --- /dev/null +++ b/games/easyrpg-player/files/patch-builds_cmake_Modules_FindHarfbuzz.cmake @@ -0,0 +1,17 @@ +--- builds/cmake/Modules/FindHarfbuzz.cmake.orig 2020-08-13 08:40:25 UTC ++++ builds/cmake/Modules/FindHarfbuzz.cmake +@@ -55,7 +55,13 @@ if(HARFBUZZ_FOUND) + + if(NOT TARGET Harfbuzz::Harfbuzz) + add_library(Harfbuzz::Harfbuzz UNKNOWN IMPORTED) +- find_library(Freetype REQUIRED) ++ # Handle circular dependency: FindFreetype.cmake asks ++ # for a QUIET lookup. ++ if (Harfbuzz_FIND_QUIETLY) ++ find_library(Freetype QUIET) ++ else() ++ find_library(Freetype REQUIRED) ++ endif() + set_target_properties(Harfbuzz::Harfbuzz PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${HARFBUZZ_INCLUDE_DIRS}" + INTERFACE_LINK_LIBRARIES Freetype::Freetype |