[PR PATCH] dolphin-emu: enable on i686

[PR PATCH] dolphin-emu: enable on i686

[Chocimier]

[-- Attachment #1: Type: text/plain, Size: 1601 bytes --]

There is a new pull request by Chocimier against master on the void-packages repository

https://github.com/Chocimier/void-packages-org dolphin-emu
https://github.com/void-linux/void-packages/pull/29708

dolphin-emu: enable on i686
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/29708.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dolphin-emu-29708.patch --]
[-- Type: text/x-diff, Size: 3214 bytes --]

From 43f717363eeffb4374f0cd3a7c47e4c9cf467b08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 24 Mar 2021 01:47:35 +0100
Subject: [PATCH] dolphin-emu: enable on i686

---
 .../dolphin-emu/patches/VkDeviceMemory.patch  | 37 +++++++++++++++++++
 srcpkgs/dolphin-emu/template                  |  2 +-
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch

diff --git a/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch b/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
new file mode 100644
index 000000000000..65d86f081476
--- /dev/null
+++ b/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch
@@ -0,0 +1,37 @@
+From d456e2e391134742c633b0029251f7ca06bb5204 Mon Sep 17 00:00:00 2001
+From: Ganael Laplanche <ganael.laplanche@martymac.org>
+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
+--- Source/Core/VideoBackends/Vulkan/VKTexture.cpp
++++ Source/Core/VideoBackends/Vulkan/VKTexture.cpp
+@@ -122,7 +122,7 @@ std::unique_ptr<VKTexture> VKTexture::CreateAdopted(const TextureConfig& tex_con
+                                                     VkImageViewType view_type, VkImageLayout layout)
+ {
+   std::unique_ptr<VKTexture> texture = std::make_unique<VKTexture>(
+-      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
+--- Source/Core/VideoBackends/Vulkan/VKTexture.h
++++ 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<VKTexture> Create(const TextureConfig& tex_config);
+   static std::unique_ptr<VKTexture>
diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template
index a577e9cc9620..729f66512d42 100644
--- a/srcpkgs/dolphin-emu/template
+++ b/srcpkgs/dolphin-emu/template
@@ -4,7 +4,7 @@ version=5.0.13178
 revision=1
 _commit=31524288e3b2450eaefff8202c6d26c4ba3f7333
 #Version/hash pair can be found at https://dolphin-emu.org/download/
-archs="x86_64* aarch64* ppc64le*"
+archs="x86_64* aarch64* ppc64le* i686*"
 wrksrc="dolphin-${_commit}"
 build_style=cmake
 configure_args="-DUSE_SHARED_ENET=ON"

Re: [PR PATCH] [Merged]: dolphin-emu: enable on i686

[Chocimier]

[-- Attachment #1: Type: text/plain, Size: 1438 bytes --]

There's a merged pull request on the void-packages repository

dolphin-emu: enable on i686
https://github.com/void-linux/void-packages/pull/29708

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->