From 4dc6cfb528564f9ac9c6d99c128076ad5fafe986 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Tue, 9 Jun 2020 20:06:38 +0200 Subject: [PATCH] d1x-rebirth: upgrade to latests / fix build with gcc10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- ...001-clipper.cpp-Fix-build-with-gcc10.patch | 30 +++++++++++++++++++ recipes-games/dxx-rebirth/d1x-rebirth_git.bb | 4 ++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 recipes-games/dxx-rebirth/d1x-rebirth/0001-clipper.cpp-Fix-build-with-gcc10.patch diff --git a/recipes-games/dxx-rebirth/d1x-rebirth/0001-clipper.cpp-Fix-build-with-gcc10.patch b/recipes-games/dxx-rebirth/d1x-rebirth/0001-clipper.cpp-Fix-build-with-gcc10.patch new file mode 100644 index 0000000..643d6e3 --- /dev/null +++ b/recipes-games/dxx-rebirth/d1x-rebirth/0001-clipper.cpp-Fix-build-with-gcc10.patch @@ -0,0 +1,30 @@ +From 14d6a8f0f48b7e6d134389581d5ba5dbaa288258 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +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' + +Signed-off-by: Andreas Müller +--- + 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 + + namespace dcx { + +-- +2.26.2 + diff --git a/recipes-games/dxx-rebirth/d1x-rebirth_git.bb b/recipes-games/dxx-rebirth/d1x-rebirth_git.bb index e5ed73c..0fc041f 100644 --- a/recipes-games/dxx-rebirth/d1x-rebirth_git.bb +++ b/recipes-games/dxx-rebirth/d1x-rebirth_git.bb @@ -10,6 +10,7 @@ DEPENDS = " \ python3-scons-native \ libsdl \ libsdl-mixer \ + libsdl-image \ physfs \ libpng \ " @@ -19,8 +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 \ " -SRCREV = "211a172c1dc5f939a3ed387bea57b1d0ee679192" +SRCREV = "6212b914cb2dfb78e1fc4dcbc574b9b1d329783b" PV = "v0.59+git${SRCPV}" S = "${WORKDIR}/git"