Date: Fri, 19 Dec 2025 07:20:09 +0000 From: Jason E. Hale <jhale@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 10a4cef0f5f0 - main - games/melonds: Update to 1.1 Message-ID: <6944fca9.332bf.37629727@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=10a4cef0f5f05c8ae17e0dee57eba8c55c5d4fb4 commit 10a4cef0f5f05c8ae17e0dee57eba8c55c5d4fb4 Author: Jason E. Hale <jhale@FreeBSD.org> AuthorDate: 2025-12-18 23:28:09 +0000 Commit: Jason E. Hale <jhale@FreeBSD.org> CommitDate: 2025-12-19 07:19:43 +0000 games/melonds: Update to 1.1 Fixes build with Qt 6.10.1. Remove qt5 flavor. Qt5 will be deprecated soon. With hat: kde@ --- MOVED | 2 ++ games/melonds/Makefile | 34 ++++++++++----------------- games/melonds/distinfo | 6 ++--- games/melonds/files/patch-backport-43d091361e | 25 -------------------- games/melonds/files/patch-backport-e6cc4b14b0 | 32 ------------------------- 5 files changed, 17 insertions(+), 82 deletions(-) diff --git a/MOVED b/MOVED index 6112fcf2a558..948c36d4d6f3 100644 --- a/MOVED +++ b/MOVED @@ -4895,3 +4895,5 @@ math/octave-forge-onsas||2025-12-15|Incompatible with octave packaging structure devel/equinix-metal-cli||2025-12-15|Has expired: Equinix Platform EOL upstream lang/typstfmt||2025-12-15|Discontinued, upstream repository archived on June 8, 2024 www/py-requests-kerberos|security/py-requests-kerberos|2025-12-17|Remove duplicate port. Use security/py-requests-kerberos instead +games/melonds@qt5|games/melonds|2025-12-19|Unflavorize port. Qt5 is defunct. Please use melonds based on Qt6 instead +games/melonds@qt6|games/melonds|2025-12-19|Unflavorize port. Continue to use melonds based on Qt6 diff --git a/games/melonds/Makefile b/games/melonds/Makefile index bd1dc8eef1b5..6e9c93bdc393 100644 --- a/games/melonds/Makefile +++ b/games/melonds/Makefile @@ -1,7 +1,7 @@ PORTNAME= melonds -PORTVERSION= 0.9.5 +PORTVERSION= 1.1 CATEGORIES= games -PKGNAMESUFFIX= -${FLAVOR} +PKGNAMESUFFIX= -qt6 MAINTAINER= henry.hu.sh@gmail.com COMMENT= Nintendo DS emulator @@ -12,33 +12,23 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_i386= static_assert failed due to requirement 'sizeof(TestCase) == 4312' -LIB_DEPENDS= libslirp.so:net/libslirp +LIB_DEPENDS= libfaad.so:audio/faad \ + libenet.so:net/enet \ + libslirp.so:net/libslirp -FLAVORS= qt5 qt6 -FLAVOR?= qt5 - -USES= cmake compiler:c++17-lang desktop-file-utils gnome \ - iconv libarchive pkgconfig qt:${FLAVOR:S/qt//} sdl kde:5 +USES= cmake compiler:c++17-lang desktop-file-utils gl gnome \ + iconv kde:6 libarchive pkgconfig qt:6 sdl xorg +USE_GL= egl opengl USE_GNOME= glib20 -USE_SDL= sdl2 USE_KDE= ecm:build - -.if ${FLAVOR} == qt5 -CMAKE_OFF= USE_QT6 -.else -CMAKE_ON= USE_QT6 -.endif +USE_QT= base multimedia +USE_SDL= sdl2 +USE_XORG= ice sm x11 xext USE_GITHUB= yes GH_ACCOUNT= melonDS-emu GH_PROJECT= melonDS -GH_TAGNAME= 0.9.5 - -qt5_CONFLICTS_INSTALL= ${PORTNAME}-qt6 -qt6_CONFLICTS_INSTALL= ${PORTNAME}-qt5 -_USE_QT5= core gui network widgets multimedia buildtools:build qmake:build -_USE_QT6= base multimedia -USE_QT= ${_USE_QT${FLAVOR:S/qt//}} +CMAKE_ON= USE_SYSTEM_LIBSLIRP .include <bsd.port.mk> diff --git a/games/melonds/distinfo b/games/melonds/distinfo index 62ab9fcd2e1a..465197ac6014 100644 --- a/games/melonds/distinfo +++ b/games/melonds/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1689499885 -SHA256 (melonDS-emu-melonDS-0.9.5_GH0.tar.gz) = 52c6b99340b8bba8c52b11a2242591f05e838c34ddd9ec20dcf1a6039405434a -SIZE (melonDS-emu-melonDS-0.9.5_GH0.tar.gz) = 2496704 +TIMESTAMP = 1765272179 +SHA256 (melonDS-emu-melonDS-1.1_GH0.tar.gz) = 61e339bcb18a68a17485973637d972ea628c5624d7e6b8adf6870f895d5e26fd +SIZE (melonDS-emu-melonDS-1.1_GH0.tar.gz) = 3673157 diff --git a/games/melonds/files/patch-backport-43d091361e b/games/melonds/files/patch-backport-43d091361e deleted file mode 100644 index 0eaa9e42bbae..000000000000 --- a/games/melonds/files/patch-backport-43d091361e +++ /dev/null @@ -1,25 +0,0 @@ -From 43d091361ed6b400a68911147fd5fe524ccecf34 Mon Sep 17 00:00:00 2001 -From: RSDuck <RSDuck@users.noreply.github.com> -Date: Fri, 25 Nov 2022 23:47:36 +0100 -Subject: [PATCH] fix #1551 - ---- - src/frontend/duckstation/duckstation_compat.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git src/frontend/duckstation/duckstation_compat.h src/frontend/duckstation/duckstation_compat.h -index a661e926..fed37805 100644 ---- src/frontend/duckstation/duckstation_compat.h -+++ 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 --- -2.41.0 - diff --git a/games/melonds/files/patch-backport-e6cc4b14b0 b/games/melonds/files/patch-backport-e6cc4b14b0 deleted file mode 100644 index 91ec9e0976a0..000000000000 --- a/games/melonds/files/patch-backport-e6cc4b14b0 +++ /dev/null @@ -1,32 +0,0 @@ -From e6cc4b14b0eb603001e968be9b1ace8a09e1bce1 Mon Sep 17 00:00:00 2001 -From: Nadia Holmquist Pedersen <nadia@nhp.sh> -Date: Sun, 16 Jul 2023 15:46:50 +0200 -Subject: [PATCH] Work around a strange bug in Qt5 that causes melonDS to crash - on launch - -...but only with LTO enabled -...but only on some UNIX systems -...but only with some additional build options except when it breaks - without any as well ---- - src/frontend/qt_sdl/CMakeLists.txt | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git src/frontend/qt_sdl/CMakeLists.txt src/frontend/qt_sdl/CMakeLists.txt -index 0ae6ecea..24261030 100644 ---- src/frontend/qt_sdl/CMakeLists.txt -+++ src/frontend/qt_sdl/CMakeLists.txt -@@ -222,4 +222,10 @@ if (UNIX AND NOT APPLE) - - install(FILES ${CMAKE_SOURCE_DIR}/res/net.kuribo64.melonDS.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications) - install(TARGETS melonDS BUNDLE DESTINATION ${CMAKE_BINARY_DIR} RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) -+ -+ if (NOT USE_QT6) -+ set_target_properties(melonDS PROPERTIES -+ INTERPROCEDURAL_OPTIMIZATION OFF -+ INTERPROCEDURAL_OPTIMIZATION_RELEASE OFF) -+ endif() - endif() --- -2.41.0 -home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6944fca9.332bf.37629727>