From: izzy Meyer <izder456@disroot.org>
Subject: UPDATE: emulators/melonds 1.0 -> 1.1
To: ports@openbsd.org
Date: Tue, 18 Nov 2025 13:51:20 -0600

Hello ports@

Here's an update to the recently released 1.1 of melonDS

Changelog:
https://github.com/melonDS-emu/melonDS/releases/tag/1.1
Announcement from upstream:
https://melonds.kuribo64.net/comments.php?id=240

Tested on amd64 with good success playing Animal Crossing: Wild World
and Mario Kart DS cart dumps. Was even able to play a match or two of
mario kart on https://wiimmfi.de

Thanks,

-- 
iz (she/her)

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

izder456 (dot) neocities (dot) org
diff --git emulators/melonds/Makefile emulators/melonds/Makefile
index d81968709e0..d79eaf92682 100644
--- emulators/melonds/Makefile
+++ emulators/melonds/Makefile
@@ -1,7 +1,9 @@
+USE_WXNEEDED =	Yes
+
 COMMENT =	Nintendo DS emulator
 
 PKGNAME =	melonds-$V
-V =		1.0
+V =		1.1
 
 DIST_TUPLE +=	github melonDS-emu melonDS $V .
 
@@ -34,11 +36,9 @@ BUILD_DEPENDS =	devel/kf6/extra-cmake-modules
 RUN_DEPENDS =	x11/gtk+4,-guic \
 		devel/desktop-file-utils
 
-
 CONFIGURE_ARGS +=	-DQt6_DIR="${LOCALBASE}/lib/qt6/cmake/Qt6" \
 			-DUSE_SYSTEM_LIBSLIRP=ON \
 			-DBUILD_STATIC=OFF \
-			-DENABLE_JIT=OFF \
 			-DENABLE_LTO_RELEASE=ON \
 			-DENABLE_LTO=ON
 
diff --git emulators/melonds/distinfo emulators/melonds/distinfo
index d0bb39fb2ea..9756033d5e9 100644
--- emulators/melonds/distinfo
+++ emulators/melonds/distinfo
@@ -1,2 +1,2 @@
-SHA256 (melonDS-emu-melonDS-1.0.tar.gz) = N45fb0EspvhGzOaPiRn6RXuhuwEHg6uhRCvlBc8N+tQ=
-SIZE (melonDS-emu-melonDS-1.0.tar.gz) = 3595302
+SHA256 (melonDS-emu-melonDS-1.1.tar.gz) = BU8GOL2qQ7fI7Pw1VxvvDnBUczip7umzhrJknP4Umh0=
+SIZE (melonDS-emu-melonDS-1.1.tar.gz) = 3673165
diff --git emulators/melonds/patches/patch-CMakeLists_txt emulators/melonds/patches/patch-CMakeLists_txt
index 90327ac5c4f..6d4678faf65 100644
--- emulators/melonds/patches/patch-CMakeLists_txt
+++ emulators/melonds/patches/patch-CMakeLists_txt
@@ -1,16 +1,26 @@
 Don't strip debug symbols.
+Backport hotfix patch commit b86390e4428bf38ce4c1ce0e9ca446d6d25955e8
 
 Index: CMakeLists.txt
 --- CMakeLists.txt.orig
 +++ CMakeLists.txt
-@@ -79,10 +79,6 @@ if (ENABLE_LTO)
-     set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
- endif()
+@@ -63,7 +63,7 @@ detect_architecture("__arm__" ARM)
+ detect_architecture("__aarch64__" ARM64)
  
--if (NOT APPLE)
--    set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} -s")
+ cmake_dependent_option(ENABLE_JIT "Enable JIT recompiler" ON
+-    "(ARCHITECTURE STREQUAL x86_64 AND NOT APPLE) OR ARCHITECTURE STREQUAL ARM64" OFF)
++    "ARCHITECTURE STREQUAL x86_64 OR ARCHITECTURE STREQUAL ARM64;NOT ARCHITECTURE STREQUAL x86_64 OR NOT APPLE" OFF)
+ cmake_dependent_option(ENABLE_JIT_PROFILING "Enable JIT profiling with VTune" OFF "ENABLE_JIT" OFF)
+ option(ENABLE_OGLRENDERER "Enable OpenGL renderer" ON)
+ 
+@@ -77,10 +77,6 @@ endif()
+ 
+ if (ENABLE_LTO)
+     set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
 -endif()
 -
- if (WIN32)
-     option(BUILD_STATIC "Statically link dependencies" OFF)
+-if (NOT APPLE)
+-    set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} -s")
  endif()
+ 
+ if (WIN32)
diff --git emulators/melonds/patches/patch-CMakeLists_txt.orig emulators/melonds/patches/patch-CMakeLists_txt.orig
new file mode 100644
index 00000000000..5d24dad56c2
--- /dev/null
+++ emulators/melonds/patches/patch-CMakeLists_txt.orig
@@ -0,0 +1,27 @@
+Don't strip debug symbols.
+Fix cmake_dependant_option for ENABLE_JIT
+
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -63,8 +63,7 @@ detect_architecture("__arm__" ARM)
+ detect_architecture("__aarch64__" ARM64)
+ 
+ cmake_dependent_option(ENABLE_JIT "Enable JIT recompiler" ON
+-    "(ARCHITECTURE STREQUAL x86_64 AND NOT APPLE) OR ARCHITECTURE STREQUAL ARM64" OFF)
+-cmake_dependent_option(ENABLE_JIT_PROFILING "Enable JIT profiling with VTune" OFF "ENABLE_JIT" OFF)
++    "ARCHITECTURE STREQUAL x86_64 OR ARCHITECTURE STREQUAL ARM64;NOT ARCHITECTURE STREQUAL x86_64 OR NOT APPLE" OFF)cmake_dependent_option(ENABLE_JIT_PROFILING "Enable JIT profiling with VTune" OFF "ENABLE_JIT" OFF)
+ option(ENABLE_OGLRENDERER "Enable OpenGL renderer" ON)
+ 
+ check_ipo_supported(RESULT IPO_SUPPORTED)
+@@ -77,10 +76,6 @@ endif()
+ 
+ if (ENABLE_LTO)
+     set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
+-endif()
+-
+-if (NOT APPLE)
+-    set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} -s")
+ endif()
+ 
+ if (WIN32)
diff --git emulators/melonds/patches/patch-src_debug_GdbStub_cpp emulators/melonds/patches/patch-src_debug_GdbStub_cpp
deleted file mode 100644
index 04894784a17..00000000000
--- emulators/melonds/patches/patch-src_debug_GdbStub_cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-Index: src/debug/GdbStub.cpp
---- src/debug/GdbStub.cpp.orig
-+++ src/debug/GdbStub.cpp
-@@ -18,6 +18,7 @@
- #include <poll.h>
- #include <signal.h>
- #include <arpa/inet.h>
-+#include <netinet/in.h>
- #include <netinet/tcp.h>
- #endif
-