[gentoo-commits] repo/gentoo:master commit in: app-misc/fastfetch/files/, app-misc/fastfetch/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: app-misc/fastfetch/files/, app-misc/fastfetch/
@ 2023-08-14 10:16 Viorel Munteanu
  0 siblings, 0 replies; 5+ messages in thread
From: Viorel Munteanu @ 2023-08-14 10:16 UTC (permalink / raw
  To: gentoo-commits

commit:     f6d44ba7a68e831f498e0aa166fc80aed78a41b8
Author:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 14 10:10:12 2023 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Mon Aug 14 10:16:20 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6d44ba7

app-misc/fastfetch: add 2.0.0

Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>

 app-misc/fastfetch/Manifest                        |   1 +
 app-misc/fastfetch/fastfetch-2.0.0.ebuild          | 106 +++++++++++++++++++++
 .../files/fastfetch-2.0.0-dont-fetch-yyjson.patch  |  31 ++++++
 app-misc/fastfetch/metadata.xml                    |   1 +
 4 files changed, 139 insertions(+)

diff --git a/app-misc/fastfetch/Manifest b/app-misc/fastfetch/Manifest
index 9b576ee9cddc..2734a521d15c 100644
--- a/app-misc/fastfetch/Manifest
+++ b/app-misc/fastfetch/Manifest
@@ -1 +1,2 @@
 DIST fastfetch-1.12.2.tar.gz 538194 BLAKE2B bc6badbc7f690dacbe1408479286a0d42ec687526f776ff4d2ec7b0eb767032e5781cbbe37778f4dc03a5d386979a9ae2aab84c466be997b82d9a9a6c81ea78f SHA512 a82a7c7ae365335c20d659a82215cf320c4c6b07ff127c4dad322a0a01f7ec57e34d229f4953108daadcd0d243c84f8504a3b4367df5e255e5a06e685fd6739a
+DIST fastfetch-2.0.0.tar.gz 663049 BLAKE2B 5836a04bd0cec14321810e5512d136b02b1aea68eb5a481a79426b9eef75dcf2c93008a6ac9b7877ce1a3b2758b4d53ddc52bd7b2fca0faad26834281f5da954 SHA512 bdd440130314b7865391b74105871842fb5241d858b5808a5e2e9091f1a2f7cdad4ff485d92bb6108dd4b3d09a847adbf4c90493623c974902d8d9bcf2abbc81

diff --git a/app-misc/fastfetch/fastfetch-2.0.0.ebuild b/app-misc/fastfetch/fastfetch-2.0.0.ebuild
new file mode 100644
index 000000000000..950efaa60c13
--- /dev/null
+++ b/app-misc/fastfetch/fastfetch-2.0.0.ebuild
@@ -0,0 +1,106 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="Fast system information tool"
+HOMEPAGE="https://github.com/fastfetch-cli/fastfetch"
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/fastfetch-cli/fastfetch.git"
+	[[ ${PV} == *0.1.9999 ]] && EGIT_BRANCH=master
+	[[ ${PV} == *0.2.9999 ]] && EGIT_BRANCH=dev
+	[[ "${EGIT_BRANCH}" == "" ]] && die "Please set a git branch"
+else
+	SRC_URI="https://github.com/fastfetch-cli/fastfetch/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="X chafa dbus ddcutil gnome imagemagick networkmanager opencl opengl osmesa pci pulseaudio sqlite vulkan wayland xcb xfce xrandr"
+
+# note - qa-vdb will always report errors because fastfetch loads the libs dynamically
+RDEPEND="
+	dev-libs/yyjson
+	sys-libs/zlib
+	X? ( x11-libs/libX11 )
+	chafa? ( media-gfx/chafa )
+	dbus? ( sys-apps/dbus )
+	ddcutil? ( app-misc/ddcutil:= )
+	gnome? (
+		dev-libs/glib
+		gnome-base/dconf
+	)
+	imagemagick? ( media-gfx/imagemagick:= )
+	networkmanager? ( net-misc/networkmanager )
+	opencl? ( virtual/opencl )
+	opengl? ( media-libs/libglvnd[X] )
+	osmesa? ( media-libs/mesa[osmesa] )
+	pci? ( sys-apps/pciutils )
+	pulseaudio? ( media-libs/libpulse )
+	sqlite? ( dev-db/sqlite:3 )
+	vulkan? ( media-libs/vulkan-loader )
+	wayland? ( dev-libs/wayland )
+	xcb? ( x11-libs/libxcb )
+	xfce? ( xfce-base/xfconf )
+	xrandr? ( x11-libs/libXrandr )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+REQUIRED_USE="
+	xrandr? ( X )
+	chafa? ( imagemagick )
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.0.0-dont-fetch-yyjson.patch )
+
+src_configure() {
+	local fastfetch_enable_imagemagick7=no
+	local fastfetch_enable_imagemagick6=no
+	if use imagemagick; then
+		fastfetch_enable_imagemagick7=$(has_version '>=media-gfx/imagemagick-7.0.0' && echo yes || echo no)
+		fastfetch_enable_imagemagick6=$(has_version '<media-gfx/imagemagick-7.0.0' && echo yes || echo no)
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_RPM=no
+		-DENABLE_ZLIB=yes
+
+		-DENABLE_CHAFA=$(usex chafa)
+		-DENABLE_DBUS=$(usex dbus)
+		-DENABLE_DDCUTIL=$(usex ddcutil)
+		-DENABLE_DCONF=$(usex gnome)
+		-DENABLE_EGL=$(usex opengl)
+		-DENABLE_GIO=$(usex gnome)
+		-DENABLE_GLX=$(usex opengl)
+		-DENABLE_IMAGEMAGICK6=${fastfetch_enable_imagemagick6}
+		-DENABLE_IMAGEMAGICK7=${fastfetch_enable_imagemagick7}
+		-DENABLE_LIBNM=$(usex networkmanager)
+		-DENABLE_LIBPCI=$(usex pci)
+		-DENABLE_OPENCL=$(usex opencl)
+		-DENABLE_OSMESA=$(usex osmesa)
+		-DENABLE_PULSE=$(usex pulseaudio)
+		-DENABLE_SQLITE3=$(usex sqlite)
+		-DENABLE_VULKAN=$(usex vulkan)
+		-DENABLE_WAYLAND=$(usex wayland)
+		-DENABLE_X11=$(usex X)
+		-DENABLE_XCB=$(usex xcb)
+		-DENABLE_XCB_RANDR=$(usex xcb)
+		-DENABLE_XFCONF=$(usex xfce)
+		-DENABLE_XRANDR=$(usex xrandr)
+	)
+
+	append-cppflags -DNDEBUG
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	rm -r "${ED}"/usr/share/licenses || die
+}

diff --git a/app-misc/fastfetch/files/fastfetch-2.0.0-dont-fetch-yyjson.patch b/app-misc/fastfetch/files/fastfetch-2.0.0-dont-fetch-yyjson.patch
new file mode 100644
index 000000000000..e235cf3a6f00
--- /dev/null
+++ b/app-misc/fastfetch/files/fastfetch-2.0.0-dont-fetch-yyjson.patch
@@ -0,0 +1,31 @@
+fastfetch 2.0.0 tries to fetch yyjson at build time.
+
+This is not allowed in Gentoo.
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -36,24 +36,6 @@
+ 
+ include(CheckIncludeFile)
+ 
+-include(FetchContent)
+-function(ff_fetch_dep package repo tag)
+-    FetchContent_Declare(
+-        "${package}"
+-        GIT_REPOSITORY "${repo}"
+-        GIT_TAG "${tag}"
+-        GIT_PROGRESS TRUE
+-    )
+-    FetchContent_GetProperties("${package}")
+-    if(NOT ${package}_POPULATED)
+-        message("-- Fetching dependency ${package}@${tag} from ${repo}")
+-        FetchContent_Populate(${package})
+-        add_subdirectory(${${package}_SOURCE_DIR} ${${package}_BINARY_DIR} EXCLUDE_FROM_ALL)
+-    endif()
+-endfunction()
+-
+-ff_fetch_dep(yyjson "https://github.com/ibireme/yyjson" "0.7.0")
+-
+ #####################
+ # Configure options #
+ #####################

diff --git a/app-misc/fastfetch/metadata.xml b/app-misc/fastfetch/metadata.xml
index 1c1ff32e0ceb..6bd2aac4ccf3 100644
--- a/app-misc/fastfetch/metadata.xml
+++ b/app-misc/fastfetch/metadata.xml
@@ -10,6 +10,7 @@
 </upstream>
 <use>
 	<flag name="chafa">Enables text/graphics renderer with <pkg>media-gfx/chafa</pkg></flag>
+	<flag name="ddcutil">Use <pkg>app-misc/ddcutil</pkg> to query monitor settings</flag>
 	<flag name="opencl">Enables OpenCL support</flag>
 	<flag name="osmesa">Enables offscreen rendering support from <pkg>media-libs/mesa</pkg></flag>
 	<flag name="pci">Enables reading GPU via <pkg>sys-apps/pciutils</pkg></flag>


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-misc/fastfetch/files/, app-misc/fastfetch/
@ 2023-12-19  6:35 Viorel Munteanu
  0 siblings, 0 replies; 5+ messages in thread
From: Viorel Munteanu @ 2023-12-19  6:35 UTC (permalink / raw
  To: gentoo-commits

commit:     7c9ecbd8e61ffc70646581bb512fa2b596931aa4
Author:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 19 06:33:11 2023 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Tue Dec 19 06:35:31 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c9ecbd8

app-misc/fastfetch: sync live ebuilds

Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>

 app-misc/fastfetch/fastfetch-0.1.9999.ebuild       | 23 ++++++++++------
 app-misc/fastfetch/fastfetch-0.2.9999.ebuild       | 20 ++++++++++----
 .../files/fastfetch-2.0.0-dont-fetch-yyjson.patch  | 31 ----------------------
 3 files changed, 30 insertions(+), 44 deletions(-)

diff --git a/app-misc/fastfetch/fastfetch-0.1.9999.ebuild b/app-misc/fastfetch/fastfetch-0.1.9999.ebuild
index 950efaa60c13..4af72e9b74c7 100644
--- a/app-misc/fastfetch/fastfetch-0.1.9999.ebuild
+++ b/app-misc/fastfetch/fastfetch-0.1.9999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 inherit cmake flag-o-matic
 
-DESCRIPTION="Fast system information tool"
+DESCRIPTION="Fast neofetch-like system information tool"
 HOMEPAGE="https://github.com/fastfetch-cli/fastfetch"
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
@@ -15,21 +15,24 @@ if [[ ${PV} == *9999 ]]; then
 	[[ "${EGIT_BRANCH}" == "" ]] && die "Please set a git branch"
 else
 	SRC_URI="https://github.com/fastfetch-cli/fastfetch/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="X chafa dbus ddcutil gnome imagemagick networkmanager opencl opengl osmesa pci pulseaudio sqlite vulkan wayland xcb xfce xrandr"
+IUSE="X chafa dbus ddcutil drm gnome imagemagick networkmanager opencl opengl osmesa pci pulseaudio sqlite test vulkan wayland xcb xfce xrandr"
+RESTRICT="!test? ( test )"
 
 # note - qa-vdb will always report errors because fastfetch loads the libs dynamically
+# make sure to crank yyjson minimum version to match bundled version
 RDEPEND="
-	dev-libs/yyjson
+	>=dev-libs/yyjson-0.8.0:=
 	sys-libs/zlib
 	X? ( x11-libs/libX11 )
 	chafa? ( media-gfx/chafa )
 	dbus? ( sys-apps/dbus )
 	ddcutil? ( app-misc/ddcutil:= )
+	drm? ( x11-libs/libdrm )
 	gnome? (
 		dev-libs/glib
 		gnome-base/dconf
@@ -42,7 +45,10 @@ RDEPEND="
 	pci? ( sys-apps/pciutils )
 	pulseaudio? ( media-libs/libpulse )
 	sqlite? ( dev-db/sqlite:3 )
-	vulkan? ( media-libs/vulkan-loader )
+	vulkan? (
+		media-libs/vulkan-loader
+		sys-apps/pciutils
+	)
 	wayland? ( dev-libs/wayland )
 	xcb? ( x11-libs/libxcb )
 	xfce? ( xfce-base/xfconf )
@@ -56,8 +62,6 @@ REQUIRED_USE="
 	chafa? ( imagemagick )
 "
 
-PATCHES=( "${FILESDIR}"/${PN}-2.0.0-dont-fetch-yyjson.patch )
-
 src_configure() {
 	local fastfetch_enable_imagemagick7=no
 	local fastfetch_enable_imagemagick6=no
@@ -69,11 +73,13 @@ src_configure() {
 	local mycmakeargs=(
 		-DENABLE_RPM=no
 		-DENABLE_ZLIB=yes
+		-DENABLE_SYSTEM_YYJSON=yes
 
 		-DENABLE_CHAFA=$(usex chafa)
 		-DENABLE_DBUS=$(usex dbus)
-		-DENABLE_DDCUTIL=$(usex ddcutil)
 		-DENABLE_DCONF=$(usex gnome)
+		-DENABLE_DDCUTIL=$(usex ddcutil)
+		-DENABLE_DRM=$(usex drm)
 		-DENABLE_EGL=$(usex opengl)
 		-DENABLE_GIO=$(usex gnome)
 		-DENABLE_GLX=$(usex opengl)
@@ -92,6 +98,7 @@ src_configure() {
 		-DENABLE_XCB_RANDR=$(usex xcb)
 		-DENABLE_XFCONF=$(usex xfce)
 		-DENABLE_XRANDR=$(usex xrandr)
+		-DBUILD_TESTS=$(usex test)
 	)
 
 	append-cppflags -DNDEBUG

diff --git a/app-misc/fastfetch/fastfetch-0.2.9999.ebuild b/app-misc/fastfetch/fastfetch-0.2.9999.ebuild
index f7fd71b82868..4af72e9b74c7 100644
--- a/app-misc/fastfetch/fastfetch-0.2.9999.ebuild
+++ b/app-misc/fastfetch/fastfetch-0.2.9999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 inherit cmake flag-o-matic
 
-DESCRIPTION="Fast system information tool"
+DESCRIPTION="Fast neofetch-like system information tool"
 HOMEPAGE="https://github.com/fastfetch-cli/fastfetch"
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
@@ -15,20 +15,24 @@ if [[ ${PV} == *9999 ]]; then
 	[[ "${EGIT_BRANCH}" == "" ]] && die "Please set a git branch"
 else
 	SRC_URI="https://github.com/fastfetch-cli/fastfetch/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="X chafa dbus ddcutil gnome imagemagick networkmanager opencl opengl osmesa pci pulseaudio sqlite vulkan wayland xcb xfce xrandr"
+IUSE="X chafa dbus ddcutil drm gnome imagemagick networkmanager opencl opengl osmesa pci pulseaudio sqlite test vulkan wayland xcb xfce xrandr"
+RESTRICT="!test? ( test )"
 
 # note - qa-vdb will always report errors because fastfetch loads the libs dynamically
+# make sure to crank yyjson minimum version to match bundled version
 RDEPEND="
+	>=dev-libs/yyjson-0.8.0:=
 	sys-libs/zlib
 	X? ( x11-libs/libX11 )
 	chafa? ( media-gfx/chafa )
 	dbus? ( sys-apps/dbus )
 	ddcutil? ( app-misc/ddcutil:= )
+	drm? ( x11-libs/libdrm )
 	gnome? (
 		dev-libs/glib
 		gnome-base/dconf
@@ -41,7 +45,10 @@ RDEPEND="
 	pci? ( sys-apps/pciutils )
 	pulseaudio? ( media-libs/libpulse )
 	sqlite? ( dev-db/sqlite:3 )
-	vulkan? ( media-libs/vulkan-loader )
+	vulkan? (
+		media-libs/vulkan-loader
+		sys-apps/pciutils
+	)
 	wayland? ( dev-libs/wayland )
 	xcb? ( x11-libs/libxcb )
 	xfce? ( xfce-base/xfconf )
@@ -66,11 +73,13 @@ src_configure() {
 	local mycmakeargs=(
 		-DENABLE_RPM=no
 		-DENABLE_ZLIB=yes
+		-DENABLE_SYSTEM_YYJSON=yes
 
 		-DENABLE_CHAFA=$(usex chafa)
 		-DENABLE_DBUS=$(usex dbus)
-		-DENABLE_DDCUTIL=$(usex ddcutil)
 		-DENABLE_DCONF=$(usex gnome)
+		-DENABLE_DDCUTIL=$(usex ddcutil)
+		-DENABLE_DRM=$(usex drm)
 		-DENABLE_EGL=$(usex opengl)
 		-DENABLE_GIO=$(usex gnome)
 		-DENABLE_GLX=$(usex opengl)
@@ -89,6 +98,7 @@ src_configure() {
 		-DENABLE_XCB_RANDR=$(usex xcb)
 		-DENABLE_XFCONF=$(usex xfce)
 		-DENABLE_XRANDR=$(usex xrandr)
+		-DBUILD_TESTS=$(usex test)
 	)
 
 	append-cppflags -DNDEBUG

diff --git a/app-misc/fastfetch/files/fastfetch-2.0.0-dont-fetch-yyjson.patch b/app-misc/fastfetch/files/fastfetch-2.0.0-dont-fetch-yyjson.patch
deleted file mode 100644
index e235cf3a6f00..000000000000
--- a/app-misc/fastfetch/files/fastfetch-2.0.0-dont-fetch-yyjson.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-fastfetch 2.0.0 tries to fetch yyjson at build time.
-
-This is not allowed in Gentoo.
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -36,24 +36,6 @@
- 
- include(CheckIncludeFile)
- 
--include(FetchContent)
--function(ff_fetch_dep package repo tag)
--    FetchContent_Declare(
--        "${package}"
--        GIT_REPOSITORY "${repo}"
--        GIT_TAG "${tag}"
--        GIT_PROGRESS TRUE
--    )
--    FetchContent_GetProperties("${package}")
--    if(NOT ${package}_POPULATED)
--        message("-- Fetching dependency ${package}@${tag} from ${repo}")
--        FetchContent_Populate(${package})
--        add_subdirectory(${${package}_SOURCE_DIR} ${${package}_BINARY_DIR} EXCLUDE_FROM_ALL)
--    endif()
--endfunction()
--
--ff_fetch_dep(yyjson "https://github.com/ibireme/yyjson" "0.7.0")
--
- #####################
- # Configure options #
- #####################


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-misc/fastfetch/files/, app-misc/fastfetch/
@ 2024-01-01 17:54 Viorel Munteanu
  0 siblings, 0 replies; 5+ messages in thread
From: Viorel Munteanu @ 2024-01-01 17:54 UTC (permalink / raw
  To: gentoo-commits

commit:     2afdfbb9c3dbda2e22ba4cefde46f97a4f5816cd
Author:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  1 17:35:05 2024 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Mon Jan  1 17:54:18 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2afdfbb9

app-misc/fastfetch: drop 2.4.0-r1

Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>

 app-misc/fastfetch/Manifest                        |   1 -
 app-misc/fastfetch/fastfetch-2.4.0-r1.ebuild       | 117 ---------------------
 .../fastfetch-2.4.0-default-config-suffix.patch    |  35 ------
 3 files changed, 153 deletions(-)

diff --git a/app-misc/fastfetch/Manifest b/app-misc/fastfetch/Manifest
index 3b7689e55f48..25cebe925918 100644
--- a/app-misc/fastfetch/Manifest
+++ b/app-misc/fastfetch/Manifest
@@ -1,4 +1,3 @@
 DIST fastfetch-2.2.3.tar.gz 901203 BLAKE2B d6d097b72ce2f252e42b3e59cbd26b43a4f17ae974382f986270fbf91b457cf3c49e78a3c775e713d9302d536fb5a363e809005b9174d1a27622e6b6ed666709 SHA512 81e051b7555d56415c723606c0b6dfc3ad7ed91fb2c7b36c07465f4dfbdb91da5c8d216e46df36863888448de0a7bd63e28c6aa701995bf1165e0d7c33c4f724
 DIST fastfetch-2.3.4.tar.gz 909105 BLAKE2B 132f88681f9133cdeae8126c4dabf4e8805865fe506a005f938bcda487750a874ab59deebdf2fc348c2a469cf4771fe5916f594a5a408769c1e49fba417ab113 SHA512 fe1e6465380e513e4e75092bc737b23adca4c9dd42de8adb888bad1ce173f1fa9c93e9cbd7b2ca648058503b7cfb72c2ba1d70abf63b8f1497e94ce6eb349524
-DIST fastfetch-2.4.0.tar.gz 913193 BLAKE2B 88df9a8cb641596855cbd539d0be7f9270cd234dc060612ee6c52f5d47b2deb0d95608bdc496c81ac5e0e74c0c403f373fdcf7c17303eebab1f3b32ee0a41270 SHA512 00130ad3825cff039dc9ab3efd9f3431b36357e0ae144148872ab761f8b07a8d95c2413450d000b0181e9424d490ad55e6af928d1b7b2efdc7d5842ead8ab028
 DIST fastfetch-2.5.0.tar.gz 984182 BLAKE2B 5185cce0e5933524835093a2f730cac8a9262cb6ec2c422fff60a4c6daec4f2a8ba11eab4323f00eaeebf2d946da9767f125b265e87cda6714d50e1c5e1383de SHA512 a69f4e839acf8897a9cd8f6c017a4d7657a8dc0b3c58e645c88fc8e47e0a7bd3411d1a3e1e916628a948cb7e1688a200f7ac1eabd090f5eb42ce4b0030e342b4

diff --git a/app-misc/fastfetch/fastfetch-2.4.0-r1.ebuild b/app-misc/fastfetch/fastfetch-2.4.0-r1.ebuild
deleted file mode 100644
index 4590e479070b..000000000000
--- a/app-misc/fastfetch/fastfetch-2.4.0-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic
-
-DESCRIPTION="Fast neofetch-like system information tool"
-HOMEPAGE="https://github.com/fastfetch-cli/fastfetch"
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/fastfetch-cli/fastfetch.git"
-	[[ ${PV} == *0.1.9999 ]] && EGIT_BRANCH=master
-	[[ ${PV} == *0.2.9999 ]] && EGIT_BRANCH=dev
-	[[ "${EGIT_BRANCH}" == "" ]] && die "Please set a git branch"
-else
-	SRC_URI="https://github.com/fastfetch-cli/fastfetch/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="X chafa dbus ddcutil drm gnome imagemagick networkmanager opencl opengl osmesa pci pulseaudio sqlite test vulkan wayland xcb xfce xrandr"
-RESTRICT="!test? ( test )"
-
-# note - qa-vdb will always report errors because fastfetch loads the libs dynamically
-# make sure to crank yyjson minimum version to match bundled version
-RDEPEND="
-	>=dev-libs/yyjson-0.8.0:=
-	sys-libs/zlib
-	X? ( x11-libs/libX11 )
-	chafa? ( media-gfx/chafa )
-	dbus? ( sys-apps/dbus )
-	ddcutil? ( app-misc/ddcutil:= )
-	drm? ( x11-libs/libdrm )
-	gnome? (
-		dev-libs/glib
-		gnome-base/dconf
-	)
-	imagemagick? ( media-gfx/imagemagick:= )
-	networkmanager? ( net-misc/networkmanager )
-	opencl? ( virtual/opencl )
-	opengl? ( media-libs/libglvnd[X] )
-	osmesa? ( media-libs/mesa[osmesa] )
-	pci? ( sys-apps/pciutils )
-	pulseaudio? ( media-libs/libpulse )
-	sqlite? ( dev-db/sqlite:3 )
-	vulkan? (
-		media-libs/vulkan-loader
-		sys-apps/pciutils
-	)
-	wayland? ( dev-libs/wayland )
-	xcb? ( x11-libs/libxcb )
-	xfce? ( xfce-base/xfconf )
-	xrandr? ( x11-libs/libXrandr )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-REQUIRED_USE="
-	xrandr? ( X )
-	chafa? ( imagemagick )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-default-config-suffix.patch
-)
-
-src_configure() {
-	local fastfetch_enable_imagemagick7=no
-	local fastfetch_enable_imagemagick6=no
-	if use imagemagick; then
-		fastfetch_enable_imagemagick7=$(has_version '>=media-gfx/imagemagick-7.0.0' && echo yes || echo no)
-		fastfetch_enable_imagemagick6=$(has_version '<media-gfx/imagemagick-7.0.0' && echo yes || echo no)
-	fi
-
-	local mycmakeargs=(
-		-DENABLE_RPM=no
-		-DENABLE_ZLIB=yes
-		-DENABLE_SYSTEM_YYJSON=yes
-
-		-DENABLE_CHAFA=$(usex chafa)
-		-DENABLE_DBUS=$(usex dbus)
-		-DENABLE_DCONF=$(usex gnome)
-		-DENABLE_DDCUTIL=$(usex ddcutil)
-		-DENABLE_DRM=$(usex drm)
-		-DENABLE_EGL=$(usex opengl)
-		-DENABLE_GIO=$(usex gnome)
-		-DENABLE_GLX=$(usex opengl)
-		-DENABLE_IMAGEMAGICK6=${fastfetch_enable_imagemagick6}
-		-DENABLE_IMAGEMAGICK7=${fastfetch_enable_imagemagick7}
-		-DENABLE_LIBNM=$(usex networkmanager)
-		-DENABLE_LIBPCI=$(usex pci)
-		-DENABLE_OPENCL=$(usex opencl)
-		-DENABLE_OSMESA=$(usex osmesa)
-		-DENABLE_PULSE=$(usex pulseaudio)
-		-DENABLE_SQLITE3=$(usex sqlite)
-		-DENABLE_VULKAN=$(usex vulkan)
-		-DENABLE_WAYLAND=$(usex wayland)
-		-DENABLE_X11=$(usex X)
-		-DENABLE_XCB=$(usex xcb)
-		-DENABLE_XCB_RANDR=$(usex xcb)
-		-DENABLE_XFCONF=$(usex xfce)
-		-DENABLE_XRANDR=$(usex xrandr)
-		-DBUILD_TESTS=$(usex test)
-	)
-
-	append-cppflags -DNDEBUG
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	rm -r "${ED}"/usr/share/licenses || die
-}

diff --git a/app-misc/fastfetch/files/fastfetch-2.4.0-default-config-suffix.patch b/app-misc/fastfetch/files/fastfetch-2.4.0-default-config-suffix.patch
deleted file mode 100644
index fcf21ce0af23..000000000000
--- a/app-misc/fastfetch/files/fastfetch-2.4.0-default-config-suffix.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Make specifying `.jsonc` suffix for configs optional
-
-https://github.com/fastfetch-cli/fastfetch/commit/456a58c8f57aaf22c51571ec0ead1e7c40c3d860
-
-From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= <zhangsongcui3371@sina.com>
-Date: Tue, 19 Dec 2023 15:26:51 +0800
-Subject: [PATCH] fastfetch: default preset names to `.jsonc`
-
-Fix #666
---- a/src/fastfetch.c
-+++ b/src/fastfetch.c
-@@ -501,6 +501,11 @@ static void optionParseConfigFile(FFdata* data, const char* key, const char* val
-         ffStrbufAppendS(&absolutePath, value);
- 
-         bool success = isJsonConfig ? parseJsoncFile(absolutePath.chars) : parseConfigFile(data, absolutePath.chars);
-+        if (!success)
-+        {
-+            ffStrbufAppendS(&absolutePath, ".jsonc");
-+            success = parseJsoncFile(absolutePath.chars);
-+        }
- 
-         if(success)
-             return;
-@@ -514,6 +519,11 @@ static void optionParseConfigFile(FFdata* data, const char* key, const char* val
-         ffStrbufAppendS(&absolutePath, value);
- 
-         bool success = isJsonConfig ? parseJsoncFile(absolutePath.chars) : parseConfigFile(data, absolutePath.chars);
-+        if (!success)
-+        {
-+            ffStrbufAppendS(&absolutePath, ".jsonc");
-+            success = parseJsoncFile(absolutePath.chars);
-+        }
- 
-         if(success)
-             return;


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-misc/fastfetch/files/, app-misc/fastfetch/
@ 2024-01-01 17:54 Viorel Munteanu
  0 siblings, 0 replies; 5+ messages in thread
From: Viorel Munteanu @ 2024-01-01 17:54 UTC (permalink / raw
  To: gentoo-commits

commit:     d19192494cdf514e77ca321a038b5b57a0097ebb
Author:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  1 17:26:56 2024 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Mon Jan  1 17:54:17 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1919249

app-misc/fastfetch: add 2.5.0

Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>

 app-misc/fastfetch/Manifest                        |   1 +
 app-misc/fastfetch/fastfetch-2.5.0.ebuild          | 118 +++++++++++++++++++++
 .../fastfetch/files/fastfetch-2.5.0-nvidia.patch   |  83 +++++++++++++++
 app-misc/fastfetch/metadata.xml                    |   1 +
 4 files changed, 203 insertions(+)

diff --git a/app-misc/fastfetch/Manifest b/app-misc/fastfetch/Manifest
index 93c10e1259e5..3b7689e55f48 100644
--- a/app-misc/fastfetch/Manifest
+++ b/app-misc/fastfetch/Manifest
@@ -1,3 +1,4 @@
 DIST fastfetch-2.2.3.tar.gz 901203 BLAKE2B d6d097b72ce2f252e42b3e59cbd26b43a4f17ae974382f986270fbf91b457cf3c49e78a3c775e713d9302d536fb5a363e809005b9174d1a27622e6b6ed666709 SHA512 81e051b7555d56415c723606c0b6dfc3ad7ed91fb2c7b36c07465f4dfbdb91da5c8d216e46df36863888448de0a7bd63e28c6aa701995bf1165e0d7c33c4f724
 DIST fastfetch-2.3.4.tar.gz 909105 BLAKE2B 132f88681f9133cdeae8126c4dabf4e8805865fe506a005f938bcda487750a874ab59deebdf2fc348c2a469cf4771fe5916f594a5a408769c1e49fba417ab113 SHA512 fe1e6465380e513e4e75092bc737b23adca4c9dd42de8adb888bad1ce173f1fa9c93e9cbd7b2ca648058503b7cfb72c2ba1d70abf63b8f1497e94ce6eb349524
 DIST fastfetch-2.4.0.tar.gz 913193 BLAKE2B 88df9a8cb641596855cbd539d0be7f9270cd234dc060612ee6c52f5d47b2deb0d95608bdc496c81ac5e0e74c0c403f373fdcf7c17303eebab1f3b32ee0a41270 SHA512 00130ad3825cff039dc9ab3efd9f3431b36357e0ae144148872ab761f8b07a8d95c2413450d000b0181e9424d490ad55e6af928d1b7b2efdc7d5842ead8ab028
+DIST fastfetch-2.5.0.tar.gz 984182 BLAKE2B 5185cce0e5933524835093a2f730cac8a9262cb6ec2c422fff60a4c6daec4f2a8ba11eab4323f00eaeebf2d946da9767f125b265e87cda6714d50e1c5e1383de SHA512 a69f4e839acf8897a9cd8f6c017a4d7657a8dc0b3c58e645c88fc8e47e0a7bd3411d1a3e1e916628a948cb7e1688a200f7ac1eabd090f5eb42ce4b0030e342b4

diff --git a/app-misc/fastfetch/fastfetch-2.5.0.ebuild b/app-misc/fastfetch/fastfetch-2.5.0.ebuild
new file mode 100644
index 000000000000..8facae65cd7b
--- /dev/null
+++ b/app-misc/fastfetch/fastfetch-2.5.0.ebuild
@@ -0,0 +1,118 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="Fast neofetch-like system information tool"
+HOMEPAGE="https://github.com/fastfetch-cli/fastfetch"
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/fastfetch-cli/fastfetch.git"
+	[[ ${PV} == *0.1.9999 ]] && EGIT_BRANCH=master
+	[[ ${PV} == *0.2.9999 ]] && EGIT_BRANCH=dev
+	[[ "${EGIT_BRANCH}" == "" ]] && die "Please set a git branch"
+else
+	SRC_URI="https://github.com/fastfetch-cli/fastfetch/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="MIT nvidia-gpu? ( NVIDIA-NVLM )"
+SLOT="0"
+IUSE="X chafa dbus ddcutil drm gnome imagemagick networkmanager nvidia-gpu opencl opengl osmesa pci pulseaudio sqlite test vulkan wayland xcb xfce xrandr"
+RESTRICT="!test? ( test )"
+
+# note - qa-vdb will always report errors because fastfetch loads the libs dynamically
+# make sure to crank yyjson minimum version to match bundled version
+RDEPEND="
+	>=dev-libs/yyjson-0.8.0:=
+	sys-libs/zlib
+	X? ( x11-libs/libX11 )
+	chafa? ( media-gfx/chafa )
+	dbus? ( sys-apps/dbus )
+	ddcutil? ( app-misc/ddcutil:= )
+	drm? ( x11-libs/libdrm )
+	gnome? (
+		dev-libs/glib
+		gnome-base/dconf
+	)
+	imagemagick? ( media-gfx/imagemagick:= )
+	networkmanager? ( net-misc/networkmanager )
+	opencl? ( virtual/opencl )
+	opengl? ( media-libs/libglvnd[X] )
+	osmesa? ( media-libs/mesa[osmesa] )
+	pci? ( sys-apps/pciutils )
+	pulseaudio? ( media-libs/libpulse )
+	sqlite? ( dev-db/sqlite:3 )
+	vulkan? (
+		media-libs/vulkan-loader
+		sys-apps/pciutils
+	)
+	wayland? ( dev-libs/wayland )
+	xcb? ( x11-libs/libxcb )
+	xfce? ( xfce-base/xfconf )
+	xrandr? ( x11-libs/libXrandr )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+REQUIRED_USE="
+	xrandr? ( X )
+	chafa? ( imagemagick )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-nvidia.patch
+)
+
+src_configure() {
+	local fastfetch_enable_imagemagick7=no
+	local fastfetch_enable_imagemagick6=no
+	if use imagemagick; then
+		fastfetch_enable_imagemagick7=$(has_version '>=media-gfx/imagemagick-7.0.0' && echo yes || echo no)
+		fastfetch_enable_imagemagick6=$(has_version '<media-gfx/imagemagick-7.0.0' && echo yes || echo no)
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_RPM=no
+		-DENABLE_ZLIB=yes
+		-DENABLE_SYSTEM_YYJSON=yes
+
+		-DENABLE_CHAFA=$(usex chafa)
+		-DENABLE_DBUS=$(usex dbus)
+		-DENABLE_DCONF=$(usex gnome)
+		-DENABLE_DDCUTIL=$(usex ddcutil)
+		-DENABLE_DRM=$(usex drm)
+		-DENABLE_EGL=$(usex opengl)
+		-DENABLE_GIO=$(usex gnome)
+		-DENABLE_GLX=$(usex opengl)
+		-DENABLE_IMAGEMAGICK6=${fastfetch_enable_imagemagick6}
+		-DENABLE_IMAGEMAGICK7=${fastfetch_enable_imagemagick7}
+		-DENABLE_LIBNM=$(usex networkmanager)
+		-DENABLE_LIBPCI=$(usex pci)
+		-DENABLE_NVIDIA_GPU=$(usex nvidia-gpu)
+		-DENABLE_OPENCL=$(usex opencl)
+		-DENABLE_OSMESA=$(usex osmesa)
+		-DENABLE_PULSE=$(usex pulseaudio)
+		-DENABLE_SQLITE3=$(usex sqlite)
+		-DENABLE_VULKAN=$(usex vulkan)
+		-DENABLE_WAYLAND=$(usex wayland)
+		-DENABLE_X11=$(usex X)
+		-DENABLE_XCB=$(usex xcb)
+		-DENABLE_XCB_RANDR=$(usex xcb)
+		-DENABLE_XFCONF=$(usex xfce)
+		-DENABLE_XRANDR=$(usex xrandr)
+		-DBUILD_TESTS=$(usex test)
+	)
+
+	append-cppflags -DNDEBUG
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	rm -r "${ED}"/usr/share/licenses || die
+}

diff --git a/app-misc/fastfetch/files/fastfetch-2.5.0-nvidia.patch b/app-misc/fastfetch/files/fastfetch-2.5.0-nvidia.patch
new file mode 100644
index 000000000000..263604bdf2fb
--- /dev/null
+++ b/app-misc/fastfetch/files/fastfetch-2.5.0-nvidia.patch
@@ -0,0 +1,83 @@
+https://github.com/fastfetch-cli/fastfetch/commit/0a1de91a29b802962e123966e370befd3894cb6d.patch
+
+Option to opt out of Nvidia GPU support.
+
+From: Viorel <ceamac.paragon@gmail.com>
+Date: Mon, 1 Jan 2024 12:38:06 +0200
+Subject: [PATCH] Add option for NVIDIA GPU support
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -76,6 +76,7 @@ option(ENABLE_SYSTEM_YYJSON "Use system provided (instead of fastfetch embedded)
+ option(ENABLE_ASAN "Build fastfetch with ASAN (address sanitizer)" OFF)
+ option(BUILD_TESTS "Build tests" OFF) # Also create test executables
+ option(SET_TWEAK "Add tweak to project version" ON) # This is set to off by github actions for release builds
++option(ENABLE_NVIDIA_GPU "Enable Nvidia NVML" ON)
+ 
+ ####################
+ # Compiler options #
+@@ -405,7 +406,6 @@ if(LINUX)
+         src/detection/displayserver/linux/xlib.c
+         src/detection/font/font_linux.c
+         src/detection/gpu/gpu_linux.c
+-        src/detection/gpu/gpu_nvidia.c
+         src/detection/gtk_qt/gtk.c
+         src/detection/host/host_linux.c
+         src/detection/icons/icons_linux.c
+@@ -519,7 +519,6 @@ elseif(BSD)
+         src/detection/displayserver/linux/xlib.c
+         src/detection/font/font_linux.c
+         src/detection/gpu/gpu_linux.c
+-        src/detection/gpu/gpu_nvidia.c
+         src/detection/gtk_qt/gtk.c
+         src/detection/host/host_bsd.c
+         src/detection/lm/lm_linux.c
+@@ -630,7 +629,6 @@ elseif(WIN32)
+         src/detection/displayserver/displayserver_windows.c
+         src/detection/font/font_windows.c
+         src/detection/gpu/gpu_windows.c
+-        src/detection/gpu/gpu_nvidia.c
+         src/detection/gpu/gpu_intel.c
+         src/detection/gpu/gpu_amd.c
+         src/detection/host/host_windows.c
+@@ -676,6 +674,11 @@ if(ENABLE_DIRECTX_HEADERS)
+     list(APPEND LIBFASTFETCH_SRC src/detection/gpu/gpu_wsl.cpp)
+ endif()
+ 
++if(ENABLE_NVIDIA_GPU AND (LINUX OR BSD OR WIN32))
++    message(STATUS "Enabling Nvidia NVML")
++    list(APPEND LIBFASTFETCH_SRC src/detection/gpu/gpu_nvidia.c)
++endif()
++
+ include(CheckFunctionExists)
+ check_function_exists(wcwidth HAVE_WCWIDTH)
+ if(NOT HAVE_WCWIDTH)
+@@ -699,6 +702,10 @@ add_library(libfastfetch OBJECT
+     ${LIBFASTFETCH_SRC}
+ )
+ 
++if(ENABLE_NVIDIA_GPU AND (LINUX OR BSD OR WIN32))
++    target_compile_definitions(libfastfetch PRIVATE FF_HAVE_NVIDIA_GPU=1)
++endif()
++
+ if(yyjson_FOUND)
+     target_compile_definitions(libfastfetch PRIVATE FF_USE_SYSTEM_YYJSON)
+     target_link_libraries(libfastfetch PRIVATE yyjson)
+--- a/src/detection/gpu/gpu_linux.c
++++ b/src/detection/gpu/gpu_linux.c
+@@ -245,6 +245,7 @@ static void pciHandleDevice(FF_MAYBE_UNUSED const FFGPUOptions* options, FFlist*
+     gpu->temperature = FF_GPU_TEMP_UNSET;
+     gpu->frequency = FF_GPU_FREQUENCY_UNSET;
+ 
++    #ifdef FF_HAVE_NVIDIA_GPU
+     if (gpu->vendor.chars == FF_GPU_VENDOR_NAME_NVIDIA && (options->temp || options->driverSpecific))
+     {
+         ffDetectNvidiaGpuInfo(&(FFGpuDriverCondition) {
+@@ -266,6 +267,7 @@ static void pciHandleDevice(FF_MAYBE_UNUSED const FFGPUOptions* options, FFlist*
+         if (gpu->dedicated.total != FF_GPU_VMEM_SIZE_UNSET)
+             gpu->type = gpu->dedicated.total > (uint64_t)1024 * 1024 * 1024 ? FF_GPU_TYPE_DISCRETE : FF_GPU_TYPE_INTEGRATED;
+     }
++    #endif
+ 
+     #ifdef __linux__
+     if(options->temp && gpu->temperature != gpu->temperature)

diff --git a/app-misc/fastfetch/metadata.xml b/app-misc/fastfetch/metadata.xml
index 52543767b237..9285504b61fa 100644
--- a/app-misc/fastfetch/metadata.xml
+++ b/app-misc/fastfetch/metadata.xml
@@ -12,6 +12,7 @@
 	<flag name="chafa">Enables text/graphics renderer with <pkg>media-gfx/chafa</pkg></flag>
 	<flag name="ddcutil">Use <pkg>app-misc/ddcutil</pkg> to query monitor settings</flag>
 	<flag name="drm">Enables support for X.org's <pkg>x11-libs/libdrm</pkg></flag>
+	<flag name="nvidia-gpu">Enables extra support for NVIDIA GPU</flag>
 	<flag name="osmesa">Enables offscreen rendering support from <pkg>media-libs/mesa</pkg></flag>
 	<flag name="pci">Enables reading GPU via <pkg>sys-apps/pciutils</pkg></flag>
 	<flag name="vulkan">Enables reading GPU via <pkg>media-libs/vulkan-loader</pkg></flag>


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-misc/fastfetch/files/, app-misc/fastfetch/
@ 2024-01-02  8:49 Viorel Munteanu
  0 siblings, 0 replies; 5+ messages in thread
From: Viorel Munteanu @ 2024-01-02  8:49 UTC (permalink / raw
  To: gentoo-commits

commit:     f9a5b8125cc689047173ab1015e57b50dfb07e56
Author:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  2 08:46:57 2024 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Tue Jan  2 08:49:32 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9a5b812

app-misc/fastfetch: Fix compilation with direct X headers

Closes: https://bugs.gentoo.org/921175
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>

 app-misc/fastfetch/fastfetch-2.5.0.ebuild            |  1 +
 .../fastfetch/files/fastfetch-2.5.0-nvidia2.patch    | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/app-misc/fastfetch/fastfetch-2.5.0.ebuild b/app-misc/fastfetch/fastfetch-2.5.0.ebuild
index 8facae65cd7b..e128b570ad48 100644
--- a/app-misc/fastfetch/fastfetch-2.5.0.ebuild
+++ b/app-misc/fastfetch/fastfetch-2.5.0.ebuild
@@ -64,6 +64,7 @@ REQUIRED_USE="
 
 PATCHES=(
 	"${FILESDIR}"/${P}-nvidia.patch
+	"${FILESDIR}"/${P}-nvidia2.patch
 )
 
 src_configure() {

diff --git a/app-misc/fastfetch/files/fastfetch-2.5.0-nvidia2.patch b/app-misc/fastfetch/files/fastfetch-2.5.0-nvidia2.patch
new file mode 100644
index 000000000000..5f256a61a34d
--- /dev/null
+++ b/app-misc/fastfetch/files/fastfetch-2.5.0-nvidia2.patch
@@ -0,0 +1,20 @@
+https://bugs.gentoo.org/921175
+
+--- a/src/detection/gpu/gpu_wsl.cpp
++++ b/src/detection/gpu/gpu_wsl.cpp
+@@ -98,6 +98,7 @@ const char* ffGPUDetectByDirectX(FF_MAYBE_UNUSED const FFGPUOptions* options, FF
+             const char* vendorStr = ffGetGPUVendorString((unsigned) hardwareId.vendorID);
+             ffStrbufSetStatic(&gpu->vendor, vendorStr);
+ 
++            #ifdef FF_HAVE_NVIDIA_GPU
+             if (vendorStr == FF_GPU_VENDOR_NAME_NVIDIA && (options->driverSpecific || options->temp))
+             {
+                 FFGpuDriverCondition cond = {
+@@ -117,6 +118,7 @@ const char* ffGPUDetectByDirectX(FF_MAYBE_UNUSED const FFGPUOptions* options, FF
+                     .frequency = &gpu->frequency,
+                 }, "/usr/lib/wsl/lib/libnvidia-ml.so");
+             }
++            #endif
+         }
+     }
+ 


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2024-01-02  8:49 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-08-14 10:16 [gentoo-commits] repo/gentoo:master commit in: app-misc/fastfetch/files/, app-misc/fastfetch/ Viorel Munteanu
  -- strict thread matches above, loose matches on Subject: below --
2023-12-19  6:35 Viorel Munteanu
2024-01-01 17:54 Viorel Munteanu
2024-01-01 17:54 Viorel Munteanu
2024-01-02  8:49 Viorel Munteanu

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox