From: Hnaguski <Hnaguski@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] dolphin-emu: update to 5.0.14344.
Date: Thu, 29 Jul 2021 01:17:32 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-32238@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1746 bytes --]
There is a new pull request by Hnaguski against master on the void-packages repository
https://github.com/Hnaguski/void-packages dolphin-emu
https://github.com/void-linux/void-packages/pull/32238
dolphin-emu: update to 5.0.14344.
<!-- 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?
- [x] 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
Removed the remaining patch as it was merged upstream: https://github.com/dolphin-emu/dolphin/commit/d456e2e391134742c633b0029251f7ca06bb5204
<!--
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/32238.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dolphin-emu-32238.patch --]
[-- Type: text/x-diff, Size: 3859 bytes --]
From ed5684e7ca996a061d32ef9b75b0acf9b25e597a Mon Sep 17 00:00:00 2001
From: Henry Naguski <henry@nilsu.org>
Date: Wed, 28 Jul 2021 18:09:23 -0400
Subject: [PATCH] dolphin-emu: update to 5.0.14344.
---
.../dolphin-emu/patches/VkDeviceMemory.patch | 37 -------------------
srcpkgs/dolphin-emu/template | 8 ++--
2 files changed, 4 insertions(+), 41 deletions(-)
delete mode 100644 srcpkgs/dolphin-emu/patches/VkDeviceMemory.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 <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
---- a/Source/Core/VideoBackends/Vulkan/VKTexture.cpp
-+++ b/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
---- 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<VKTexture> Create(const TextureConfig& tex_config);
- static std::unique_ptr<VKTexture>
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 <orphan@voidlinux.org>"
+maintainer="Henry Naguski <henry@nilsu.org>"
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
next reply other threads:[~2021-07-28 23:17 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-28 23:17 Hnaguski [this message]
2021-07-28 23:34 ` Hnaguski
2021-07-29 17:16 ` ericonr
2021-07-31 13:18 ` [PR PATCH] [Updated] " Hnaguski
2021-07-31 13:27 ` Hnaguski
2021-07-31 13:56 ` Hnaguski
2021-08-01 11:57 ` Hnaguski
2021-08-01 12:53 ` paper42
2021-08-01 13:23 ` [PR PATCH] [Updated] " Hnaguski
2021-08-01 13:44 ` dolphin-emu: update to 5.0.14790 Hnaguski
2021-08-01 13:47 ` Hnaguski
2021-08-03 3:39 ` ericonr
2021-08-03 18:37 ` [PR PATCH] [Updated] " Hnaguski
2021-08-03 18:58 ` Hnaguski
2021-08-10 18:29 ` [PR PATCH] [Merged]: " ericonr
2021-08-10 18:29 ` ericonr
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-32238@inbox.vuxu.org \
--to=hnaguski@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).