From nobody Thu Dec 28 23:03:44 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T1PFX6H67z54r23; Thu, 28 Dec 2023 23:03:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T1PFX5PtHz3KNS; Thu, 28 Dec 2023 23:03:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703804624; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PLOxTw8dhFtQVf+sOd+sBk2FSc8pIcwfbefY3gQX34Y=; b=bfk0/2O3GTN97kjYMpBeoe3r4G86Bqw4GipxVrVYDxtp0sRpiR1EmrdQi6h4SjI23kN6nG T3IVE/hB9lZLNgBsHfokAg5HWjhSzKfMJ8mJx7aozkeLaWVogS87WzEypYkIEZhmxWybl1 qd1L1b5Hav93v8+dCSlRYmlZNoO3lJkhSi3VZ3zHblwDO4QV/ysEVTc7L2S/TrMHytzLOp f0QiAyosIbFR0i0foOj4Uy3zSQAe6YwG2896ubrlooCTlpJOpvQt3E2Mh8jg2vmd08DCJ+ iMuiJgKPPtps81iNLNL/mZD1FHir0R/nEakjbu5LCJDLqjMpet9AgmCKMOkueQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703804624; a=rsa-sha256; cv=none; b=uyuYgu0Kj1ZBURAMUu9bhrJeuKBSwMAZFnxhAf8EqDI8Zoe8QgpZNJQbwJRVEvXUGlnQjm b4HPzwNoVW8wnv/rMqoVROhc7DJwSA10xldNjF7MaPsEJE+u+IM6AaW7aj1PtxRns3Jl9N qz5Ol8FDX19I0pcDipGImutsi0FxXlMoum0b7aNRcTZJ/7PoHfS45qyqFrdIFlTnmhfIl7 NnyDauHsKcmOOFP3IpC6twNCvdCwrPCrOzlsn0l3Oe8kKMki5PDwv6O5x+BWvHkNR1r8TV B3MRqiu18FwAh3QIsAjltiLk4MQNzegI100AHBX9uCFnGsSwARi5VZAxxGgn8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703804624; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PLOxTw8dhFtQVf+sOd+sBk2FSc8pIcwfbefY3gQX34Y=; b=nto3dAO7vECAZpR38JXvMzOTPRi1KksX4gabDckmB8nZqdnaK5ozzP4MpRyEx7my3YJSVH pWzt89GWyVVxfbRdMUIms4XE1Ti9KOOCtX0x424e7KbXjeb5BdIPv/w2bjezJSLwTvp29c RgNi1qALIw4rUVQkfDaJ45u6I81tZgQ0pcXtAqXitxk9U76611trca9eUrTACmC2iZXjrR mNuduNIJrCTD0cl4RG9QVVplGCw4AmPK1ysCdwTpefGc/3jjgScjVi11h9ZtSYvBTy8ShT rlRLn/T4ft3ybR4fYR0g/P+7HjltChFBRAsKi03HduYvPZa1JU9TtE0ouPstug== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T1PFX4WhfzhxV; Thu, 28 Dec 2023 23:03:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BSN3iJU059502; Thu, 28 Dec 2023 23:03:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BSN3ihY059499; Thu, 28 Dec 2023 23:03:44 GMT (envelope-from git) Date: Thu, 28 Dec 2023 23:03:44 GMT Message-Id: <202312282303.3BSN3ihY059499@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: 447a6897ddde - main - games/fs2open: Fix configure with CMake >= 3.28.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 447a6897dddebd4ad863c2a11556707a0392cf6b Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=447a6897dddebd4ad863c2a11556707a0392cf6b commit 447a6897dddebd4ad863c2a11556707a0392cf6b Author: Jason E. Hale AuthorDate: 2023-12-28 20:12:53 +0000 Commit: Jason E. Hale CommitDate: 2023-12-28 23:03:32 +0000 games/fs2open: Fix configure with CMake >= 3.28.0 While here, "unbundle" devel/jansson which is automatically linked to if installed. Otherwise, a bundled copy is built and statically linked to. PR: 275730 Approved by: portmgr (blanket) --- games/fs2open/Makefile | 2 ++ games/fs2open/files/patch-lib_freetype.cmake | 27 +++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/games/fs2open/Makefile b/games/fs2open/Makefile index af2f7428912e..39217bef2638 100644 --- a/games/fs2open/Makefile +++ b/games/fs2open/Makefile @@ -1,6 +1,7 @@ PORTNAME= fs2open DISTVERSIONPREFIX= release_ DISTVERSION= 23_2_1 +PORTREVISION= 1 CATEGORIES= games MAINTAINER= pkubaj@FreeBSD.org @@ -13,6 +14,7 @@ LICENSE_FILE= ${WRKSRC}/Copying.md LICENSE_PERMS= dist-mirror auto-accept LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ + libjansson.so:devel/jansson \ libpng.so:graphics/png \ libfreetype.so:print/freetype2 diff --git a/games/fs2open/files/patch-lib_freetype.cmake b/games/fs2open/files/patch-lib_freetype.cmake new file mode 100644 index 000000000000..f68461c60d94 --- /dev/null +++ b/games/fs2open/files/patch-lib_freetype.cmake @@ -0,0 +1,27 @@ +Fix configure with CMake >= 3.28.0 where the FindFreetype module uses +freetype-config.cmake if found, which already defines the freetype +target. + +--- lib/freetype.cmake.orig 2023-11-03 16:14:29 UTC ++++ lib/freetype.cmake +@@ -1,7 +1,7 @@ + +-add_library(freetype INTERFACE) +- + if(PLATFORM_WINDOWS OR PLATFORM_MAC) ++ add_library(freetype INTERFACE) ++ + # We use prebuilt binaries for windows and mac + get_prebuilt_path(PREBUILT_PATH) + set(FREETYPE_ROOT_DIR "${PREBUILT_PATH}/freetype") +@@ -21,6 +21,10 @@ else() + + else() + find_package(Freetype REQUIRED) ++ ++ if(NOT TARGET freetype) ++ add_library(freetype INTERFACE) ++ endif() + + target_include_directories(freetype INTERFACE ${FREETYPE_INCLUDE_DIRS}) + target_link_libraries(freetype INTERFACE ${FREETYPE_LIBRARIES})