Whoops! that diff is invalid. Re-attached.
-- 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/Makefile b/Makefile
index 17b194523..833b497dd 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,7 @@
COMMENT = Nintendo DS emulator
PKGNAME = melonds-$V
-V = 0.9.5
-REVISION = 0
+V = 1.0rc
DIST_TUPLE += github melonDS-emu melonDS $V .
@@ -18,21 +17,29 @@ PERMIT_PACKAGE = Yes
COMPILER = base-clang ports-gcc
WANTLIB += ${COMPILER_LIBCXX}
-WANTLIB += EGL ICE Qt5Core Qt5Gui Qt5Multimedia Qt5Network Qt5Widgets
-WANTLIB += SDL2 SM X11 Xext archive c glib-2.0 intl m slirp
+WANTLIB += EGL GL ICE Qt6Core Qt6Gui Qt6Multimedia Qt6Network
+WANTLIB += Qt6OpenGL Qt6OpenGLWidgets Qt6Widgets SDL2 SM X11 Xext
+WANTLIB += archive c enet glib-2.0 intl m slirp zstd
MODULES = devel/cmake
LIB_DEPENDS = archivers/libarchive \
devel/sdl2 \
+ net/enet \
net/libslirp \
- x11/qt5/qtmultimedia
+ x11/qt6/qtmultimedia
BUILD_DEPENDS = devel/kf6/extra-cmake-modules
RUN_DEPENDS = x11/gtk+4,-guic \
devel/desktop-file-utils
-CONFIGURE_ARGS += -DQt5_DIR="${LOCALBASE}/lib/qt5/cmake/Qt5" \
+CONFIGURE_ARGS += -DMELONDS_EMBED_BUILD_INFO=ON \
+ -DMELONDS_BUILD_PROVIDER="izzy Meyer <izder...@disroot.org>" \
+ -DMELONDS_GIT_HASH="e3fa6f4224e0d706df3ee262ae41cfb0deadc593" \
+ -DMELONDS_GIT_BRANCH="master" \
-DBUILD_STATIC=OFF \
+ -DNEED_LIBRT=OFF \
+ -DUSE_SYSTEM_LIBSLIRP=ON \
+ -DENABLE_GDBSTUB=OFF \
-DENABLE_JIT=OFF \
-DENABLE_LTO_RELEASE=ON \
-DENABLE_LTO=ON
diff --git a/distinfo b/distinfo
index 602356f47..3fa37f016 100644
--- a/distinfo
+++ b/distinfo
@@ -1,2 +1,2 @@
-SHA256 (melonDS-emu-melonDS-0.9.5.tar.gz) = Usa5k0C4u6jFKxGiJCWR8F6DjDTd2ewg3PGmA5QFQ0o=
-SIZE (melonDS-emu-melonDS-0.9.5.tar.gz) = 2496704
+SHA256 (melonDS-emu-melonDS-1.0rc.tar.gz) = ECTy9U3gHSgazkQAAOaJFhyDbgNDOYw1DJYPwhI+7EE=
+SIZE (melonDS-emu-melonDS-1.0rc.tar.gz) = 3594949
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"
pgp8TfLjk6L3D.pgp
Description: OpenPGP digital signature
