Date: Tue, 13 Feb 2024 00:52:35 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 1f55a941f766 - 2024Q1 - emulators/yuzu: update to s20240211 Message-ID: <202402130052.41D0qZn9037040@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2024Q1 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=1f55a941f766420800b9aa3e9aa49e82776097e9 commit 1f55a941f766420800b9aa3e9aa49e82776097e9 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2024-02-12 02:58:28 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2024-02-13 00:52:30 +0000 emulators/yuzu: update to s20240211 Changes: https://github.com/yuzu-emu/yuzu/compare/2337397a15...2ff45cd0da (cherry picked from commit 4a563b36494a94b97304f9d2c78d32a4dba0852b) --- emulators/yuzu/Makefile | 8 ++--- emulators/yuzu/distinfo | 14 ++++---- emulators/yuzu/files/patch-nogit | 76 +++++++++++++++++++++++++++++----------- 3 files changed, 67 insertions(+), 31 deletions(-) diff --git a/emulators/yuzu/Makefile b/emulators/yuzu/Makefile index 6e07e4a6f68c..55f3fb389472 100644 --- a/emulators/yuzu/Makefile +++ b/emulators/yuzu/Makefile @@ -1,5 +1,5 @@ PORTNAME= yuzu -PORTVERSION= s20240210 +PORTVERSION= s20240211 CATEGORIES= emulators wayland .if make(makesum) MASTER_SITES= https://api.yuzu-emu.org/gamedb/?dummy=/:gamedb @@ -47,18 +47,18 @@ qt6_OPTIONS_EXCLUDE= QT5 USE_GITHUB= yes GH_ACCOUNT= yuzu-emu -GH_TAGNAME= 2337397a15 +GH_TAGNAME= 2ff45cd0da GH_TUPLE= yuzu-emu:mbedtls:v2.16.9-115-g8c88150ca:mbedtls/externals/mbedtls \ yuzu-emu:sirit:ab75463:sirit/externals/sirit \ GPUOpen-LibrariesAndSDKs:VulkanMemoryAllocator:v3.0.1-114-g2f382df:VulkanMemoryAllocator/externals/VulkanMemoryAllocator \ KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-201-gc214f6f:SPIRV_Headers/externals/sirit/externals/SPIRV-Headers \ - merryhime:dynarmic:6.6.1:dynarmic/externals/dynarmic \ + merryhime:dynarmic:6.6.2-15-gba8192d8:dynarmic/externals/dynarmic \ merryhime:oaknut:2.0.1:oaknut/externals/oaknut \ arun11299:cpp-jwt:v1.4-18-g10ef573:cpp_jwt/externals/cpp-jwt \ arsenm:sanitizers-cmake:aab6948:sanitizers_cmake/externals/cubeb/cmake/sanitizers-cmake \ eggert:tz:2022g-11-g16ce126a:tz/externals/nx_tzdb/tzdb_to_nx/externals/tz/tz \ kinetiknz:cubeb:cubeb-0.2-1452-g48689ae:cubeb/externals/cubeb \ - lat9nq:tzdb_to_nx:221202-6-g404d390:tzdb_to_nx/externals/nx_tzdb/tzdb_to_nx \ + lat9nq:tzdb_to_nx:221202-15-g9792969:tzdb_to_nx/externals/nx_tzdb/tzdb_to_nx \ yhirose:cpp-httplib:v0.14.1:cpp_httplib/externals/cpp-httplib USES= cmake:testing elfctl localbase:ldflags pkgconfig sdl ssl diff --git a/emulators/yuzu/distinfo b/emulators/yuzu/distinfo index bbe3d720bf08..f15e27053e2e 100644 --- a/emulators/yuzu/distinfo +++ b/emulators/yuzu/distinfo @@ -1,8 +1,8 @@ -TIMESTAMP = 1707598843 +TIMESTAMP = 1707706708 SHA256 (yuzu-s20230424/compatibility_list.json) = 382db629d6b060af722a27dfa9cd6bb60ac16a7544c58322f63aa1be4c0c0fac SIZE (yuzu-s20230424/compatibility_list.json) = 1801327 -SHA256 (yuzu-emu-yuzu-s20240210-2337397a15_GH0.tar.gz) = 2b66830428ec4a8fe29278680da9d775827a57f8444a258d7f10a97678f92971 -SIZE (yuzu-emu-yuzu-s20240210-2337397a15_GH0.tar.gz) = 6906185 +SHA256 (yuzu-emu-yuzu-s20240211-2ff45cd0da_GH0.tar.gz) = d47bcf0cedb02fbea24ffe9bb2669b185fb6e89f768171edc5a4a927bf7319ef +SIZE (yuzu-emu-yuzu-s20240211-2ff45cd0da_GH0.tar.gz) = 6911945 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-ab75463_GH0.tar.gz) = 6b61e265be182b7a78075fc1b98ccf80fd33008343205dd0e22a10a439c45319 @@ -11,8 +11,8 @@ SHA256 (GPUOpen-LibrariesAndSDKs-VulkanMemoryAllocator-v3.0.1-114-g2f382df_GH0.t SIZE (GPUOpen-LibrariesAndSDKs-VulkanMemoryAllocator-v3.0.1-114-g2f382df_GH0.tar.gz) = 877938 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 (merryhime-dynarmic-6.6.1_GH0.tar.gz) = 434dd77f2a1c091c49348a91a50a65e75050858f2a66ba652ca37d0ba340faaf -SIZE (merryhime-dynarmic-6.6.1_GH0.tar.gz) = 3717926 +SHA256 (merryhime-dynarmic-6.6.2-15-gba8192d8_GH0.tar.gz) = b44837dcb53e32afdccff1a82b24c952baf169b1726c54586946fdf23611680c +SIZE (merryhime-dynarmic-6.6.2-15-gba8192d8_GH0.tar.gz) = 3744710 SHA256 (merryhime-oaknut-2.0.1_GH0.tar.gz) = f41fefd949f75c7cad43fc7ca1363a2a1b5b1a5a0f1e1cdebd5769bc5c0482c7 SIZE (merryhime-oaknut-2.0.1_GH0.tar.gz) = 86226 SHA256 (arun11299-cpp-jwt-v1.4-18-g10ef573_GH0.tar.gz) = f88855ae7e94954a8c34688f49eb63542c69496ec8138006a2cc8fc7a51eb8df @@ -23,8 +23,8 @@ SHA256 (eggert-tz-2022g-11-g16ce126a_GH0.tar.gz) = 1d1a5d867053ea55f526cb76f18c8 SIZE (eggert-tz-2022g-11-g16ce126a_GH0.tar.gz) = 594209 SHA256 (kinetiknz-cubeb-cubeb-0.2-1452-g48689ae_GH0.tar.gz) = c0f83a493f1d54a92e16baf56f27813ff294ce78bc42fbcc3935580852a624de SIZE (kinetiknz-cubeb-cubeb-0.2-1452-g48689ae_GH0.tar.gz) = 228346 -SHA256 (lat9nq-tzdb_to_nx-221202-6-g404d390_GH0.tar.gz) = 7479950498ad3ac567fccdd2e43224afd0f7c6eb6817572cf69fe02dea1a69cd -SIZE (lat9nq-tzdb_to_nx-221202-6-g404d390_GH0.tar.gz) = 8246 +SHA256 (lat9nq-tzdb_to_nx-221202-15-g9792969_GH0.tar.gz) = b661401eda279d0a3d43c3df87efe6f408694d9710b031e98efb732999599eed +SIZE (lat9nq-tzdb_to_nx-221202-15-g9792969_GH0.tar.gz) = 8413 SHA256 (yhirose-cpp-httplib-v0.14.1_GH0.tar.gz) = 2d4fb5544da643e5d0a82585555d8b7502b4137eb321a4abbb075e21d2f00e96 SIZE (yhirose-cpp-httplib-v0.14.1_GH0.tar.gz) = 1148935 SHA256 (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = b5a9ff1793b1e2d388a3819bf35797002b1d2e40bb35a10c65605e0ea1435271 diff --git a/emulators/yuzu/files/patch-nogit b/emulators/yuzu/files/patch-nogit index b433f719a438..c76b65a5bc15 100644 --- a/emulators/yuzu/files/patch-nogit +++ b/emulators/yuzu/files/patch-nogit @@ -19,37 +19,73 @@ thus don't contain .git subdirs. if (NOT GNU_MAKE) set(CAN_BUILD_NX_TZDB false) endif() ---- externals/nx_tzdb/tzdb_to_nx/externals/tz/tz/version.orig 2023-06-23 13:27:28 UTC +--- externals/nx_tzdb/tzdb_to_nx/externals/tz/CMakeLists.txt.orig 2024-02-10 22:27:31 UTC ++++ externals/nx_tzdb/tzdb_to_nx/externals/tz/CMakeLists.txt +@@ -13,20 +13,11 @@ endif() + message(FATAL_ERROR "GNU make not found") + endif() + +-find_program(GIT_PROGRAM git) +-if (NOT GIT_PROGRAM) +- message(FATAL_ERROR "git program not found") +-endif() +- + if (NOT EXISTS "${TZ_DIR}" OR NOT EXISTS "${TZIF_LIST_FILE}") + if (NOT TZDB2NX_ZONEINFO_DIR) # If a custom zoneinfo directory was specified + # tz's makefile can only build in-tree, so copy the whole source tree to a + # separate directory before building. +- execute_process( +- COMMAND +- ${GIT_PROGRAM} clone --depth 1 "file://${TZ_SOURCE_DIR}" "${TZ_TMP_SOURCE_DIR}" +- COMMAND_ERROR_IS_FATAL ANY +- ) ++ file(COPY ${TZ_SOURCE_DIR}/ DESTINATION ${TZ_TMP_SOURCE_DIR}) + + if (APPLE) + set(TZ_MAKEFLAGS "LDLIBS=${Intl_LIBRARY}") +--- externals/nx_tzdb/tzdb_to_nx/externals/tz/tz/version.orig 2024-02-12 23:43:35 UTC +++ externals/nx_tzdb/tzdb_to_nx/externals/tz/tz/version @@ -0,0 +1 @@ +2022c ---- externals/nx_tzdb/tzdb_to_nx/src/tzdb/CMakeLists.txt.orig 2023-06-23 19:37:14 UTC +--- externals/nx_tzdb/tzdb_to_nx/src/tzdb/CMakeLists.txt.orig 2024-02-10 22:27:31 UTC +++ externals/nx_tzdb/tzdb_to_nx/src/tzdb/CMakeLists.txt @@ -1,8 +1,3 @@ -find_program(GIT_PROGRAM git) --if ("${GIT_PROGRAM}" STREQUAL "GIT_PROGRAM-NOTFOUND") +-if (NOT GIT_PROGRAM) - message(FATAL_ERROR "git program not found") -endif() - find_program(GNU_DATE date) - if ("${GNU_DATE}" STREQUAL "GNU_DATE-NOTFOUND") + if (NOT GNU_DATE) message(FATAL_ERROR "date program not found") -@@ -12,17 +7,7 @@ set(TZDB_VERSION_FILE ${TZ_SOURCE_DIR}/NEWS) - set(NX_ZONEINFO_DIR "${NX_TZDB_DIR}/zoneinfo") - - set(TZDB_VERSION_FILE ${TZ_SOURCE_DIR}/NEWS) +@@ -16,29 +11,7 @@ else() + if (NOT "${TZDB2NX_VERSION}" STREQUAL "") + set(TZDB_VERSION "${TZDB2NX_VERSION}\n") + else() +- execute_process( +- COMMAND +- ${GIT_PROGRAM} log --pretty=%at -n1 NEWS +- OUTPUT_VARIABLE +- TZ_COMMIT_TIME +- WORKING_DIRECTORY +- ${TZ_SOURCE_DIR} +- COMMAND_ERROR_IS_FATAL ANY) - --execute_process( -- COMMAND -- ${GIT_PROGRAM} log --pretty=%at -n1 NEWS -- OUTPUT_VARIABLE -- TZ_COMMIT_TIME -- WORKING_DIRECTORY -- ${TZ_SOURCE_DIR} -- COMMAND_ERROR_IS_FATAL ANY) +- string(REPLACE "\n" "" TZ_COMMIT_TIME "${TZ_COMMIT_TIME}") - --string(REPLACE "\n" "" TZ_COMMIT_TIME "${TZ_COMMIT_TIME}") -+set(TZ_COMMIT_TIME 1687220316) +- if (APPLE OR CMAKE_SYSTEM_NAME MATCHES "DragonFly|FreeBSD|NetBSD|OpenBSD") +- set(VERSION_COMMAND ${GNU_DATE} -r ${TZ_COMMIT_TIME} +%y%m%d) +- else () +- set(VERSION_COMMAND ${GNU_DATE} +%y%m%d --date=@${TZ_COMMIT_TIME}) +- endif () +- +- execute_process( +- COMMAND +- ${VERSION_COMMAND} +- OUTPUT_VARIABLE +- TZDB_VERSION +- COMMAND_ERROR_IS_FATAL ANY) ++ set(TZDB_VERSION 230620) + endif() - if (APPLE) - set(VERSION_COMMAND ${GNU_DATE} -r ${TZ_COMMIT_TIME} +%y%m%d) + set(NX_VERSION_FILE ${NX_TZDB_DIR}/version.txt)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202402130052.41D0qZn9037040>