Date: Tue, 27 Jul 2021 20:34:21 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 629c7003d510 - main - emulators/yuzu: update to s20210727 Message-ID: <202107272034.16RKYLhY079639@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=629c7003d510597b6b08fadff4f3153eecb51b95 commit 629c7003d510597b6b08fadff4f3153eecb51b95 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2021-07-27 19:17:20 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2021-07-27 20:34:13 +0000 emulators/yuzu: update to s20210727 Changes: https://github.com/yuzu-emu/yuzu/compare/f85bbf3a8...ab206d637 --- emulators/yuzu/Makefile | 26 +++++++----------- emulators/yuzu/distinfo | 44 +++++++++++-------------------- emulators/yuzu/files/patch-CMakeLists.txt | 26 ++++++++++-------- emulators/yuzu/files/patch-sdl2 | 16 +++++------ 4 files changed, 47 insertions(+), 65 deletions(-) diff --git a/emulators/yuzu/Makefile b/emulators/yuzu/Makefile index 0cb8b8048c93..94317bea980f 100644 --- a/emulators/yuzu/Makefile +++ b/emulators/yuzu/Makefile @@ -1,21 +1,14 @@ PORTNAME= yuzu -PORTVERSION= s20210719 +PORTVERSION= s20210727 PORTREVISION?= 0 CATEGORIES= emulators PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= a2686843592e.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/4836 mainline-merge -PATCHFILES+= e2d5cff34554.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896 mainline-merge -PATCHFILES+= 5e559324a080.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896 mainline-merge -PATCHFILES+= 3bfdd34ce241.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896 mainline-merge -PATCHFILES+= 234d7ded1c52.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896 mainline-merge -PATCHFILES+= 2caf2f0fe288.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896 mainline-merge -PATCHFILES+= b9ff77485840.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896 mainline-merge -PATCHFILES+= 26907dfe941c.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896 mainline-merge -PATCHFILES+= 043027f85b64.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896 mainline-merge -PATCHFILES+= 169384b954b9.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896 mainline-merge -PATCHFILES+= 16a67d43d9a4.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896 mainline-merge +PATCHFILES+= 0acf96796cae.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/6598 mainline-merge PATCHFILES+= a24224e27463.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/6753 +PATCHFILES+= c4cd82fa7c14.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/6758 +PATCHFILES+= 353be2306c7b.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/6758 MAINTAINER= jbeich@FreeBSD.org COMMENT= Nintendo Switch emulator/debugger @@ -44,12 +37,12 @@ LIB_DEPENDS= liblz4.so:archivers/liblz4 \ USE_GITHUB= yes GH_ACCOUNT= yuzu-emu -GH_TAGNAME= f85bbf3a8 +GH_TAGNAME= ab206d637 GH_TUPLE= yuzu-emu:mbedtls:v2.16.9-115-g8c88150ca:mbedtls/externals/mbedtls \ - KhronosGroup:SPIRV-Headers:2c51218:SPIRV_Headers/externals/sirit/externals/SPIRV-Headers \ - KhronosGroup:Vulkan-Headers:v1.2.145:Vulkan_Headers/externals/Vulkan-Headers \ + KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-32-ga3fdfe8:SPIRV_Headers/externals/sirit/externals/SPIRV-Headers \ + KhronosGroup:Vulkan-Headers:v1.2.180:Vulkan_Headers/externals/Vulkan-Headers \ MerryMage:dynarmic:r5-88-g7946868a:dynarmic/externals/dynarmic \ - ReinUsesLisp:sirit:eefca56:sirit/externals/sirit \ + ReinUsesLisp:sirit:a395963:sirit/externals/sirit \ arsenm:sanitizers-cmake:aab6948:sanitizers_cmake/externals/cubeb/cmake/sanitizers-cmake \ benhoyt:inih:r52:inih/externals/inih/inih \ citra-emu:ext-soundtouch:060181e:soundtouch/externals/soundtouch \ @@ -61,8 +54,7 @@ GH_TUPLE= yuzu-emu:mbedtls:v2.16.9-115-g8c88150ca:mbedtls/externals/mbedtls \ USES= cmake:testing compiler:c++17-lang localbase:ldflags sdl ssl USE_GCC= yes:build # libc++ lacks std::atomic_ref, std::ranges USE_SDL= sdl2 -CMAKE_ON= YUZU_ALLOW_SYSTEM_SDL2 -CMAKE_OFF= ENABLE_GNUTLS ENABLE_MBEDTLS +CMAKE_OFF= YUZU_USE_EXTERNAL_SDL2 ENABLE_GNUTLS ENABLE_MBEDTLS 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 edb20339fa82..27a21858c150 100644 --- a/emulators/yuzu/distinfo +++ b/emulators/yuzu/distinfo @@ -1,16 +1,16 @@ -TIMESTAMP = 1626713200 -SHA256 (yuzu-emu-yuzu-s20210719-f85bbf3a8_GH0.tar.gz) = 695d0962696704726826f0ad65be6af4c67f6d236f910b50940754460beb974d -SIZE (yuzu-emu-yuzu-s20210719-f85bbf3a8_GH0.tar.gz) = 3849988 +TIMESTAMP = 1627413440 +SHA256 (yuzu-emu-yuzu-s20210727-ab206d637_GH0.tar.gz) = aadad7cab5f68307a4415fa5ccab0e0fee5f6dec07a8173c0d60937669d53173 +SIZE (yuzu-emu-yuzu-s20210727-ab206d637_GH0.tar.gz) = 3957779 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-2c51218_GH0.tar.gz) = 08f70947b69e17c7e322156adcd471cf02b4b3f63e7baf8ee0f02d32603ac5ff -SIZE (KhronosGroup-SPIRV-Headers-2c51218_GH0.tar.gz) = 280829 -SHA256 (KhronosGroup-Vulkan-Headers-v1.2.145_GH0.tar.gz) = c8656969f0dc33f5f544b9449f02d66b7c9de67e6e58376c1cd4999694ab8517 -SIZE (KhronosGroup-Vulkan-Headers-v1.2.145_GH0.tar.gz) = 766896 +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.180_GH0.tar.gz) = ed4974bd223e3868db3be66c2f1fe0eb85de6ecc897a9a7da2e263a98abdd214 +SIZE (KhronosGroup-Vulkan-Headers-v1.2.180_GH0.tar.gz) = 1065448 SHA256 (MerryMage-dynarmic-r5-88-g7946868a_GH0.tar.gz) = 297f0ebc2179028f95e9e5add0cba949d06c07fb3169e4ea5d7bedaf8d87a005 SIZE (MerryMage-dynarmic-r5-88-g7946868a_GH0.tar.gz) = 28297022 -SHA256 (ReinUsesLisp-sirit-eefca56_GH0.tar.gz) = cc95e8155e14e596526c378d0a3cc2bb4bfe7da68773a79f224d48f89b20685a -SIZE (ReinUsesLisp-sirit-eefca56_GH0.tar.gz) = 22035 +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 SIZE (arsenm-sanitizers-cmake-aab6948_GH0.tar.gz) = 7240 SHA256 (benhoyt-inih-r52_GH0.tar.gz) = 439cff9ce9a8afc52d08772ac3e93b3cecd79c7707f871fb4534fb3a48201880 @@ -27,25 +27,11 @@ SHA256 (yhirose-cpp-httplib-v0.9.0-5-g9648f95_GH0.tar.gz) = a37315dd30f20845cb18 SIZE (yhirose-cpp-httplib-v0.9.0-5-g9648f95_GH0.tar.gz) = 577183 SHA256 (a2686843592e.patch) = 78ce14d6aa5f808ed6d7eb581e28b7b6af8c0c62161bf4f8d791c2bdc113e911 SIZE (a2686843592e.patch) = 10853 -SHA256 (e2d5cff34554.patch) = a653e1593d13e558373bfe630a65022cb56d6cc623b382e7b8374142877a6386 -SIZE (e2d5cff34554.patch) = 5944 -SHA256 (5e559324a080.patch) = d2750ff351bad8d8e5f10a26b27194a54a0d929cda4b51cfff821ff73b3ca684 -SIZE (5e559324a080.patch) = 11749 -SHA256 (3bfdd34ce241.patch) = 872af12ed04c2cebeb31088af0f483cbea02457623f629c091200a9d2f47d55d -SIZE (3bfdd34ce241.patch) = 6472 -SHA256 (234d7ded1c52.patch) = 7c53dac00ef7d602ad74af30d4ac4e469f3d46fffe05d528a492e318eebce891 -SIZE (234d7ded1c52.patch) = 21968 -SHA256 (2caf2f0fe288.patch) = 8d69edd9890554082e6e41011f0bb6128850c9b0aba00a9800584cf02b16e090 -SIZE (2caf2f0fe288.patch) = 11925 -SHA256 (b9ff77485840.patch) = 118643e60cc17c1e0691ad5e98d84c1824c64dda7e256cc05ffd7cf87c17a2de -SIZE (b9ff77485840.patch) = 6679 -SHA256 (26907dfe941c.patch) = e255c4cfd710f1940e198047142eb95fcfddf916bbeac4c4741ba54a1a039627 -SIZE (26907dfe941c.patch) = 3670 -SHA256 (043027f85b64.patch) = caf4ba797d51e15cb9a1006cd10d1f918c6d3f85164164ac8495495349a70ee5 -SIZE (043027f85b64.patch) = 4700 -SHA256 (169384b954b9.patch) = 1f4240c6aa6d20054eef8087304f513468bfc4cbaca457874fe99cc1f1828bb4 -SIZE (169384b954b9.patch) = 6093 -SHA256 (16a67d43d9a4.patch) = f14f33fbdd2a318556239e2a97e71a949d923d69a3c0935d9e159a5c67f6e73c -SIZE (16a67d43d9a4.patch) = 4616 +SHA256 (0acf96796cae.patch) = ca713feca740ef8e56fa40de822a83d49cca6d1128eb7945860fb28975bd0c17 +SIZE (0acf96796cae.patch) = 4650 SHA256 (a24224e27463.patch) = 1065321fa190dc2b5fe490fbbf7ded2eb08d4637d8f539131b63cf6592d7e86b SIZE (a24224e27463.patch) = 5204 +SHA256 (c4cd82fa7c14.patch) = c1747186624db38441cbf27cbd54b6b4de683335f4b01c2ed7e732344d169896 +SIZE (c4cd82fa7c14.patch) = 1205 +SHA256 (353be2306c7b.patch) = d2cab3827ef13bc43bbcc0a8f77927aa044bd8e53801e3c154f968dbbaa66920 +SIZE (353be2306c7b.patch) = 1074 diff --git a/emulators/yuzu/files/patch-CMakeLists.txt b/emulators/yuzu/files/patch-CMakeLists.txt index 6227928ceb59..0a4fdd397c1c 100644 --- a/emulators/yuzu/files/patch-CMakeLists.txt +++ b/emulators/yuzu/files/patch-CMakeLists.txt @@ -1,23 +1,27 @@ yuzu (Qt) currently needs SDL for input ---- CMakeLists.txt.orig 2021-05-19 22:47:48 UTC +--- CMakeLists.txt.orig 2021-07-27 01:51:00 UTC +++ CMakeLists.txt -@@ -293,10 +293,14 @@ if (ENABLE_SDL2) - add_library(SDL2 INTERFACE) - target_link_libraries(SDL2 INTERFACE "${SDL2_LIBRARY}") +@@ -395,7 +395,10 @@ if (ENABLE_SDL2) target_include_directories(SDL2 INTERFACE "${SDL2_INCLUDE_DIR}") + elseif (YUZU_USE_EXTERNAL_SDL2) + message(STATUS "Using SDL2 from externals.") - else() + endif() +endif() + -+if (NOT YUZU_USE_BUNDLED_SDL2) - if (YUZU_ALLOW_SYSTEM_SDL2) - find_package(SDL2 2.0.15 QUIET) ++if (NOT YUZU_USE_BUNDLED_SDL2 AND NOT YUZU_USE_EXTERNAL_SDL2) + find_package(SDL2 2.0.15 REQUIRED) + + # Some installations don't set SDL2_LIBRARIES +@@ -407,7 +410,6 @@ if (ENABLE_SDL2) + include_directories(SYSTEM ${SDL2_INCLUDE_DIRS}) + add_library(SDL2 INTERFACE) + target_link_libraries(SDL2 INTERFACE "${SDL2_LIBRARIES}") +- endif() + endif() -+ if (TRUE) - if (SDL2_FOUND) - # Some installations don't set SDL2_LIBRARIES - if("${SDL2_LIBRARIES}" STREQUAL "") + # Install any missing dependencies with conan install --- src/input_common/CMakeLists.txt.orig 2021-04-21 21:36:33 UTC +++ src/input_common/CMakeLists.txt @@ -62,7 +62,7 @@ else() diff --git a/emulators/yuzu/files/patch-sdl2 b/emulators/yuzu/files/patch-sdl2 index e10b98a630f8..0fb9b30ee992 100644 --- a/emulators/yuzu/files/patch-sdl2 +++ b/emulators/yuzu/files/patch-sdl2 @@ -9,17 +9,17 @@ CMake Error at externals/CMakeLists.txt:54 (add_subdirectory): does not contain a CMakeLists.txt file. ---- CMakeLists.txt.orig 2021-05-19 22:47:48 UTC +--- CMakeLists.txt.orig 2021-07-27 01:51:00 UTC +++ CMakeLists.txt -@@ -297,7 +297,7 @@ endif() +@@ -398,7 +398,7 @@ if (ENABLE_SDL2) + endif() - if (NOT YUZU_USE_BUNDLED_SDL2) - if (YUZU_ALLOW_SYSTEM_SDL2) -- find_package(SDL2 2.0.15 QUIET) -+ find_package(SDL2 2.0.12 QUIET) + if (NOT YUZU_USE_BUNDLED_SDL2 AND NOT YUZU_USE_EXTERNAL_SDL2) +- find_package(SDL2 2.0.15 REQUIRED) ++ find_package(SDL2 2.0.12 REQUIRED) - if (TRUE) - if (SDL2_FOUND) + # Some installations don't set SDL2_LIBRARIES + if("${SDL2_LIBRARIES}" STREQUAL "") --- src/input_common/sdl/sdl_impl.cpp.orig 2021-06-02 22:29:09 UTC +++ src/input_common/sdl/sdl_impl.cpp @@ -64,6 +64,7 @@ class SDLJoystick { (public)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202107272034.16RKYLhY079639>