From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 51598158164 for ; Sun, 17 Nov 2024 16:26:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9A74FE0F08; Sun, 17 Nov 2024 16:26:54 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 84057E0F08 for ; Sun, 17 Nov 2024 16:26:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C0FE5335D6A for ; Sun, 17 Nov 2024 16:26:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5FC1FAED for ; Sun, 17 Nov 2024 16:26:52 +0000 (UTC) From: "Maciej Barć" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Maciej Barć" Message-ID: <1731860806.a70cfc5d2fffded77dc7d6d4a4f212efbf43c8f6.xgqt@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/melonds/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-emulation/melonds/melonds-9999.ebuild X-VCS-Directories: games-emulation/melonds/ X-VCS-Committer: xgqt X-VCS-Committer-Name: Maciej Barć X-VCS-Revision: a70cfc5d2fffded77dc7d6d4a4f212efbf43c8f6 X-VCS-Branch: master Date: Sun, 17 Nov 2024 16:26:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1205c122-4b07-44fb-837e-2800ea6b0d26 X-Archives-Hash: 02108afb2d3fe39260e02c67c824f576 commit: a70cfc5d2fffded77dc7d6d4a4f212efbf43c8f6 Author: Violet Purcell inventati org> AuthorDate: Sat Nov 16 03:12:39 2024 +0000 Commit: Maciej Barć gentoo org> CommitDate: Sun Nov 17 16:26:46 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a70cfc5d games-emulation/melonds: update live - Update to use Qt6 as is now upstream default. - Pass -DUSE_SYSTEM_LIBSLIRP to use system libslirp. - The filter-lto and -fno-strict-aliasing appear to be due to an issue from 2022 which appears to no longer be applicable since there has been some heavy refactoring. Remove them. Bug: https://bugs.gentoo.org/858710 Signed-off-by: Violet Purcell inventati.org> Signed-off-by: Maciej Barć gentoo.org> games-emulation/melonds/melonds-9999.ebuild | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/games-emulation/melonds/melonds-9999.ebuild b/games-emulation/melonds/melonds-9999.ebuild index e20ccdc8096e..088c19006bc0 100644 --- a/games-emulation/melonds/melonds-9999.ebuild +++ b/games-emulation/melonds/melonds-9999.ebuild @@ -6,7 +6,7 @@ EAPI=8 REAL_PN="melonDS" REAL_P="${REAL_PN}-${PV}" -inherit cmake flag-o-matic readme.gentoo-r1 toolchain-funcs xdg +inherit cmake readme.gentoo-r1 toolchain-funcs xdg DESCRIPTION="Nintendo DS emulator, sorta" HOMEPAGE="http://melonds.kuribo64.net @@ -30,11 +30,9 @@ IUSE="+jit +opengl wayland" RDEPEND=" app-arch/libarchive - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtmultimedia:5 - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5 + dev-qt/qtbase:6[network,opengl,widgets] + dev-qt/qtmultimedia:6 + dev-qt/qtsvg:6 media-libs/libsdl2[sound,video] net-libs/enet:= net-libs/libpcap @@ -64,19 +62,13 @@ DOC_CONTENTS="You need the following files in order to run melonDS: Place them in ~/.config/melonDS Those files can be extracted from devices or found somewhere on the Internet ;-)" -src_prepare() { - filter-lto - append-flags -fno-strict-aliasing - - cmake_src_prepare -} - src_configure() { local -a mycmakeargs=( -DBUILD_SHARED_LIBS="OFF" -DENABLE_JIT="$(usex jit)" -DENABLE_OGLRENDERER="$(usex opengl)" -DENABLE_WAYLAND="$(usex wayland)" + -DUSE_SYSTEM_LIBSLIRP=ON ) cmake_src_configure }