From owner-dev-commits-ports-main@freebsd.org Thu May 20 00:58:38 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3AFC3630100; Thu, 20 May 2021 00:58:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Flrvy1CC1z3qSm; Thu, 20 May 2021 00:58:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 123351C925; Thu, 20 May 2021 00:58:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14K0wbv6080682; Thu, 20 May 2021 00:58:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14K0wbA2080681; Thu, 20 May 2021 00:58:37 GMT (envelope-from git) Date: Thu, 20 May 2021 00:58:37 GMT Message-Id: <202105200058.14K0wbA2080681@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: c61770cb8015 - main - emulators/yuzu: update to s20210519 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c61770cb8015e82460619ce0068c4becac8e2a68 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 May 2021 00:58:38 -0000 The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=c61770cb8015e82460619ce0068c4becac8e2a68 commit c61770cb8015e82460619ce0068c4becac8e2a68 Author: Jan Beich AuthorDate: 2021-05-14 03:11:32 +0000 Commit: Jan Beich CommitDate: 2021-05-20 00:57:39 +0000 emulators/yuzu: update to s20210519 Changes: https://github.com/yuzu-emu/yuzu/compare/904584e4b...41b1f8d61 --- emulators/yuzu/Makefile | 27 ++--------------- emulators/yuzu/distinfo | 50 ++----------------------------- emulators/yuzu/files/patch-CMakeLists.txt | 15 +++++----- emulators/yuzu/files/patch-sdl2 | 27 ++++++++++++----- 4 files changed, 34 insertions(+), 85 deletions(-) diff --git a/emulators/yuzu/Makefile b/emulators/yuzu/Makefile index ad0d4df839b3..00955856e6b3 100644 --- a/emulators/yuzu/Makefile +++ b/emulators/yuzu/Makefile @@ -1,5 +1,5 @@ PORTNAME= yuzu -PORTVERSION= s20210513 +PORTVERSION= s20210519 PORTREVISION?= 0 CATEGORIES= emulators @@ -15,28 +15,6 @@ PATCHFILES+= 26907dfe941c.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/5896 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+= d08bd3e062e6.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/6299 mainline-merge -PATCHFILES+= ed25191ee634.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/6299 mainline-merge -PATCHFILES+= 7a06037c5fd2.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/6299 mainline-merge -PATCHFILES+= 75f23ad494cc.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/6299 mainline-merge -PATCHFILES+= 9f44a44f2f6d.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/6299 mainline-merge -PATCHFILES+= cfed6936f3c0.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/6299 mainline-merge -PATCHFILES+= 44c763f9c630.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/6299 mainline-merge -PATCHFILES+= c6de9657be71.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/6299 mainline-merge -PATCHFILES+= f54ea749a4a5.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/6299 mainline-merge -PATCHFILES+= 934b2d8842f0.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/6299 mainline-merge -PATCHFILES+= 41928dfdda96.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/6299 mainline-merge -PATCHFILES+= da25a5986666.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/6299 mainline-merge -PATCHFILES+= 21671d05a362.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/6299 mainline-merge -PATCHFILES+= 49c4c329f6c8.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/6299 mainline-merge -PATCHFILES+= 913971417e07.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/6299 mainline-merge -PATCHFILES+= 2c1e119c4a57.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/6299 mainline-merge -PATCHFILES+= 343d92a09276.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/6299 mainline-merge -PATCHFILES+= b9f543b29f2d.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/6299 mainline-merge -PATCHFILES+= f2c26443f85a.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/6299 mainline-merge -PATCHFILES+= fc086f93b216.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/6299 mainline-merge -PATCHFILES+= 12d569e48383.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/6299 mainline-merge -PATCHFILES+= eee302b9b9fe.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/6299 mainline-merge MAINTAINER= jbeich@FreeBSD.org COMMENT= Nintendo Switch emulator/debugger @@ -64,7 +42,7 @@ LIB_DEPENDS= liblz4.so:archivers/liblz4 \ USE_GITHUB= yes GH_ACCOUNT= yuzu-emu -GH_TAGNAME= 904584e4b +GH_TAGNAME= 41b1f8d61 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 \ @@ -81,6 +59,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 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 8f4c14a78ace..857a1db39807 100644 --- a/emulators/yuzu/distinfo +++ b/emulators/yuzu/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1620961892 -SHA256 (yuzu-emu-yuzu-s20210513-904584e4b_GH0.tar.gz) = a95b6afadadc02577ba7f113bb26ddff57ef763f17bb388c2ec0b754d2a47b4c -SIZE (yuzu-emu-yuzu-s20210513-904584e4b_GH0.tar.gz) = 3834498 +TIMESTAMP = 1621291536 +SHA256 (yuzu-emu-yuzu-s20210519-41b1f8d61_GH0.tar.gz) = 45a0f7fdf2c03272d4f5861ad0b043147c1183e8d6f56202fca007e4ff20c291 +SIZE (yuzu-emu-yuzu-s20210519-41b1f8d61_GH0.tar.gz) = 3838017 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 @@ -47,47 +47,3 @@ SHA256 (169384b954b9.patch) = 1f4240c6aa6d20054eef8087304f513468bfc4cbaca457874f SIZE (169384b954b9.patch) = 6093 SHA256 (16a67d43d9a4.patch) = f14f33fbdd2a318556239e2a97e71a949d923d69a3c0935d9e159a5c67f6e73c SIZE (16a67d43d9a4.patch) = 4616 -SHA256 (d08bd3e062e6.patch) = a0bfb1ddb8a71618313ad2fcdf86d1c07d4c748f60828cf2aba150c217df8281 -SIZE (d08bd3e062e6.patch) = 6022 -SHA256 (ed25191ee634.patch) = 66be4282e21411a1f020cf77c2b1818f6b2251a889f9a760815e997b91c7a847 -SIZE (ed25191ee634.patch) = 2316 -SHA256 (7a06037c5fd2.patch) = 4ce12f5f4a078a7cac469a8186ccc228b60f0ab6d8c682258cdc0b052732278e -SIZE (7a06037c5fd2.patch) = 1303 -SHA256 (75f23ad494cc.patch) = 29a546788da3da810533a6d9f729435da68ea8c9f1d76edb9414a2d00f9cc9d4 -SIZE (75f23ad494cc.patch) = 922 -SHA256 (9f44a44f2f6d.patch) = 2ed146d307b03481714600a830c0b430e358488a63b9b229d6491812812baf96 -SIZE (9f44a44f2f6d.patch) = 1221 -SHA256 (cfed6936f3c0.patch) = 04542a42096a3d0deac60e64d261b0dffe37e6107734f03a01294390c258c02a -SIZE (cfed6936f3c0.patch) = 797 -SHA256 (44c763f9c630.patch) = 2f6b679812bd3f19f608f0381eaec915b87adb79f8b7a44940a8ca11854d056e -SIZE (44c763f9c630.patch) = 1629 -SHA256 (c6de9657be71.patch) = 8660131f69fad776b092437802be7eee2f21c0d0916528da4994723724eef150 -SIZE (c6de9657be71.patch) = 6263 -SHA256 (f54ea749a4a5.patch) = 0392c7cd67383f77b8d8cbd9db57b859cb48361148bd72d7734cf5026eedcdc9 -SIZE (f54ea749a4a5.patch) = 1254 -SHA256 (934b2d8842f0.patch) = f0beb60a0beaa4da33531e6f10bb85254c18783bb0ddee10c1d2419237c25346 -SIZE (934b2d8842f0.patch) = 1187 -SHA256 (41928dfdda96.patch) = c1e33a281dc4af2a6e8eee6958fe4cdea507a13686210f6e68ccb5a4782f2f1e -SIZE (41928dfdda96.patch) = 954 -SHA256 (da25a5986666.patch) = 93daae685f6281ca780df7345865decd87e435ea478905073d862f2fe86fdeee -SIZE (da25a5986666.patch) = 4402 -SHA256 (21671d05a362.patch) = bff301a25ead85c8525bc632cbff0b707b13a0a84d2f826ae7e78e5594744bbc -SIZE (21671d05a362.patch) = 5262 -SHA256 (49c4c329f6c8.patch) = 45e2b636972eb2808a0be91e22cbdef4eddaf658888360757b87acdd58da4590 -SIZE (49c4c329f6c8.patch) = 1221 -SHA256 (913971417e07.patch) = d1b68476f3d096fd71036d7a80e90edee6ca784cf6a84b2e932b4d5f04a89350 -SIZE (913971417e07.patch) = 10420 -SHA256 (2c1e119c4a57.patch) = 5c451971694addd625571a6b351cb826e906d1ee072b748c423fbb442f3e35e8 -SIZE (2c1e119c4a57.patch) = 8702 -SHA256 (343d92a09276.patch) = 598ad1bf6f9fd7f23389285d2258cd832c5305b0fc8a659f2e0db7fe063e9a6d -SIZE (343d92a09276.patch) = 840 -SHA256 (b9f543b29f2d.patch) = 1604cd304bc4941bb6ae029c636dac6843fece96efd1ae84b0d22be5d308c0b6 -SIZE (b9f543b29f2d.patch) = 5642 -SHA256 (f2c26443f85a.patch) = 713204231d5c4faa2f67110ea3c8fdddd0d29cc643bd39f2f5fa3dd47bf711a5 -SIZE (f2c26443f85a.patch) = 956 -SHA256 (fc086f93b216.patch) = bfa7b8259a6e48afd734d7cc34c8b38405009a58d426e0468d55ce4d3a787c4b -SIZE (fc086f93b216.patch) = 4290 -SHA256 (12d569e48383.patch) = 3477d27cf60eec31488ac979fe620d631eb05a579daecbeb580a989e295be1e2 -SIZE (12d569e48383.patch) = 2749 -SHA256 (eee302b9b9fe.patch) = fbc8d416da35aeb9188fbf57acbbf8f2e74fef82034a743d4e826edfad90965f -SIZE (eee302b9b9fe.patch) = 887 diff --git a/emulators/yuzu/files/patch-CMakeLists.txt b/emulators/yuzu/files/patch-CMakeLists.txt index a113b73cafff..6227928ceb59 100644 --- a/emulators/yuzu/files/patch-CMakeLists.txt +++ b/emulators/yuzu/files/patch-CMakeLists.txt @@ -1,8 +1,8 @@ yuzu (Qt) currently needs SDL for input ---- CMakeLists.txt.orig 2021-05-10 03:15:00 UTC +--- CMakeLists.txt.orig 2021-05-19 22:47:48 UTC +++ CMakeLists.txt -@@ -291,9 +291,13 @@ if (ENABLE_SDL2) +@@ -293,10 +293,14 @@ if (ENABLE_SDL2) add_library(SDL2 INTERFACE) target_link_libraries(SDL2 INTERFACE "${SDL2_LIBRARY}") target_include_directories(SDL2 INTERFACE "${SDL2_INCLUDE_DIR}") @@ -11,12 +11,13 @@ yuzu (Qt) currently needs SDL for input +endif() + +if (NOT YUZU_USE_BUNDLED_SDL2) - find_package(SDL2 2.0.15 QUIET) + if (YUZU_ALLOW_SYSTEM_SDL2) + find_package(SDL2 2.0.15 QUIET) -+ if (TRUE) - if (SDL2_FOUND) - # Some installations don't set SDL2_LIBRARIES - if("${SDL2_LIBRARIES}" STREQUAL "") ++ if (TRUE) + if (SDL2_FOUND) + # Some installations don't set SDL2_LIBRARIES + if("${SDL2_LIBRARIES}" STREQUAL "") --- 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 9a0ca406d41e..352e22153016 100644 --- a/emulators/yuzu/files/patch-sdl2 +++ b/emulators/yuzu/files/patch-sdl2 @@ -9,14 +9,27 @@ CMake Error at externals/CMakeLists.txt:54 (add_subdirectory): does not contain a CMakeLists.txt file. ---- CMakeLists.txt.orig 2021-05-10 03:15:00 UTC +--- CMakeLists.txt.orig 2021-05-19 22:47:48 UTC +++ CMakeLists.txt -@@ -293,7 +293,7 @@ if (ENABLE_SDL2) - endif() +@@ -297,7 +297,7 @@ endif() if (NOT YUZU_USE_BUNDLED_SDL2) -- find_package(SDL2 2.0.15 QUIET) -+ find_package(SDL2 2.0.12 QUIET) + if (YUZU_ALLOW_SYSTEM_SDL2) +- find_package(SDL2 2.0.15 QUIET) ++ find_package(SDL2 2.0.12 QUIET) - if (TRUE) - if (SDL2_FOUND) + if (TRUE) + if (SDL2_FOUND) +--- src/input_common/sdl/sdl_impl.cpp.orig 2021-05-19 22:47:48 UTC ++++ src/input_common/sdl/sdl_impl.cpp +@@ -796,8 +796,10 @@ SDLState::SDLState() { + RegisterFactory("sdl", motion_factory); + + // Enable HIDAPI rumble. This prevents SDL from disabling motion on PS4 and PS5 controllers ++#ifdef SDL_HINT_JOYSTICK_HIDAPI_PS5_RUMBLE + SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_PS4_RUMBLE, "1"); + SDL_SetHint(SDL_HINT_JOYSTICK_HIDAPI_PS5_RUMBLE, "1"); ++#endif + + // Tell SDL2 to use the hidapi driver. This will allow joycons to be detected as a + // GameController and not a generic one