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 32ECF15813A for ; Sat, 18 Jan 2025 16:34:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6A902E08AA; Sat, 18 Jan 2025 16:34:14 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 D3612E086A for ; Sat, 18 Jan 2025 16:34:13 +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 D099C342F97 for ; Sat, 18 Jan 2025 16:34:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2CC172082 for ; Sat, 18 Jan 2025 16:34:11 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1737218046.38cfe8b6df92866003b5e88c66304862dc3c55d1.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-emulation/dolphin/dolphin-9999.ebuild X-VCS-Directories: games-emulation/dolphin/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 38cfe8b6df92866003b5e88c66304862dc3c55d1 X-VCS-Branch: master Date: Sat, 18 Jan 2025 16:34:11 +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: 9e6d6028-21b1-4864-924b-91d5c219ff88 X-Archives-Hash: 295cbdef4b6488f44021084638d11f8a commit: 38cfe8b6df92866003b5e88c66304862dc3c55d1 Author: Alfred Wingate protonmail com> AuthorDate: Sat Jan 18 14:25:49 2025 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Jan 18 16:34:06 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38cfe8b6 games-emulation/dolphin: update live Signed-off-by: Alfred Wingate protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/40191 Signed-off-by: Michał Górny gentoo.org> games-emulation/dolphin/dolphin-9999.ebuild | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/games-emulation/dolphin/dolphin-9999.ebuild b/games-emulation/dolphin/dolphin-9999.ebuild index 3b46bec0ea5d..b18e0c26a48b 100644 --- a/games-emulation/dolphin/dolphin-9999.ebuild +++ b/games-emulation/dolphin/dolphin-9999.ebuild @@ -72,8 +72,7 @@ RDEPEND=" app-arch/xz-utils >=app-arch/zstd-1.4.0:= dev-libs/hidapi - =dev-libs/libfmt-10.1 + >=dev-libs/libfmt-10.1:= dev-libs/lzo:2 dev-libs/pugixml dev-libs/xxhash @@ -127,6 +126,8 @@ declare -A KEEP_BUNDLED=( # please keep this list in CMakeLists.txt order # TODO: use system libraries + # bug #873952 + # https://github.com/dolphin-emu/dolphin/pull/13089 [zlib-ng]=ZLIB [minizip-ng]=ZLIB @@ -155,7 +156,6 @@ declare -A KEEP_BUNDLED=( ) PATCHES=( - "${FILESDIR}"/dolphin-2407-libfmt-11-fix.patch "${FILESDIR}"/dolphin-2407-minizip.patch ) @@ -196,11 +196,6 @@ src_prepare() { einfo "removing sources: ${remove[*]}" rm -r "${remove[@]}" || die - # About 50% compile-time speedup - if ! use vulkan; then - sed -i -e '/Externals\/glslang/d' CMakeLists.txt || die - fi - # Remove dirty suffix: needed for netplay sed -i -e 's/--dirty/&=""/' CMake/ScmRevGen.cmake || die } @@ -226,7 +221,6 @@ src_configure() { -DENCODE_FRAMEDUMPS=$(usex ffmpeg) -DFASTLOG=$(usex log) -DOPROFILING=$(usex profile) - -DSTEAM=OFF -DUSE_DISCORD_PRESENCE=$(usex discord-presence) -DUSE_MGBA=$(usex mgba) -DUSE_RETRO_ACHIEVEMENTS=OFF @@ -242,7 +236,6 @@ src_configure() { -DUSE_SYSTEM_BZIP2=ON -DUSE_SYSTEM_LIBLZMA=ON -DUSE_SYSTEM_ZSTD=ON - -DUSE_SYSTEM_ZLIB=OFF -DUSE_SYSTEM_MINIZIP=OFF -DUSE_SYSTEM_LZO=ON -DUSE_SYSTEM_LZ4=ON