Date: Thu, 13 Aug 2020 10:05:50 +0000 (UTC) From: Adriaan de Groot <adridg@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r544796 - in head/games/easyrpg-player: . files Message-ID: <202008131005.07DA5oRR046655@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adridg Date: Thu Aug 13 10:05:49 2020 New Revision: 544796 URL: https://svnweb.freebsd.org/changeset/ports/544796 Log: 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 Added: head/games/easyrpg-player/files/ head/games/easyrpg-player/files/patch-builds_cmake_Modules_FindHarfbuzz.cmake (contents, props changed) Modified: head/games/easyrpg-player/Makefile Modified: head/games/easyrpg-player/Makefile ============================================================================== --- head/games/easyrpg-player/Makefile Thu Aug 13 09:36:32 2020 (r544795) +++ head/games/easyrpg-player/Makefile Thu Aug 13 10:05:49 2020 (r544796) @@ -3,6 +3,7 @@ PORTNAME= easyrpg-player PORTVERSION= 0.6.2.1 +PORTREVISION= 1 CATEGORIES= games MAINTAINER= amdmi3@FreeBSD.org Added: head/games/easyrpg-player/files/patch-builds_cmake_Modules_FindHarfbuzz.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/easyrpg-player/files/patch-builds_cmake_Modules_FindHarfbuzz.cmake Thu Aug 13 10:05:49 2020 (r544796) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008131005.07DA5oRR046655>