From nobody Sat Apr 6 16:50:31 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VBhDl4Pqgz5GxxB; Sat, 6 Apr 2024 16:50:31 +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 4VBhDl46s1z41VK; Sat, 6 Apr 2024 16:50:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712422231; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uw/EZIYqmkGLpq0OKcDtsA3h+CdiTWsOP3c6ATR8Mhs=; b=JkyqDtEFAk3+8nsmCcVHqMTsa4oWGu0bdfIUToNdKTanCHQ7+sk15PbZMcaRC1kKEeoJu3 f5YgBuCXEoExXvOf0BBqR8H/a72yvGbMSv6jpuBOeFd46hj3AeOgSzpS0u3ifjGqRNxg3H PgsctLYckWiQPQ1UCT155NYz2no38k4oRXx08csmjtFOJoD1dA6R4LLK3onkzF4eq1WjJg SYfft7SLMKxf6PFYD4W+OFRqBlGkvHOjKT2kVTagp2+7uT85kEuizoj3gxWlXcufuF0iKr /zrPid9pKmnM3k03jPBgJnEXfxCCNsZQMxQ/QyKVaYisfb3e4Gu7S1bE05alWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712422231; a=rsa-sha256; cv=none; b=cQC7JDu7SBi6R4ugF87A9wuaTMjd1uuakSLvgmVp/LVUgaYjh2jXOrXatpMJEstMsrLMqi IA5j+FZZQrgH1PG4fITLaOOV6xPHpau/Vpg/JxLzV4ppa703WYJcnRzmx4blKg8evVxx+X HAMu3FSCjyHYXKdYL8S4x4SUHWpK7UXqqtrse2YvmESAtW40DyE63K3HrPmNfmu0Xtactn 2XZTZi+UpDHJaWZRiAiptpiA57ksCx3BtvXcBrWf+tnKR1ncrX7slwhpwZFoWtgAw6RO+5 p61/r6oiUeZSPNLHdcxqTgxpG2PkbekfI9mS3KRk76St6CseSRComtpoDccs1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712422231; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uw/EZIYqmkGLpq0OKcDtsA3h+CdiTWsOP3c6ATR8Mhs=; b=lJ4tYFjPzNCATEtXkMQ9Yds6xA68zyUz7bPUSCr6F17mhB1v1x1oP3VwlH1UfafoqaG2Sp 3q+Z4FbIp46BLcZb9rEin3JuF8gKXzkak1e40OihHAmtzbqCNNhmGmE7+gyBo6MT+eyZzP KrGrNlE5ndNKD32C+NtQsK2RdK3cFtu6+10ndtXWg7PbIyaZg4szeO5g6BR8LfpFH7Fzea atv4j7wyOY2Elk7GILtuOm6GBAZh+r+6vmPpIWWasnhKPvZMcXpLDVoAO5YNZwhcEt95dP 1R1FzPzH+oiaxw/1tQUEBZhLnRi1kh8ThNo2biLCIjB6BymlkDCYkWorfAhx7g== 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 4VBhDl3k0kzrp4; Sat, 6 Apr 2024 16:50:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 436GoVeE082836; Sat, 6 Apr 2024 16:50:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 436GoVOM082833; Sat, 6 Apr 2024 16:50:31 GMT (envelope-from git) Date: Sat, 6 Apr 2024 16:50:31 GMT Message-Id: <202404061650.436GoVOM082833@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ganael LAPLANCHE Subject: git: 149b093bfa63 - main - emulators/dolphin-emu: Update to 5.0.21264 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: martymac X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 149b093bfa63470923331cf1b182276a3f2a0f20 Auto-Submitted: auto-generated The branch main has been updated by martymac: URL: https://cgit.FreeBSD.org/ports/commit/?id=149b093bfa63470923331cf1b182276a3f2a0f20 commit 149b093bfa63470923331cf1b182276a3f2a0f20 Author: Ganael LAPLANCHE AuthorDate: 2024-04-06 16:50:01 +0000 Commit: Ganael LAPLANCHE CommitDate: 2024-04-06 16:50:01 +0000 emulators/dolphin-emu: Update to 5.0.21264 --- emulators/dolphin-emu/Makefile | 6 +- emulators/dolphin-emu/Makefile.tuples | 9 +- emulators/dolphin-emu/distinfo | 22 +-- emulators/dolphin-emu/files/patch-CMakeLists.txt | 21 +-- emulators/dolphin-emu/files/patch-libfmt | 168 ----------------------- emulators/dolphin-emu/pkg-plist | 99 ++++++++++++- 6 files changed, 120 insertions(+), 205 deletions(-) diff --git a/emulators/dolphin-emu/Makefile b/emulators/dolphin-emu/Makefile index 380bcce10f56..946051724ff5 100644 --- a/emulators/dolphin-emu/Makefile +++ b/emulators/dolphin-emu/Makefile @@ -1,6 +1,5 @@ PORTNAME= dolphin-emu -PORTVERSION= 5.0.19870 -PORTREVISION= 4 +PORTVERSION= 5.0.21264 CATEGORIES= emulators MAINTAINER= martymac@FreeBSD.org @@ -33,6 +32,7 @@ LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libzstd.so:archivers/zstd \ libminizip-ng.so:archivers/minizip-ng \ liblzo2.so:archivers/lzo2 \ + liblz4.so:archivers/liblz4 \ libspng.so:graphics/libspng \ libspeexdsp.so:audio/speexdsp \ libpulse.so:audio/pulseaudio \ @@ -54,7 +54,7 @@ ELF_FEATURES= +noaslr:Binaries/dolphin-emu* # for latest beta version and associated commit USE_GITHUB= yes GH_PROJECT= dolphin -GH_TAGNAME= 8c2a1c1 +GH_TAGNAME= 1efda86 .include "${.CURDIR}/Makefile.tuples" USE_GL= egl gl diff --git a/emulators/dolphin-emu/Makefile.tuples b/emulators/dolphin-emu/Makefile.tuples index eb900c4773f2..24d6cc0d63d3 100644 --- a/emulators/dolphin-emu/Makefile.tuples +++ b/emulators/dolphin-emu/Makefile.tuples @@ -1,7 +1,10 @@ GH_TUPLE= \ GPUOpen-LibrariesAndSDKs:VulkanMemoryAllocator:498e20dfd1343d99b9115201034bb0219801cdec:VulkanMemoryAllocator/Externals/VulkanMemoryAllocator \ - mozilla:cubeb:27d2a102b0b75d9e49d43bc1ea516233fb87d778:cubeb/Externals/cubeb/cubeb \ - epezent:implot:d87512353495e7760e7fda7566a05beef7627d8f:implot/Externals/implot/implot \ + mozilla:cubeb:54217bca3f3e0cd53c073690a23dd25d83557909:cubeb/Externals/cubeb/cubeb \ + epezent:implot:cc5e1daa5c7f2335a9460ae79c829011dc5cef2d:implot/Externals/implot/implot \ google:googletest:58d77fa8070e8cec2dc1ed015d66b454c8d78850:googletest/Externals/gtest \ - RetroAchievements:rcheevos:d9e990e6d13527532b7e2bb23164a1f3b7f33bb5:rcheevos/Externals/rcheevos/rcheevos \ + RetroAchievements:rcheevos:b64ac2b25038bc9feb94ca759b5ba4d02642b3af:rcheevos/Externals/rcheevos/rcheevos \ + lsalzman:enet:2a85cd64459f6ba038d233a634d9440490dbba12:enet/Externals/enet/enet \ + syoyo:tinygltf:c5641f2c22d117da7971504591a8f6a41ece488b:tinygltf/Externals/tinygltf/tinygltf \ arsenm:sanitizers-cmake:aab6948fa863bc1cbe5d0850bc46b9ef02ed4c1a:sanitizerscmake/Externals/cubeb/cubeb/cmake/sanitizers-cmake \ + diff --git a/emulators/dolphin-emu/distinfo b/emulators/dolphin-emu/distinfo index 06e88a39cec3..223340ab221d 100644 --- a/emulators/dolphin-emu/distinfo +++ b/emulators/dolphin-emu/distinfo @@ -1,15 +1,19 @@ -TIMESTAMP = 1696355651 -SHA256 (dolphin-emu-dolphin-5.0.19870-8c2a1c1_GH0.tar.gz) = 539fb312ad194b35dfce0cb1b9aeac64f29490ea2cebbd1a42da0cf696525f87 -SIZE (dolphin-emu-dolphin-5.0.19870-8c2a1c1_GH0.tar.gz) = 20538143 +TIMESTAMP = 1712174768 +SHA256 (dolphin-emu-dolphin-5.0.21264-1efda86_GH0.tar.gz) = 8f86b70d652688c765fab7b710ec0007fcc534cad48d5dce56bfef1420683cf2 +SIZE (dolphin-emu-dolphin-5.0.21264-1efda86_GH0.tar.gz) = 20260599 SHA256 (GPUOpen-LibrariesAndSDKs-VulkanMemoryAllocator-498e20dfd1343d99b9115201034bb0219801cdec_GH0.tar.gz) = 4cb34c92b57d132d3200aa8c9b7f758e963eaeb31b6127d6edd0cd0902dc177e SIZE (GPUOpen-LibrariesAndSDKs-VulkanMemoryAllocator-498e20dfd1343d99b9115201034bb0219801cdec_GH0.tar.gz) = 880127 -SHA256 (mozilla-cubeb-27d2a102b0b75d9e49d43bc1ea516233fb87d778_GH0.tar.gz) = 9326a22d41b30b6d613c248a8ea2eb56c5ffc76a7080b0127165682fd8eba13e -SIZE (mozilla-cubeb-27d2a102b0b75d9e49d43bc1ea516233fb87d778_GH0.tar.gz) = 223102 -SHA256 (epezent-implot-d87512353495e7760e7fda7566a05beef7627d8f_GH0.tar.gz) = b85b27cde80816c6ecbd63390e5cb9d3ea56211a63564372b7a7f89fe5b76a9b -SIZE (epezent-implot-d87512353495e7760e7fda7566a05beef7627d8f_GH0.tar.gz) = 137760 +SHA256 (mozilla-cubeb-54217bca3f3e0cd53c073690a23dd25d83557909_GH0.tar.gz) = a795511bf56183ff7bad8fb2d2836ca5bb158e12ddd519caced62946ffa69c83 +SIZE (mozilla-cubeb-54217bca3f3e0cd53c073690a23dd25d83557909_GH0.tar.gz) = 228779 +SHA256 (epezent-implot-cc5e1daa5c7f2335a9460ae79c829011dc5cef2d_GH0.tar.gz) = af51940ae6482c0e96ffb4309982fa309f9aa383cd8f980081681010c8c3a835 +SIZE (epezent-implot-cc5e1daa5c7f2335a9460ae79c829011dc5cef2d_GH0.tar.gz) = 137924 SHA256 (google-googletest-58d77fa8070e8cec2dc1ed015d66b454c8d78850_GH0.tar.gz) = c6ab3b6b33f51ef7465921f8f8c10c15d7cbc510761a15a18ad85babf6d73278 SIZE (google-googletest-58d77fa8070e8cec2dc1ed015d66b454c8d78850_GH0.tar.gz) = 855887 -SHA256 (RetroAchievements-rcheevos-d9e990e6d13527532b7e2bb23164a1f3b7f33bb5_GH0.tar.gz) = dc165d4e7ce7b2b36169d94cc3291012e4b1fdf6a49b6b1d33c5126b289c888f -SIZE (RetroAchievements-rcheevos-d9e990e6d13527532b7e2bb23164a1f3b7f33bb5_GH0.tar.gz) = 540722 +SHA256 (RetroAchievements-rcheevos-b64ac2b25038bc9feb94ca759b5ba4d02642b3af_GH0.tar.gz) = c0aeb1ccb988927b7481ec16ac023a20d85f4b923496c902bd1d97e95f3bd490 +SIZE (RetroAchievements-rcheevos-b64ac2b25038bc9feb94ca759b5ba4d02642b3af_GH0.tar.gz) = 651498 +SHA256 (lsalzman-enet-2a85cd64459f6ba038d233a634d9440490dbba12_GH0.tar.gz) = 526c5af3980edfaebb510119c3311a9062d33ca5599e9f137a88e0d8a3be67a6 +SIZE (lsalzman-enet-2a85cd64459f6ba038d233a634d9440490dbba12_GH0.tar.gz) = 82867 +SHA256 (syoyo-tinygltf-c5641f2c22d117da7971504591a8f6a41ece488b_GH0.tar.gz) = 6352803f1ed18d479ea93abf96ac75c0222a21403be22840bde1072ee5935dfa +SIZE (syoyo-tinygltf-c5641f2c22d117da7971504591a8f6a41ece488b_GH0.tar.gz) = 5903179 SHA256 (arsenm-sanitizers-cmake-aab6948fa863bc1cbe5d0850bc46b9ef02ed4c1a_GH0.tar.gz) = 9f5b073625375322236a94ce8d2d803cdedad321c91e63845f487b9ebfb2c433 SIZE (arsenm-sanitizers-cmake-aab6948fa863bc1cbe5d0850bc46b9ef02ed4c1a_GH0.tar.gz) = 7234 diff --git a/emulators/dolphin-emu/files/patch-CMakeLists.txt b/emulators/dolphin-emu/files/patch-CMakeLists.txt index 1ee3b806760d..a479bc68f018 100644 --- a/emulators/dolphin-emu/files/patch-CMakeLists.txt +++ b/emulators/dolphin-emu/files/patch-CMakeLists.txt @@ -11,26 +11,9 @@ See: https://github.com/zlib-ng/zlib-ng/blob/develop/PORTING.md#zlib-ng-native-m minizip is found using the name 'minizip-ng' with pkgconf -3) Fix xxhash detection - -Add missing call to dolphin_find_optional_system_library_pkgconfig() to -detect libxxhash - ---- CMakeLists.txt.orig 2023-07-23 02:24:09 UTC +--- CMakeLists.txt.orig 2024-04-03 19:20:37 UTC +++ CMakeLists.txt -@@ -663,10 +663,7 @@ dolphin_find_optional_system_library(pugixml Externals - - dolphin_find_optional_system_library_pkgconfig(ENET libenet>=1.3.8 enet::enet Externals/enet) - --if(NOT XXHASH_FOUND) -- message(STATUS "Using static xxhash from Externals") -- add_subdirectory(Externals/xxhash) --endif() -+dolphin_find_optional_system_library_pkgconfig(XXHASH libxxhash xxhash:xxhash Externals/xxhash) - - dolphin_find_optional_system_library(BZip2 Externals/bzip2) - -@@ -676,9 +673,9 @@ dolphin_make_imported_target_if_missing(LibLZMA::LibLZ +@@ -672,9 +672,9 @@ dolphin_find_optional_system_library_pkgconfig(ZSTD li dolphin_find_optional_system_library_pkgconfig(ZSTD libzstd>=1.4.0 zstd::zstd Externals/zstd) diff --git a/emulators/dolphin-emu/files/patch-libfmt b/emulators/dolphin-emu/files/patch-libfmt deleted file mode 100644 index 56679c6177f5..000000000000 --- a/emulators/dolphin-emu/files/patch-libfmt +++ /dev/null @@ -1,168 +0,0 @@ -Obtained from: https://github.com/dolphin-emu/dolphin/commit/63467559b20682a6b9e4ec43c6b43456e1fca111 - https://github.com/dolphin-emu/dolphin/commit/b5b28da39d371ff2abbb0855fadc3c748a8a7043 - ---- CMakeLists.txt.orig 2023-07-23 02:24:09 UTC -+++ CMakeLists.txt -@@ -630,7 +630,7 @@ if (_M_X86) - endif() - add_subdirectory(Externals/cpp-optparse) - --dolphin_find_optional_system_library(fmt Externals/fmt 8) -+dolphin_find_optional_system_library(fmt Externals/fmt 10.1) - - add_subdirectory(Externals/imgui) - add_subdirectory(Externals/implot) ---- Source/Android/jni/GpuDriver.cpp.orig 2023-07-23 02:24:09 UTC -+++ Source/Android/jni/GpuDriver.cpp -@@ -7,6 +7,7 @@ - - #include - -+#include "Common/EnumUtils.h"` - #include "Common/IniFile.h" - #include "jni/AndroidCommon/AndroidCommon.h" - #include "jni/AndroidCommon/IDCache.h" -@@ -69,7 +70,7 @@ Java_org_dolphinemu_dolphinemu_utils_GpuDriverHelper_0 - properties2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2; - properties2.pNext = &driverProperties; - vkGetPhysicalDeviceProperties2(gpu_list.front(), &properties2); -- driverId = fmt::format("{}", driverProperties.driverID); -+ driverId = fmt::format("{}", Common::ToUnderlying(driverProperties.driverID)); - } - else - { ---- Source/Core/Common/HRWrap.cpp.orig 2023-07-23 02:24:09 UTC -+++ Source/Core/Common/HRWrap.cpp -@@ -3,13 +3,15 @@ - - #include "HRWrap.h" - --#include -- - namespace Common - { - std::string GetHResultMessage(HRESULT hr) - { - auto err = winrt::hresult_error(hr); - return winrt::to_string(err.message()); -+} -+std::string GetHResultMessage(const winrt::hresult& hr) -+{ -+ return GetHResultMessage(hr.value); - } - } // namespace Common ---- Source/Core/Common/HRWrap.h.orig 2023-07-23 02:24:09 UTC -+++ Source/Core/Common/HRWrap.h -@@ -6,6 +6,7 @@ - #include - #include - #include -+#include - - #include "Common/CommonTypes.h" - -@@ -31,5 +32,16 @@ struct fmt::formatter - { - return fmt::format_to(ctx.out(), "{} ({:#010x})", Common::GetHResultMessage(hr.m_hr), - static_cast(hr.m_hr)); -+ } -+}; -+ -+template <> -+struct fmt::formatter -+{ -+ constexpr auto parse(fmt::format_parse_context& ctx) { return ctx.begin(); } -+ template -+ auto format(const winrt::hresult& hr, FormatContext& ctx) const -+ { -+ return fmt::format_to(ctx.out(), "{} ({:#010x})", Common::GetHResultMessage(hr), hr.value); - } - }; ---- Source/Core/Common/Swap.h.orig 2023-07-23 02:24:09 UTC -+++ Source/Core/Common/Swap.h -@@ -16,6 +16,8 @@ - #include - #endif - -+#include -+ - #include "Common/CommonTypes.h" - - namespace Common -@@ -183,3 +185,15 @@ struct BigEndianValue (private) - value_type raw; - }; - } // Namespace Common -+ -+template -+struct fmt::formatter> -+{ -+ fmt::formatter m_formatter; -+ constexpr auto parse(format_parse_context& ctx) { return m_formatter.parse(ctx); } -+ template -+ auto format(const Common::BigEndianValue& value, FormatContext& ctx) const -+ { -+ return m_formatter.format(value.operator value_type(), ctx); -+ } -+}; ---- Source/Core/InputCommon/ControllerInterface/WGInput/WGInput.cpp.orig 2023-07-23 02:24:09 UTC -+++ Source/Core/InputCommon/ControllerInterface/WGInput/WGInput.cpp -@@ -23,6 +23,7 @@ - - #include - -+#include "Common/HRWrap.h" - #include "Common/Logging/Log.h" - #include "Common/StringUtil.h" - #include "InputCommon/ControllerInterface/ControllerInterface.h" -@@ -506,7 +507,7 @@ class Device : public Core::Device (private) - catch (winrt::hresult_error error) - { - ERROR_LOG_FMT(CONTROLLERINTERFACE, -- "WGInput: IRawGameController::GetCurrentReading failed: {:x}", error.code()); -+ "WGInput: IRawGameController::GetCurrentReading failed: {}", error.code()); - } - - // IGamepad: -@@ -518,7 +519,7 @@ class Device : public Core::Device (private) - } - catch (winrt::hresult_error error) - { -- ERROR_LOG_FMT(CONTROLLERINTERFACE, "WGInput: IGamepad::GetCurrentReading failed: {:x}", -+ ERROR_LOG_FMT(CONTROLLERINTERFACE, "WGInput: IGamepad::GetCurrentReading failed: {}", - error.code()); - } - } ---- Source/Core/VideoCommon/Assets/DirectFilesystemAssetLibrary.cpp.orig 2023-07-23 02:24:09 UTC -+++ Source/Core/VideoCommon/Assets/DirectFilesystemAssetLibrary.cpp -@@ -4,7 +4,8 @@ - #include "VideoCommon/Assets/DirectFilesystemAssetLibrary.h" - - #include --#include -+ -+#include - - #include "Common/FileUtil.h" - #include "Common/Logging/Log.h" ---- Source/Core/VideoCommon/BPMemory.h.orig 2023-07-23 02:24:09 UTC -+++ Source/Core/VideoCommon/BPMemory.h -@@ -1863,7 +1863,7 @@ enum class ColorChannel : u32 - template <> - struct fmt::formatter : EnumFormatter - { -- formatter() : EnumFormatter({"Red", "Green", "Blue", "Alpha"}) {} -+ constexpr formatter() : EnumFormatter({"Red", "Green", "Blue", "Alpha"}) {} - }; - - enum class KonstSel : u32 ---- Source/Core/VideoCommon/TextureCacheBase.h.orig 2023-07-23 02:24:09 UTC -+++ Source/Core/VideoCommon/TextureCacheBase.h -@@ -98,7 +98,6 @@ struct EFBCopyParams - template <> - struct fmt::formatter - { -- std::shared_ptr state; - constexpr auto parse(format_parse_context& ctx) { return ctx.begin(); } - template - auto format(const EFBCopyParams& uid, FormatContext& ctx) const diff --git a/emulators/dolphin-emu/pkg-plist b/emulators/dolphin-emu/pkg-plist index 53c212a233de..002742d18641 100644 --- a/emulators/dolphin-emu/pkg-plist +++ b/emulators/dolphin-emu/pkg-plist @@ -1,8 +1,6 @@ bin/dolphin-emu bin/dolphin-emu-nogui bin/dolphin-tool -share/man/man6/dolphin-emu-nogui.6.gz -share/man/man6/dolphin-emu.6.gz share/applications/dolphin-emu.desktop %%DATADIR%%/sys/GC/dsp_coef.bin %%DATADIR%%/sys/GC/dsp_rom.bin @@ -144,6 +142,8 @@ share/applications/dolphin-emu.desktop %%DATADIR%%/sys/GameSettings/FARE01.ini %%DATADIR%%/sys/GameSettings/FASE01.ini %%DATADIR%%/sys/GameSettings/G2B.ini +%%DATADIR%%/sys/GameSettings/G2BE5G.ini +%%DATADIR%%/sys/GameSettings/G2BP7D.ini %%DATADIR%%/sys/GameSettings/G2C.ini %%DATADIR%%/sys/GameSettings/G2FE78.ini %%DATADIR%%/sys/GameSettings/G2M.ini @@ -169,6 +169,7 @@ share/applications/dolphin-emu.desktop %%DATADIR%%/sys/GameSettings/G4S.ini %%DATADIR%%/sys/GameSettings/G4SP01.ini %%DATADIR%%/sys/GameSettings/G4Z.ini +%%DATADIR%%/sys/GameSettings/G5B.ini %%DATADIR%%/sys/GameSettings/G5D.ini %%DATADIR%%/sys/GameSettings/G5N.ini %%DATADIR%%/sys/GameSettings/G5T.ini @@ -219,6 +220,7 @@ share/applications/dolphin-emu.desktop %%DATADIR%%/sys/GameSettings/GC6E01.ini %%DATADIR%%/sys/GameSettings/GC6J01.ini %%DATADIR%%/sys/GameSettings/GC6P01.ini +%%DATADIR%%/sys/GameSettings/GC8JA4.ini %%DATADIR%%/sys/GameSettings/GC9.ini %%DATADIR%%/sys/GameSettings/GCC.ini %%DATADIR%%/sys/GameSettings/GCCE01.ini @@ -567,6 +569,8 @@ share/applications/dolphin-emu.desktop %%DATADIR%%/sys/GameSettings/HAC.ini %%DATADIR%%/sys/GameSettings/HAF.ini %%DATADIR%%/sys/GameSettings/HAG.ini +%%DATADIR%%/sys/GameSettings/HAJ.ini +%%DATADIR%%/sys/GameSettings/HAL.ini %%DATADIR%%/sys/GameSettings/HAT.ini %%DATADIR%%/sys/GameSettings/HATE01.ini %%DATADIR%%/sys/GameSettings/HATJ01.ini @@ -814,6 +818,7 @@ share/applications/dolphin-emu.desktop %%DATADIR%%/sys/GameSettings/REB.ini %%DATADIR%%/sys/GameSettings/RED.ini %%DATADIR%%/sys/GameSettings/REF.ini +%%DATADIR%%/sys/GameSettings/REG.ini %%DATADIR%%/sys/GameSettings/REL.ini %%DATADIR%%/sys/GameSettings/RELJAB.ini %%DATADIR%%/sys/GameSettings/REM.ini @@ -893,6 +898,7 @@ share/applications/dolphin-emu.desktop %%DATADIR%%/sys/GameSettings/RIU.ini %%DATADIR%%/sys/GameSettings/RIZ.ini %%DATADIR%%/sys/GameSettings/RJ2.ini +%%DATADIR%%/sys/GameSettings/RJ3.ini %%DATADIR%%/sys/GameSettings/RJ4.ini %%DATADIR%%/sys/GameSettings/RJ7.ini %%DATADIR%%/sys/GameSettings/RJ8.ini @@ -1244,6 +1250,7 @@ share/applications/dolphin-emu.desktop %%DATADIR%%/sys/GameSettings/SGD.ini %%DATADIR%%/sys/GameSettings/SGL.ini %%DATADIR%%/sys/GameSettings/SGLEA4.ini +%%DATADIR%%/sys/GameSettings/SGLPA4.ini %%DATADIR%%/sys/GameSettings/SGT.ini %%DATADIR%%/sys/GameSettings/SGV.ini %%DATADIR%%/sys/GameSettings/SGX.ini @@ -1343,6 +1350,7 @@ share/applications/dolphin-emu.desktop %%DATADIR%%/sys/GameSettings/SRA.ini %%DATADIR%%/sys/GameSettings/SRE.ini %%DATADIR%%/sys/GameSettings/SRL.ini +%%DATADIR%%/sys/GameSettings/SRQ.ini %%DATADIR%%/sys/GameSettings/SRT.ini %%DATADIR%%/sys/GameSettings/SRV.ini %%DATADIR%%/sys/GameSettings/SRW.ini @@ -1611,6 +1619,8 @@ share/applications/dolphin-emu.desktop %%DATADIR%%/sys/Load/GraphicMods/Battalion Wars 2/metadata.json %%DATADIR%%/sys/Load/GraphicMods/Donkey Kong Country Returns/SF8.txt %%DATADIR%%/sys/Load/GraphicMods/Donkey Kong Country Returns/metadata.json +%%DATADIR%%/sys/Load/GraphicMods/Dragon Ball Z Budokai Tenkaichi 3/RDS.txt +%%DATADIR%%/sys/Load/GraphicMods/Dragon Ball Z Budokai Tenkaichi 3/metadata.json %%DATADIR%%/sys/Load/GraphicMods/Fragile Dreams - Farewell Ruins of the Moon/R2G.txt %%DATADIR%%/sys/Load/GraphicMods/Fragile Dreams - Farewell Ruins of the Moon/metadata.json %%DATADIR%%/sys/Load/GraphicMods/Link's Crossbow Training/RZP.txt @@ -1731,8 +1741,10 @@ share/applications/dolphin-emu.desktop %%DATADIR%%/sys/Shaders/Anaglyph/fullcolor.glsl %%DATADIR%%/sys/Shaders/Anaglyph/grayscale.glsl %%DATADIR%%/sys/Shaders/Anaglyph/grayscale2.glsl +%%DATADIR%%/sys/Shaders/AutoHDR.glsl %%DATADIR%%/sys/Shaders/FXAA.glsl %%DATADIR%%/sys/Shaders/Passive/horizontal.glsl +%%DATADIR%%/sys/Shaders/PerceptualHDR.glsl %%DATADIR%%/sys/Shaders/acidmetal.glsl %%DATADIR%%/sys/Shaders/acidtrip.glsl %%DATADIR%%/sys/Shaders/acidtrip2.glsl @@ -1764,7 +1776,6 @@ share/applications/dolphin-emu.desktop %%DATADIR%%/sys/Shaders/posterize2.glsl %%DATADIR%%/sys/Shaders/primarycolors.glsl %%DATADIR%%/sys/Shaders/sepia.glsl -%%DATADIR%%/sys/Shaders/sharp_bilinear.glsl %%DATADIR%%/sys/Shaders/sketchy.glsl %%DATADIR%%/sys/Shaders/spookey1.glsl %%DATADIR%%/sys/Shaders/spookey2.glsl @@ -1775,6 +1786,22 @@ share/applications/dolphin-emu.desktop %%DATADIR%%/sys/Shaders/swap_RGB_GRB.glsl %%DATADIR%%/sys/Shaders/swap_RGB_RBG.glsl %%DATADIR%%/sys/Shaders/toxic.glsl +%%DATADIR%%/sys/Themes/Clean Blue/assembler_assemble.png +%%DATADIR%%/sys/Themes/Clean Blue/assembler_assemble@2x.png +%%DATADIR%%/sys/Themes/Clean Blue/assembler_assemble@4x.png +%%DATADIR%%/sys/Themes/Clean Blue/assembler_clipboard.png +%%DATADIR%%/sys/Themes/Clean Blue/assembler_inject.png +%%DATADIR%%/sys/Themes/Clean Blue/assembler_inject@2x.png +%%DATADIR%%/sys/Themes/Clean Blue/assembler_inject@4x.png +%%DATADIR%%/sys/Themes/Clean Blue/assembler_new.png +%%DATADIR%%/sys/Themes/Clean Blue/assembler_new@2x.png +%%DATADIR%%/sys/Themes/Clean Blue/assembler_new@4x.png +%%DATADIR%%/sys/Themes/Clean Blue/assembler_openasm.png +%%DATADIR%%/sys/Themes/Clean Blue/assembler_openasm@2x.png +%%DATADIR%%/sys/Themes/Clean Blue/assembler_openasm@4x.png +%%DATADIR%%/sys/Themes/Clean Blue/assembler_save.png +%%DATADIR%%/sys/Themes/Clean Blue/assembler_save@2x.png +%%DATADIR%%/sys/Themes/Clean Blue/assembler_save@4x.png %%DATADIR%%/sys/Themes/Clean Blue/browse.png %%DATADIR%%/sys/Themes/Clean Blue/browse@2x.png %%DATADIR%%/sys/Themes/Clean Blue/browse@4x.png @@ -1853,6 +1880,22 @@ share/applications/dolphin-emu.desktop %%DATADIR%%/sys/Themes/Clean Blue/wiimote.png %%DATADIR%%/sys/Themes/Clean Blue/wiimote@2x.png %%DATADIR%%/sys/Themes/Clean Blue/wiimote@4x.png +%%DATADIR%%/sys/Themes/Clean Emerald/assembler_assemble.png +%%DATADIR%%/sys/Themes/Clean Emerald/assembler_assemble@2x.png +%%DATADIR%%/sys/Themes/Clean Emerald/assembler_assemble@4x.png +%%DATADIR%%/sys/Themes/Clean Emerald/assembler_clipboard.png +%%DATADIR%%/sys/Themes/Clean Emerald/assembler_inject.png +%%DATADIR%%/sys/Themes/Clean Emerald/assembler_inject@2x.png +%%DATADIR%%/sys/Themes/Clean Emerald/assembler_inject@4x.png +%%DATADIR%%/sys/Themes/Clean Emerald/assembler_new.png +%%DATADIR%%/sys/Themes/Clean Emerald/assembler_new@2x.png +%%DATADIR%%/sys/Themes/Clean Emerald/assembler_new@4x.png +%%DATADIR%%/sys/Themes/Clean Emerald/assembler_openasm.png +%%DATADIR%%/sys/Themes/Clean Emerald/assembler_openasm@2x.png +%%DATADIR%%/sys/Themes/Clean Emerald/assembler_openasm@4x.png +%%DATADIR%%/sys/Themes/Clean Emerald/assembler_save.png +%%DATADIR%%/sys/Themes/Clean Emerald/assembler_save@2x.png +%%DATADIR%%/sys/Themes/Clean Emerald/assembler_save@4x.png %%DATADIR%%/sys/Themes/Clean Emerald/browse.png %%DATADIR%%/sys/Themes/Clean Emerald/browse@2x.png %%DATADIR%%/sys/Themes/Clean Emerald/browse@4x.png @@ -1931,6 +1974,22 @@ share/applications/dolphin-emu.desktop %%DATADIR%%/sys/Themes/Clean Emerald/wiimote.png %%DATADIR%%/sys/Themes/Clean Emerald/wiimote@2x.png %%DATADIR%%/sys/Themes/Clean Emerald/wiimote@4x.png +%%DATADIR%%/sys/Themes/Clean Lite/assembler_assemble.png +%%DATADIR%%/sys/Themes/Clean Lite/assembler_assemble@2x.png +%%DATADIR%%/sys/Themes/Clean Lite/assembler_assemble@4x.png +%%DATADIR%%/sys/Themes/Clean Lite/assembler_clipboard.png +%%DATADIR%%/sys/Themes/Clean Lite/assembler_inject.png +%%DATADIR%%/sys/Themes/Clean Lite/assembler_inject@2x.png +%%DATADIR%%/sys/Themes/Clean Lite/assembler_inject@4x.png +%%DATADIR%%/sys/Themes/Clean Lite/assembler_new.png +%%DATADIR%%/sys/Themes/Clean Lite/assembler_new@2x.png +%%DATADIR%%/sys/Themes/Clean Lite/assembler_new@4x.png +%%DATADIR%%/sys/Themes/Clean Lite/assembler_openasm.png +%%DATADIR%%/sys/Themes/Clean Lite/assembler_openasm@2x.png +%%DATADIR%%/sys/Themes/Clean Lite/assembler_openasm@4x.png +%%DATADIR%%/sys/Themes/Clean Lite/assembler_save.png +%%DATADIR%%/sys/Themes/Clean Lite/assembler_save@2x.png +%%DATADIR%%/sys/Themes/Clean Lite/assembler_save@4x.png %%DATADIR%%/sys/Themes/Clean Lite/browse.png %%DATADIR%%/sys/Themes/Clean Lite/browse@2x.png %%DATADIR%%/sys/Themes/Clean Lite/browse@4x.png @@ -2009,6 +2068,22 @@ share/applications/dolphin-emu.desktop %%DATADIR%%/sys/Themes/Clean Lite/wiimote.png %%DATADIR%%/sys/Themes/Clean Lite/wiimote@2x.png %%DATADIR%%/sys/Themes/Clean Lite/wiimote@4x.png +%%DATADIR%%/sys/Themes/Clean Pink/assembler_assemble.png +%%DATADIR%%/sys/Themes/Clean Pink/assembler_assemble@2x.png +%%DATADIR%%/sys/Themes/Clean Pink/assembler_assemble@4x.png +%%DATADIR%%/sys/Themes/Clean Pink/assembler_clipboard.png +%%DATADIR%%/sys/Themes/Clean Pink/assembler_inject.png +%%DATADIR%%/sys/Themes/Clean Pink/assembler_inject@2x.png +%%DATADIR%%/sys/Themes/Clean Pink/assembler_inject@4x.png +%%DATADIR%%/sys/Themes/Clean Pink/assembler_new.png +%%DATADIR%%/sys/Themes/Clean Pink/assembler_new@2x.png +%%DATADIR%%/sys/Themes/Clean Pink/assembler_new@4x.png +%%DATADIR%%/sys/Themes/Clean Pink/assembler_openasm.png +%%DATADIR%%/sys/Themes/Clean Pink/assembler_openasm@2x.png +%%DATADIR%%/sys/Themes/Clean Pink/assembler_openasm@4x.png +%%DATADIR%%/sys/Themes/Clean Pink/assembler_save.png +%%DATADIR%%/sys/Themes/Clean Pink/assembler_save@2x.png +%%DATADIR%%/sys/Themes/Clean Pink/assembler_save@4x.png %%DATADIR%%/sys/Themes/Clean Pink/browse.png %%DATADIR%%/sys/Themes/Clean Pink/browse@2x.png %%DATADIR%%/sys/Themes/Clean Pink/browse@4x.png @@ -2087,6 +2162,22 @@ share/applications/dolphin-emu.desktop %%DATADIR%%/sys/Themes/Clean Pink/wiimote.png %%DATADIR%%/sys/Themes/Clean Pink/wiimote@2x.png %%DATADIR%%/sys/Themes/Clean Pink/wiimote@4x.png +%%DATADIR%%/sys/Themes/Clean/assembler_assemble.png +%%DATADIR%%/sys/Themes/Clean/assembler_assemble@2x.png +%%DATADIR%%/sys/Themes/Clean/assembler_assemble@4x.png +%%DATADIR%%/sys/Themes/Clean/assembler_clipboard.png +%%DATADIR%%/sys/Themes/Clean/assembler_inject.png +%%DATADIR%%/sys/Themes/Clean/assembler_inject@2x.png +%%DATADIR%%/sys/Themes/Clean/assembler_inject@4x.png +%%DATADIR%%/sys/Themes/Clean/assembler_new.png +%%DATADIR%%/sys/Themes/Clean/assembler_new@2x.png +%%DATADIR%%/sys/Themes/Clean/assembler_new@4x.png +%%DATADIR%%/sys/Themes/Clean/assembler_openasm.png +%%DATADIR%%/sys/Themes/Clean/assembler_openasm@2x.png +%%DATADIR%%/sys/Themes/Clean/assembler_openasm@4x.png +%%DATADIR%%/sys/Themes/Clean/assembler_save.png +%%DATADIR%%/sys/Themes/Clean/assembler_save@2x.png +%%DATADIR%%/sys/Themes/Clean/assembler_save@4x.png %%DATADIR%%/sys/Themes/Clean/browse.png %%DATADIR%%/sys/Themes/Clean/browse@2x.png %%DATADIR%%/sys/Themes/Clean/browse@4x.png @@ -2221,3 +2312,5 @@ share/icons/hicolor/scalable/apps/dolphin-emu.svg %%NLS%%share/locale/tr/LC_MESSAGES/dolphin-emu.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/dolphin-emu.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/dolphin-emu.mo +share/man/man6/dolphin-emu-nogui.6.gz +share/man/man6/dolphin-emu.6.gz