From nobody Sun Feb 11 11:50:14 2024 X-Original-To: dev-commits-ports-all@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 4TXm9f5hVtz59Z8W; Sun, 11 Feb 2024 11:50:14 +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 4TXm9f3p69z46jK; Sun, 11 Feb 2024 11:50:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707652214; 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=p2oebi8S4FS2l1vunoVaQe+96EzBvtIsZobLaf89eNc=; b=DE8CHPXqWl1gf56yxoHw0TLNzBwQvin5NgkbvqscxaESfEA/Jd1wiBzSecg2zJR5D5FIwo vWut32Jus9WzNYKTbdqudjke/Jmrop7cx4nZVdvkPkWrJbUW3HfK4v/IyH4CGi3mrBGTuS xUmzonnXsz+KtdvLEZ1geM83jjVG6AUyOYSVH7C6AYnMsVSJwR9IUkP2cduZshKT5HVM1u qZtyz40eOtDOLI3DxYVdt4pmnnOGO4igurNYfAj/Me8NSlyC7pKxpWSpD6rWCcp4wU6hvG 9qTg8b7zSuW5FtloWoW1pD3/fzsCwtQx1VrAtVT5xer/AmSRF2q7+CLM8tRstw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707652214; a=rsa-sha256; cv=none; b=Hh4n19IxQrLsfQbTePD4mBCk1lnXUvENEmaIKUSw38GuQFxv9en7pUos1UBzniitIok9B/ BjFHx/OYBuGmZHAdFY9mXRPTIbTUAiJg7UbwZ7spqqsRLIXUsJabqEFr8m2E1kl89blGRj NXAKaQNGbOvj0hLnxPfKQmsG65xZfJuVT9WVMaGguqVYgGXobApZ90iAjAAvjIAGEEmg7F zfTYsgdntcD9+2uf38n7qHU3xMu2/VPrQQFWBxrgrBNVxNcll3A8xJFuEpPh8WhjG8iOdF w1irxz+UjdmbnZFesS6b253OUyfZxb/CqCys6ooeDSq51OELhVhE+kU0F3FEKw== 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=1707652214; 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=p2oebi8S4FS2l1vunoVaQe+96EzBvtIsZobLaf89eNc=; b=NFYYs9LHzWk5r/LmP8jV3AlV2RsJx6847YKKeqhEVNr33e0yjbtlbar8ItL1ERnRmAP4wa XlYCz0Bks1WSsgeJeZcAV+P6RhdT3v35A6sYxO+2nTBNVPyy5++6EU9iX9VDuzRLD7eGng NT5t2TMn+yak8KdvmZ2Y8yygGLBgxCr6OORUR7nQwisRWqhRQZRZZw9aExMIo/e6QXySDe HEMmzYjPz/XeaFTrcz2YeIIlDofjuy6I2ZxtC2WF924qEHQW6k4l0z6tYU2drjPqhg92aY FKHHHT0kCxrI534NDBkmdGPq2ocRZZ/gZtYhEm2PouJr22m6QDv6IpkQEkR8JQ== 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 4TXm9f2wFvzy8D; Sun, 11 Feb 2024 11:50:14 +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 41BBoEji093068; Sun, 11 Feb 2024 11:50:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41BBoEto093063; Sun, 11 Feb 2024 11:50:14 GMT (envelope-from git) Date: Sun, 11 Feb 2024 11:50:14 GMT Message-Id: <202402111150.41BBoEto093063@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 27fd645f259d - main - games/etlegacy: fix build on armv7, powerpc and powerpc64 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 27fd645f259deb9bc33ab0eb7582b466b62bac92 Auto-Submitted: auto-generated The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=27fd645f259deb9bc33ab0eb7582b466b62bac92 commit 27fd645f259deb9bc33ab0eb7582b466b62bac92 Author: Piotr Kubaj AuthorDate: 2024-02-11 11:46:26 +0000 Commit: Piotr Kubaj CommitDate: 2024-02-11 11:49:10 +0000 games/etlegacy: fix build on armv7, powerpc and powerpc64 --- games/etlegacy/Makefile | 36 ++++++++++++++++++++-- .../etlegacy/files/patch-src_qcommon_q__platform.h | 16 ++++++++-- games/etlegacy/pkg-plist | 15 +++++++++ 3 files changed, 62 insertions(+), 5 deletions(-) diff --git a/games/etlegacy/Makefile b/games/etlegacy/Makefile index 1f0435e77afc..aa9c4f26f9db 100644 --- a/games/etlegacy/Makefile +++ b/games/etlegacy/Makefile @@ -60,15 +60,45 @@ SUB_FILES= pkg-message .if ${ARCH} == "i386" PLIST_SUB+= I386="" \ AARCH64="@comment " \ - AMD64="@comment " + AMD64="@comment " \ + POWERPC="@comment " \ + POWERPC64="@comment " \ + ARMV7="@comment " .elif ${ARCH} == "amd64" PLIST_SUB+= I386="@comment " \ AARCH64="@comment " \ - AMD64="" + AMD64="" \ + POWERPC="@comment " \ + POWERPC64="@comment " \ + ARMV7="@comment " .elif ${ARCH} == "aarch64" PLIST_SUB+= I386="@comment " \ AARCH64="" \ - AMD64="@comment " + AMD64="@comment " \ + POWERPC="@comment " \ + POWERPC64="@comment " \ + ARMV7="@comment " +.elif ${ARCH} == "powerpc" +PLIST_SUB+= I386="@comment " \ + AARCH64="@comment " \ + AMD64="@comment " \ + POWERPC="" \ + POWERPC64="@comment " \ + ARMV7="@comment " +.elif ${ARCH:Mpowerpc64*} +PLIST_SUB+= I386="@comment " \ + AARCH64="@comment " \ + AMD64="@comment " \ + POWERPC="@comment " \ + POWERPC64="" \ + ARMV7="@comment " +.elif ${ARCH} == "armv7" +PLIST_SUB+= I386="@comment " \ + AARCH64="@comment " \ + AMD64="@comment " \ + POWERPC="@comment " \ + POWERPC64="@comment " \ + ARMV7="" .endif .if ! ${PORT_OPTIONS:MCLIENT} && ${PORT_OPTIONS:MDEDICATED} diff --git a/games/etlegacy/files/patch-src_qcommon_q__platform.h b/games/etlegacy/files/patch-src_qcommon_q__platform.h index d40a0876f3d1..f3478400b85b 100644 --- a/games/etlegacy/files/patch-src_qcommon_q__platform.h +++ b/games/etlegacy/files/patch-src_qcommon_q__platform.h @@ -1,6 +1,6 @@ ---- src/qcommon/q_platform.h.orig 2024-01-16 23:51:21 UTC +--- src/qcommon/q_platform.h.orig 2023-03-12 18:33:03 UTC +++ src/qcommon/q_platform.h -@@ -264,6 +264,8 @@ +@@ -264,12 +264,20 @@ #ifdef __i386__ #define ARCH_STRING "i386" @@ -9,3 +9,15 @@ #elif defined __amd64__ #undef idx64 #define idx64 1 + #define ARCH_STRING "x86_64" + #elif defined __axp__ + #define ARCH_STRING "alpha" ++#elif defined __powerpc64__ ++#define ARCH_STRING "ppc64" ++#elif defined __powerpc__ ++#define ARCH_STRING "ppc" ++#elif defined __arm__ ++#define ARCH_STRING "arm" // __ARM_ARCH_'V'__ FIXME: add ARM version to the ARCH_STRING + #endif + + #if BYTE_ORDER == BIG_ENDIAN diff --git a/games/etlegacy/pkg-plist b/games/etlegacy/pkg-plist index f3913c34bd98..860126c8aa46 100644 --- a/games/etlegacy/pkg-plist +++ b/games/etlegacy/pkg-plist @@ -1,9 +1,15 @@ %%AARCH64%%%%CLIENT%%bin/etl.aarch64 %%AMD64%%%%CLIENT%%bin/etl.x86_64 +%%ARMV7%%%%CLIENT%%bin/etl.armv7 %%I386%%%%CLIENT%%bin/etl.i386 +%%POWERPC%%bin/etl.powerpc +%%POWERPC64%%bin/etl.powerpc64 %%AARCH64%%%%DEDICATED%%bin/etlded.aarch64 %%AMD64%%%%DEDICATED%%bin/etlded.x86_64 +%%ARMV7%%%%DEDICATED%%bin/etlded.armv7 %%I386%%%%DEDICATED%%bin/etlded.i386 +%%POWERPC%%bin/etlded.powerpc +%%POWERPC64%%bin/etlded.powerpc64 lib/etlegacy/etmain/campaigncycle.cfg lib/etlegacy/etmain/etl_server.cfg lib/etlegacy/etmain/etl_server_comp.cfg @@ -120,15 +126,24 @@ lib/etlegacy/legacy/luascripts/wolfadmin/util/timers.lua lib/etlegacy/legacy/luascripts/wolfadmin/util/util.lua %%AARCH64%%lib/etlegacy/legacy/qagame.mp.fbsd.aarch64.so %%AMD64%%lib/etlegacy/legacy/qagame.mp.fbsd.x86_64.so +%%ARMV7%%lib/etlegacy/legacy/qagame.mp.fbsd.armv7.so %%I386%%lib/etlegacy/legacy/qagame.mp.fbsd.i386.so +%%POWERPC%%lib/etlegacy/legacy/qagame.mp.fbsd.powerpc.so +%%POWERPC64%%lib/etlegacy/legacy/qagame.mp.fbsd.powerpc64.so lib/etlegacy/legacy/rules.toml lib/etlegacy/legacy/wolfadmin.toml %%AARCH64%%%%CLIENT%%lib/etlegacy/librenderer_opengl1_aarch64.so %%AMD64%%%%CLIENT%%lib/etlegacy/librenderer_opengl1_x86_64.so +%%ARMV7%%%%CLIENT%%lib/etlegacy/librenderer_opengl1_armv7.so %%I386%%%%CLIENT%%lib/etlegacy/librenderer_opengl1_i386.so +%%POWERPC%%lib/etlegacy/librenderer_opengl1_powerpc.so +%%POWERPC64%%lib/etlegacy/librenderer_opengl1_powerpc64.so %%AARCH64%%share/applications/com.etlegacy.ETLegacy.aarch64.desktop %%AMD64%%share/applications/com.etlegacy.ETLegacy.x86_64.desktop +%%ARMV7%%share/applications/com.etlegacy.ETLegacy.armv7.desktop %%I386%%share/applications/com.etlegacy.ETLegacy.i386.desktop +%%POWERPC%%share/applications/com.etlegacy.ETLegacy.powerpc.desktop +%%POWERPC64%%share/applications/com.etlegacy.ETLegacy.powerpc64.desktop %%DOCSDIR%%/INSTALL.txt share/icons/hicolor/scalable/apps/etl.svg share/man/man6/etl.6.gz