From nobody Sat Apr 20 14:24:34 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 4VMDKv0ttKz5Hs20; Sat, 20 Apr 2024 14:24:35 +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 4VMDKt6gYqz4Sm8; Sat, 20 Apr 2024 14:24:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713623074; 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=glSXKpchqeBiexUN+P+hef5ExWButS6WYJL7c/aUVlo=; b=XC3qDI/eg4hAYClPxmhm1AKK13IKy7vgBxNs9i8rzY4iRMeNmATow08JUhGf34gRysmU0T Jk2Pp+sk9MQIrJogrqhrHz7Yu6WYb4kgxGsbSn8o9LpXw54TUjs0gTQE2yAA63cE9KHEp1 sWdY5/GHPzKWD1wBdqco3NRGp46ThEuaVK1+GCJZ+C3FvAf1RLSsnjo0Eafn2o+VE6+Omn wyjxh1i8Ke8k/0eaQa1q6gwYM06w/DeytVicY9CcpxF8+lyIF2l/2DImOEtVjEqc9B5lME igDEs2oiQ5CvjM8k9uaUz3DAsbWh3iNd/UJC1LUOYxtgBo+Pfg9GH4PLdSjCSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713623074; a=rsa-sha256; cv=none; b=wYlANczp/v8uQDoC2pc0LxHIOl5qatd4t+2Qt7xBDw4ewDDu5F/o31SoiBzulS9vDBNEOT wkAh3B3Mwt385bdoTbGm3YYqcuGB4PnLEbX/rlg5jRNs2e+LKy7v1oTm5Ba1JI15LF/PO2 Z40WR2o4Oo5ATcHF5Z1+i0VRpQgg/brw9yW1Ovb2xMz5hN0x6mQ6zu3ojwA6J8NY1WE6nY BsdATSvQPeaOfVbllBD/0Rt+BSqTDc0TE+V0nH2XmUVk/JE8AFu+u7uOPpJfI+ctAyqZYD 9riqi4XKlCX/v6dPUFkN3c2wkBCnOkHBWcXZ0wF76X0UIM2g4WBDJ3XYIlcwIA== 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=1713623074; 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=glSXKpchqeBiexUN+P+hef5ExWButS6WYJL7c/aUVlo=; b=HqCGES5gxIbOtGERL710RflGkbsBtcEZral/oOFPBNggGRxHQgXl3HYBd4xbO4OrjBhGmU /sMO9hfGrcWVpx/9n+rDqTJvAX9jSgoa0jjhOPGFjYHgO8LeakWnuZBVzXinGQVVtcgFbl mQU+OTkm3cd0cXHB+yZCT6NlnJJqDsYFDSdjBQmxjwO8HiRTTc649bXbEB/RX4DsDSHZpl 6Y6OFmt0je9Rr9PSnei4QxebeHj633z2SokhVoDwLapKdZB2fDv4K2EeHy3ezrdvlLT4Vg 8giZfxww5WWP6d5FhX0EthPQNVkwD09bEIbl0VFVW8ekD+6B5DQ6k0YCYxRmVw== 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 4VMDKt5pYBzgLW; Sat, 20 Apr 2024 14:24:34 +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 43KEOYqR005114; Sat, 20 Apr 2024 14:24:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43KEOYCs005110; Sat, 20 Apr 2024 14:24:34 GMT (envelope-from git) Date: Sat, 20 Apr 2024 14:24:34 GMT Message-Id: <202404201424.43KEOYCs005110@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dimitry Andric Subject: git: 39dd48012d92 - main - emulators/mupen64plus-video-glide64mk2: fix build with clang 18 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 39dd48012d9233d058e7622db3e45d0f2f5e28e3 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=39dd48012d9233d058e7622db3e45d0f2f5e28e3 commit 39dd48012d9233d058e7622db3e45d0f2f5e28e3 Author: Dimitry Andric AuthorDate: 2024-03-27 20:16:09 +0000 Commit: Dimitry Andric CommitDate: 2024-04-20 14:23:09 +0000 emulators/mupen64plus-video-glide64mk2: fix build with clang 18 I am unsure if clang 18 actually has anything to do with it, but whatever the case, emulators/mupen64plus-video-glide64mk2 does not build: CXX _obj/Glide64/rdp.o ../../src/Glide64/rdp.cpp:1863:11: error: use of undeclared identifier 'bswap32' 1863 | *v5 = bswap32(v12); | ^ And a bunch more of these. Fix it by including in the __FreeBSD__ case in src/Glide64/Util.h. PR: 278001 Approved by: maintainer timeout (2 weeks) MFH: 2024Q2 --- .../mupen64plus-video-glide64mk2/files/patch-src_Glide64_Util.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/emulators/mupen64plus-video-glide64mk2/files/patch-src_Glide64_Util.h b/emulators/mupen64plus-video-glide64mk2/files/patch-src_Glide64_Util.h index 1b60d58f5f26..30529e17c6f7 100644 --- a/emulators/mupen64plus-video-glide64mk2/files/patch-src_Glide64_Util.h +++ b/emulators/mupen64plus-video-glide64mk2/files/patch-src_Glide64_Util.h @@ -1,14 +1,16 @@ --- src/Glide64/Util.h.orig 2024-01-06 03:12:23 UTC +++ src/Glide64/Util.h -@@ -94,6 +94,7 @@ float ScaleZ(float z); +@@ -94,6 +94,9 @@ float ScaleZ(float z); #include #define bswap32(x) _byteswap_ulong(x) #else -+#if !defined __FreeBSD__ ++#if defined __FreeBSD__ ++#include ++#else static inline uint32_t bswap32(uint32_t val) { return (((val & 0xff000000) >> 24) | -@@ -101,6 +102,7 @@ static inline uint32_t bswap32(uint32_t val) +@@ -101,6 +104,7 @@ static inline uint32_t bswap32(uint32_t val) ((val & 0x0000ff00) << 8) | ((val & 0x000000ff) << 24)); }