Greeting fellow nurds,

I have updated my MelonDS port to the release candidate for 1.0. This
release adds LAN netplay among other changes such as an enable-able GDB
stub for debugging (broken on non glibc for now). 

Full changlog is in the GitHub release page:
https://github.com/melonDS-emu/melonDS/releases/tag/1.0rc 

My port is here:
https://github.com/jasperla/openbsd-wip/tree/master/emulators/melonds
(It is also attached)

I had to disable GDB stub cos the aformentioned breakage with non-glibc
systems, and as such found another oversight. (I'll need to look into
the GDB stuff stuff later). The fix for said oversight is in
patches/patch-src_frontend_qt_sdl_EmuInstance_cpp 

I also upstreamed this and left more information here (has been merged):
https://github.com/melonDS-emu/melonDS/pull/2247

I'm curious if anyone wants to help test this? (Especially the LAN code
as I only have a single OpenBSD box)

Thanks-

-- 
iz (they/them)

> i like to say mundane things,
> there are too many uninteresting things
> that go unnoticed.

izder456 (dot) neocities (dot) org
diff --git a/patches/patch-src_frontend_qt_sdl_EmuInstance_cpp b/patches/patch-src_frontend_qt_sdl_EmuInstance_cpp
new file mode 100644
index 000000000..0580ee2b3
--- /dev/null
+++ b/patches/patch-src_frontend_qt_sdl_EmuInstance_cpp
@@ -0,0 +1,12 @@
+Index: src/frontend/qt_sdl/EmuInstance.cpp
+--- src/frontend/qt_sdl/EmuInstance.cpp.orig
++++ src/frontend/qt_sdl/EmuInstance.cpp
+@@ -1292,7 +1292,7 @@ bool EmuInstance::updateConsole() noexcept
+     };
+     auto gdbargs = gdbopt.GetBool("Enabled") ? std::make_optional(_gdbargs) : std::nullopt;
+ #else
+-    optional<GDBArgs> gdbargs = std::nullopt;
++    std::optional<GDBArgs> gdbargs = std::nullopt;
+ #endif
+ 
+     NDSArgs ndsargs {
diff --git a/patches/patch-src_net_Net_PCap_cpp b/patches/patch-src_net_Net_PCap_cpp
new file mode 100644
index 000000000..6f3ebb00f
--- /dev/null
+++ b/patches/patch-src_net_Net_PCap_cpp
@@ -0,0 +1,12 @@
+Index: src/net/Net_PCap.cpp
+--- src/net/Net_PCap.cpp.orig
++++ src/net/Net_PCap.cpp
+@@ -17,7 +17,7 @@
+ */
+ 
+ #include <string.h>
+-#include <pcap/pcap.h>
++#include <pcap.h>
+ #include "Net.h"
+ #include "Net_PCap.h"
+ #include "Platform.h"
diff --git a/patches/patch-src_net_Net_PCap_h b/patches/patch-src_net_Net_PCap_h
new file mode 100644
index 000000000..809a43a6d
--- /dev/null
+++ b/patches/patch-src_net_Net_PCap_h
@@ -0,0 +1,12 @@
+Index: src/net/Net_PCap.h
+--- src/net/Net_PCap.h.orig
++++ src/net/Net_PCap.h
+@@ -24,7 +24,7 @@
+ #include <optional>
+ #include <string_view>
+ #include <vector>
+-#include <pcap/pcap.h>
++#include <pcap.h>
+ 
+ #include "types.h"
+ #include "Platform.h"

Attachment: pgppcvTGRpSyI.pgp
Description: OpenPGP digital signature

Reply via email to