MAME: enable Qt debugger

Fixes #7085
This commit is contained in:
PulkoMandy
2022-08-05 19:25:20 +02:00
parent 8665a34bf7
commit 27af3f9e45
2 changed files with 60 additions and 10 deletions

View File

@@ -13,7 +13,7 @@ calculators, in addition to the arcade video games that were its initial focus."
HOMEPAGE="https://www.mamedev.org/"
COPYRIGHT="1997-2020 MAMEDev and contributors"
LICENSE="GNU GPL v2"
REVISION="1"
REVISION="2"
SOURCE_URI="https://github.com/mamedev/mame/archive/mame${portVersion/./}.tar.gz"
CHECKSUM_SHA256="7c4c9ec232ba988e65fd29665c9b8e40b5ac3aa9f561eeb107cebbf08ba94baf"
SOURCE_FILENAME="mame-$portVersion.tar.gz"
@@ -49,7 +49,6 @@ PROVIDES="
cmd:jedutil$commandSuffix
cmd:ldresample$commandSuffix
cmd:ldverify$commandSuffix
cmd:mame.sh
cmd:mame$commandSuffix
cmd:nltool$commandSuffix
cmd:nlwav$commandSuffix
@@ -73,6 +72,9 @@ REQUIRES="
lib:libjpeg$secondaryArchSuffix
lib:liblua$secondaryArchSuffix >= 5.3
lib:libpugixml$secondaryArchSuffix
lib:libQt5Core$secondaryArchSuffix
lib:libQt5Gui$secondaryArchSuffix
lib:libQt5Widgets$secondaryArchSuffix
lib:libSDL2_2.0$secondaryArchSuffix
lib:libSDL2_ttf$secondaryArchSuffix
lib:libsqlite3$secondaryArchSuffix
@@ -93,6 +95,9 @@ BUILD_REQUIRES="
devel:libogg$secondaryArchSuffix
devel:libpugixml$secondaryArchSuffix
devel:librapidjson$secondaryArchSuffix
devel:libQt5Core$secondaryArchSuffix
devel:libQt5Gui$secondaryArchSuffix
devel:libQt5Widgets$secondaryArchSuffix
devel:libSDL2_2.0$secondaryArchSuffix
devel:libSDL2_ttf$secondaryArchSuffix
devel:libsqlite3$secondaryArchSuffix
@@ -104,10 +109,12 @@ BUILD_PREREQUIRES="
cmd:ld$secondaryArchSuffix
cmd:libtoolize
cmd:make
cmd:moc$secondaryArchSuffix
cmd:pkg_config$secondaryArchSuffix
cmd:python2
cmd:sed
cmd:strip$secondaryArchSuffix
cmd:which
"
defineDebugInfoPackage mame$secondaryArchSuffix \
@@ -140,10 +147,12 @@ BUILD()
ARCHOPTS="$SYS_CFLAGS $SYS_LDFLAGS" \
make \
REGENIE=1 \
IGNORE_GIT=1 \
TOOLS=1 \
PRECOMPILE=0 \
NOWERROR=1 \
OPTIMIZE=$optimize \
USE_QTDEBUG=1 \
USE_SYSTEM_LIB_EXPAT=1 \
USE_SYSTEM_LIB_ZLIB=1 \
USE_SYSTEM_LIB_JPEG=1 \

View File

@@ -1,4 +1,4 @@
From 3cd4c88bb5cc2eabf23568a1b8ff556c8ff8bd2a Mon Sep 17 00:00:00 2001
From e634f7d6d66f5feb51e662d54f050366445faaa9 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Wed, 10 Jun 2020 22:35:16 +1000
Subject: Haiku patches
@@ -909,10 +909,10 @@ index 39f11a2..61c4baa 100644
# endif // BX_PLATFORM_
}
--
2.28.0
2.36.1
From 22fff4a338284fe1bca14b61db9111e3a8ad1b5a Mon Sep 17 00:00:00 2001
From 4d6c98988c8fe948c801896a1462f99eced787ab Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Thu, 11 Jun 2020 08:59:34 +1000
Subject: Use stat Haiku
@@ -950,10 +950,10 @@ index c158af0..2d6aa3e 100644
_out.type = FileType::File;
_out.size = UINT64_MAX;
--
2.28.0
2.36.1
From 6db75a40c1da45e0a95484c894b37a708867b961 Mon Sep 17 00:00:00 2001
From 5ed349df65f1b093355613ea23864858c56f0b07 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Thu, 11 Jun 2020 09:00:11 +1000
Subject: Disable ptty
@@ -973,10 +973,10 @@ index a960e80..76cae4c 100644
#else // defined(__ANDROID__)
#if (defined(sun) || defined(__sun)) && (defined(__SVR4) || defined(__svr4__))
--
2.28.0
2.36.1
From f0d45284a7b0c006ead6494f3b629c6413d4c2c2 Mon Sep 17 00:00:00 2001
From e7015152b09aef14d9e3b82b8c43945ec9e3342c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Thu, 29 Oct 2020 07:05:28 +0100
Subject: Build fix
@@ -996,5 +996,46 @@ index 9243645..00fe44e 100644
if (::posix_memalign(&p, alignment, size) != 0) {
p = nullptr;
--
2.28.0
2.36.1
From 67cc5d963c7ea49d794724e7f2443b7d9c3c1d43 Mon Sep 17 00:00:00 2001
From: PulkoMandy <pulkomandy@pulkomandy.tk>
Date: Fri, 5 Aug 2022 19:24:12 +0200
Subject: Allow use of Qt Debugger on Haiku
It is normally tied to X11, but we want Qt and no X11, so introduce a
special case.
diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua
index 10aa994..62adc04 100644
--- a/scripts/src/osd/sdl.lua
+++ b/scripts/src/osd/sdl.lua
@@ -298,14 +298,16 @@ if BASE_TARGETOS=="unix" then
end
end
else
- if _OPTIONS["NO_X11"]=="1" then
- _OPTIONS["USE_QTDEBUG"] = "0"
- else
- libdirs {
- "/usr/X11/lib",
- "/usr/X11R6/lib",
- "/usr/openwin/lib",
- }
+ if _OPTIONS["targetos"]~="haiku" then
+ if _OPTIONS["NO_X11"]=="1" then
+ _OPTIONS["USE_QTDEBUG"] = "0"
+ else
+ libdirs {
+ "/usr/X11/lib",
+ "/usr/X11R6/lib",
+ "/usr/openwin/lib",
+ }
+ end
end
if _OPTIONS["with-bundled-sdl2"]~=nil then
if _OPTIONS["targetos"]~="android" then
--
2.36.1