cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

emulators/yuzu: update to s20221205

Browse Source 
Changes:	f77cc6c41...3b19f741b
This commit is contained in:
Jan Beich 2022-12-04 15:46:50 +00:00
parent 4e4b2b3fa7
commit 6869c8470d
4 changed files with 20 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
emulators/yuzu/Makefile
View File

@ -1,5 +1,5 @@
PORTNAME= yuzu
PORTVERSION= s20221203
PORTVERSION= s20221205
CATEGORIES= emulators
.if make(makesum)
MASTER_SITES= https://api.yuzu-emu.org/gamedb/?dummy=/:gamedb
@ -11,7 +11,6 @@ EXTRACT_ONLY= ${DISTFILES:N*\:gamedb:C/\:.*//}
PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
PATCHFILES+= c17d71240b23.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/9042 mainline-merge
PATCHFILES+= 14440b195c66.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/9375
MAINTAINER= jbeich@FreeBSD.org
COMMENT= Nintendo Switch emulator/debugger
@ -39,16 +38,15 @@ TEST_DEPENDS= catch>0:devel/catch
USE_GITHUB= yes
GH_ACCOUNT= yuzu-emu
GH_TAGNAME= f77cc6c41
GH_TAGNAME= 3b19f741b
GH_TUPLE= yuzu-emu:mbedtls:v2.16.9-115-g8c88150ca:mbedtls/externals/mbedtls \
yuzu-emu:sirit:d7ad93a:sirit/externals/sirit \
KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-201-gc214f6f:SPIRV_Headers/externals/sirit/externals/SPIRV-Headers \
KhronosGroup:Vulkan-Headers:v1.3.213:Vulkan_Headers/externals/Vulkan-Headers \
MerryMage:dynarmic:6.3.1-1-ga5b57bb9:dynarmic/externals/dynarmic \
KhronosGroup:Vulkan-Headers:v1.3.236:Vulkan_Headers/externals/Vulkan-Headers \
MerryMage:dynarmic:6.3.1-57-ga76a2fff:dynarmic/externals/dynarmic \
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:v6.64:xbyak/externals/xbyak \
kinetiknz:cubeb:cubeb-0.2-1350-gf79e0cf:cubeb/externals/cubeb \
lsalzman:enet:v1.3.13-14-g39a72ab:enet/externals/enet \

22
emulators/yuzu/distinfo
View File

@ -1,26 +1,24 @@
TIMESTAMP = 1670095405
SHA256 (yuzu-s20221203/compatibility_list.json) = 59f3cefe7c70e0739413262f7b943ec8881001a4282c128ca8d27ebe2eb7d58b
SIZE (yuzu-s20221203/compatibility_list.json) = 1644857
SHA256 (yuzu-emu-yuzu-s20221203-f77cc6c41_GH0.tar.gz) = cc64784bcd1f1fc6e9d9c3789d5fbe8fa82354811dec33bf2c8ca56dd9fc05c9
SIZE (yuzu-emu-yuzu-s20221203-f77cc6c41_GH0.tar.gz) = 5275139
TIMESTAMP = 1670261169
SHA256 (yuzu-s20221205/compatibility_list.json) = 76d03e453fd8f0c91283be305dcc496f95c1a0d46ebea0d3765d95c557a40f3c
SIZE (yuzu-s20221205/compatibility_list.json) = 1645865
SHA256 (yuzu-emu-yuzu-s20221205-3b19f741b_GH0.tar.gz) = ee2ff71b5288e202bedb9f75705c773390290a7d9bec0dc2c818a15d5c11bbc1
SIZE (yuzu-emu-yuzu-s20221205-3b19f741b_GH0.tar.gz) = 5279487
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 (yuzu-emu-sirit-d7ad93a_GH0.tar.gz) = f338a73c12bcc4e6c18a1a8104ca7bf30af40eb37b4054992e3be4c3d3589faa
SIZE (yuzu-emu-sirit-d7ad93a_GH0.tar.gz) = 23652
SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-201-gc214f6f_GH0.tar.gz) = 5e32aefc599e6d26c2373b7296a37980b9c6c7ff6f636d5eee49f79b437e5a51
SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-201-gc214f6f_GH0.tar.gz) = 445472
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.3.1-1-ga5b57bb9_GH0.tar.gz) = 89aba8404b4624cf506dc0e365fcec3491ab2f74931b2ae522e0cdba0be86367
SIZE (MerryMage-dynarmic-6.3.1-1-ga5b57bb9_GH0.tar.gz) = 2612971
SHA256 (KhronosGroup-Vulkan-Headers-v1.3.236_GH0.tar.gz) = a86b8c38618b764057b359cf0f18c12a7c81b7760fe6fca1acf9adb471d55d4c
SIZE (KhronosGroup-Vulkan-Headers-v1.3.236_GH0.tar.gz) = 1764329
SHA256 (MerryMage-dynarmic-6.3.1-57-ga76a2fff_GH0.tar.gz) = 8ba40e732a93f29cc535226b74f63adadd816fcb211b70d53f6aa574caa363bd
SIZE (MerryMage-dynarmic-6.3.1-57-ga76a2fff_GH0.tar.gz) = 2621782
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
SIZE (benhoyt-inih-r52_GH0.tar.gz) = 16808
SHA256 (fmtlib-fmt-8.1.1_GH0.tar.gz) = 3d794d3cf67633b34b2771eb9f073bde87e846e0d395d254df7b211ef1ec7346
SIZE (fmtlib-fmt-8.1.1_GH0.tar.gz) = 826254
SHA256 (herumi-xbyak-v6.64_GH0.tar.gz) = 836b125677e2b0c3d14d624600b8f8bb8342ab5680193559c57835267b709109
SIZE (herumi-xbyak-v6.64_GH0.tar.gz) = 247663
SHA256 (kinetiknz-cubeb-cubeb-0.2-1350-gf79e0cf_GH0.tar.gz) = 8629757290774a34ed3fcd53b6491e9ccc96231018406c58c493f336b3ced908
@ -31,5 +29,3 @@ SHA256 (yhirose-cpp-httplib-v0.10.8-1-g305a7ab_GH0.tar.gz) = 2b8ebbe60c5fab1254e
SIZE (yhirose-cpp-httplib-v0.10.8-1-g305a7ab_GH0.tar.gz) = 620778
SHA256 (c17d71240b23.patch) = 4aaf5522ec3f7d393cec59638220d6142489c4e946060ec94444ca3f47e2b2a7
SIZE (c17d71240b23.patch) = 7562
SHA256 (14440b195c66.patch) = 277b6655172fb223052061a684298ab4d86c725f1c16704b675f7ba3a33da405
SIZE (14440b195c66.patch) = 1118

22
emulators/yuzu/files/patch-dynarmic
View File

@ -1,22 +0,0 @@
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

36
emulators/yuzu/files/patch-fmt
View File

@ -47,35 +47,13 @@ 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-11-30 15:41:32 UTC
--- CMakeLists.txt.orig 2022-12-05 17:26:09 UTC
+++ CMakeLists.txt
@@ -1,7 +1,7 @@
# SPDX-FileCopyrightText: 2018 yuzu Emulator Project
# SPDX-License-Identifier: GPL-2.0-or-later
-cmake_minimum_required(VERSION 3.22)
+cmake_minimum_required(VERSION 3.15)
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules")
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/externals/cmake-modules")
@@ -180,7 +179,6 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DI
# System imported libraries
@@ -200,7 +200,6 @@ find_package(enet 1.3)
# =======================================================================
-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()
add_library(catch-single-include INTERFACE)
target_include_directories(catch-single-include INTERFACE catch/single_include)
+# libfmt
+add_subdirectory(fmt)
+add_library(fmt::fmt ALIAS fmt)
+
# Dynarmic
if (ARCHITECTURE_x86_64)
set(DYNARMIC_TESTS OFF)
find_package(enet 1.3)
-find_package(fmt 9 REQUIRED)
find_package(inih)
find_package(lz4 1.8 REQUIRED)
find_package(nlohmann_json 3.8 REQUIRED)