diff --git a/srcpkgs/melonDS/patches/align-test-case-i686.patch b/srcpkgs/melonDS/patches/align-test-case-i686.patch new file mode 100644 index 00000000000..1427d4ce1b0 --- /dev/null +++ b/srcpkgs/melonDS/patches/align-test-case-i686.patch @@ -0,0 +1,28 @@ +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/ignore-padding.patch b/srcpkgs/melonDS/patches/ignore-padding.patch deleted file mode 100644 index e2264c6f9bf..00000000000 --- a/srcpkgs/melonDS/patches/ignore-padding.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- a/src/teakra/src/test.h -+++ b/src/teakra/src/test.h -@@ -34,5 +34,4 @@ - u16 opcode, expand; - }; - --static_assert(sizeof(TestCase) == 4312); - static_assert(std::is_trivially_copyable_v); diff --git a/srcpkgs/melonDS/template b/srcpkgs/melonDS/template index 10480badba3..58602c65746 100644 --- a/srcpkgs/melonDS/template +++ b/srcpkgs/melonDS/template @@ -1,7 +1,7 @@ # Template file for 'melonDS' pkgname=melonDS version=0.9.3 -revision=1 +revision=2 build_style=cmake hostmakedepends="pkg-config qt5-host-tools qt5-qmake" makedepends="qt5-devel libslirp-devel SDL2-devel libepoxy-devel