From 4646746bcda83aeb8ba95252b8a23fe235c0da50 Mon Sep 17 00:00:00 2001 From: SolitudeSF Date: Tue, 16 May 2023 17:03:46 +0300 Subject: [PATCH] melonDS: update to 0.9.5 --- .../patches/align-test-case-i686.patch | 28 ------------------- srcpkgs/melonDS/patches/fix-gcc12.patch | 19 ------------- srcpkgs/melonDS/template | 8 +++--- 3 files changed, 4 insertions(+), 51 deletions(-) delete mode 100644 srcpkgs/melonDS/patches/align-test-case-i686.patch delete mode 100644 srcpkgs/melonDS/patches/fix-gcc12.patch diff --git a/srcpkgs/melonDS/patches/align-test-case-i686.patch b/srcpkgs/melonDS/patches/align-test-case-i686.patch deleted file mode 100644 index 1427d4ce1b02..000000000000 --- a/srcpkgs/melonDS/patches/align-test-case-i686.patch +++ /dev/null @@ -1,28 +0,0 @@ -https://github.com/wwylele/teakra/commit/5862fd000353b8086b5be799c0a7f3ee1b2fe971.patch - -From 5862fd000353b8086b5be799c0a7f3ee1b2fe971 Mon Sep 17 00:00:00 2001 -From: Jan Beich -Date: Mon, 14 Jan 2019 22:21:41 +0000 -Subject: [PATCH] Align TestCase on 32-bit x86 - -src/test.h:37:1: fatal error: static_assert failed -static_assert(sizeof(TestCase) == 4312); -^ ~~~~~~~~~~~~~~~~~~~~~~~~ ---- - src/test.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/teakra/src/test.h b/src/teakra/src/test.h -index e8c8742..869f8d2 100644 ---- a/src/teakra/src/test.h -+++ b/src/teakra/src/test.h -@@ -29,7 +29,7 @@ struct State { - - static_assert(std::is_trivially_copyable_v); - --struct TestCase { -+struct alignas(8) TestCase { - State before, after; - u16 opcode, expand; - }; - diff --git a/srcpkgs/melonDS/patches/fix-gcc12.patch b/srcpkgs/melonDS/patches/fix-gcc12.patch deleted file mode 100644 index 46daaa51e91d..000000000000 --- a/srcpkgs/melonDS/patches/fix-gcc12.patch +++ /dev/null @@ -1,19 +0,0 @@ -From 55355e1e7c82e9bccda9cfb72b65c64c6d8b208c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Trung=20L=C3=AA?= -Date: Thu, 24 Feb 2022 10:42:35 +1100 -Subject: [PATCH] Add utility lib to fix missing std::exchange error - ---- - src/interpreter.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/interpreter.h b/src/interpreter.h -index 72724ee..aac4916 100644 ---- a/src/teakra/src/interpreter.h -+++ b/src/teakra/src/interpreter.h -@@ -1,4 +1,5 @@ - #pragma once -+#include - #include - #include - #include diff --git a/srcpkgs/melonDS/template b/srcpkgs/melonDS/template index 9594c3b3294b..11da3e44906d 100644 --- a/srcpkgs/melonDS/template +++ b/srcpkgs/melonDS/template @@ -1,14 +1,14 @@ # Template file for 'melonDS' pkgname=melonDS -version=0.9.4 +version=0.9.5 revision=1 build_style=cmake -hostmakedepends="pkg-config qt5-host-tools qt5-qmake" +hostmakedepends="pkg-config qt5-host-tools qt5-qmake extra-cmake-modules" makedepends="qt5-devel libslirp-devel SDL2-devel libepoxy-devel - libarchive-devel" + libarchive-devel qt5-multimedia-devel" short_desc="Fast and accurate Nintendo DS emulator" maintainer="Francesco Circhetta " license="GPL-3.0-or-later" homepage="http://melonds.kuribo64.net/" distfiles="https://github.com/Arisotura/melonDS/archive/${version}.tar.gz" -checksum=8022c8798a723f8ffae6ffdad2e7637cf9046e88f86b55b5f9ad3fa3b2e6d398 +checksum=52c6b99340b8bba8c52b11a2242591f05e838c34ddd9ec20dcf1a6039405434a