From nobody Wed Jan 17 18:36:29 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 4TFZMy0LbZz56QFm; Wed, 17 Jan 2024 18:36:30 +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 4TFZMx5zwZz4gv0; Wed, 17 Jan 2024 18:36:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705516589; 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=Wnm/lX2oSzvD5klIAKuIJsgYsf3eOUGPHTPIvdG8W9E=; b=fB6x0P2vbNGUWH7t+RttfvE61fc5s2F5FkbYsftlWnJYmvFxMaAamnlrhbJmeu9Uma9LBJ BrKKVe3bcmv6+DTFpaum1aYwGNuWzcl4yIHtKDPeSSN2BBGBHVhjPjSO01xnHmZao5E3oM ycvhauVVd/DD1Hs24+PQE2r9T3Npr8R7R+1Aie4FLt8l8HSYqPuZoXYT//+3jFMm+rapAN e6Ouo/F6C7bx56PgleMhK4cpo0mU/YUfPkpS8xr25vYWBXChern4aD0q5uHMCK249Y0L+F Az3J49aHxShytiIlniPgrRbjSUvWxyl9yvNr3r4kGDPanaQYJSjT83I8yEbzNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705516589; 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=Wnm/lX2oSzvD5klIAKuIJsgYsf3eOUGPHTPIvdG8W9E=; b=R24AH7xntxMSOVmrm/vvYRYd6NzIgCWXFL1MUGRdpDZbs1tVZUDSkKqJQMkE4WA698+u1D M5pxrAMfa9Bu1fWu3kauqc1d2IIxAjW2E81SjBiIECw1Sk+8R5Bceu6kvDY5YSxWyGKA2h kC4eGCOxZ/xUitzuvROwhEDSUnRrqWdgPsIx+twzbxX13sRgvX8Q4M+eCQa1d+j5mqWB3/ ccivDi7aop4T1aVr9vnLmTT8isaE+ck4TleiKzPWYFOsxRtufEYVgQNJPW6ROq7p0CpEXR naNDGydplgTNun2Ik+f5x823szlrkkoA6s1zPKIibQJ/jaQD6PgmO0LOsLu0cQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705516589; a=rsa-sha256; cv=none; b=rbNwVt70vRjAlGucULDpQmGTHHFxjteHlVC2B5s3fwkLmNa/Dy/btgzgMT5+bEEm70Tbc4 SzOvDdKlIVJ2KshX42iC1LL/ggRp7WC2pzbcSf0MWj47wPwWYLH0TUtZzUTspDctrMYm4F jGm1cKtypKzOtQ8iOeEHU5zqPZ2vX8lwRY4+RKB46OW44eqieHFVFfGG5ee6iZJ+VRjow2 ASlXSI7Y8/YNkQuv14RkwTwxKqHzKhcpQ323a6ZrVjjDWj5+lN7pTd19DE5QfXDX+k6CJF BncniyNyhOpsEy61ZqAdfAYioS5NxOFfVOvHe1tPPXLHPDGiomTdUe3gh4eP1w== 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 4TFZMx52bxzb7x; Wed, 17 Jan 2024 18:36:29 +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 40HIaTks079987; Wed, 17 Jan 2024 18:36:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40HIaT25079984; Wed, 17 Jan 2024 18:36:29 GMT (envelope-from git) Date: Wed, 17 Jan 2024 18:36:29 GMT Message-Id: <202401171836.40HIaT25079984@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jose Alonso Cardenas Marquez Subject: git: fb8f40741f53 - main - games/etlegacy: Try to fix build on aarch64 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: acm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fb8f40741f53b3619050e7d200623df1852a2768 Auto-Submitted: auto-generated The branch main has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=fb8f40741f53b3619050e7d200623df1852a2768 commit fb8f40741f53b3619050e7d200623df1852a2768 Author: Jose Alonso Cardenas Marquez AuthorDate: 2024-01-17 02:34:01 +0000 Commit: Jose Alonso Cardenas Marquez CommitDate: 2024-01-17 18:36:00 +0000 games/etlegacy: Try to fix build on aarch64 Reported by: pkg-fallout --- games/etlegacy/Makefile | 7 +++++++ games/etlegacy/files/patch-src_qcommon_q__platform.h | 11 +++++++++++ games/etlegacy/pkg-plist | 5 +++++ 3 files changed, 23 insertions(+) diff --git a/games/etlegacy/Makefile b/games/etlegacy/Makefile index 2a4d2ba35f4a..36a86fca3453 100644 --- a/games/etlegacy/Makefile +++ b/games/etlegacy/Makefile @@ -1,5 +1,6 @@ PORTNAME= etlegacy DISTVERSION= 2.81.1 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= https://mirror.etlegacy.com/geoip/:geoip \ https://mirror.etlegacy.com/wolfadmin/:wolfadmin @@ -54,10 +55,16 @@ SUB_FILES= pkg-message .if ${ARCH} == "i386" PLIST_SUB+= I386="" \ + AARCH64="@comment " \ AMD64="@comment " .elif ${ARCH} == "amd64" PLIST_SUB+= I386="@comment " \ + AARCH64="@comment " \ AMD64="" +.elif ${ARCH} == "aarch64" +PLIST_SUB+= I386="@comment " \ + AARCH64="" \ + AMD64="@comment" .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 new file mode 100644 index 000000000000..d40a0876f3d1 --- /dev/null +++ b/games/etlegacy/files/patch-src_qcommon_q__platform.h @@ -0,0 +1,11 @@ +--- src/qcommon/q_platform.h.orig 2024-01-16 23:51:21 UTC ++++ src/qcommon/q_platform.h +@@ -264,6 +264,8 @@ + + #ifdef __i386__ + #define ARCH_STRING "i386" ++#elif defined __aarch64__ ++#define ARCH_STRING "aarch64" + #elif defined __amd64__ + #undef idx64 + #define idx64 1 diff --git a/games/etlegacy/pkg-plist b/games/etlegacy/pkg-plist index 5fecd315fe95..1fdb98503112 100644 --- a/games/etlegacy/pkg-plist +++ b/games/etlegacy/pkg-plist @@ -1,5 +1,7 @@ +%%AARCH64%%%%CLIENT%%bin/etl.aarch64 %%AMD64%%%%CLIENT%%bin/etl.x86_64 %%I386%%%%CLIENT%%bin/etl.i386 +%%AARCH64%%%%DEDICATED%%bin/etlded.aarch64 %%AMD64%%%%DEDICATED%%bin/etlded.x86_64 %%I386%%%%DEDICATED%%bin/etlded.i386 lib/etlegacy/etmain/campaigncycle.cfg @@ -116,12 +118,15 @@ lib/etlegacy/legacy/luascripts/wolfadmin/util/settings.lua lib/etlegacy/legacy/luascripts/wolfadmin/util/tables.lua 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 %%I386%%lib/etlegacy/legacy/qagame.mp.fbsd.i386.so lib/etlegacy/legacy/rules.toml lib/etlegacy/legacy/wolfadmin.toml +%%AARCH64%%lib/etlegacy/librenderer_opengl1_aarch64.so %%AMD64%%lib/etlegacy/librenderer_opengl1_x86_64.so %%I386%%lib/etlegacy/librenderer_opengl1_i386.so +%%AARCH64%%share/applications/com.etlegacy.ETLegacy.aarch64.desktop %%AMD64%%share/applications/com.etlegacy.ETLegacy.x86_64.desktop %%I386%%share/applications/com.etlegacy.ETLegacy.i386.desktop %%DOCSDIR%%/INSTALL.txt