From nobody Thu Aug 10 10:14:47 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RM2pv32LHz4Tx9f; Thu, 10 Aug 2023 10:14:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RM2pv2WR2z4jhj; Thu, 10 Aug 2023 10:14:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691662487; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PgbN89QqtmsMhViTxSOdfsHyy0MD/D7sZQk7iDI7T+E=; b=ywEJbJThVb7jAsOXSsvr4BUMC9xvDJC6WuPe+vg5tU9R1T+eQeelwwnXIRoA47fZj0Qr4R FaR2/s3dhmwau1XfE0I5MK1ASnrO7kVqOLGFnN9Vl4k+kY56SFtouoS+HqvlLRGMY7oTS5 qiEp4P1XzTIKtYkOqel9lrP4iIJizOSXcsiWhHuy4vxi8KQPvQFMT92EpAg631qPl1wtsL XV3JmTC44FL31JuaTQ5Wol1VLL5GC8ovMd1lzla03M8ExhIN1GcdAiTLglvN8baVbtG9p5 /ArJZJRcfINNkZZB4Ndm/HVdw4LC2Vj3lO8y+/FcDlFtB6nR8mXb2s2ZNGCgZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691662487; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PgbN89QqtmsMhViTxSOdfsHyy0MD/D7sZQk7iDI7T+E=; b=uP/gYPCaa7YiEhUB3Jjc6vtpSAV1C0O/rvbm0VYr6ED6HFUR9YpH094tYE/tA7oHltFdr7 wTDvmTLqlVpuooj25lZrqH+saxIKtfJB//+SU21rnGggfvaJ88sQfna72n2DUT//tjTG/K XiikotMHG5J/P2ZcArsJVCQaAoKjned8KF+Y9EW5QtLqcsc3Kcqw1LttTp6Kp2QmlSFOs8 0tBpzfPctQs9t0uJtUJtphZPnFSOFwP7PCCG3U5e65HdcQDXMoneGAcZ30Mwn+8YVnTT1p /mw/6KO6IM1bO0u6fl5Kpu7KUb5LGWPTZpU/YbPoMLrMnZrENkOuRQlH+7aA4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691662487; a=rsa-sha256; cv=none; b=mDdrp2Y4t9WnCSjTezNqO/kUzha5a9jpJDkXJ2GPdrhn2OADJZ95exsqP8v+UU6RBYdyfF P2NxPH6yRqqC1wnJ1uFMDoGqrqtxpc//gN588Q3CPTsh3/lVBFM6VmBHsuJPHMYJIvzb8N PfcMiQg0lD4f89GelAb/QyoYT+JjxfQTez4l6LfgGVcFSevcY7P5BY+r4ytYymyj2o5tCf f7cvJFELzu5JuO3t2D1IQcYwzC4sGEqGTJ6VO3dxHDOI2YUyFobneYNdVeRd6ma5nEwiYY PMqL16lRsx2MBK/trthuNFtfuphs15CrNOMwuOwUAwiKFWXR7TpmfVB3zadCag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RM2pv1b7mzswl; Thu, 10 Aug 2023 10:14:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37AAEltr008731; Thu, 10 Aug 2023 10:14:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37AAElFp008728; Thu, 10 Aug 2023 10:14:47 GMT (envelope-from git) Date: Thu, 10 Aug 2023 10:14:47 GMT Message-Id: <202308101014.37AAElFp008728@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Fernando =?utf-8?Q?Apestegu=C3=ADa?= Subject: git: 3e10ec461ae5 - main - games/melonds: Update to 0.9.5 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3e10ec461ae5e04573c6180230022e1ccb809f15 Auto-Submitted: auto-generated The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=3e10ec461ae5e04573c6180230022e1ccb809f15 commit 3e10ec461ae5e04573c6180230022e1ccb809f15 Author: Nadia Holmquist Pedersen AuthorDate: 2023-07-31 08:19:32 +0000 Commit: Fernando Apesteguía CommitDate: 2023-08-10 10:14:05 +0000 games/melonds: Update to 0.9.5 ChangeLog: https://github.com/melonDS-emu/melonDS/releases/tag/0.9.5 * remove incorrect color profile from PNG icons * DLDI fixes for the Smash demo * fix gaps in I/O handling * fix invalid savemem commands, fixes Dementium * FreeBIOS: add VRAM-compatible LZ77 decompress function, fixes Yoshi's Island * default firmware: in DSi mode, emulate DWM-W015 wifi board instead of DWM-W024 * default firmware: save WFC settings to separate file * disable firmware overrides UI when firmware override isn't checked * 2D: more accurate fade/blending * DSi: add support for GXFIFO NDMA * DSi: add mainRAM mirror at 0x0C000000 * add 3DS 5:3 aspect ratio, refactor aspect ratio code * OpenGL: fix 16x resolution on macOS * fix triggers being recognized as negative analog stick values during mapping * fix joystick mapping buttons on macOS * DSi: preliminary implementation of SNDEXCNT * DSi: fix SD inserted/removed IRQ bits * DSi: implement 8/16bit access to AES registers * DSi: fix SCFG_MC cart-inserted bit * JIT: invalidate blocks in ARM7 VRAM/WRAM when it is remapped * fix ROM banner reading when the ROM has no banner * fix UTF16 ROM title handling in the ROM info dialog * wifi: improvements to wifi emulation * wifi: shared-memory based sync/comm mechanism for local wifi * proper support for multiple melonDS instances for multiplayer * DSi: actual, proper camera support * DSi: fix DSP enough that it will actually work * fix OpenGL context handling * force-align all memory accesses * better CLI parameter handling * fix bugs in DSi direct boot PR: 272801 Reported by: nadia@nhp.sh Approved by: henry.hu.sh@gmail.com (maintainer, timeout > 2 weeks) --- games/melonds/Makefile | 15 ++++++------- games/melonds/distinfo | 6 ++--- games/melonds/files/patch-backport-43d091361e | 25 +++++++++++++++++++++ games/melonds/files/patch-backport-e6cc4b14b0 | 32 +++++++++++++++++++++++++++ 4 files changed, 67 insertions(+), 11 deletions(-) diff --git a/games/melonds/Makefile b/games/melonds/Makefile index ae46febe12a5..bd1dc8eef1b5 100644 --- a/games/melonds/Makefile +++ b/games/melonds/Makefile @@ -1,6 +1,5 @@ PORTNAME= melonds -PORTVERSION= 0.9.4 -PORTREVISION= 1 +PORTVERSION= 0.9.5 CATEGORIES= games PKGNAMESUFFIX= -${FLAVOR} @@ -13,16 +12,16 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_i386= static_assert failed due to requirement 'sizeof(TestCase) == 4312' -LIB_DEPENDS= libslirp.so:net/libslirp \ - libepoxy.so:graphics/libepoxy +LIB_DEPENDS= 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 + iconv libarchive pkgconfig qt:${FLAVOR:S/qt//} sdl kde:5 USE_GNOME= glib20 USE_SDL= sdl2 +USE_KDE= ecm:build .if ${FLAVOR} == qt5 CMAKE_OFF= USE_QT6 @@ -33,13 +32,13 @@ CMAKE_ON= USE_QT6 USE_GITHUB= yes GH_ACCOUNT= melonDS-emu GH_PROJECT= melonDS -GH_TAGNAME= 0.9.4 +GH_TAGNAME= 0.9.5 qt5_CONFLICTS_INSTALL= ${PORTNAME}-qt6 qt6_CONFLICTS_INSTALL= ${PORTNAME}-qt5 -_USE_QT5= core gui network widgets buildtools:build qmake:build -_USE_QT6= base +_USE_QT5= core gui network widgets multimedia buildtools:build qmake:build +_USE_QT6= base multimedia USE_QT= ${_USE_QT${FLAVOR:S/qt//}} .include diff --git a/games/melonds/distinfo b/games/melonds/distinfo index 12ee4fff5a36..62ab9fcd2e1a 100644 --- a/games/melonds/distinfo +++ b/games/melonds/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1662945631 -SHA256 (melonDS-emu-melonDS-0.9.4_GH0.tar.gz) = 8022c8798a723f8ffae6ffdad2e7637cf9046e88f86b55b5f9ad3fa3b2e6d398 -SIZE (melonDS-emu-melonDS-0.9.4_GH0.tar.gz) = 2330696 +TIMESTAMP = 1689499885 +SHA256 (melonDS-emu-melonDS-0.9.5_GH0.tar.gz) = 52c6b99340b8bba8c52b11a2242591f05e838c34ddd9ec20dcf1a6039405434a +SIZE (melonDS-emu-melonDS-0.9.5_GH0.tar.gz) = 2496704 diff --git a/games/melonds/files/patch-backport-43d091361e b/games/melonds/files/patch-backport-43d091361e new file mode 100644 index 000000000000..0eaa9e42bbae --- /dev/null +++ b/games/melonds/files/patch-backport-43d091361e @@ -0,0 +1,25 @@ +From 43d091361ed6b400a68911147fd5fe524ccecf34 Mon Sep 17 00:00:00 2001 +From: RSDuck +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 new file mode 100644 index 000000000000..91ec9e0976a0 --- /dev/null +++ b/games/melonds/files/patch-backport-e6cc4b14b0 @@ -0,0 +1,32 @@ +From e6cc4b14b0eb603001e968be9b1ace8a09e1bce1 Mon Sep 17 00:00:00 2001 +From: Nadia Holmquist Pedersen +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 +