Compare commits
3 Commits
wlroots-up
...
dunfell
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c5c7d602fe | ||
|
|
3f6bfaec17 | ||
|
|
261136a10e |
@@ -23,8 +23,8 @@ SRC_URI = " \
|
||||
file://0001-use-pkgconfig-to-find-sdl2.patch \
|
||||
file://0002-Enable-unaligned-memory-based-on-recipe-s-suggestion.patch \
|
||||
"
|
||||
SRCREV = "54e9600993656635357a6886efe4a42ded07f11e"
|
||||
PV = "0.83.11"
|
||||
SRCREV = "9c950893419b387425172c2f532c45cb81cd709a"
|
||||
PV = "0.83.13"
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
EXTRA_OECONF = " \
|
||||
|
||||
@@ -9,8 +9,8 @@ SRC_URI = " \
|
||||
file://mame.desktop \
|
||||
file://mame32k.desktop \
|
||||
"
|
||||
PV = "0231"
|
||||
SRCREV = "1f2211366135e116c4a92aa2f49b9b81184a8726"
|
||||
PV = "0232"
|
||||
SRCREV = "2b0f01bc3aee493b3c05cf34c15af7cf5521210a"
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
inherit siteinfo gtk-icon-cache
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
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
|
||||
|
||||
@@ -1,32 +0,0 @@
|
||||
From 14d6a8f0f48b7e6d134389581d5ba5dbaa288258 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Tue, 9 Jun 2020 18:44:54 +0200
|
||||
Subject: [PATCH] clipper.cpp: Fix build with gcc10
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
| common/3d/clipper.cpp:29:14: error: 'out_of_range' is not a member of 'std'
|
||||
|
||||
Upstream-Status: Submitted[https://github.com/dxx-rebirth/dxx-rebirth/pull/512]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
common/3d/clipper.cpp | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/common/3d/clipper.cpp b/common/3d/clipper.cpp
|
||||
index 111514c9e..188885e18 100644
|
||||
--- a/common/3d/clipper.cpp
|
||||
+++ b/common/3d/clipper.cpp
|
||||
@@ -11,6 +11,7 @@
|
||||
#include "dxxerror.h"
|
||||
|
||||
#include "compiler-range_for.h"
|
||||
+#include <stdexcept>
|
||||
|
||||
namespace dcx {
|
||||
|
||||
--
|
||||
2.26.2
|
||||
|
||||
@@ -20,9 +20,9 @@ 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-clipper.cpp-Fix-build-with-gcc10.patch \
|
||||
file://0001-Hack-build-with-gcc11.patch \
|
||||
"
|
||||
SRCREV = "6212b914cb2dfb78e1fc4dcbc574b9b1d329783b"
|
||||
SRCREV = "48589d0fb019eb971818c15665358e30fa778dc4"
|
||||
PV = "v0.59+git${SRCPV}"
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
@@ -36,7 +36,7 @@ SRC_URI[music.sha256sum] = "b27f7b9dc5f9c2744402c56c9499dfd9503c17e73a2a5223e745
|
||||
do_unpack[depends] += "p7zip-native:do_populate_sysroot"
|
||||
|
||||
do_compile() {
|
||||
scons opengl=0 prefix=${D}${prefix} sharepath=${datadir}/${BPN}
|
||||
scons ${PARALLEL_MAKE} opengl=0 prefix=${D}${prefix} sharepath=${datadir}/${BPN}
|
||||
}
|
||||
|
||||
do_install() {
|
||||
|
||||
Reference in New Issue
Block a user