haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-03-19 01:46:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

euae, fix references to lib:libsdl*, build fixes (#9004)

Browse Source
This commit is contained in:
Schrijvers Luc
2023-07-07 12:23:11 +02:00
committed by GitHub
parent a5a27fcd97
commit 827b282bdb
2 changed files with 73 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app-emulation/euae/euae-0.8.29~wip4.recipe
View File

@@ -26,7 +26,7 @@ Amiga Forever distribution."
HOMEPAGE="https://www.rcdrummond.net/uae/"
COPYRIGHT="2004-2007 Richard Drummond"
LICENSE="GNU GPL v2"
REVISION="4"
REVISION="5"
SOURCE_URI="http://www.rcdrummond.net/uae/e-uae-0.8.29-WIP4/e-uae-0.8.29-WIP4.tar.bz2"
CHECKSUM_SHA256="9828cb0fca783160bcb33900d0254f4bdaade1c9a41256e5f298e973d0c07456"
SOURCE_DIR="e-uae-0.8.29-WIP4"
@@ -52,11 +52,11 @@ REQUIRES="
haiku$secondaryArchSuffix
lib:libbz2$secondaryArchSuffix
lib:libGL$secondaryArchSuffix
lib:libglu$secondaryArchSuffix
lib:libGLU$secondaryArchSuffix
lib:libncurses$secondaryArchSuffix
lib:libpng16$secondaryArchSuffix
lib:libSDL_1.2$secondaryArchSuffix
lib:libsdl_sound$secondaryArchSuffix
lib:libsdl_sound_1.0$secondaryArchSuffix
lib:libxml2$secondaryArchSuffix
lib:libz$secondaryArchSuffix
"
@@ -65,11 +65,11 @@ BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libbz2$secondaryArchSuffix
devel:libGL$secondaryArchSuffix
devel:libglu$secondaryArchSuffix
devel:libGLU$secondaryArchSuffix
devel:libncurses$secondaryArchSuffix
devel:libpng16$secondaryArchSuffix
devel:libsdl$secondaryArchSuffix
devel:libsdl_sound$secondaryArchSuffix
devel:libSDL_1.2$secondaryArchSuffix
devel:libSDL_sound_1.0$secondaryArchSuffix
devel:libxml2$secondaryArchSuffix
devel:libz$secondaryArchSuffix
"

73
app-emulation/euae/patches/euae-0.8.29~wip4.patchset
View File

@@ -1,4 +1,4 @@
From ee861ed5a5a6c940f320eaef2d6a82411ccfef21 Mon Sep 17 00:00:00 2001
From 78e0ae42d71170b1b64c442ba85c4f6d5cbaa2d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Sat, 4 May 2019 19:53:56 +0200
Subject: e-uae-0.8.29_rc4-no_schily.patch from gentoo portage
@@ -24,10 +24,10 @@ index 12a1f91..8d4b3a7 100644
[
AC_MSG_RESULT(no)
--
2.21.0
2.37.3
From 75f22cb773872c2a684eeb004a2c2dca8338be98 Mon Sep 17 00:00:00 2001
From 8723baf3bbef5a841d4c0e7c5c9f6bff92712408 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Sat, 4 May 2019 19:56:22 +0200
Subject: e-uae-0.8.29_rc4-high-cpu-usage.patch from gentoo portage
@@ -49,10 +49,10 @@ index 6351143..6ffe4fe 100644
{
}
--
2.21.0
2.37.3
From a67e92a02e61471698283169cb5863b370c14d67 Mon Sep 17 00:00:00 2001
From b239c9590573782fb73fdec860893539f0538b95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Sat, 4 May 2019 20:19:32 +0200
Subject: AC_PROG_OBJC fix
@@ -71,5 +71,66 @@ index 8d4b3a7..b6cb160 100644
AM_PROG_AS
AC_PROG_MAKE_SET
--
2.21.0
2.37.3
From 240a81127fe11f0b266db897623ba7fed5a43ade Mon Sep 17 00:00:00 2001
From: Begasus <begasus@gmail.com>
Date: Fri, 7 Jul 2023 11:56:45 +0000
Subject: Fix multiple definitions of ...
diff --git a/src/custom.c b/src/custom.c
index d0ab91b..04b3f81 100644
--- a/src/custom.c
+++ b/src/custom.c
@@ -134,7 +134,7 @@ static uae_u32 sprclx[16], clxmask[16];
static int custom_wput_1 (unsigned int, uaecptr, uae_u32, int) REGPARAM;
uae_u16 intena,intreq;
-uae_u16 dmacon;
+extern uae_u16 dmacon;
uae_u16 adkcon; /* used by audio code */
static uae_u32 cop1lc,cop2lc,copcon;
diff --git a/src/include/bsdsocket.h b/src/include/bsdsocket.h
index 14575a8..3abde8f 100644
--- a/src/include/bsdsocket.h
+++ b/src/include/bsdsocket.h
@@ -80,7 +80,7 @@ struct socketbase {
uae_u32 timeout;
uae_u32 sigmp;
#endif
-} *socketbases;
+} extern *socketbases;
#define LIBRARY_SIZEOF 36
--
2.37.3
From 5a1200ad8f2fa737bc8355af6abed8a575afb916 Mon Sep 17 00:00:00 2001
From: Begasus <begasus@gmail.com>
Date: Fri, 7 Jul 2023 12:18:02 +0000
Subject: Build fix
diff --git a/src/dms/u_heavy.c b/src/dms/u_heavy.c
index fff93d3..47b9f37 100644
--- a/src/dms/u_heavy.c
+++ b/src/dms/u_heavy.c
@@ -30,8 +30,8 @@ USHORT heavy_text_loc;
static USHORT read_tree_c(void);
static USHORT read_tree_p(void);
-INLINE USHORT decode_c(void);
-INLINE USHORT decode_p(void);
+extern INLINE USHORT decode_c(void);
+extern INLINE USHORT decode_p(void);
--
2.37.3