From nobody Thu Mar 28 20:43:54 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 4V5FrB2JnBz5G0Qv; Thu, 28 Mar 2024 20:43:54 +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 4V5FrB1kD5z4bxH; Thu, 28 Mar 2024 20:43:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711658634; 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=Cslic3RxxN5Y4HQHoetOpTL5IRetlwskYjqq4fmSGn8=; b=g5czg0zqpnKqG0ji7iuBSeWlpMOS0pvECjMf5s2zWJlUdro3xP+tazxlkFJD2EYLBeiAPL I8dqzin0gaZ8hUkHtSiujG6p8BOm0lcVs6JdY70d9OqorHB3dA5hpqnKCwc4Z/GoHUcN/S goOolWqhpdsh+ihUKFtyI3T36gEwPy2HXjhwSXPlEorU27T3UGDUrcqx5zd4V8xuzpdeRi 093uEElKoZivE2WGTZUgJ/fuPfG87MJEVwlCBFSisBdg78kRiFce7brtURARpA8kPsWkQJ TkkofR6KN4RzmpdV/N/O18x9X/j/NkfzXFWn2GeUgJRO2Nnl1cupJW3Y9vglbQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711658634; a=rsa-sha256; cv=none; b=mH4V5r6D9Oh+/s2+rGK0MURrYfoOPyySJUWa3yM5T/Pfq9l8HZV3KSvkWZ8A29GFI+q+79 Y/NIw+E2r4Ae7jUge3w6RyMhbh7YPrll950W8HsoYH8enT3kdeKrp0qy+Lz9MrVuS3SH5+ nUV6OlkyJjFV9vRC3QWxD9lKTnUkkwJJdDCJ6AwcxmUW7OQ/RlQbJr7K4U9meLw+DXs4Wi Y8qPlhUf3PzkcVarts3MgQnk1KBEUQgXSah4kRvVPmSqaKqahos5H+u/A2e2AEnHhSBATI RV1pfjJFZnsHSiAnpKIBz8ggOvoDr5P/RakGkdfEKf8Mog1bEHjhzbG8fRQYxg== 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=1711658634; 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=Cslic3RxxN5Y4HQHoetOpTL5IRetlwskYjqq4fmSGn8=; b=AFCkhN4xMVVwSh7MHIEJw1xQfdXkAtaKgOUUDixHIRaFPzfgAlkobPY7C1l72G/tkgOIni c9xWkPedeZtvW6MsY2opUA+BJ/7c6OyfPPpHtwMlBt9fGy9nlBqNK8wxxnhpi++10zJLrQ 3Ioq7UzlkuOU/vhK+Hf4tJXxjmWHLfkA7L3qOAWDMBxqTXDLPjxPStYpdv2N94NI/GHvAJ qcYXsFWE5eEmWW7Ik7Q1LoHn5yq0i/e+Ki5LwVqf56Y9tpzRAep2jX4TCJm1ylgBmA+fUU vsjQX3WJwx/wPTP+CKpchF3Ek8AGTaSRxxjg2bVGNI9Tge9VFJSh43GY3REveQ== 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 4V5FrB1DSrzjD7; Thu, 28 Mar 2024 20:43:54 +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 42SKhsuF091134; Thu, 28 Mar 2024 20:43:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42SKhsUN091131; Thu, 28 Mar 2024 20:43:54 GMT (envelope-from git) Date: Thu, 28 Mar 2024 20:43:54 GMT Message-Id: <202403282043.42SKhsUN091131@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: 5887af366d3d - main - games/endless-sky: fix build with clang 18 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: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5887af366d3d0d54d0d8dea3b0ee34ae3104a0d0 Auto-Submitted: auto-generated The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=5887af366d3d0d54d0d8dea3b0ee34ae3104a0d0 commit 5887af366d3d0d54d0d8dea3b0ee34ae3104a0d0 Author: Dmitry Marakasov AuthorDate: 2024-03-28 18:59:27 +0000 Commit: Dmitry Marakasov CommitDate: 2024-03-28 20:16:01 +0000 games/endless-sky: fix build with clang 18 PR: 278002 Submitted by: dim --- games/endless-sky/files/patch-source_Audio.cpp | 63 ++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/games/endless-sky/files/patch-source_Audio.cpp b/games/endless-sky/files/patch-source_Audio.cpp new file mode 100644 index 000000000000..e89a03aaa292 --- /dev/null +++ b/games/endless-sky/files/patch-source_Audio.cpp @@ -0,0 +1,63 @@ +--- source/Audio.cpp.orig 2023-10-21 20:01:54 UTC ++++ source/Audio.cpp +@@ -82,7 +82,7 @@ namespace { + // This queue keeps track of sounds that have been requested to play. Each + // added sound is "deferred" until the next audio position update to make + // sure that all sounds from a given frame start at the same time. +- map queue; ++ map queue_; + map deferred; + thread::id mainThreadID; + +@@ -249,7 +249,7 @@ void Audio::Update(const Point &listenerPosition) + listener = listenerPosition; + + for(const auto &it : deferred) +- queue[it.first].Add(it.second); ++ queue_[it.first].Add(it.second); + deferred.clear(); + } + +@@ -273,7 +273,7 @@ void Audio::Play(const Sound *sound, const Point &posi + // Place sounds from the main thread directly into the queue. They are from + // the UI, and the Engine may not be running right now to call Update(). + if(this_thread::get_id() == mainThreadID) +- queue[sound].Add(position - listener); ++ queue_[sound].Add(position - listener); + else + { + unique_lock lock(audioMutex); +@@ -317,12 +317,12 @@ void Audio::Step() + { + if(source.GetSound()->IsLooping()) + { +- auto it = queue.find(source.GetSound()); +- if(it != queue.end()) ++ auto it = queue_.find(source.GetSound()); ++ if(it != queue_.end()) + { + source.Move(it->second); + newSources.push_back(source); +- queue.erase(it); ++ queue_.erase(it); + } + else + { +@@ -367,7 +367,7 @@ void Audio::Step() + + // Now, what is left in the queue is sounds that want to play, and that do + // not correspond to an existing source. +- for(const auto &it : queue) ++ for(const auto &it : queue_) + { + // Use a recycled source if possible. Otherwise, create a new one. + unsigned source = 0; +@@ -396,7 +396,7 @@ void Audio::Step() + sources.back().Move(it.second); + alSourcePlay(source); + } +- queue.clear(); ++ queue_.clear(); + + // Queue up new buffers for the music, if necessary. + int buffersDone = 0;