zepto-forks/meta-retro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dxx-rebirth: upgrade to latest

Browse Source 
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
2022-09-22 00:04:45 +02:00
parent 8c57c7c189
commit d5d9e9fbef
2 changed files with 2 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
recipes-games/dxx-rebirth/d1x-rebirth/0001-Hack-build-with-gcc11.patch
View File

@@ -1,37 +0,0 @@
From a9bdc7d166851eb032af187b5873f2e74b6deaaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Sat, 8 May 2021 16:23:08 +0200
Subject: [PATCH] Hack build with gcc11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
| common/2d/canvas.cpp:58:19: error: '<unknown>' may be used uninitialized [-Werror=maybe-uninitialized]
| 58 | gr_init_bitmap(canv.cv_bitmap, pixtype, 0, 0, w, h, wreal, pixdata);
| | ~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Upstream-Status: Pending
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
common/2d/canvas.cpp | 3 +++
1 file changed, 3 insertions(+)
diff --git a/common/2d/canvas.cpp b/common/2d/canvas.cpp
index b32b31902..c47aa3ce1 100644
--- a/common/2d/canvas.cpp
+++ b/common/2d/canvas.cpp
@@ -55,7 +55,10 @@ void gr_init_canvas(grs_canvas &canv, unsigned char *const pixdata, const bm_mod
canv.cv_font_fg_color = 0;
canv.cv_font_bg_color = 0;
auto wreal = w;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
gr_init_bitmap(canv.cv_bitmap, pixtype, 0, 0, w, h, wreal, pixdata);
+#pragma GCC diagnostic pop
}
void gr_init_sub_canvas(grs_canvas &n, grs_canvas &src, uint16_t x, uint16_t y, uint16_t w, uint16_t h)
--
2.30.2

5
recipes-games/dxx-rebirth/d1x-rebirth_git.bb
View File

@@ -20,9 +20,8 @@ SRC_URI = " \
http://www.dxx-rebirth.com/download/dxx/content/descent-mac-demo.zip;name=data \
http://www.descent2.de/files/sound/hires-sounds.7z;name=sound \
http://www.dxx-rebirth.com/download/dxx/res/d1xr-sc55-music.dxa;name=music;unpack=0 \
file://0001-Hack-build-with-gcc11.patch \
"
SRCREV = "48589d0fb019eb971818c15665358e30fa778dc4"
SRCREV = "ad46235b67a24a38dec4734f94a59eba149ad94a"
PV = "v0.59+git${SRCPV}"
S = "${WORKDIR}/git"
@@ -41,7 +40,7 @@ do_compile() {
do_install() {
install -d ${D}${bindir}
install ${S}/${BPN}/${BPN} ${D}${bindir}
install ${S}/build/${BPN}/${BPN} ${D}${bindir}
install -d ${D}${datadir}/applications
install ${S}/${BPN}/${BPN}.desktop ${D}${datadir}/applications