haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-05-03 13:38:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

opendune, fix int types error on 32bit (#5397)

Browse Source
This commit is contained in:
Schrijvers Luc
2020-11-11 09:18:39 +01:00
committed by GitHub
parent da717df94e
commit 49ec4509b7
2 changed files with 47 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
games-strategy/opendune/opendune-0.9.recipe
View File

@@ -10,7 +10,7 @@ for the game to run properly."
HOMEPAGE="http://www.opendune.org/" HOMEPAGE="http://www.opendune.org/"
COPYRIGHT="2009-2018 OpenDUNE Developers" COPYRIGHT="2009-2018 OpenDUNE Developers"
LICENSE="GNU GPL v2" LICENSE="GNU GPL v2"
REVISION="1" REVISION="2"
SOURCE_URI="https://github.com/OpenDUNE/OpenDUNE/archive/$portVersion.tar.gz" SOURCE_URI="https://github.com/OpenDUNE/OpenDUNE/archive/$portVersion.tar.gz"
CHECKSUM_SHA256="8d5ed67669df1f17a44c097d9b6bee4e0623ce2a37f11938ce9cd77de546d06c" CHECKSUM_SHA256="8d5ed67669df1f17a44c097d9b6bee4e0623ce2a37f11938ce9cd77de546d06c"
SOURCE_FILENAME="OpenDUNE-$portVersion.tar.gz" SOURCE_FILENAME="OpenDUNE-$portVersion.tar.gz"

65
games-strategy/opendune/patches/opendune-0.9.patchset
View File

@@ -1,4 +1,4 @@
From e548da4082671534856a6b513eb7c9d00ee6689f Mon Sep 17 00:00:00 2001 From f185f3c2a797666ce339aaf79b9742c7b948b495 Mon Sep 17 00:00:00 2001
From: Gabriele Baldassarre <gabriele@gabrielebaldassarre.com> From: Gabriele Baldassarre <gabriele@gabrielebaldassarre.com>
Date: Mon, 22 Oct 2018 23:00:12 +0200 Date: Mon, 22 Oct 2018 23:00:12 +0200
Subject: initial set of defines for Haiku Subject: initial set of defines for Haiku
@@ -25,10 +25,10 @@ index daac831..bdea121 100644
extern char *strdup (__const char *__s); extern char *strdup (__const char *__s);
#endif /* __GCC__ */ #endif /* __GCC__ */
-- --
2.19.1 2.28.0
From 439c5b7b19a5501aaa37c610817f8673323f1f1f Mon Sep 17 00:00:00 2001 From 2f50b43feb955e7d7d0159a3227973452137ed9d Mon Sep 17 00:00:00 2001
From: Gabriele Baldassarre <gabriele@gabrielebaldassarre.com> From: Gabriele Baldassarre <gabriele@gabrielebaldassarre.com>
Date: Tue, 23 Oct 2018 00:23:24 +0200 Date: Tue, 23 Oct 2018 00:23:24 +0200
Subject: added support for Haiku paths Subject: added support for Haiku paths
@@ -64,7 +64,7 @@ index 4d3f4dc..0b08d60 100644
/* In order to avoid to open/close the same .PAK file multiple time /* In order to avoid to open/close the same .PAK file multiple time
* in a row, we cache the last opened PAK file. * in a row, we cache the last opened PAK file.
diff --git a/src/inifile.c b/src/inifile.c diff --git a/src/inifile.c b/src/inifile.c
index d51996a..1600f0e 100644 index d51996a..6633c92 100644
--- a/src/inifile.c --- a/src/inifile.c
+++ b/src/inifile.c +++ b/src/inifile.c
@@ -3,6 +3,11 @@ @@ -3,6 +3,11 @@
@@ -134,10 +134,10 @@ index d51996a..1600f0e 100644
/* current directory */ /* current directory */
f = fopen("opendune.ini", "rb"); f = fopen("opendune.ini", "rb");
-- --
2.19.1 2.28.0
From 1c636a36ab749fae4daf8dcf912b5b078102b0e1 Mon Sep 17 00:00:00 2001 From c4f1da75651c9a359d65a0ea7e708265a1c6e857 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1ximo=20Casta=C3=B1eda?= <antiswen@yahoo.es> From: =?UTF-8?q?M=C3=A1ximo=20Casta=C3=B1eda?= <antiswen@yahoo.es>
Date: Wed, 28 Oct 2020 14:32:14 +0100 Date: Wed, 28 Oct 2020 14:32:14 +0100
Subject: Use the correct endian.h Subject: Use the correct endian.h
@@ -160,7 +160,7 @@ index f8e9361..f8e3e86 100644
2.28.0 2.28.0
From 3bd7f4073916c5fa75582a044b03ed4f1b7287c6 Mon Sep 17 00:00:00 2001 From a08cb09c074355a9d6d46f38ab6a3ef50f11782a Mon Sep 17 00:00:00 2001
From: Thomas Bernard <miniupnp@free.fr> From: Thomas Bernard <miniupnp@free.fr>
Date: Thu, 9 Apr 2020 22:21:46 +0200 Date: Thu, 9 Apr 2020 22:21:46 +0200
Subject: -Fix: Tile_PackTile() is now a macro Subject: -Fix: Tile_PackTile() is now a macro
@@ -209,7 +209,7 @@ index 234b08e..3f97403 100644
2.28.0 2.28.0
From a03da1d4c068717acdcddbfc91a3b54097d9d1d1 Mon Sep 17 00:00:00 2001 From 72418d134aa04cc9f03bfec38a8cbdcd1d74cb01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1ximo=20Casta=C3=B1eda?= <antiswen@yahoo.es> From: =?UTF-8?q?M=C3=A1ximo=20Casta=C3=B1eda?= <antiswen@yahoo.es>
Date: Wed, 28 Oct 2020 16:11:07 +0100 Date: Wed, 28 Oct 2020 16:11:07 +0100
Subject: Remove keyboard scancode magic Subject: Remove keyboard scancode magic
@@ -252,7 +252,7 @@ index 5cfebc0..af9c209 100644
2.28.0 2.28.0
From 1df2d2876399ccd44fe2dcb1b1b44f909947641e Mon Sep 17 00:00:00 2001 From c647b8b95190ca68126f89d8654569489ada00ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1ximo=20Casta=C3=B1eda?= <antiswen@yahoo.es> From: =?UTF-8?q?M=C3=A1ximo=20Casta=C3=B1eda?= <antiswen@yahoo.es>
Date: Sun, 1 Nov 2020 20:19:20 +0100 Date: Sun, 1 Nov 2020 20:19:20 +0100
Subject: Fix: solve CTRL key disabling keyboard Subject: Fix: solve CTRL key disabling keyboard
@@ -275,14 +275,14 @@ index f0d3cc6..4a1b510 100644
2.28.0 2.28.0
From cc5208edadd3944b2eb0dc5f8ea91af7d323b27e Mon Sep 17 00:00:00 2001 From 829379097c26a9be768152a92ce0309065f28fee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1ximo=20Casta=C3=B1eda?= <antiswen@yahoo.es> From: =?UTF-8?q?M=C3=A1ximo=20Casta=C3=B1eda?= <antiswen@yahoo.es>
Date: Thu, 29 Oct 2020 20:57:40 +0100 Date: Thu, 29 Oct 2020 20:57:40 +0100
Subject: Add visible error messages Subject: Add visible error messages
diff --git a/Makefile.src.in b/Makefile.src.in diff --git a/Makefile.src.in b/Makefile.src.in
index 828b32f..4de7d06 100644 index 828b32f..e95454d 100644
--- a/Makefile.src.in --- a/Makefile.src.in
+++ b/Makefile.src.in +++ b/Makefile.src.in
@@ -26,8 +26,9 @@ CONFIG_CACHE_SOURCE = $(SRC_OBJS_DIR)/!!CONFIG_CACHE_SOURCE!! @@ -26,8 +26,9 @@ CONFIG_CACHE_SOURCE = $(SRC_OBJS_DIR)/!!CONFIG_CACHE_SOURCE!!
@@ -328,7 +328,7 @@ index 828b32f..4de7d06 100644
$(E) '$(STAGE) Assembling $(<:$(SRC_DIR)/%.s=%.s)' $(E) '$(STAGE) Assembling $(<:$(SRC_DIR)/%.s=%.s)'
$(Q)$(AS_HOST) $(ASFLAGS) -o $@ $< $(Q)$(AS_HOST) $(ASFLAGS) -o $@ $<
diff --git a/config.lib b/config.lib diff --git a/config.lib b/config.lib
index 09bd456..0cadf2b 100644 index 09bd456..c41a604 100644
--- a/config.lib --- a/config.lib
+++ b/config.lib +++ b/config.lib
@@ -1872,6 +1872,7 @@ make_sed() { @@ -1872,6 +1872,7 @@ make_sed() {
@@ -340,7 +340,7 @@ index 09bd456..0cadf2b 100644
s@!!OBJS_S!!@$OBJS_S@g; s@!!OBJS_S!!@$OBJS_S@g;
s@!!SRCS!!@$SRCS@g; s@!!SRCS!!@$SRCS@g;
diff --git a/configure b/configure diff --git a/configure b/configure
index 4619b0b..986a0c8 100755 index 4619b0b..783c340 100755
--- a/configure --- a/configure
+++ b/configure +++ b/configure
@@ -125,6 +125,7 @@ AWKCOMMAND=' @@ -125,6 +125,7 @@ AWKCOMMAND='
@@ -370,7 +370,7 @@ index 58a5a38..f6aa25c 100644
os/readdir_atari.c os/readdir_atari.c
diff --git a/src/os/error_haiku.cpp b/src/os/error_haiku.cpp diff --git a/src/os/error_haiku.cpp b/src/os/error_haiku.cpp
new file mode 100644 new file mode 100644
index 0000000..22875de index 0000000..40b2e62
--- /dev/null --- /dev/null
+++ b/src/os/error_haiku.cpp +++ b/src/os/error_haiku.cpp
@@ -0,0 +1,79 @@ @@ -0,0 +1,79 @@
@@ -457,7 +457,7 @@ index 0000000..22875de
2.28.0 2.28.0
From ace9f930ce398bd23fa5977c82885941855e0d19 Mon Sep 17 00:00:00 2001 From fc3de30f66054de72b8fdb685af11f2a66346166 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1ximo=20Casta=C3=B1eda?= <antiswen@yahoo.es> From: =?UTF-8?q?M=C3=A1ximo=20Casta=C3=B1eda?= <antiswen@yahoo.es>
Date: Fri, 30 Oct 2020 12:42:28 +0100 Date: Fri, 30 Oct 2020 12:42:28 +0100
Subject: snooze-based timer loop Subject: snooze-based timer loop
@@ -468,7 +468,7 @@ a multitude of reasons. So just ditch it and use snooze and system_time.
It's smooth now and doesn't hog the CPU. It's smooth now and doesn't hog the CPU.
diff --git a/src/timer.c b/src/timer.c diff --git a/src/timer.c b/src/timer.c
index bd35a4b..85de1d6 100644 index 475331d..1abade9 100644
--- a/src/timer.c --- a/src/timer.c
+++ b/src/timer.c +++ b/src/timer.c
@@ -16,6 +16,8 @@ @@ -16,6 +16,8 @@
@@ -554,7 +554,7 @@ index bd35a4b..85de1d6 100644
2.28.0 2.28.0
From d247964aaa7932e8d02340878fae54bf4deda3af Mon Sep 17 00:00:00 2001 From 56675fce4d121dfc328ac8f6908ef7edacf5a7de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1ximo=20Casta=C3=B1eda?= <antiswen@yahoo.es> From: =?UTF-8?q?M=C3=A1ximo=20Casta=C3=B1eda?= <antiswen@yahoo.es>
Date: Sun, 1 Nov 2020 16:26:50 +0100 Date: Sun, 1 Nov 2020 16:26:50 +0100
Subject: Add sound Subject: Add sound
@@ -563,7 +563,7 @@ For some reason my system, SDL or whatever does not like U8 format.
Change to a format that does produce sound, use the existing conversion for the frequency, as the SDL function only converts for integer (and maybe only powers of two) relations, and let SDL convert the format. Change to a format that does produce sound, use the existing conversion for the frequency, as the SDL function only converts for integer (and maybe only powers of two) relations, and let SDL convert the format.
diff --git a/src/audio/dsp_sdl.c b/src/audio/dsp_sdl.c diff --git a/src/audio/dsp_sdl.c b/src/audio/dsp_sdl.c
index 0b1004e..9b0b8f2 100644 index 0b1004e..f0c6d31 100644
--- a/src/audio/dsp_sdl.c --- a/src/audio/dsp_sdl.c
+++ b/src/audio/dsp_sdl.c +++ b/src/audio/dsp_sdl.c
@@ -22,7 +22,7 @@ static void DSP_Callback(void *userdata, Uint8 *stream, int len) @@ -22,7 +22,7 @@ static void DSP_Callback(void *userdata, Uint8 *stream, int len)
@@ -638,7 +638,7 @@ index 0b1004e..9b0b8f2 100644
2.28.0 2.28.0
From 91b8cc6cc5373dc42e1624f7c1e90a4c2e7102eb Mon Sep 17 00:00:00 2001 From 9df3fac82533ba02538f7d9ae8f94dce036da524 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1ximo=20Casta=C3=B1eda?= <antiswen@yahoo.es> From: =?UTF-8?q?M=C3=A1ximo=20Casta=C3=B1eda?= <antiswen@yahoo.es>
Date: Mon, 2 Nov 2020 12:43:36 +0100 Date: Mon, 2 Nov 2020 12:43:36 +0100
Subject: Add MIDI music Subject: Add MIDI music
@@ -780,3 +780,30 @@ index 0000000..a2c678f
-- --
2.28.0 2.28.0
From 6ee768cc16605ff5c7d1b19f682605a593544f40 Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Wed, 11 Nov 2020 09:10:55 +0000
Subject: Fix conflicting int types for 32bit
diff --git a/include/types.h b/include/types.h
index e623ebd..d8489ae 100644
--- a/include/types.h
+++ b/include/types.h
@@ -81,8 +81,12 @@ typedef unsigned char uint8;
typedef signed char int8;
typedef unsigned short uint16;
typedef signed short int16;
+#if defined(__HAIKU__)
+#include <SupportDefs.h>
+#else
typedef unsigned int uint32;
typedef signed int int32;
+#endif
assert_compile(sizeof(uint8 ) == 1);
assert_compile(sizeof( int8 ) == 1);
assert_compile(sizeof(uint16) == 2);
--
2.28.0