From nobody Thu Jan 13 00:45:22 2022 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 1D074194C87E; Thu, 13 Jan 2022 00:45:23 +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 4JZ5Lp2tp4z3F4j; Thu, 13 Jan 2022 00:45:22 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 2D5B91709C; Thu, 13 Jan 2022 00:45:22 +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 20D0jMCb072974; Thu, 13 Jan 2022 00:45:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20D0jMa5072973; Thu, 13 Jan 2022 00:45:22 GMT (envelope-from git) Date: Thu, 13 Jan 2022 00:45:22 GMT Message-Id: <202201130045.20D0jMa5072973@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 08dc4b92fdcb - 2022Q1 - emulators/yuzu: update to s20220111 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: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2022Q1 X-Git-Reftype: branch X-Git-Commit: 08dc4b92fdcb5f777e39bdc170327b3c1c1f0e26 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642034722; 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=vuxjEn09YsjkVEHIvid+qAHk3Rm835SYiRwX4dE0hxs=; b=kpf9k+iV95n2djeOsM90A67yosc7F1mr8D6Pk6UhhZtPcqpuKp6FNyl35eFh2ErkCoezpV WZGnb4JNhfhS4AYuHwPwArLJSIAMKDCDStj4eex/Y49xHWcTOepjrCXL5lTGJTI+poxCkU v3LgmstxHd20qZrEby3Lp+axxmo5UaE+r5+v/wGJEYGVAMV3zlgcbraIXh9/GnbcgVIAxX bAjz7igshUgwxrMwFM/3V4C+z8USBz4T5VBhREE6n0NY+goW1DaLS7ZVMyxuKjqZ2PV64C 2qJOeoHucEU5LvkY53HvSQzO95KLtzsSWYnLZikpA3WkwHMV4NvWwjTetfl7Bg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642034722; a=rsa-sha256; cv=none; b=CvREojpOuYBQukxcRhmiz8qbuveo/22qaN2i0BNQyg6sDORF8NVXsTIIn9H/8u09Y29HXP HDvu5+6tuuS6HwORe8lChVsQXPfXLiTR3jsgcah3d0agOfGW1S9TIGbVzdUTQEukdlDfem nzAfB0G3A6pOeaG0/S6GN2ghhi5IIqrrmfMS71kwQZKQZRZUah5qznAemQi6Jq3CdFVilY prqhA88aJZKmmnNZgoA52ebRczRvSBq3dMQUTB+aEl5EzwaMwEz5sTF0fJ2oeJOpudfwaO yROQ3cJUbQVqHeGeF3xi1fLienu5TRLbUQF467rBlJMqO2GKzB9xhha6gHDjwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q1 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=08dc4b92fdcb5f777e39bdc170327b3c1c1f0e26 commit 08dc4b92fdcb5f777e39bdc170327b3c1c1f0e26 Author: Jan Beich AuthorDate: 2022-01-12 04:58:16 +0000 Commit: Jan Beich CommitDate: 2022-01-13 00:45:18 +0000 emulators/yuzu: update to s20220111 Changes: https://github.com/yuzu-emu/yuzu/compare/b3308830b...eb7197eb4 (cherry picked from commit 0b91c3023c83e31806976f40b576a568ea0e45e2) --- emulators/yuzu/Makefile | 10 ++++++---- emulators/yuzu/distinfo | 6 +++--- emulators/yuzu/files/patch-fmt | 6 +++--- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/emulators/yuzu/Makefile b/emulators/yuzu/Makefile index 1e69008da319..da3badd14b90 100644 --- a/emulators/yuzu/Makefile +++ b/emulators/yuzu/Makefile @@ -1,5 +1,5 @@ PORTNAME= yuzu -PORTVERSION= s20220109 +PORTVERSION= s20220111 PORTREVISION?= 0 CATEGORIES= emulators .if make(makesum) @@ -32,18 +32,18 @@ ONLY_FOR_ARCHS= aarch64 amd64 ONLY_FOR_ARCHS_REASON= requires int128 and dynarmic backend BROKEN_aarch64= https://github.com/yuzu-emu/yuzu/issues/5290 -BUILD_DEPENDS= catch>0:devel/catch \ - boost-libs>0:devel/boost-libs \ +BUILD_DEPENDS= boost-libs>0:devel/boost-libs \ nlohmann-json>0:devel/nlohmann-json \ glslangValidator:graphics/glslang LIB_DEPENDS= liblz4.so:archivers/liblz4 \ libzstd.so:archivers/zstd \ libopus.so:audio/opus \ libavcodec.so:multimedia/ffmpeg +TEST_DEPENDS= catch>0:devel/catch USE_GITHUB= yes GH_ACCOUNT= yuzu-emu -GH_TAGNAME= b3308830b +GH_TAGNAME= eb7197eb4 GH_TUPLE= yuzu-emu:mbedtls:v2.16.9-115-g8c88150ca:mbedtls/externals/mbedtls \ KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-32-ga3fdfe8:SPIRV_Headers/externals/sirit/externals/SPIRV-Headers \ KhronosGroup:Vulkan-Headers:v1.2.202:Vulkan_Headers/externals/Vulkan-Headers \ @@ -63,6 +63,8 @@ USE_SDL= sdl2 CMAKE_ON= Boost_USE_STATIC_LIBS CMAKE_ON+= BUNDLE_SPEEX # only used by cubeb tests CMAKE_OFF= YUZU_USE_BUNDLED_OPUS YUZU_USE_EXTERNAL_SDL2 ENABLE_GNUTLS ENABLE_MBEDTLS +CMAKE_OFF+= ${CMAKE_TESTING_ON} +CMAKE_TESTING_ON= YUZU_TESTS LDFLAGS+= -static-libstdc++ # avoid libc++ conflict, requires files/patch-fmt LDFLAGS+= -Wl,--as-needed # Qt5Network diff --git a/emulators/yuzu/distinfo b/emulators/yuzu/distinfo index 2bc704054dc7..24ae6df6877e 100644 --- a/emulators/yuzu/distinfo +++ b/emulators/yuzu/distinfo @@ -1,8 +1,8 @@ -TIMESTAMP = 1641781799 +TIMESTAMP = 1641963496 SHA256 (yuzu/compatibility_list.json) = d0e2b865f30b815d1fb42c32be533f663d79df51497a8197e4bbad112e36498e SIZE (yuzu/compatibility_list.json) = 1255228 -SHA256 (yuzu-emu-yuzu-s20220109-b3308830b_GH0.tar.gz) = c3716fcfc5dc39b3556e94455536cbcfedd313bea36f85393eefe0af313870fe -SIZE (yuzu-emu-yuzu-s20220109-b3308830b_GH0.tar.gz) = 4485018 +SHA256 (yuzu-emu-yuzu-s20220111-eb7197eb4_GH0.tar.gz) = 0fb83339717a5bf6542ae6816accf5b876d71e184fd940b397f9606946c8383d +SIZE (yuzu-emu-yuzu-s20220111-eb7197eb4_GH0.tar.gz) = 4488279 SHA256 (yuzu-emu-mbedtls-v2.16.9-115-g8c88150ca_GH0.tar.gz) = 8cd6d075b4da0ad5fb995eb37390e2e6088be8d41ab1cdfc7e7e4256bd991450 SIZE (yuzu-emu-mbedtls-v2.16.9-115-g8c88150ca_GH0.tar.gz) = 2679189 SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-32-ga3fdfe8_GH0.tar.gz) = bd629d6296dd374eb2aeff923c75895ba0f3ce6448dad89763930e65b954e0cb diff --git a/emulators/yuzu/files/patch-fmt b/emulators/yuzu/files/patch-fmt index cd85017cb2c3..1b97693431f2 100644 --- a/emulators/yuzu/files/patch-fmt +++ b/emulators/yuzu/files/patch-fmt @@ -47,12 +47,12 @@ microinstruction.cpp:(.text._ZN3fmt2v76detail12format_valueIcN8Dynarmic2IR6Opcod microinstruction.cpp:(.text._ZN3fmt2v76detail12format_valueIcN8Dynarmic2IR4TypeEEEvRNS1_6bufferIT_EERKT0_NS1_10locale_refE[_ZN3fmt2v76detail12format_valueIcN8Dynarmic2IR4TypeEEEvRNS1_6bufferIT_EERKT0_NS1_10locale_refE]+0x10f): undefined reference to `std::locale fmt::v7::detail::locale_ref::get() const' collect2: error: ld returned 1 exit status ---- CMakeLists.txt.orig 2022-01-10 02:29:59 UTC +--- CMakeLists.txt.orig 2022-01-12 04:58:16 UTC +++ CMakeLists.txt -@@ -169,7 +169,6 @@ macro(yuzu_find_packages) +@@ -170,7 +170,6 @@ macro(yuzu_find_packages) + # Capitalization matters here. We need the naming to match the generated paths from Conan set(REQUIRED_LIBS # Cmake Pkg Prefix Version Conan Pkg - "Catch2 2.13.7 catch2/2.13.7" - "fmt 8.0.1 fmt/8.1.1" "lz4 1.8 lz4/1.9.2" "nlohmann_json 3.8 nlohmann_json/3.8.0"