dolphin-emu: update to 5.0.14790.
This commit is contained in:
parent
a8a068960e
commit
8032d1ac00
|
@ -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>
|
|
|
@ -1,11 +1,12 @@
|
||||||
# Template file for 'dolphin-emu'
|
# Template file for 'dolphin-emu'
|
||||||
pkgname=dolphin-emu
|
pkgname=dolphin-emu
|
||||||
version=5.0.13178
|
version=5.0.14790
|
||||||
revision=1
|
revision=1
|
||||||
_commit=31524288e3b2450eaefff8202c6d26c4ba3f7333
|
_dolphin_commit=3cc274880f47d340bd508dba91aaf37c48acd367
|
||||||
|
_mgba_commit=9cccc5197ed73ba0a54f584d3121c27dc97405f5
|
||||||
#Version/hash pair can be found at https://dolphin-emu.org/download/
|
#Version/hash pair can be found at https://dolphin-emu.org/download/
|
||||||
archs="x86_64* aarch64* ppc64le* i686*"
|
archs="x86_64* aarch64* ppc64le* i686*"
|
||||||
wrksrc="dolphin-${_commit}"
|
wrksrc="dolphin-${_dolphin_commit}"
|
||||||
build_style=cmake
|
build_style=cmake
|
||||||
configure_args="-DUSE_SHARED_ENET=ON"
|
configure_args="-DUSE_SHARED_ENET=ON"
|
||||||
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
|
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
|
||||||
|
@ -16,11 +17,13 @@ makedepends="
|
||||||
mbedtls-devel SFML-devel libenet-devel liblzma-devel pugixml-devel"
|
mbedtls-devel SFML-devel libenet-devel liblzma-devel pugixml-devel"
|
||||||
depends="desktop-file-utils"
|
depends="desktop-file-utils"
|
||||||
short_desc="Gamecube / Wii / Triforce emulator"
|
short_desc="Gamecube / Wii / Triforce emulator"
|
||||||
maintainer="Orphaned <orphan@voidlinux.org>"
|
maintainer="Henry Naguski <henry@nilsu.org>"
|
||||||
license="GPL-2.0-or-later"
|
license="GPL-2.0-or-later"
|
||||||
homepage="http://dolphin-emu.org"
|
homepage="http://dolphin-emu.org"
|
||||||
distfiles="https://github.com/dolphin-emu/dolphin/archive/${_commit}.tar.gz"
|
distfiles="https://github.com/dolphin-emu/dolphin/archive/${_dolphin_commit}.tar.gz
|
||||||
checksum=a7ce8390993b3309108dea8f23976b343d2d7cd527f3ded9ef4c2a0462c7f338
|
https://github.com/mgba-emu/mgba/archive/${_mgba_commit}.tar.gz"
|
||||||
|
checksum="2ef4b7eadb74f98e110654f0acca7c758fb9266847ba50d6c88c96011e0ca03b
|
||||||
|
d1c9fa071aae747fe1350130a2c69ed618ad52a759b35b119dbb7292252b4a77"
|
||||||
nopie=yes
|
nopie=yes
|
||||||
|
|
||||||
case "$XBPS_TARGET_MACHINE" in
|
case "$XBPS_TARGET_MACHINE" in
|
||||||
|
@ -28,6 +31,11 @@ case "$XBPS_TARGET_MACHINE" in
|
||||||
*) configure_args+=" -DENABLE_GENERIC=ON" ;;
|
*) configure_args+=" -DENABLE_GENERIC=ON" ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
post_extract() {
|
||||||
|
rmdir Externals/mGBA/mgba
|
||||||
|
mv ../mgba-${_mgba_commit} Externals/mGBA/mgba
|
||||||
|
}
|
||||||
|
|
||||||
post_install() {
|
post_install() {
|
||||||
rm -f ${DESTDIR}/usr/lib/*.a
|
rm -f ${DESTDIR}/usr/lib/*.a
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue