From bc3b7a19a0c3c3d9da0b6e455592522ef6958775 Mon Sep 17 00:00:00 2001 From: Henry Naguski Date: Sat, 31 Jul 2021 09:26:45 -0400 Subject: [PATCH] dolphin-emu: update to 5.0.14344. --- .../dolphin-emu/patches/VkDeviceMemory.patch | 37 ------------------- srcpkgs/dolphin-emu/patches/i686.patch | 23 ++++++++++++ srcpkgs/dolphin-emu/patches/musl.patch | 21 +++++++++++ srcpkgs/dolphin-emu/template | 8 ++-- 4 files changed, 48 insertions(+), 41 deletions(-) delete mode 100644 srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch create mode 100644 srcpkgs/dolphin-emu/patches/i686.patch create mode 100644 srcpkgs/dolphin-emu/patches/musl.patch diff --git a/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch b/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch deleted file mode 100644 index 62d1bc863041..000000000000 --- a/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch +++ /dev/null @@ -1,37 +0,0 @@ -From d456e2e391134742c633b0029251f7ca06bb5204 Mon Sep 17 00:00:00 2001 -From: Ganael Laplanche -Date: Wed, 7 Oct 2020 21:25:29 +0200 -Subject: [PATCH] Resolve VkDeviceMemory/nullptr type mismatch to fix build on - FreeBSD i386 - ---- - Source/Core/VideoBackends/Vulkan/VKTexture.cpp | 2 +- - Source/Core/VideoBackends/Vulkan/VKTexture.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git Source/Core/VideoBackends/Vulkan/VKTexture.cpp Source/Core/VideoBackends/Vulkan/VKTexture.cpp -index fcff0db4048..80c0c4aa86d 100644 ---- a/Source/Core/VideoBackends/Vulkan/VKTexture.cpp -+++ b/Source/Core/VideoBackends/Vulkan/VKTexture.cpp -@@ -122,7 +122,7 @@ std::unique_ptr VKTexture::CreateAdopted(const TextureConfig& tex_con - VkImageViewType view_type, VkImageLayout layout) - { - std::unique_ptr texture = std::make_unique( -- tex_config, nullptr, image, layout, ComputeImageLayout::Undefined); -+ tex_config, VkDeviceMemory(VK_NULL_HANDLE), image, layout, ComputeImageLayout::Undefined); - if (!texture->CreateView(view_type)) - return nullptr; - -diff --git Source/Core/VideoBackends/Vulkan/VKTexture.h Source/Core/VideoBackends/Vulkan/VKTexture.h -index 91d3e54eac2..3b803dd4da4 100644 ---- a/Source/Core/VideoBackends/Vulkan/VKTexture.h -+++ b/Source/Core/VideoBackends/Vulkan/VKTexture.h -@@ -54,7 +54,7 @@ class VKTexture final : public AbstractTexture - VkImageView GetView() const { return m_view; } - VkImageLayout GetLayout() const { return m_layout; } - VkFormat GetVkFormat() const { return GetVkFormatForHostTextureFormat(m_config.format); } -- bool IsAdopted() const { return m_device_memory != nullptr; } -+ bool IsAdopted() const { return m_device_memory != VkDeviceMemory(VK_NULL_HANDLE); } - - static std::unique_ptr Create(const TextureConfig& tex_config); - static std::unique_ptr diff --git a/srcpkgs/dolphin-emu/patches/i686.patch b/srcpkgs/dolphin-emu/patches/i686.patch new file mode 100644 index 000000000000..fc2303b0866f --- /dev/null +++ b/srcpkgs/dolphin-emu/patches/i686.patch @@ -0,0 +1,23 @@ +From beb6ec056909b4fc7507154d97e42d0020206dee Mon Sep 17 00:00:00 2001 +From: CrystalGamma +Date: Mon, 12 Jul 2021 03:24:55 +0200 +Subject: [PATCH] VideoCommon: fix generic build + +On x86/ARM Common/Assert.h is included by way of +VideoCommon/VertexLoader{X64,ARM64}.h, on other platforms it is missing. +--- + Source/Core/VideoCommon/VertexLoaderBase.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Source/Core/VideoCommon/VertexLoaderBase.cpp b/Source/Core/VideoCommon/VertexLoaderBase.cpp +index 481f8a8a2f06..a9740329dee1 100644 +--- a/Source/Core/VideoCommon/VertexLoaderBase.cpp ++++ b/Source/Core/VideoCommon/VertexLoaderBase.cpp +@@ -12,6 +12,7 @@ + + #include + ++#include "Common/Assert.h" + #include "Common/CommonTypes.h" + #include "Common/Logging/Log.h" + #include "Common/MsgHandler.h" diff --git a/srcpkgs/dolphin-emu/patches/musl.patch b/srcpkgs/dolphin-emu/patches/musl.patch new file mode 100644 index 000000000000..b1089f29856b --- /dev/null +++ b/srcpkgs/dolphin-emu/patches/musl.patch @@ -0,0 +1,21 @@ +From 7a1922fd8f0f6686188d179732c9757faf2d1b4f Mon Sep 17 00:00:00 2001 +From: thyrc +Date: Mon, 14 Jun 2021 10:18:34 +0200 +Subject: [PATCH] Fix includes for musl libc + +--- + Source/Core/Core/MemoryWatcher.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Source/Core/Core/MemoryWatcher.cpp b/Source/Core/Core/MemoryWatcher.cpp +index 491ecd83150a..13843e2021ca 100644 +--- a/Source/Core/Core/MemoryWatcher.cpp ++++ b/Source/Core/Core/MemoryWatcher.cpp +@@ -2,6 +2,7 @@ + // Licensed under GPLv2+ + // Refer to the license.txt file included. + ++#include + #include + #include + #include diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template index 729f66512d42..8ff426ad913e 100644 --- a/srcpkgs/dolphin-emu/template +++ b/srcpkgs/dolphin-emu/template @@ -1,8 +1,8 @@ # Template file for 'dolphin-emu' pkgname=dolphin-emu -version=5.0.13178 +version=5.0.14344 revision=1 -_commit=31524288e3b2450eaefff8202c6d26c4ba3f7333 +_commit=acc7d3710d60552769f61f4b44bc8533a940df36 #Version/hash pair can be found at https://dolphin-emu.org/download/ archs="x86_64* aarch64* ppc64le* i686*" wrksrc="dolphin-${_commit}" @@ -16,11 +16,11 @@ makedepends=" mbedtls-devel SFML-devel libenet-devel liblzma-devel pugixml-devel" depends="desktop-file-utils" short_desc="Gamecube / Wii / Triforce emulator" -maintainer="Orphaned " +maintainer="Henry Naguski " license="GPL-2.0-or-later" homepage="http://dolphin-emu.org" distfiles="https://github.com/dolphin-emu/dolphin/archive/${_commit}.tar.gz" -checksum=a7ce8390993b3309108dea8f23976b343d2d7cd527f3ded9ef4c2a0462c7f338 +checksum=22075f3b335ba11bbfb34034028e7b9718be4be64dc037453c03359e6191307f nopie=yes case "$XBPS_TARGET_MACHINE" in