From nobody Thu Feb 02 06:37:35 2023 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 4P6pxW5b0zz3c2M0; Thu, 2 Feb 2023 06:37: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 4P6pxW549Sz4K5g; Thu, 2 Feb 2023 06:37:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675319855; 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=V1hz/63C/ozAJVbK7kgra0uYyBkocmwbOqDHcaDfbPg=; b=BtPRRwQDFXcb90cqehgtOXEQ3Xx60CbBL21oPylqzs9qsDd+J2snzztdPp9RxEDiKK83aX uuU7cEZObvFtEvsOjTnheQlSL4puoBKaR3Tkaqb3Ris2JNFRiOXyhLwvzE4euwCpHIVv7w ZSkg0vuUK5Qg3w0ie7PnABtPZQzXjXdI5ahLAUCSpMN+3LsW2itn/l71F4g/ZGdQX6WmVq G3gjTGomwWrsICaQ1ZTLLQ7XDoTFF0m2l6OLp0iJguyk9JOPduqht2q0p5NXugaJj4qGpJ 85ZynmK7wZQOG53WYMF1JTHVXQc+L7tVbyZmcBOiNx2l0YiDWRdjHB5Uzn9SUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675319855; 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=V1hz/63C/ozAJVbK7kgra0uYyBkocmwbOqDHcaDfbPg=; b=w17WxFIEVkkfzqrx9ErkVbdGNIrMEVVpQ9HzznAxro7b/EI+eU7tpuAa0faBMtzSF9VSAs QmLU0fAmT8OtOOJi0uPRxmXdlcrnG+xFi1IDsNHiD8gj3g01SLNx5crPOS3Cw6bI4cIlNh K3vkR1D2Q/XEN8xey8hoUj+Wgybpckz3nmH9KhHz6eTYrRcLNscKsYkGn5iwdBv04oHSTV Y9cpWU597O4urwXByE7VmOYmoYmFpIozSHDoxI3eGHvU+Gtw2WPExmYWHrGw00ZKZbIJpu zII1J2vAnLJv+KQVg5cEu6Mq7wYA/pYWkQNp6z1FQwrGqQsu65DlJRL0+hoTOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675319855; a=rsa-sha256; cv=none; b=N32p46pg2NaYBjF11/cBp6CRd7IEPgtR7QvWcH0ghbe8B+UzuXa6g6lTENe3my4aSBMOYL IpxWoSzTyCjobszqFnlemsmryfOsdjmPQgRy0aoXhIddkELalW7GVzjr2ic4mzwbrEi/Uw s9THkBLYaxFERsNn4XMxcb8z2UAWBTIvjbrYe1rUJPa9PMZFhpA4y8CZ+QIWGJWGmReINe +TSiKpUVfemrjGw0jJyQgNU7sF36vt4zTbUWeUU3Gp0+tI+lnivX7U2h0P1uOy/lMWX7fg s2WRHUfq4zlF+rxtcEb3eGjGAPuVvS6MFDl3hYKj9ZapAqMNl3HDYUdnrVvqKg== 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 4P6pxW47HPzlJV; Thu, 2 Feb 2023 06:37:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3126bZIA075595; Thu, 2 Feb 2023 06:37:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3126bZuk075594; Thu, 2 Feb 2023 06:37:35 GMT (envelope-from git) Date: Thu, 2 Feb 2023 06:37:35 GMT Message-Id: <202302020637.3126bZuk075594@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: 71ce3cb476ac - main - emulators/yuzu: switch to newer libc++ 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: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 71ce3cb476ac72829c957d0d1a739aa5ddad993a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=71ce3cb476ac72829c957d0d1a739aa5ddad993a commit 71ce3cb476ac72829c957d0d1a739aa5ddad993a Author: Jan Beich AuthorDate: 2023-01-31 01:50:14 +0000 Commit: Jan Beich CommitDate: 2023-02-02 06:36:27 +0000 emulators/yuzu: switch to newer libc++ Disable src/common/polyfill_ranges.h as it's not tested by upstream CI and breaks build with recent libc++ versions. --- emulators/yuzu/Makefile | 19 ++++++++++++++----- emulators/yuzu/distinfo | 4 ++-- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/emulators/yuzu/Makefile b/emulators/yuzu/Makefile index 760dc264bc5b..193a66308d03 100644 --- a/emulators/yuzu/Makefile +++ b/emulators/yuzu/Makefile @@ -1,5 +1,6 @@ PORTNAME= yuzu PORTVERSION= s20230130 +PORTREVISION= 1 CATEGORIES= emulators wayland .if make(makesum) MASTER_SITES= https://api.yuzu-emu.org/gamedb/?dummy=/:gamedb @@ -71,7 +72,6 @@ CMAKE_ON+= BUNDLE_SPEEX # only used by cubeb tests CMAKE_OFF= YUZU_CHECK_SUBMODULES YUZU_USE_EXTERNAL_SDL2 YUZU_USE_EXTERNAL_VULKAN_HEADERS CMAKE_OFF+= ${CMAKE_TESTING_ON} CMAKE_TESTING_ON= YUZU_TESTS -CXXFLAGS+= -D_LIBCPP_HAS_NO_INCOMPLETE_RANGES # common/polyfill_ranges.h LDFLAGS+= -Wl,--as-needed # Qt5Network ELF_FEATURES= ${PLIST_FILES:Mbin/*:S/^/+wxneeded:/} PLIST_FILES= bin/${PORTNAME}-cmd \ @@ -145,17 +145,26 @@ post-patch-VAAPI-off: @${REINPLACE_CMD} -i .nova '/pkg_check.*libva/d' \ ${WRKSRC}/CMakeLists.txt -# libc++ >= 14 defines std::ranges outside -D_LIBCPP_HAS_NO_INCOMPLETE_RANGES -.if exists(/usr/include/c++/v1/__memory/concepts.h) +# XXX Drop after FreeBSD 13.2 EOL around 2024-05-01 (don't forget distinfo) +.if !exists(/usr/include/c++/v1/__ranges/as_rvalue_view.h) || make(makesum) || make(fetch) +. if !exists(/usr/include/c++/v1/__memory/concepts.h) +USES+= llvm:min=14,build +CC= clang${LLVM_VERSION} +CXX= clang++${LLVM_VERSION} +CPP= clang-cpp${LLVM_VERSION} +CONFIGURE_ENV+= CC="${CC}" CXX="${CXX}" CPP="${CPP}" +. endif + # XXX Move into separate port and standardize via USES -GH_TUPLE+= llvm:llvm-project:llvmorg-13.0.1:libcxx +GH_TUPLE+= llvm:llvm-project:llvmorg-16.0.0-rc1:libcxx CXXFLAGS+= -nostdinc++ -isystem${WRKDIR}/libcxx_prefix/include/c++/v1 -# Don't link against old libc++ to avoid ABI mismatch in Qt +# Don't link against new libc++ to avoid ABI mismatch in Qt #LDFLAGS+= -nostdlib++ -L${WRKDIR}/libcxx_prefix/lib -l:libc++.a -lcxxrt pre-configure: bundled-libcxx bundled-libcxx: @${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS:M*Ninja*} \ + -DLIBCXX_INCLUDE_BENCHMARKS:BOOL=OFF \ -DCMAKE_INSTALL_PREFIX:PATH=${WRKDIR}/libcxx_prefix \ -B ${WRKDIR}/libcxx_build -S ${WRKSRC_libcxx}/libcxx @${DO_MAKE_BUILD:NDESTDIR*} install -C ${WRKDIR}/libcxx_build diff --git a/emulators/yuzu/distinfo b/emulators/yuzu/distinfo index e967daffaf40..a68b4ac367a4 100644 --- a/emulators/yuzu/distinfo +++ b/emulators/yuzu/distinfo @@ -21,7 +21,7 @@ SHA256 (kinetiknz-cubeb-cubeb-0.2-1350-gf79e0cf_GH0.tar.gz) = 8629757290774a34ed SIZE (kinetiknz-cubeb-cubeb-0.2-1350-gf79e0cf_GH0.tar.gz) = 220847 SHA256 (yhirose-cpp-httplib-v0.10.8-1-g305a7ab_GH0.tar.gz) = 2b8ebbe60c5fab1254e454518108cb8da5ee3a07e1cf9f432448d985efe4a003 SIZE (yhirose-cpp-httplib-v0.10.8-1-g305a7ab_GH0.tar.gz) = 620778 -SHA256 (llvm-llvm-project-llvmorg-13.0.1_GH0.tar.gz) = 09c50d558bd975c41157364421820228df66632802a4a6a7c9c17f86a7340802 -SIZE (llvm-llvm-project-llvmorg-13.0.1_GH0.tar.gz) = 147290251 +SHA256 (llvm-llvm-project-llvmorg-16.0.0-rc1_GH0.tar.gz) = e1b8d991921c8e9564359b17955878716dc68201ded4699c6b175b14fe3085aa +SIZE (llvm-llvm-project-llvmorg-16.0.0-rc1_GH0.tar.gz) = 180127224 SHA256 (c17d71240b23.patch) = 4aaf5522ec3f7d393cec59638220d6142489c4e946060ec94444ca3f47e2b2a7 SIZE (c17d71240b23.patch) = 7562