From nobody Sat Apr 20 14:25:11 2024 X-Original-To: dev-commits-ports-branches@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 4VMDLc2CXWz5HsYt; Sat, 20 Apr 2024 14:25:12 +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 4VMDLc1gsyz4St4; Sat, 20 Apr 2024 14:25:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713623112; 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=xp++AMPWN8p3/o/kZJ5sTqwWeuF4gW2qCN1stQK9+0M=; b=KMY1Kk2HdmFGdIDFe2q2Q6maT6htWlBIl43jTtcirL8uPi4w2JPpQKIKVNJR6p5WBQBjhx o+bFpS8Hm2n9WfKuEjYBZa3U6ZEUoD20WhC/F6uGI2bAgcTcW6waZ0qR6ixgfdmqovz+L5 oE1Fkhql1fnTEgNpNsGO8Hs9VqKmRfz0sELJH9HUeViKgGxuUFYuAacf4FO+7MF/4qGEaj VZwYMYriB95QM4zbwsNuYp/aagEQWdjZ9HueK0SOtCgUHcvCAepTtDeA6jsaGAjcsOfcM+ M+VRGoQMrDe+6xr88miy0uayayQThsJ9HpTiDR/z7Ph2l4IhMxcxTUcCJzbYAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713623112; a=rsa-sha256; cv=none; b=lN/kGDzH4p2iYYk8EDJAA1nSVdujZEmTxPaw8Q5EvKHfUzv8E9uxNLPJAUDf+sZkmSAoop uqpONnK7OAZ1KQrGbF52WajV6wKkP3/sqsrPsrFM/9oHqyo5Ev0vkkgoNxiXUdW1vHiiB4 xIP6S+1Gmbp/wgmJ0sgtS+yK0fyT2ocMt/otsZVT6MJFskGAzQ0tvxHO3VXJ+fyUqUXdQV lB1KQRzaywVT5r3yjZYrOa+LR0GVOdI+7IVQPP12CCRDfkL1OykpMz5UXRIvB3I1ccVF93 ni5gMAxRPN9kSEnK3xMX0dN5/iL8EU6mxR3MGt/0eB1FKCPOXun+5gztmckMeA== 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=1713623112; 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=xp++AMPWN8p3/o/kZJ5sTqwWeuF4gW2qCN1stQK9+0M=; b=Opf0qvQpX9Y9tdd+VdS1bgSN1ezFu+/DxzUa3A7USeELJbO92DIGTOBgNskyg7gLgQ/hTQ 2zuJX5jPmiHSzrliMVpZYldOTS7Nn96OpeMdBTlZT8+wD39+PaUyUM1t0nJ9hKizq6trGJ xq7C6FwXpGDILFWAH9yorVAktiPryqFaIyYUyR0yaaOfS+yLFXb7pNjEv2/Thfz4rJM5Gu GqbPCPodrO7GeAZoQZIJ9JexnwQ6b+LNakHtwW+OL4io9BVCPeAKdKlqUFMnzYiZoqdcfY c5AHjEmAD9GDDYslc9BBGuRTRViZpbi7w7EkeeT7L1kC+u/kGDheByVH12oyPA== 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 4VMDLb6vcrzgh3; Sat, 20 Apr 2024 14:25:11 +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 43KEPB2s005435; Sat, 20 Apr 2024 14:25:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43KEPBT8005432; Sat, 20 Apr 2024 14:25:11 GMT (envelope-from git) Date: Sat, 20 Apr 2024 14:25:11 GMT Message-Id: <202404201425.43KEPBT8005432@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Dimitry Andric Subject: git: 1d30066dccab - 2024Q2 - emulators/mupen64plus-video-glide64mk2: fix build with clang 18 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@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/2024Q2 X-Git-Reftype: branch X-Git-Commit: 1d30066dccab85388b1f7947b96d5b00951e381a Auto-Submitted: auto-generated The branch 2024Q2 has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=1d30066dccab85388b1f7947b96d5b00951e381a commit 1d30066dccab85388b1f7947b96d5b00951e381a Author: Dimitry Andric AuthorDate: 2024-03-27 20:16:09 +0000 Commit: Dimitry Andric CommitDate: 2024-04-20 14:25:00 +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 (cherry picked from commit 39dd48012d9233d058e7622db3e45d0f2f5e28e3) --- .../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)); }