From nobody Sat Jul 20 03:21:06 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 4WQsJL3PFYz5R0lH; Sat, 20 Jul 2024 03:21:06 +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 4WQsJL2wF7z47Sy; Sat, 20 Jul 2024 03:21:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721445666; 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=4CUVOBWZ/RolfyOfXAlR+2kmE7aUMaRsoxTBXMqnQd4=; b=UGjee1c86ss11KO4h2KHPD454jezsR7fD01+8modVwz1WP5HXJ0NbVa7lZjXXmouNlxq+t y3TqPoxMhJg7HDuQE2aWgjnU4/8bmzOC8clfjSK2KsgMWLaQqvtCci/paf/GOMbKH+RA3H Mg59EliRv20/YcAswcGJ3hYDZe4Vy52XpXDd4il1J3roo5E6i9mvNVPPjf9ea+lSz40Mcl eKork4F/JVuh0mwy3JKS3sehy93s09nkb50+Tavi/2RsV1K7J0wjLRxnJr3yXOzaM0JT1M gCpHBO2kJ2e2pkqCISycI50ORbhgdjfI9vc186gUdtOfBQ3LG0x0MW+A7PhSgA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721445666; a=rsa-sha256; cv=none; b=lQAVwcJsrxF8OJiGL9ABoyelD8zTLkUdHGLrJ5+XUnGSd9TAzVbflhl5Do1RCVkj/Ihg2/ bsL52s/mlUqFZep1UUXVmhVCuv3XNXKuWqfNqLtmNFrjvyaT8I+BanDXprm9gU6BI4JU1C AQcrjqbYyQHQJPwL+qTH2chma3v/r+VBRLVWkDOobZFNnBrayTx7mgvVBao7FTe9ONHHDs iTc7kZFWrbVPpDsmAdzs6uKBBvP42jn3WjH3RKP1kIv361tMWsVoICXNmHdBlh/QFb+m9g L1ZMrt4SKI34Ka/fkHa8K+fJap7xiWg5ML8ncPHOtOVNwjYMjX4IZG6PmF9nPQ== 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=1721445666; 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=4CUVOBWZ/RolfyOfXAlR+2kmE7aUMaRsoxTBXMqnQd4=; b=aEGypcPRcR11w11ha1g/oUPPfjBexcSkD6VXPSxRD5THfO25TMtcab73+h/xbsDx7vBN1w rx91JhzEIojlBHW301vHYwIvPPXdZ7l2iwRC5KRBsf0L0w5Zn5JN+8HjRpDvbNN4BEUyVw kLrL+/TBb8V4Tk1zipZ8C25Hg224lORfELJLpgwyhIvj4avFEvI99SLqGVJ8EuRi8kbAFn 9HQdRbh1G8HmY5wzTPhNFg3Xlxf9NkbnS8Ftp1pkJzbbMu2/SKErK15PTMxQOWqt6SOSY2 0JZUE0D2R/rmg2UY2F4HVJi+WvKAAXE3NKw3oGpa7EQyg4Bi3ewHuWg3Gqi3iw== 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 4WQsJL2Wpvz10F2; Sat, 20 Jul 2024 03:21:06 +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 46K3L6Ur072999; Sat, 20 Jul 2024 03:21:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46K3L65R072996; Sat, 20 Jul 2024 03:21:06 GMT (envelope-from git) Date: Sat, 20 Jul 2024 03:21:06 GMT Message-Id: <202407200321.46K3L65R072996@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: de28fc5f84fd - main - x11-toolkits/aquamarine: unbreak build with libc++ 16 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: de28fc5f84fd79315a6fa7da33258ef98cf854e0 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=de28fc5f84fd79315a6fa7da33258ef98cf854e0 commit de28fc5f84fd79315a6fa7da33258ef98cf854e0 Author: Jan Beich AuthorDate: 2024-07-20 03:18:53 +0000 Commit: Jan Beich CommitDate: 2024-07-20 03:19:51 +0000 x11-toolkits/aquamarine: unbreak build with libc++ 16 In file included from src/allocator/GBM.cpp:1: In file included from ./include/aquamarine/allocator/GBM.hpp:3: In file included from ./include/aquamarine/allocator/Allocator.hpp:4: In file included from ./include/aquamarine/allocator/../buffer/Buffer.hpp:6: In file included from /usr/local/include/hyprutils/math/Region.hpp:5: /usr/local/include/hyprutils/math/Vector2D.hpp:141:5: error: no member named 'format_error' in namespace 'std' AQ_FORMAT_PARSE(AQ_FORMAT_FLAG('j', formatJson) // ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /usr/local/include/hyprutils/math/Vector2D.hpp:110:57: note: expanded from macro 'AQ_FORMAT_PARSE' switch (*it) { specs__ default : throw std::format_error("invalid format specification"); } \ ~~~~~^ /usr/local/include/hyprutils/math/Vector2D.hpp:148:68: error: no member named 'format' in namespace 'std' std::string formatString = precision.empty() ? "{}" : std::format("{{:.{}f}}", precision); ~~~~~^ /usr/local/include/hyprutils/math/Vector2D.hpp:151:33: error: no member named 'format' in namespace 'std' formatString = std::format("[{0}, {0}]", formatString); ~~~~~^ /usr/local/include/hyprutils/math/Vector2D.hpp:153:33: error: no member named 'format' in namespace 'std' formatString = std::format("{0}x{0}", formatString); ~~~~~^ /usr/local/include/hyprutils/math/Vector2D.hpp:155:33: error: no member named 'format' in namespace 'std' formatString = std::format("[Vector2D: x: {0}, y: {0}]", formatString); ~~~~~^ /usr/local/include/hyprutils/math/Vector2D.hpp:157:31: error: no member named 'vformat' in namespace 'std' string buf = std::vformat(formatString, std::make_format_args(vec.x, vec.y)); ~~~~~^ /usr/local/include/hyprutils/math/Vector2D.hpp:157:58: error: no member named 'make_format_args' in namespace 'std' string buf = std::vformat(formatString, std::make_format_args(vec.x, vec.y)); ~~~~~^ /usr/local/include/hyprutils/math/Vector2D.hpp:158:25: error: no member named 'format_to' in namespace 'std' return std::format_to(ctx.out(), "{}", buf); ~~~~~^ /usr/local/include/hyprutils/math/Vector2D.hpp:159:23: error: no type named 'format_error' in namespace 'std'; did you mean 'domain_error'? } catch (std::format_error& e) { return std::format_to(ctx.out(), "[{}, {}]", vec.x, vec.y); } ~~~~~^ /usr/include/c++/v1/stdexcept:123:29: note: 'domain_error' declared here class _LIBCPP_EXCEPTION_ABI domain_error ^ In file included from src/allocator/GBM.cpp:1: In file included from ./include/aquamarine/allocator/GBM.hpp:3: In file included from ./include/aquamarine/allocator/Allocator.hpp:4: In file included from ./include/aquamarine/allocator/../buffer/Buffer.hpp:6: In file included from /usr/local/include/hyprutils/math/Region.hpp:5: /usr/local/include/hyprutils/math/Vector2D.hpp:159:54: error: no member named 'format_to' in namespace 'std' } catch (std::format_error& e) { return std::format_to(ctx.out(), "[{}, {}]", vec.x, vec.y); } ~~~~~^ src/allocator/GBM.cpp:68:40: error: no member named 'format' in namespace 'std' std::format("GBM: Allocating a buffer: size {}, format {}, cursor: {}, multigpu: {}", attrs.size, fourccToName(attrs.format), CURSOR, MULTIGPU))); ~~~~~^ ./src/include/Shared.hpp:26:13: note: expanded from macro 'TRACE' expr; \ ^~~~ src/allocator/GBM.cpp:77:56: error: no member named 'format' in namespace 'std' allocator->backend->log(AQ_LOG_DEBUG, std::format("GBM: Automatically selected format {} for new GBM buffer", fourccToName(attrs.format))); ~~~~~^ src/allocator/GBM.cpp:118:58: error: no member named 'format' in namespace 'std' TRACE(allocator->backend->log(AQ_LOG_TRACE, std::format("GBM: Using modifier-based allocation, modifiers: {}", explicitModifiers.size()))); ~~~~~^ ./src/include/Shared.hpp:26:13: note: expanded from macro 'TRACE' expr; \ ^~~~ src/allocator/GBM.cpp:120:62: error: no member named 'format' in namespace 'std' TRACE(allocator->backend->log(AQ_LOG_TRACE, std::format("GBM: | mod 0x{:x}", mod))); ~~~~~^ ./src/include/Shared.hpp:26:13: note: expanded from macro 'TRACE' expr; \ ^~~~ src/allocator/GBM.cpp:144:56: error: no member named 'format' in namespace 'std' allocator->backend->log(AQ_LOG_ERROR, std::format("GBM: Failed to query fd for plane {}", i)); ~~~~~^ src/allocator/GBM.cpp:158:34: error: no member named 'format' in namespace 'std' std::format("GBM: Allocated a new buffer with size {} and format {} with modifier {} aka {}", attrs.size, fourccToName(attrs.format), attrs.modifier, ~~~~~^ src/allocator/GBM.cpp:236:38: error: no member named 'format' in namespace 'std' backend_->log(AQ_LOG_DEBUG, std::format("Created a GBM allocator with drm fd {}", drmfd_)); ~~~~~^ src/allocator/GBM.cpp:246:41: error: no member named 'format' in namespace 'std' backend->log(AQ_LOG_ERROR, std::format("Couldn't open a GBM device at fd {}", fd_)); ~~~~~^ src/allocator/GBM.cpp:258:41: error: no member named 'format' in namespace 'std' backend->log(AQ_LOG_ERROR, std::format("Couldn't allocate a gbm buffer with invalid size {}", params.size)); ~~~~~^ fatal error: too many errors emitted, stopping now [-ferror-limit=] Reported by: pkg-fallout --- x11-toolkits/aquamarine/Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/x11-toolkits/aquamarine/Makefile b/x11-toolkits/aquamarine/Makefile index d674fc287217..0389a8ca9abb 100644 --- a/x11-toolkits/aquamarine/Makefile +++ b/x11-toolkits/aquamarine/Makefile @@ -30,6 +30,11 @@ USE_XORG= pixman GH_ACCOUNT= hyprwm PLIST_SUB= VERSION=${DISTVERSION:C/-.*//} +# XXX Drop after FreeBSD 14.0 EOL around 2024-10-01 +.if exists(/usr/lib/libc++.so) && !exists(/usr/include/c++/v1/__format/write_escaped.h) +CXXFLAGS+= -fexperimental-library +.endif + # XXX Drop after FreeBSD 13.4 EOL around 2026-01-31 # https://cgit.freebsd.org/src/commit/?id=af93fea71038 .if !exists(/usr/include/sys/timerfd.h)