git: 95399d6ad468 - main - emulators/yuzu: update to s20221104
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 04 Nov 2022 17:24:25 UTC
The branch main has been updated by jbeich:
URL: https://cgit.FreeBSD.org/ports/commit/?id=95399d6ad46804077b736f7cc0e7e81175c1f7f0
commit 95399d6ad46804077b736f7cc0e7e81175c1f7f0
Author: Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2022-11-04 05:21:58 +0000
Commit: Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2022-11-04 17:23:17 +0000
emulators/yuzu: update to s20221104
Changes: https://github.com/yuzu-emu/yuzu/compare/6e36f4d23...9fc1bcc7b
---
emulators/yuzu/Makefile | 27 ++++++++++++++++-----------
emulators/yuzu/distinfo | 28 +++++++++++++++-------------
emulators/yuzu/files/patch-fmt | 18 +++++++++---------
3 files changed, 40 insertions(+), 33 deletions(-)
diff --git a/emulators/yuzu/Makefile b/emulators/yuzu/Makefile
index 81ec7ef76e43..3af9d88e15a6 100644
--- a/emulators/yuzu/Makefile
+++ b/emulators/yuzu/Makefile
@@ -1,6 +1,5 @@
PORTNAME= yuzu
-PORTVERSION= s20220721
-PORTREVISION= 1
+PORTVERSION= s20221104
CATEGORIES= emulators
.if make(makesum)
MASTER_SITES= https://api.yuzu-emu.org/gamedb/?dummy=/:gamedb
@@ -11,10 +10,9 @@ DISTFILES= ${PORTNAME}/compatibility_list.json:gamedb
EXTRACT_ONLY= ${DISTFILES:N*\:gamedb:C/\:.*//}
PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES+= 4a8a248b47a2.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/6598 mainline-merge
-PATCHFILES+= e919bea9c84e.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/7346 mainline-merge
-PATCHFILES+= 30e8876ea48a.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/8240 mainline-merge
-PATCHFILES+= d657ea69c94c.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/8240 mainline-merge
+PATCHFILES+= c17d71240b23.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/9042 mainline-merge
+PATCHFILES+= 717c8ded8210.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/9178
+PATCHFILES+= d7d7ae821978.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/9181
MAINTAINER= jbeich@FreeBSD.org
COMMENT= Nintendo Switch emulator/debugger
@@ -23,7 +21,7 @@ WWW= https://yuzu-emu.org/
LICENSE= APACHE20 BSD3CLAUSE GPLv3+ ISCL MIT UNLICENSE
LICENSE_COMB= multi
LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/externals/inih/inih/LICENSE.txt
-LICENSE_FILE_GPLv3+ = ${WRKSRC}/license.txt
+LICENSE_FILE_GPLv3+ = ${WRKSRC}/LICENSE.txt
LICENSE_FILE_ISCL= ${WRKSRC}/externals/cubeb/LICENSE
LICENSE_FILE_MIT= ${WRKSRC}/externals/sirit/externals/SPIRV-Headers/LICENSE
@@ -43,17 +41,19 @@ TEST_DEPENDS= catch>0:devel/catch
USE_GITHUB= yes
GH_ACCOUNT= yuzu-emu
-GH_TAGNAME= 6e36f4d23
+GH_TAGNAME= 9fc1bcc7b
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.3.213:Vulkan_Headers/externals/Vulkan-Headers \
- MerryMage:dynarmic:6.2.0-7-g91d1f944:dynarmic/externals/dynarmic \
+ MerryMage:dynarmic:6.2.3:dynarmic/externals/dynarmic \
ReinUsesLisp:sirit:aa292d5:sirit/externals/sirit \
+ arun11299:cpp-jwt:v1.4-14-ge12ef06:cpp_jwt/externals/cpp-jwt \
arsenm:sanitizers-cmake:aab6948:sanitizers_cmake/externals/cubeb/cmake/sanitizers-cmake \
benhoyt:inih:r52:inih/externals/inih/inih \
fmtlib:fmt:8.1.1:fmt/externals/fmt \
herumi:xbyak:v5.96:xbyak/externals/xbyak \
kinetiknz:cubeb:cubeb-0.2-1350-gf79e0cf:cubeb/externals/cubeb \
+ lsalzman:enet:v1.3.13-14-g39a72ab:enet/externals/enet \
yhirose:cpp-httplib:v0.10.8-1-g305a7ab:cpp_httplib/externals/cpp-httplib
USES= cmake:testing compiler:c++17-lang elfctl localbase:ldflags pkgconfig sdl ssl
@@ -67,7 +67,8 @@ CMAKE_TESTING_ON= YUZU_TESTS
LDFLAGS+= -static-libstdc++ # avoid libc++ conflict, requires files/patch-fmt
LDFLAGS+= -Wl,--as-needed # Qt5Network
ELF_FEATURES= ${PLIST_FILES:Mbin/*:S/^/+wxneeded:/}
-PLIST_FILES= bin/${PORTNAME}-cmd
+PLIST_FILES= bin/${PORTNAME}-cmd \
+ bin/${PORTNAME}-room
OPTIONS_DEFINE= ALSA PULSEAUDIO JACK NLS QT5 SNDIO VAAPI VULKAN WEBENGINE
OPTIONS_DEFAULT=PULSEAUDIO JACK QT5 SNDIO VAAPI VULKAN WEBENGINE
@@ -87,7 +88,7 @@ PULSEAUDIO_BUILD_DEPENDS=pulseaudio>0:audio/pulseaudio
PULSEAUDIO_CMAKE_BOOL= USE_PULSE
QT5_USES= desktop-file-utils qt:5 shared-mime-info
-QT5_USE= QT=qmake:build,buildtools:build,concurrent:build,core,gui,widgets
+QT5_USE= QT=qmake:build,buildtools:build,concurrent:build,core,dbus,gui,multimedia,widgets
QT5_CMAKE_BOOL= ENABLE_QT
QT5_PLIST_FILES= bin/${PORTNAME} \
share/applications/org.yuzu_emu.yuzu.desktop \
@@ -114,6 +115,10 @@ post-patch:
@${REINPLACE_CMD} -e 's/@GIT_BRANCH@/master/' \
-e 's/@GIT_DESC@/${GH_TAGNAME}/' \
${WRKSRC}/src/common/scm_rev.cpp.in
+# Temporarily use ConsoleKit2 like sysutils/gnome-settings-daemon
+ @${REINPLACE_CMD} -e 's,/login1,/ConsoleKit/Manager,' \
+ -e 's,login1,ConsoleKit,' \
+ ${WRKSRC}/src/${PORTNAME}/main.cpp
post-patch-VAAPI-off:
@${REINPLACE_CMD} -i .nova '/pkg_check.*libva/d' \
diff --git a/emulators/yuzu/distinfo b/emulators/yuzu/distinfo
index 9e63489b7b81..00b4fa429dfd 100644
--- a/emulators/yuzu/distinfo
+++ b/emulators/yuzu/distinfo
@@ -1,18 +1,20 @@
-TIMESTAMP = 1658443435
+TIMESTAMP = 1667543982
SHA256 (yuzu/compatibility_list.json) = 6a73a63bb36c7070ec4314f4dfe61b244c819178e171254680aa43c2dfff187c
SIZE (yuzu/compatibility_list.json) = 1255189
-SHA256 (yuzu-emu-yuzu-s20220721-6e36f4d23_GH0.tar.gz) = 44b871b11002739f32f196456dba553c6b63949b68ba1a4973627808a5c58804
-SIZE (yuzu-emu-yuzu-s20220721-6e36f4d23_GH0.tar.gz) = 4792875
+SHA256 (yuzu-emu-yuzu-s20221104-9fc1bcc7b_GH0.tar.gz) = c6f3de3d63ca59fed2ce9cfd5afa630126e261c50dcad9252f6f29c5b06e3ff6
+SIZE (yuzu-emu-yuzu-s20221104-9fc1bcc7b_GH0.tar.gz) = 5206299
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
SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-32-ga3fdfe8_GH0.tar.gz) = 403778
SHA256 (KhronosGroup-Vulkan-Headers-v1.3.213_GH0.tar.gz) = 7f4a6118dc3524703c1ce0a44089379e89eeb930fbe28188b90fdac1f10ef676
SIZE (KhronosGroup-Vulkan-Headers-v1.3.213_GH0.tar.gz) = 1485380
-SHA256 (MerryMage-dynarmic-6.2.0-7-g91d1f944_GH0.tar.gz) = d00e3a3d9d5048982114c6d0182ce631e0fc91b4f94d5450b886194ab8e5ac45
-SIZE (MerryMage-dynarmic-6.2.0-7-g91d1f944_GH0.tar.gz) = 2667650
+SHA256 (MerryMage-dynarmic-6.2.3_GH0.tar.gz) = 474cab067cab5dede0e07a0abae909f49026f18c633d8041a57630f04a44835b
+SIZE (MerryMage-dynarmic-6.2.3_GH0.tar.gz) = 2676270
SHA256 (ReinUsesLisp-sirit-aa292d5_GH0.tar.gz) = 62efd50e59be5a3709dc69258b57c3796bb72ba25ad3e46bdb566c8c6bfc9878
SIZE (ReinUsesLisp-sirit-aa292d5_GH0.tar.gz) = 23507
+SHA256 (arun11299-cpp-jwt-v1.4-14-ge12ef06_GH0.tar.gz) = 0409fa5413800fb291251cf3142e07a43fd4064996fee0e793323d3a74dd33b8
+SIZE (arun11299-cpp-jwt-v1.4-14-ge12ef06_GH0.tar.gz) = 1246634
SHA256 (arsenm-sanitizers-cmake-aab6948_GH0.tar.gz) = d9009e17948aff769a6f6e16b52d4d8752c5cc2cab1e9c381d3a31fd1a680b58
SIZE (arsenm-sanitizers-cmake-aab6948_GH0.tar.gz) = 7240
SHA256 (benhoyt-inih-r52_GH0.tar.gz) = 439cff9ce9a8afc52d08772ac3e93b3cecd79c7707f871fb4534fb3a48201880
@@ -23,13 +25,13 @@ SHA256 (herumi-xbyak-v5.96_GH0.tar.gz) = 727f15d3ed786cae255ebfed1829a84a357c0e4
SIZE (herumi-xbyak-v5.96_GH0.tar.gz) = 226999
SHA256 (kinetiknz-cubeb-cubeb-0.2-1350-gf79e0cf_GH0.tar.gz) = 8629757290774a34ed3fcd53b6491e9ccc96231018406c58c493f336b3ced908
SIZE (kinetiknz-cubeb-cubeb-0.2-1350-gf79e0cf_GH0.tar.gz) = 220847
+SHA256 (lsalzman-enet-v1.3.13-14-g39a72ab_GH0.tar.gz) = bac947ed61414d92ac4689d677f25ab457f29efe4b676547f56b4e913daa6d54
+SIZE (lsalzman-enet-v1.3.13-14-g39a72ab_GH0.tar.gz) = 79521
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 (4a8a248b47a2.patch) = 578118a4ebc2facf50c86124c8f258601938bb1ba54cea66230a780e8bf2452a
-SIZE (4a8a248b47a2.patch) = 4777
-SHA256 (e919bea9c84e.patch) = e132ba798a1e5e660bc43c3a524113898036f4cee6f7cc7c65a83b0e10170a42
-SIZE (e919bea9c84e.patch) = 3248
-SHA256 (30e8876ea48a.patch) = 344c495fb24a0596bfcb206e4ac8784c742e299dc9fd60de22fb82526c7db8d4
-SIZE (30e8876ea48a.patch) = 3584
-SHA256 (d657ea69c94c.patch) = cfaa66ba0b0ae7adb82625af52d6c334b35765594fe14f98219c50d030885a11
-SIZE (d657ea69c94c.patch) = 1610
+SHA256 (c17d71240b23.patch) = 4aaf5522ec3f7d393cec59638220d6142489c4e946060ec94444ca3f47e2b2a7
+SIZE (c17d71240b23.patch) = 7562
+SHA256 (717c8ded8210.patch) = 69fe7028303237698b7c61037cbec300c927325175bbe62d0e3d11afe2180430
+SIZE (717c8ded8210.patch) = 3591
+SHA256 (d7d7ae821978.patch) = 203a424f5c49f3ac1cd88d6035753d276346f3338dbd93791000b6c4534c1722
+SIZE (d7d7ae821978.patch) = 6994
diff --git a/emulators/yuzu/files/patch-fmt b/emulators/yuzu/files/patch-fmt
index 1b97693431f2..b296a8773283 100644
--- a/emulators/yuzu/files/patch-fmt
+++ b/emulators/yuzu/files/patch-fmt
@@ -47,16 +47,16 @@ 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<std::locale>() const'
collect2: error: ld returned 1 exit status
---- CMakeLists.txt.orig 2022-01-12 04:58:16 UTC
+--- CMakeLists.txt.orig 2022-11-04 05:21:58 UTC
+++ CMakeLists.txt
-@@ -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
-- "fmt 8.0.1 fmt/8.1.1"
- "lz4 1.8 lz4/1.9.2"
- "nlohmann_json 3.8 nlohmann_json/3.8.0"
- "ZLIB 1.2 zlib/1.2.11"
+@@ -175,7 +175,6 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DI
+ # System imported libraries
+ # =======================================================================
+
+-find_package(fmt 8.0.1 REQUIRED CONFIG)
+ find_package(nlohmann_json 3.8 REQUIRED CONFIG)
+ find_package(ZLIB 1.2 REQUIRED)
+
--- externals/CMakeLists.txt.orig 2021-02-22 04:23:45 UTC
+++ externals/CMakeLists.txt
@@ -15,6 +15,10 @@ endif()