From nobody Sat Jan 18 17:32:49 2025 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 4Yb3b56r0Mz5kd9c; Sat, 18 Jan 2025 17:32:49 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yb3b552g2z3tLT; Sat, 18 Jan 2025 17:32:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737221569; 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=CXCGgGO9Pil92nqdULJ84MPnI7ZebXA+68/hX2/kEWU=; b=XrcTJL8rlwWd8zgeU2hpkeqZ/zsH8T0oAK2GrvCw5Q212e01PBqXKiKZtrug38OB2dSeg4 mRFNr/QGh8+MIqrMJ3rCzmYlwwxUi6TRWsw1apqDjS1stUzBhS9vb2/XC+kS7cR64+NLyo aIVZKo+h+1eMC2F3glmmrZSPAwKTjyuIpcYqJlbY03cXnR10gu8Xad8T4WOiXzIwGUytWS y1vjI9QhdluA688aBy6TddkRtiQ2Pkn12eL2Mle1MyUGuMSJZxf3JdP1vwdKUR1cY7h/DA rg+N9UpGCzxVY1nEl7p1mEGSsM53JrtV5PD0bGZzZqMpBXF0ujj1IqTdDaV5mg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737221569; 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=CXCGgGO9Pil92nqdULJ84MPnI7ZebXA+68/hX2/kEWU=; b=B5ATrZ/6funbv6eJdGLIkQR71+Om8A0SdshwM+TA3/B+jLcTLXj+vrvTHa58xcq65/n4P+ L5GdiC/IarrKWuwY4XZmQduH4O33mLQ7ipBpJV3RovU8qjeE+K2IEj1vx7VPZu3Z8i0Xve ZIFOsh7Z9ubnct/7SMD5j3Bv72tQpPiEaUqNR6tIcNCwWj65+HVTnXcJwwsePUSVLQq+Zs hSYTajd7ESMeA0p4hXs9iDgxlyIS305j5sRSn5Gtn+EngH8y9zQnHSzK8h+HMrlhhtbIqC hEvEbInqncgeak0WnTH1SGRQa4PZU9KXXun70k/rC1kJpjF3+sNR9sTP48hIqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737221569; a=rsa-sha256; cv=none; b=xekgW+UbgCNXpS6c5+OZtQr1mnGgfY6ElaFbjtW5WezA0WozFfFNnP3W/g2IMbqg54Kinq sXk3qcVRISMzCBkbsAdCL0m0IpJ/4HNKTH7OCK+QYWcl2r2N9NvWRBRFAy52QMFVcwPDVo wVtFTX7MdEGYg5R+Q2pdrC7i0UqOnjKLgB59n2WssT0jYtFIISnfF3D5bpfaX2NBt/Unlx KM19zLiJDe+QeDSFPWnAEwmjoK/fZxbxOWrn0CkbONGk5es28qhlH7WFJxFRluzvv/Bo7S 6sWehkQ0FeH0LCwUfINNEfHWEZAZR/xAuf7Fr2tDP/vaL8JYyY9eDVqNE2ZnXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Yb3b54KyPz2l; Sat, 18 Jan 2025 17:32:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50IHWn3e060036; Sat, 18 Jan 2025 17:32:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50IHWnDJ060033; Sat, 18 Jan 2025 17:32:49 GMT (envelope-from git) Date: Sat, 18 Jan 2025 17:32:49 GMT Message-Id: <202501181732.50IHWnDJ060033@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: 15f93866a01c - main - games/endless-sky: update 0.10.4 =?utf-8?Q?=E2=86=92?= 0.10.10 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: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 15f93866a01c86585af58df4759fac10f7e37c56 Auto-Submitted: auto-generated The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=15f93866a01c86585af58df4759fac10f7e37c56 commit 15f93866a01c86585af58df4759fac10f7e37c56 Author: Dmitry Marakasov AuthorDate: 2024-03-29 17:50:10 +0000 Commit: Dmitry Marakasov CommitDate: 2025-01-18 17:32:22 +0000 games/endless-sky: update 0.10.4 → 0.10.10 - Fix test build depends PR: 277487 Tested by: alster@vinterdalen.se Reported by: alster@vinterdalen.se --- games/endless-sky/Makefile | 14 +++-- games/endless-sky/distinfo | 6 +-- games/endless-sky/files/patch-source_Audio.cpp | 63 ---------------------- .../patch-tests_unit_src_test__weightedList.cpp | 11 ++++ 4 files changed, 25 insertions(+), 69 deletions(-) diff --git a/games/endless-sky/Makefile b/games/endless-sky/Makefile index cb34395669b4..29ac088b20f7 100644 --- a/games/endless-sky/Makefile +++ b/games/endless-sky/Makefile @@ -1,5 +1,5 @@ PORTNAME= endless-sky -PORTVERSION= 0.10.4 +PORTVERSION= 0.10.10 DISTVERSIONPREFIX= v CATEGORIES= games @@ -21,18 +21,26 @@ USE_GITHUB= yes USES= cmake compiler:c++11-lang gl jpeg openal sdl USE_SDL= sdl2 USE_GL= gl glew -CMAKE_OFF= ES_USE_VCPKG +CMAKE_OFF= ES_USE_VCPKG CMAKE_CXX_SCAN_FOR_MODULES CMAKE_ARGS= -DCMAKE_INSTALL_DOCDIR="${DOCSDIR}" +# https://github.com/endless-sky/endless-sky/issues/10714#issuecomment-2448722018 +TEST_ENV= ASAN_OPTIONS=detect_container_overflow=0 LDFLAGS_i386= -Wl,-znotext PORTDATA= * PORTDOCS= * -OPTIONS_DEFINE= DOCS +OPTIONS_DEFINE= DOCS TEST + +TEST_CMAKE_BOOL= BUILD_TESTING +TEST_BUILD_DEPENDS= catch2>=0:devel/catch2 post-build: @${REINPLACE_CMD} -e 's|/usr/local/|${PREFIX}/|; s|share/games|share|' \ ${WRKSRC}/source/Files.cpp +do-test-TEST-on: + @cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${LOCALBASE}/bin/ctest -V + .include diff --git a/games/endless-sky/distinfo b/games/endless-sky/distinfo index e71e8b0d24f5..ae550bf55eac 100644 --- a/games/endless-sky/distinfo +++ b/games/endless-sky/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1698072980 -SHA256 (endless-sky-endless-sky-v0.10.4_GH0.tar.gz) = baeaa462315587788d81c58847d600f66f1ced063cdfb4cf108d6a26fe75e175 -SIZE (endless-sky-endless-sky-v0.10.4_GH0.tar.gz) = 255144369 +TIMESTAMP = 1730149437 +SHA256 (endless-sky-endless-sky-v0.10.10_GH0.tar.gz) = 2d3cce20335f151f401a617624a4914a08911f4a424aae84bdf6eb8984f3c085 +SIZE (endless-sky-endless-sky-v0.10.10_GH0.tar.gz) = 271561866 diff --git a/games/endless-sky/files/patch-source_Audio.cpp b/games/endless-sky/files/patch-source_Audio.cpp deleted file mode 100644 index e89a03aaa292..000000000000 --- a/games/endless-sky/files/patch-source_Audio.cpp +++ /dev/null @@ -1,63 +0,0 @@ ---- 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; diff --git a/games/endless-sky/files/patch-tests_unit_src_test__weightedList.cpp b/games/endless-sky/files/patch-tests_unit_src_test__weightedList.cpp new file mode 100644 index 000000000000..76d617098781 --- /dev/null +++ b/games/endless-sky/files/patch-tests_unit_src_test__weightedList.cpp @@ -0,0 +1,11 @@ +--- tests/unit/src/test_weightedList.cpp.orig 2024-10-26 19:04:44 UTC ++++ tests/unit/src/test_weightedList.cpp +@@ -348,7 +348,7 @@ SCENARIO( "Obtaining a random value", "[WeightedList][ + REQUIRE( list.empty() ); + THEN( "an informative runtime exception is thrown" ) { + CHECK_THROWS_AS( list.Get(), std::runtime_error ); +-#ifndef __APPLE__ ++#if !defined(__APPLE__) && !defined(__FreeBSD__) + CHECK_THROWS_WITH( list.Get(), Catch::Matchers::ContainsSubstring("empty weighted list") ); + #endif + }