From 4eaeaf683cb193978f14d55e52ea834d32e8a089 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 2 Jan 2024 14:53:28 +0000 Subject: gentoo auto-resync : 02:01:2024 - 14:53:28 --- app-misc/fastfetch/Manifest | 5 +++-- app-misc/fastfetch/fastfetch-0.2.9999.ebuild | 7 ++++--- app-misc/fastfetch/fastfetch-2.5.0.ebuild | 1 + .../fastfetch/files/fastfetch-2.5.0-nvidia2.patch | 20 ++++++++++++++++++++ 4 files changed, 28 insertions(+), 5 deletions(-) create mode 100644 app-misc/fastfetch/files/fastfetch-2.5.0-nvidia2.patch (limited to 'app-misc/fastfetch') diff --git a/app-misc/fastfetch/Manifest b/app-misc/fastfetch/Manifest index 3a0a86830c42..6db42640f3f6 100644 --- a/app-misc/fastfetch/Manifest +++ b/app-misc/fastfetch/Manifest @@ -1,8 +1,9 @@ AUX fastfetch-2.5.0-nvidia.patch 3351 BLAKE2B b2b2522a7d2da3225624ee4039a6a4f615d5127d2d95e3be0f4e117bb49a384c92954a2b1e0ec141809f718167aea40313c31038304c1c8612fd215afb403364 SHA512 0b5144a674b3ac20e0dbc1cc995fe088a4b80547f8d5f684306b1c1cdc7dc45a4f7c57b411b1d4f655cbec5199211b44ad37877f340e9139eef21e856c019ed4 +AUX fastfetch-2.5.0-nvidia2.patch 821 BLAKE2B a12c7a75bee30d3d1060e779d51d66200c945308a8d559a0f1cf984549e8e4e4a4e8b9902ee06819ce58f42107c3ac78ae229eb4fd937c1ccc796f66311ac0b0 SHA512 415123a2329fadfb73b4a52ab8ab26bbc82a3d25101b539db4f599cb625c3ca51270422ab3378d7d4fdaab3aead35a7a63dabb839d26a3488df4160b969b0f6a DIST fastfetch-2.2.3.tar.gz 901203 BLAKE2B d6d097b72ce2f252e42b3e59cbd26b43a4f17ae974382f986270fbf91b457cf3c49e78a3c775e713d9302d536fb5a363e809005b9174d1a27622e6b6ed666709 SHA512 81e051b7555d56415c723606c0b6dfc3ad7ed91fb2c7b36c07465f4dfbdb91da5c8d216e46df36863888448de0a7bd63e28c6aa701995bf1165e0d7c33c4f724 DIST fastfetch-2.5.0.tar.gz 984182 BLAKE2B 5185cce0e5933524835093a2f730cac8a9262cb6ec2c422fff60a4c6daec4f2a8ba11eab4323f00eaeebf2d946da9767f125b265e87cda6714d50e1c5e1383de SHA512 a69f4e839acf8897a9cd8f6c017a4d7657a8dc0b3c58e645c88fc8e47e0a7bd3411d1a3e1e916628a948cb7e1688a200f7ac1eabd090f5eb42ce4b0030e342b4 EBUILD fastfetch-0.1.9999.ebuild 3207 BLAKE2B cabd4260ab8a66ccf3885032006ff31fd1e99e13bc0fc1ef1e074d3e3d93b8e1864ed3132418a1cabe3bcb8c1a639e98e1f528cd638e9b4e5b9ddf7efba71dc4 SHA512 89ec6d13b8e35d86a2b396f6b1d4528d0a2565da80becb8cb41e09a5cf83882ec738577280ce6014a8229aec0ba9664b75f186800aa9bdf467be38ab807ed67a -EBUILD fastfetch-0.2.9999.ebuild 3207 BLAKE2B cabd4260ab8a66ccf3885032006ff31fd1e99e13bc0fc1ef1e074d3e3d93b8e1864ed3132418a1cabe3bcb8c1a639e98e1f528cd638e9b4e5b9ddf7efba71dc4 SHA512 89ec6d13b8e35d86a2b396f6b1d4528d0a2565da80becb8cb41e09a5cf83882ec738577280ce6014a8229aec0ba9664b75f186800aa9bdf467be38ab807ed67a +EBUILD fastfetch-0.2.9999.ebuild 3303 BLAKE2B cd6c1347c215b8d7d27138d5b8f01b00ae6b96ef396cc99eb4123b8adfece4d3c2ab90a718a13651fd2ac109b5a806dad3ae58a678f8f5474000bb65c3738e34 SHA512 7cf00462ff9a2b5ae0e84a81e4d0fcae95ea17057a20130f3ed452f065c2d3eeb187948b69a0fedf6b43ae749d68a2f6fb2e32318fbec1a5debad69b56607c23 EBUILD fastfetch-2.2.3-r1.ebuild 3150 BLAKE2B 68ef835c0dcd463b19fa4ece4f7c64107af0ba3cbdf05f78e8ebf664d4db6ecd662a659899d4f5977d26801aea4d29be55476842186a917d39e4811dcbeb37cd SHA512 2493ed60298576479119a6bfae5ae6966fb0bd9fef92d48c3b60759dd3b8dddbd3f35a164f3d67b31f568386378def792361154d4ea71e8fd72f56e64b773fee -EBUILD fastfetch-2.5.0.ebuild 3333 BLAKE2B 68b55ff2bb1c2bf020d56e1b7be1b610a55ee2765d3c5cde6a83b58b75f9d2a83386df0c0cd0aefef2e73fadb04106658b41de4fbaf236acdaf6f6c0fa118b81 SHA512 7c1028c84bdff525143e347486be7df2ca169cfc433f6a8d451b018f2d7adbc716557a8dfeda1f384a5e759643146d6e1e4bc27b136f8f6f1b501aa5e79c1639 +EBUILD fastfetch-2.5.0.ebuild 3367 BLAKE2B b155726ada17a7898e7ece0aeb80e72a8f8fda5ba9d1d1a9801a7ce3329de597d8a31a86ed9a75024960778fa1eca5da5c57529a4fdb7a47bc32441974a8c785 SHA512 6f2a51b6db7e213da97c3d5032956d76db081846206b9790b0b468a14a72e66c417b9b1801b96a5f4e3dc098a165663cd3301c7778ca3db593fb6d023105eda7 MISC metadata.xml 1257 BLAKE2B 521e87300ee660b7285c28ed7987a4cc52565e1c6fec3a10e37509822f829f808d468bd119ace4bea96d441b82d2cdce598d9d3cd25bacda5fae05920818a4bb SHA512 461c8f2f48789fe2635bb419f7655389a190b5684b9e1367dfb8faa7b6650984b001c8ac76051c39040526d51c71ac2faf566f0fd5a2f2e75c0702885eefa32a diff --git a/app-misc/fastfetch/fastfetch-0.2.9999.ebuild b/app-misc/fastfetch/fastfetch-0.2.9999.ebuild index 4af72e9b74c7..ae19e4a9dad9 100644 --- a/app-misc/fastfetch/fastfetch-0.2.9999.ebuild +++ b/app-misc/fastfetch/fastfetch-0.2.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022-2023 Gentoo Authors +# Copyright 2022-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -18,9 +18,9 @@ else KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" fi -LICENSE="MIT" +LICENSE="MIT nvidia-gpu? ( NVIDIA-NVLM )" SLOT="0" -IUSE="X chafa dbus ddcutil drm gnome imagemagick networkmanager opencl opengl osmesa pci pulseaudio sqlite test vulkan wayland xcb xfce xrandr" +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 @@ -87,6 +87,7 @@ src_configure() { -DENABLE_IMAGEMAGICK7=${fastfetch_enable_imagemagick7} -DENABLE_LIBNM=$(usex networkmanager) -DENABLE_LIBPCI=$(usex pci) + -DENABLE_PROPRIETARY_GPU_DRIVER_API=$(usex nvidia-gpu) -DENABLE_OPENCL=$(usex opencl) -DENABLE_OSMESA=$(usex osmesa) -DENABLE_PULSE=$(usex pulseaudio) 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 + } + } + -- cgit v1.2.3