[gentoo-commits] repo/proj/guru:dev commit in: games-emulation/citra/

["Samuel Bauer" <samuel.bauer@yahoo.fr>]

commit:     9c2e2c9937eb8917976335e459fd92ebef679c81
Author:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Sun May 22 05:02:35 2022 +0000
Commit:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
CommitDate: Sun May 22 05:02:35 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9c2e2c99

games-emulation/citra: add system-libfmt flag

Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>

 games-emulation/citra/citra-9999.ebuild | 34 ++++++++++++++++++---------------
 games-emulation/citra/metadata.xml      |  1 +
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/games-emulation/citra/citra-9999.ebuild b/games-emulation/citra/citra-9999.ebuild
index b2e44375e..6e70e19e2 100644
--- a/games-emulation/citra/citra-9999.ebuild
+++ b/games-emulation/citra/citra-9999.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://citra-emu.org"
 EGIT_REPO_URI="https://github.com/citra-emu/citra"
 EGIT_SUBMODULES=( '*'
 	'-boost' '-catch' '-cryptopp' '-cubeb' '-enet'
-	'-fmt' '-inih' '-libressl' '-libusb' '-zstd'
+	'-inih' '-libressl' '-libusb' '-zstd'
 	'-externals/dynarmic/externals/fmt'
 	'-externals/dynarmic/externals/xbyak'
 )
@@ -18,25 +18,25 @@ EGIT_SUBMODULES=( '*'
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="cubeb +hle-sound nls +qt5 sdl +telemetry video"
+IUSE="cubeb +hle-sound nls +qt5 sdl system-libfmt +telemetry video"
 
 DEPEND="
 	cubeb? ( media-libs/cubeb )
 	!hle-sound? ( media-libs/fdk-aac )
 	hle-sound? ( media-video/ffmpeg[fdk] )
 	qt5? ( nls? ( dev-qt/linguist )
-			dev-qt/qtgui
-			dev-qt/qtmultimedia
-			dev-qt/qtnetwork
-			dev-qt/qtopengl
-			dev-qt/qtwidgets )
+			dev-qt/qtgui:5
+			dev-qt/qtmultimedia:5
+			dev-qt/qtnetwork:5
+			dev-qt/qtopengl:5
+			dev-qt/qtwidgets:5 )
 	sdl? (
 		media-libs/libsdl2
 		>=dev-libs/inih-52
 	)
+	system-libfmt? ( <=dev-libs/libfmt-8 )
 	video? ( media-video/ffmpeg )
 	>=app-arch/zstd-1.4.8
-	>=dev-libs/libfmt-8
 	>=dev-libs/openssl-1.1
 	dev-cpp/catch:0
 	dev-cpp/robin-map
@@ -49,6 +49,9 @@ RDEPEND="${DEPEND}"
 REQUIRED_USE="|| ( qt5 sdl )"
 
 src_unpack() {
+	if use system-libfmt; then
+		EGIT_SUBMODULES+=( "-fmt" "-externals/dynarmic/externals/fmt" )
+	fi
 	git-r3_src_unpack
 
 	cp -a "${S}"/externals/xbyak "${S}"/externals/dynarmic/externals/ || die
@@ -89,12 +92,13 @@ src_prepare() {
 		src/{citra,citra_qt,dedicated_room,tests}/CMakeLists.txt || die
 	sed -i -e '1ifind_package(OpenSSL 1.1)' src/{citra,citra_qt,dedicated_room,tests}/CMakeLists.txt || die
 
-	# Unbundle libfmt
-	sed -i -e '/fmt/d' externals/CMakeLists.txt || die
-	sed -i -e 's/fmt/&::&/' -e '1ifind_package(fmt)' \
-		src/{core,citra,citra_qt,dedicated_room,input_common,tests,video_core}/CMakeLists.txt || die
-	sed -i -e '1ifind_package(fmt)' externals/dynarmic/src/CMakeLists.txt || die
-	sed -i -e '/^#pragma once$/a#include <algorithm>' src/common/logging/log.h || die
+	if use system-libfmt; then # Unbundle libfmt
+		sed -i -e '/fmt/d' externals/CMakeLists.txt || die
+		sed -i -e 's/fmt/&::&/' -e '1ifind_package(fmt)' \
+			src/{core,citra,citra_qt,dedicated_room,input_common,tests,video_core}/CMakeLists.txt || die
+		sed -i -e '1ifind_package(fmt)' externals/dynarmic/src/CMakeLists.txt || die
+		sed -i -e '/^#pragma once$/a#include <algorithm>' src/common/logging/log.h || die
+	fi
 
 	# Unbundle zstd
 	sed -i -e 's:libzstd_static:${ZSTD_LIBRARIES}:' \
@@ -126,7 +130,7 @@ src_prepare() {
 	# Unbundle cubeb
 	sed -i -e '/CUBEB/,/endif()/d' externals/CMakeLists.txt || die
 	if use cubeb; then
-		sed -i -e '$afind_package(cubeb REQUIRED)\n'
+		sed -i -e '$afind_package(cubeb REQUIRED)\n' CMakeLists.txt || die
 	fi
 
 	# TODO unbundle xbyak (wait for 5.96 in ytree)

diff --git a/games-emulation/citra/metadata.xml b/games-emulation/citra/metadata.xml
index acd89943b..87cb3dfdc 100644
--- a/games-emulation/citra/metadata.xml
+++ b/games-emulation/citra/metadata.xml
@@ -8,6 +8,7 @@
 <use>
 	<flag name="cubeb">Enables the cubeb audio backend</flag>
 	<flag name="hle-sound">Enable HLE sound via FFmpeg audio (AAC) decoder</flag>
+	<flag name="system-libfmt">Use system libfmt</flag>
 	<flag name="telemetry">Enable web services (telemetry, etc.)</flag>
 	<flag name="video">Enable FFmpeg video dumper</flag>
 </use>