From nobody Tue Aug 13 07:38:01 2024 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 4Wjjsj3ymRz5Sbrn; Tue, 13 Aug 2024 07:38:01 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wjjsj32k4z4Q1t; Tue, 13 Aug 2024 07:38:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723534681; 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=wgJcluyb6J16IztGOSpaZ90v0UFS9vibzGrmiI1Zr9U=; b=G5Yx3zRF2qTOMYO68NMf1Mlv+Um9CzTgcwY+kRyEgSQ1ZBY9FCIsZGEoPDE7IBLHIRzPhh tV2BtnstfXtlvAvcAQJiBEel+h5/4m58ny5/N0Mqq5JnyYJ068jJ9g0GmxgRf8QCRDmQlv YMXEWvlTwHDA0xVWuQe7XANBdTA5i87mZQb23L2YNlq0E0fSyW5gymgPFmy020uFd4TqKi RL8A6XILUAkTNck0sf7BnQPQ5QYGIJVv6QK5EAGgv1N2kUVw40kTq+j8JDmRqGNGMmUfDR ekavcz1qRftxGXTNZzIcHyqHP9OPeb072hdwKJfWFE/LP/gSWiA5eWeeSBJf4g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723534681; a=rsa-sha256; cv=none; b=ngB0AP8wJjaJy1WJU29SaI767MYS7bC1BW+/blcdSeQf2+6aXEslR7LMfYGN452J0O0/7I DgyOm6TdJr08vGLU9rO0/F2PzKwYmB0+ldKEI96TgxJxp986DXC7rv1DwQ285o91b7VAqy V2SqmfEIiQ5GS8dCHkw7csTZRJqgUSu4nxC/JyxiBSvjpHmBv4x0YKLeyuG1Fms1XFCMKD jpIflynInVwJnS2YKeUsRqgAeItS4xZFPeSB5+w1O7TsSDYAm2n9moYcAqx23ASJ+/vMQE kAmLbwBnL4o8V3uyDkD4WOdjRG1nbXj1WXH0+kwEGHLWm0oFXToe1UHskN9Ofw== 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=1723534681; 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=wgJcluyb6J16IztGOSpaZ90v0UFS9vibzGrmiI1Zr9U=; b=rDrDoMLEUFUqgD6JSOJXJJ6hyPcN14DX/YUVNCZElhBgORm+Tgb+25NBhEEO1CtGGJINq/ TCpePyXg6Aerp+rgPop+CAnD3VnBx22W7xGtxQagW2r8eCXRHADdAc6GHxNweaQEXDT5Pn 3r85gzawXi9uQ4Aci8ZOUBBJqCxLBt7wJ2BsAQt+/zCGVuDiodtlQl/hNupZ6apWlIAHfW +k/viE8LJM6hMiVRB3i8dovP0xD9zz9g4or/UsiVEQERhItpjV6DIFAuUrTZUS4T0BRjGV b61ToE4hFxg+0zFpZ8cHyFrZn22bF0vxvXl699rQia4KHK+RT+PtHQ1osZoxbA== 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 4Wjjsj2ChMz12CZ; Tue, 13 Aug 2024 07:38:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47D7c1n3035836; Tue, 13 Aug 2024 07:38:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47D7c1GB035832; Tue, 13 Aug 2024 07:38:01 GMT (envelope-from git) Date: Tue, 13 Aug 2024 07:38:01 GMT Message-Id: <202408130738.47D7c1GB035832@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: 85d08af5eaa4 - main - games/openmw: unbreak build on i386 (+) 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 85d08af5eaa43ab141d6905bdac616ddb300274f Auto-Submitted: auto-generated The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=85d08af5eaa43ab141d6905bdac616ddb300274f commit 85d08af5eaa43ab141d6905bdac616ddb300274f Author: Dima Panov AuthorDate: 2024-08-13 07:36:25 +0000 Commit: Dima Panov CommitDate: 2024-08-13 07:37:53 +0000 games/openmw: unbreak build on i386 (+) While here, unbreak build with GCC14+ Reported by: pkg-fallout --- games/openmw/Makefile | 19 +++++++++++++++++-- .../patch-apps_openmw_mwstate_charactermanager.hpp | 11 +++++++++++ games/openmw/files/patch-components_bsa_bsa__file.cpp | 10 ++++++++++ 3 files changed, 38 insertions(+), 2 deletions(-) diff --git a/games/openmw/Makefile b/games/openmw/Makefile index fbb43aa0aa90..6999dd3042ca 100644 --- a/games/openmw/Makefile +++ b/games/openmw/Makefile @@ -41,16 +41,31 @@ CMAKE_ARGS= -DDESIRED_QT_VERSION=5 \ -DMORROWIND_DATA_FILES="${DATADIR}/data" \ -DOPENMW_RESOURCE_FILES="${DATADIR}/resources" +# passed from openal to prevent linker errors +LDFLAGS+= -Wl,--as-needed +LDFLAGS_i386= -Wl,-z,notext + OPTIONS_DEFINE= DOCS DOCS_CMAKE_BOOL= BUILD_DOCS +DOCS_BINARY_ALIAS= sphinx-build=sphinx-build-${PYTHON_VER} DOCS_BUILD_DEPENDS= doxygen>0:devel/doxygen \ - sphinx-build:textproc/py-sphinx@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} DOCS_USES= python:build PORTDOCS= * +.include + +# The following is actually meant for lld 15.0 and later, but the ports +# framework does not support LINKER_TYPE and LINKER_VERSION yet. +.if ${COMPILER_TYPE} == "clang" +# Turn off checking of dynamic relocations, to avoid lld diagnostics about +# possibly incorrect addend values. +LDFLAGS_i386+= -Wl,--no-check-dynamic-relocations +.endif + post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* -.include +.include diff --git a/games/openmw/files/patch-apps_openmw_mwstate_charactermanager.hpp b/games/openmw/files/patch-apps_openmw_mwstate_charactermanager.hpp new file mode 100644 index 000000000000..fe61c1fc661e --- /dev/null +++ b/games/openmw/files/patch-apps_openmw_mwstate_charactermanager.hpp @@ -0,0 +1,11 @@ +--- apps/openmw/mwstate/charactermanager.hpp.orig 2023-08-08 09:23:20 UTC ++++ apps/openmw/mwstate/charactermanager.hpp +@@ -1,6 +1,8 @@ + #ifndef GAME_STATE_CHARACTERMANAGER_H + #define GAME_STATE_CHARACTERMANAGER_H + ++#include ++ + #include + + #include "character.hpp" diff --git a/games/openmw/files/patch-components_bsa_bsa__file.cpp b/games/openmw/files/patch-components_bsa_bsa__file.cpp new file mode 100644 index 000000000000..0dcb26d6581f --- /dev/null +++ b/games/openmw/files/patch-components_bsa_bsa__file.cpp @@ -0,0 +1,10 @@ +--- components/bsa/bsa_file.cpp.orig 2023-08-08 09:23:20 UTC ++++ components/bsa/bsa_file.cpp +@@ -26,6 +26,7 @@ + #include + + #include ++#include + + #include + #include