git: 3063438e50b1 - main - emulators/yuzu: update to s20211231

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Jan Beich <jbeich_at_FreeBSD.org>
Date: Fri, 31 Dec 2021 20:16:54 UTC
The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3063438e50b13bcfdcf12177ef2d303120ddddcb

commit 3063438e50b13bcfdcf12177ef2d303120ddddcb
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2021-12-31 07:49:16 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2021-12-31 20:15:57 +0000

    emulators/yuzu: update to s20211231
    
    Changes:        https://github.com/yuzu-emu/yuzu/compare/279c7bcc1...eb7d36165
---
 emulators/yuzu-qt5/Makefile         |  2 +-
 emulators/yuzu/Makefile             |  6 +++---
 emulators/yuzu/distinfo             | 10 +++++-----
 emulators/yuzu/files/patch-dynarmic | 22 ++++++++++++++++++++++
 4 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/emulators/yuzu-qt5/Makefile b/emulators/yuzu-qt5/Makefile
index e8c5a305c736..30c667b9c82a 100644
--- a/emulators/yuzu-qt5/Makefile
+++ b/emulators/yuzu-qt5/Makefile
@@ -1,4 +1,4 @@
-PORTREVISION=	1
+PORTREVISION=	0
 PKGNAMESUFFIX=	-qt5
 
 MASTERDIR=	${.CURDIR}/../yuzu
diff --git a/emulators/yuzu/Makefile b/emulators/yuzu/Makefile
index 60d2f8c45ad6..00f68ff9e389 100644
--- a/emulators/yuzu/Makefile
+++ b/emulators/yuzu/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	yuzu
-PORTVERSION=	s20211228
+PORTVERSION=	s20211231
 PORTREVISION?=	0
 CATEGORIES=	emulators
 MASTER_SITES=	https://api.yuzu-emu.org/gamedb/?dummy=/:gamedb \
@@ -40,11 +40,11 @@ LIB_DEPENDS=	liblz4.so:archivers/liblz4 \
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	yuzu-emu
-GH_TAGNAME=	279c7bcc1
+GH_TAGNAME=	eb7d36165
 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 \
-		MerryMage:dynarmic:r5-127-gcce7e4ee:dynarmic/externals/dynarmic \
+		MerryMage:dynarmic:r5-129-g28714ee7:dynarmic/externals/dynarmic \
 		ReinUsesLisp:sirit:a395963:sirit/externals/sirit \
 		arsenm:sanitizers-cmake:aab6948:sanitizers_cmake/externals/cubeb/cmake/sanitizers-cmake \
 		benhoyt:inih:r52:inih/externals/inih/inih \
diff --git a/emulators/yuzu/distinfo b/emulators/yuzu/distinfo
index e1bf18861dc1..792643d16491 100644
--- a/emulators/yuzu/distinfo
+++ b/emulators/yuzu/distinfo
@@ -1,16 +1,16 @@
-TIMESTAMP = 1640737537
+TIMESTAMP = 1640936956
 SHA256 (yuzu/compatibility_list.json) = 0e601d6ad2ebc5b6ec9dd84bbafd0b93f24e5a1d727507dcb03e33b94a8ed8e6
 SIZE (yuzu/compatibility_list.json) = 1255231
-SHA256 (yuzu-emu-yuzu-s20211228-279c7bcc1_GH0.tar.gz) = 98d32aef80cb808e682a7af1ddd075b9f6ce4f6c18fb88f4541a10b3ee774b37
-SIZE (yuzu-emu-yuzu-s20211228-279c7bcc1_GH0.tar.gz) = 4470528
+SHA256 (yuzu-emu-yuzu-s20211231-eb7d36165_GH0.tar.gz) = a04ed8222b26fcffc9e308f241753d11eee3bd19c31cbe4a035b7f5f1feeb524
+SIZE (yuzu-emu-yuzu-s20211231-eb7d36165_GH0.tar.gz) = 4470927
 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.2.202_GH0.tar.gz) = df8748ba3073be032f78c97994798c3c2b52b1812e506cc58855faf10f031226
 SIZE (KhronosGroup-Vulkan-Headers-v1.2.202_GH0.tar.gz) = 1361825
-SHA256 (MerryMage-dynarmic-r5-127-gcce7e4ee_GH0.tar.gz) = a2108478aaea438f192d1336fc5373051e6e914957427686484854e99479e67a
-SIZE (MerryMage-dynarmic-r5-127-gcce7e4ee_GH0.tar.gz) = 28295877
+SHA256 (MerryMage-dynarmic-r5-129-g28714ee7_GH0.tar.gz) = 7b86e26bdab0bc284f9b853e7de790bf1f014b85ae52e626395b863bd9671b84
+SIZE (MerryMage-dynarmic-r5-129-g28714ee7_GH0.tar.gz) = 28298013
 SHA256 (ReinUsesLisp-sirit-a395963_GH0.tar.gz) = 2a060a1f8927582b87aad31d2234892d4f67cd6acc5cc9c60023c710c319ada5
 SIZE (ReinUsesLisp-sirit-a395963_GH0.tar.gz) = 23399
 SHA256 (arsenm-sanitizers-cmake-aab6948_GH0.tar.gz) = d9009e17948aff769a6f6e16b52d4d8752c5cc2cab1e9c381d3a31fd1a680b58
diff --git a/emulators/yuzu/files/patch-dynarmic b/emulators/yuzu/files/patch-dynarmic
new file mode 100644
index 000000000000..a5429af85e7d
--- /dev/null
+++ b/emulators/yuzu/files/patch-dynarmic
@@ -0,0 +1,22 @@
+Don't install bundled robin-map in dynarmic bundled in yuzu
+
+===> Checking for items in STAGEDIR missing from pkg-plist
+Error: Orphaned: include/tsl/robin_growth_policy.h
+Error: Orphaned: include/tsl/robin_hash.h
+Error: Orphaned: include/tsl/robin_map.h
+Error: Orphaned: include/tsl/robin_set.h
+Error: Orphaned: share/cmake/tsl-robin-map/tsl-robin-mapConfig.cmake
+Error: Orphaned: share/cmake/tsl-robin-map/tsl-robin-mapConfigVersion.cmake
+Error: Orphaned: share/cmake/tsl-robin-map/tsl-robin-mapTargets.cmake
+
+--- externals/dynarmic/externals/CMakeLists.txt.orig	2021-12-23 11:38:58 UTC
++++ externals/dynarmic/externals/CMakeLists.txt
+@@ -24,7 +24,7 @@ target_include_directories(mp INTERFACE $<BUILD_INTERF
+ # robin-map
+ 
+ if (NOT TARGET tsl::robin_map)
+-    add_subdirectory(robin-map)
++    add_subdirectory(robin-map EXCLUDE_FROM_ALL)
+ endif()
+ 
+ # vixl