From nobody Fri Dec 01 10:55:33 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 4ShVMp0mKlz52SFb; Fri, 1 Dec 2023 10:55:34 +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 4ShVMn6ypnz4T2T; Fri, 1 Dec 2023 10:55:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701428134; 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=FycDhpgWVmGOkCixrGR2JGcT3rNhL5S/IUItwjqH9Fo=; b=IKdFJhuVj4+H2WAp7UXDkyk/044enAcWhbCLKXo4Kz/PuQDqlc9/BkdELfZMb2/YbK21eD HEKzAZiQAJk268AwIGVAcTU5cocOfB5W139UJjxudG3MV7eIeWK4PQm/SzgtmI5BDnPYF/ wT5fNjJY8//WkfC1XyOjU1o4IXYVQLi5BOADsVwt/TKUKOKjYq7Ru49uLDjkVUJ1UX0oZy I/+uIgH58ji3AbQ3krFBcrAhO912MmFE+a96C18FdcjBjC2/Jm9I8TNtAYiGONGuGqT1mv jkFIMzYqidHbU4TnwoRjc3xuKfUeTJ5JCSfun4Ugfogm4eu0hgXlkPQk3KenwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701428134; 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=FycDhpgWVmGOkCixrGR2JGcT3rNhL5S/IUItwjqH9Fo=; b=Ru5h88xk47J0diZd+oO7XhYN/jPKp+x0VkpgOLuIM0NufBpf/Fm5Z4XR7FUaAMPNTtKVNL Cc8ujiJUoN31KFsHMpAXLooqXOJcajUAP4lHxiSdZUcHubEn/n01J598MaFn+4KiSIYAwI sVewEGz3vfqDk83y14/FXDhESisSWIyAwiaMaua3F7nTJk030liBz53tJTd90mPU/XtGjR gLXv4iPV0rvTa7rduuUGS5eU/p2UiOQE1zh3X+BZiRFf277csmPQCST+IAc7YnVNVc+Ibr dwt0HqEvcdQTZecr0gwnJ3aes0nAdnhpvvpCSDVcXoSfkWIkE3Txaax6A/iZXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701428134; a=rsa-sha256; cv=none; b=wgJu401PQIAnr2nDd5NrQAkjyHDgsKjqAvBiz5Z/a2MPYCAwSQ8mYskkfZ4eGChj6q+6/d GVJiVNpL3mFUdIdPr4y5WmxoPAYxfwo+rj4tDmRJr+YfEANVftnqs3QQUD7naP5rB2/g8g VNGUrcJbGVO1rmbJDVs2ehUg1Pa4AzZ90G2seho9L9vogTsn/AvxwdY5Iu/phm2siIg05d dBqjkuMc7gNnSSJLtB6e3w9tFgyw1I0P7zRnGkPJbzOlz7ipVlLZOyGfVx2jEfFYARCaWB q64gG+I/ca5vEfaNlAPyZvlrCBzOKvT6dWUrkfPNoo+JQBQBFSyzK/2JnOgHnw== 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 4ShVMn5x4lzWg3; Fri, 1 Dec 2023 10:55:33 +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 3B1AtX8C092730; Fri, 1 Dec 2023 10:55:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B1AtXpm092727; Fri, 1 Dec 2023 10:55:33 GMT (envelope-from git) Date: Fri, 1 Dec 2023 10:55:33 GMT Message-Id: <202312011055.3B1AtXpm092727@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: a20b29fff507 - main - games/diaspora: fix architecture detection on 64-bit non-amd64 and unbreak 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: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a20b29fff507590850a6dcce1331f0ad203f43da Auto-Submitted: auto-generated The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=a20b29fff507590850a6dcce1331f0ad203f43da commit a20b29fff507590850a6dcce1331f0ad203f43da Author: Piotr Kubaj AuthorDate: 2023-12-01 10:53:02 +0000 Commit: Piotr Kubaj CommitDate: 2023-12-01 10:55:30 +0000 games/diaspora: fix architecture detection on 64-bit non-amd64 and unbreak aarch64 --- games/diaspora/Makefile | 2 -- games/diaspora/files/patch-code_globalincs_pstypes.h | 11 +++++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/games/diaspora/Makefile b/games/diaspora/Makefile index afebc8c14662..93a0d3da557a 100644 --- a/games/diaspora/Makefile +++ b/games/diaspora/Makefile @@ -23,8 +23,6 @@ LICENSE_FILE_VOLITION= ${WRKSRC}/COPYING LICENSE_FILE_GPLv2= ${WRKDIR_DIASPORA}/wxlauncher/GPLv2.txt LICENSE_PERMS_VOLITION= dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept -BROKEN_aarch64= Fails to compile: cast from pointer to smaller type loses information - LIB_DEPENDS= libjansson.so:devel/jansson \ libpng.so:graphics/png \ libogg.so:audio/libogg \ diff --git a/games/diaspora/files/patch-code_globalincs_pstypes.h b/games/diaspora/files/patch-code_globalincs_pstypes.h new file mode 100644 index 000000000000..e6ed2652858a --- /dev/null +++ b/games/diaspora/files/patch-code_globalincs_pstypes.h @@ -0,0 +1,11 @@ +--- code/globalincs/pstypes.h.orig 2023-11-24 00:40:45 UTC ++++ code/globalincs/pstypes.h +@@ -18,7 +18,7 @@ + #include + #include + +-#if defined( __x86_64__ ) || defined( _WIN64 ) ++#if defined( __LP64__ ) || defined( _WIN64 ) + #define IAM_64BIT 1 + #endif +