On Wed, 6 Aug 2025 06:12:05 +0100
Stuart Henderson <stu@spacehopper.org> wrote:

> On 2025/08/05 19:44, izzy Meyer wrote:
> > Hello ports@,
> > 
> > I'm trying to update my emulators/melonds port and when running
> >    `$ make package`
> > I get this:
> > 
> > Creating package melonds-1.0
> > Creating package debug-melonds-1.0
> > checking dependencies|emulators/melonds
> > Error: Dependency = doesn't match FULLPKGNAME: melonds-0.9.5p0
> 
> this usually means you have a copy of the port in mystuff which is
> conflicting with the one in the main tree
> 

This is strange cos this is usually how I go about updating my ports. I
copy it to mystuff, then when done I'll replace the one in the tree
then generate a diff with git. I've never come upon this issue before
cos of this. But I'll keep this in mind for the future. Thanks!

Since the diff is still OK for me otherwise (worked fine after a reboot
for some reason), could you take a look over it please?

Thanks for all the hints you've given me.

From my reply:
> I dunno what changed, but I tried again after rebooting and it stopped
> complaining. If this diff works fine on other's systems, could it get
> committed? I did some testing playing a dump of my mario kart DS cart
> and things worked as expected. Nearly the same as 0.9.5
> 
> Changelog:
> https://github.com/melonDS-emu/melonDS/releases/tag/1.0
> Blog post from upstream about the 1.0 release:
> https://melonds.kuribo64.net/comments.php?id=230

-- 
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 17b1945238a..430bb4a0587 100644
--- emulators/melonds/Makefile
+++ emulators/melonds/Makefile
@@ -1,8 +1,7 @@
 COMMENT =	Nintendo DS emulator
 
 PKGNAME =	melonds-$V
-V =		0.9.5
-REVISION =	0
+V =		1.0
 
 DIST_TUPLE +=	github melonDS-emu melonDS $V .
 
@@ -17,21 +16,23 @@ 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 += ${COMPILER_LIBCXX} EGL GL ICE Qt6Core Qt6Gui Qt6Multimedia
+WANTLIB += Qt6Network Qt6OpenGL Qt6OpenGLWidgets Qt6Widgets SDL2
+WANTLIB += SM X11 Xext 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 +=	-DQt6_DIR="${LOCALBASE}/lib/qt6/cmake/Qt6" \
+			-DUSE_SYSTEM_LIBSLIRP=ON \
 			-DBUILD_STATIC=OFF \
 			-DENABLE_JIT=OFF \
 			-DENABLE_LTO_RELEASE=ON \
diff --git emulators/melonds/distinfo emulators/melonds/distinfo
index 602356f47e2..d0bb39fb2ea 100644
--- emulators/melonds/distinfo
+++ emulators/melonds/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.0.tar.gz) = N45fb0EspvhGzOaPiRn6RXuhuwEHg6uhRCvlBc8N+tQ=
+SIZE (melonDS-emu-melonDS-1.0.tar.gz) = 3595302
diff --git emulators/melonds/patches/patch-CMakeLists_txt emulators/melonds/patches/patch-CMakeLists_txt
index 3f39b80159d..90327ac5c4f 100644
--- emulators/melonds/patches/patch-CMakeLists_txt
+++ emulators/melonds/patches/patch-CMakeLists_txt
@@ -3,9 +3,9 @@ Don't strip debug symbols.
 Index: CMakeLists.txt
 --- CMakeLists.txt.orig
 +++ CMakeLists.txt
-@@ -78,10 +78,6 @@ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O
- string(REPLACE "-O2" "-O3" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
- string(REPLACE "-O2" "-O3" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
+@@ -79,10 +79,6 @@ if (ENABLE_LTO)
+     set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
+ endif()
  
 -if (NOT APPLE)
 -    set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} -s")
diff --git emulators/melonds/patches/patch-src_CMakeLists_txt emulators/melonds/patches/patch-src_CMakeLists_txt
deleted file mode 100644
index ea1dce29fdf..00000000000
--- emulators/melonds/patches/patch-src_CMakeLists_txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: src/CMakeLists.txt
---- src/CMakeLists.txt.orig
-+++ src/CMakeLists.txt
-@@ -129,8 +129,8 @@ endif()
- 
- if (WIN32)
-     target_link_libraries(core PRIVATE ole32 comctl32 ws2_32)
--elseif(NOT APPLE)
--    target_link_libraries(core PRIVATE rt)
-+elseif(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
-+    target_link_libraries(core PRIVATE)
- endif()
- 
- if (ENABLE_JIT_PROFILING)
diff --git emulators/melonds/patches/patch-src_debug_GdbStub_cpp emulators/melonds/patches/patch-src_debug_GdbStub_cpp
new file mode 100644
index 00000000000..04894784a17
--- /dev/null
+++ emulators/melonds/patches/patch-src_debug_GdbStub_cpp
@@ -0,0 +1,11 @@
+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
+ 
diff --git emulators/melonds/patches/patch-src_frontend_duckstation_duckstation_compat_h emulators/melonds/patches/patch-src_frontend_duckstation_duckstation_compat_h
deleted file mode 100644
index a6bbcc6df13..00000000000
--- emulators/melonds/patches/patch-src_frontend_duckstation_duckstation_compat_h
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: src/frontend/duckstation/duckstation_compat.h
---- src/frontend/duckstation/duckstation_compat.h.orig
-+++ src/frontend/duckstation/duckstation_compat.h
-@@ -12,6 +12,6 @@
- 
- #define Panic(msg) assert(false && msg)
- 
--#define UnreachableCode() __builtin_unreachable
-+#define UnreachableCode() __builtin_unreachable()
- 
--#endif
-\ No newline at end of file
-+#endif
diff --git emulators/melonds/patches/patch-src_frontend_duckstation_gl_context_cpp emulators/melonds/patches/patch-src_frontend_duckstation_gl_context_cpp
deleted file mode 100644
index 942d233fe30..00000000000
--- emulators/melonds/patches/patch-src_frontend_duckstation_gl_context_cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-https://github.com/melonDS-emu/melonDS/pull/1979
-
-Index: src/frontend/duckstation/gl/context.cpp
---- src/frontend/duckstation/gl/context.cpp.orig
-+++ src/frontend/duckstation/gl/context.cpp
-@@ -3,11 +3,7 @@
- #include "loader.h"
- #include <cstdlib>
- #include <cstring>
--#ifdef __APPLE__
- #include <stdlib.h>
--#else
--#include <malloc.h>
--#endif
- Log_SetChannel(GL::Context);
- 
- #if defined(_WIN32) && !defined(_M_ARM64)
diff --git emulators/melonds/patches/patch-src_frontend_qt_sdl_LAN_PCap_cpp emulators/melonds/patches/patch-src_frontend_qt_sdl_LAN_PCap_cpp
deleted file mode 100644
index fca59052101..00000000000
--- emulators/melonds/patches/patch-src_frontend_qt_sdl_LAN_PCap_cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: src/frontend/qt_sdl/LAN_PCap.cpp
---- src/frontend/qt_sdl/LAN_PCap.cpp.orig
-+++ src/frontend/qt_sdl/LAN_PCap.cpp
-@@ -22,7 +22,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <SDL2/SDL.h>
--#include <pcap/pcap.h>
-+#include <pcap.h>
- #include "../Wifi.h"
- #include "LAN_PCap.h"
- #include "Config.h"
diff --git emulators/melonds/patches/patch-src_teakra_src_CMakeLists_txt emulators/melonds/patches/patch-src_teakra_src_CMakeLists_txt
deleted file mode 100644
index 5194c4b22ab..00000000000
--- emulators/melonds/patches/patch-src_teakra_src_CMakeLists_txt
+++ /dev/null
@@ -1,24 +0,0 @@
-From upstream 21e2a876ec7392eb3d8d2c4d0f0aee5cd9a298f0.
-
-Index: src/teakra/src/CMakeLists.txt
---- src/teakra/src/CMakeLists.txt.orig
-+++ src/teakra/src/CMakeLists.txt
-@@ -32,10 +32,15 @@ add_library(teakra
-     register.h
-     shared_memory.h
-     teakra.cpp
--    test.h
--    test_generator.cpp
--    test_generator.h
- )
-+
-+if (TEAKRA_BUILD_UNIT_TESTS)
-+    target_sources(teakra PUBLIC
-+        test.h
-+        test_generator.cpp
-+        test_generator.h
-+    )
-+endif()
- 
- create_target_directory_groups(teakra)
- 

• melonds-1.0.diff (6K)