diff --git a/emulators/mupen64plus-qt/Makefile b/emulators/mupen64plus-qt/Makefile index af80d0147711..bf59088bc828 100644 --- a/emulators/mupen64plus-qt/Makefile +++ b/emulators/mupen64plus-qt/Makefile @@ -1,49 +1,38 @@ PORTNAME= mupen64plus-qt -DISTVERSION= 1.14 -PORTREVISION= 6 +DISTVERSION= 1.17 CATEGORIES= emulators -MAINTAINER= maintainer@hasting.email +MAINTAINER= makc@FreeBSD.org COMMENT= Basic launcher for Mupen64Plus WWW= https://github.com/dh4/mupen64plus-qt LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= libquazip1-qt5.so:archivers/quazip@qt5 +LIB_DEPENDS= libquazip1-qt6.so:archivers/quazip@qt6 RUN_DEPENDS= ${LOCALBASE}/lib/libmupen64plus.so.2:emulators/mupen64plus-core \ ${LOCALBASE}/lib/mupen64plus/mupen64plus-audio-sdl.so:emulators/mupen64plus-audio-sdl \ ${LOCALBASE}/lib/mupen64plus/mupen64plus-input-sdl.so:emulators/mupen64plus-input-sdl \ ${LOCALBASE}/lib/mupen64plus/mupen64plus-rsp-hle.so:emulators/mupen64plus-rsp-hle \ ${LOCALBASE}/lib/mupen64plus/mupen64plus-video-rice.so:emulators/mupen64plus-video-rice \ mupen64plus:emulators/mupen64plus-ui-console -USES= gl pkgconfig qmake qt:5 +USES= cmake compiler:c++17-lang gl pkgconfig qt:6 sdl USE_GL= gl -USE_QT= core gui network sql widgets xml \ - buildtools:build \ - sql-sqlite3:run +USE_QT= base \ + sqldriver-sqlite:run +USE_SDL= sdl2 USE_GITHUB= yes GH_ACCOUNT= dh4 PORTDOCS= README.md PLIST_FILES= bin/mupen64plus-qt \ share/man/man6/mupen64plus-qt.6.gz \ share/applications/mupen64plus-qt.desktop \ share/pixmaps/mupen64plus-qt.png -OPTIONS_DEFINE= DOCS - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/resources/${PORTNAME}.desktop ${STAGEDIR}${PREFIX}/share/applications - ${INSTALL_DATA} ${WRKSRC}/resources/images/mupen64plus.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png - ${INSTALL_MAN} ${WRKSRC}/resources/${PORTNAME}.6 ${STAGEDIR}${PREFIX}/share/man/man6 - -do-install-DOCS-on: - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}/ +OPTIONS_DEFINE= DOCS .include diff --git a/emulators/mupen64plus-qt/distinfo b/emulators/mupen64plus-qt/distinfo index 637390d257f5..93d4ef215b0c 100644 --- a/emulators/mupen64plus-qt/distinfo +++ b/emulators/mupen64plus-qt/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1582335642 -SHA256 (dh4-mupen64plus-qt-1.14_GH0.tar.gz) = 467f4e5b75a0f63f23b1c8266746b3e7932b9dc4ee950c42b2bfaf9660e64614 -SIZE (dh4-mupen64plus-qt-1.14_GH0.tar.gz) = 573526 +TIMESTAMP = 1784026917 +SHA256 (dh4-mupen64plus-qt-1.17_GH0.tar.gz) = 2da57d302265f8c0a2e705660e243c2a827a086cba2a6ed92fccdb1ea333f328 +SIZE (dh4-mupen64plus-qt-1.17_GH0.tar.gz) = 733502 diff --git a/emulators/mupen64plus-qt/files/patch-CMakeLists.txt b/emulators/mupen64plus-qt/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..e0ad9b700748 --- /dev/null +++ b/emulators/mupen64plus-qt/files/patch-CMakeLists.txt @@ -0,0 +1,49 @@ +--- CMakeLists.txt.orig 2024-11-17 16:27:11 UTC ++++ CMakeLists.txt +@@ -8,6 +8,8 @@ find_package(Qt6 REQUIRED COMPONENTS Gui Network Sql W + + find_package(QT NAMES Qt6 REQUIRED COMPONENTS Core) + find_package(Qt6 REQUIRED COMPONENTS Gui Network Sql Widgets Xml) ++find_package(SDL2) ++include(GNUInstallDirs) + + qt_standard_project_setup() + +@@ -51,7 +53,7 @@ target_link_libraries(mupen64plus-qt PRIVATE + Qt::Sql + Qt::Widgets + Qt::Xml +- SDL2 ++ SDL2::SDL2 + ) + + +@@ -95,9 +97,23 @@ install(TARGETS mupen64plus-qt + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ) + +-qt_generate_deploy_app_script( +- TARGET mupen64plus-qt +- FILENAME_VARIABLE deploy_script +- NO_UNSUPPORTED_PLATFORM_ERROR ++ ++install(FILES resources/images/mupen64plus-qt.png ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/pixmaps + ) +-install(SCRIPT ${deploy_script}) ++install(FILES resources/mupen64plus-qt.desktop ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/applications ++) ++install(FILES resources/mupen64plus-qt.6 ++ DESTINATION ${CMAKE_INSTALL_MANDIR}/man6 ++) ++install(FILES README.md ++ DESTINATION ${CMAKE_INSTALL_DOCDIR} ++) ++ ++# qt_generate_deploy_app_script( ++# TARGET mupen64plus-qt ++# FILENAME_VARIABLE deploy_script ++# NO_UNSUPPORTED_PLATFORM_ERROR ++# ) ++# install(SCRIPT ${deploy_script}) diff --git a/emulators/mupen64plus-qt/files/patch-mupen64plus-qt.pro b/emulators/mupen64plus-qt/files/patch-mupen64plus-qt.pro deleted file mode 100644 index 9dae8b250deb..000000000000 --- a/emulators/mupen64plus-qt/files/patch-mupen64plus-qt.pro +++ /dev/null @@ -1,12 +0,0 @@ ---- mupen64plus-qt.pro.orig 2020-11-08 17:31:05 UTC -+++ mupen64plus-qt.pro -@@ -86,7 +86,8 @@ win32|macx|linux_quazip_static { - LIBS += -lquazip5 - } - } else { -- LIBS += -lquazip5 -+ CONFIG += link_pkgconfig -+ PKGCONFIG += quazip1-qt5 - } - } - } diff --git a/emulators/mupen64plus-qt/files/patch-src_common.cpp b/emulators/mupen64plus-qt/files/patch-src_common.cpp deleted file mode 100644 index 39d8817b00d2..000000000000 --- a/emulators/mupen64plus-qt/files/patch-src_common.cpp +++ /dev/null @@ -1,13 +0,0 @@ ---- src/common.cpp.orig 2020-11-08 17:32:57 UTC -+++ src/common.cpp -@@ -40,8 +40,8 @@ - #include - #include - --#include --#include -+#include -+#include - - #ifdef Q_OS_WIN - #include diff --git a/emulators/mupen64plus-qt/files/patch-src_emulation_emulatorhandler.cpp b/emulators/mupen64plus-qt/files/patch-src_emulation_emulatorhandler.cpp deleted file mode 100644 index a5be9a36500d..000000000000 --- a/emulators/mupen64plus-qt/files/patch-src_emulation_emulatorhandler.cpp +++ /dev/null @@ -1,13 +0,0 @@ ---- src/emulation/emulatorhandler.cpp.orig 2020-11-08 17:32:57 UTC -+++ src/emulation/emulatorhandler.cpp -@@ -38,8 +38,8 @@ - #include - #include - --#include --#include -+#include -+#include - - - EmulatorHandler::EmulatorHandler(QWidget *parent) : QObject(parent)