From 3d82d55e5db27854bf931716e4320c3dd64d42b8 Mon Sep 17 00:00:00 2001 From: Carter Li Date: Sun, 29 Sep 2024 13:34:25 +0800 Subject: [PATCH 1/5] Packaging: update debian stuff [ci skip] --- debian/changelog | 6 ++++++ debian/files | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index caa889c2fe..3a6b98854b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +fastfetch (2.26.0) jammy; urgency=medium + + * Update to 2.26.0 + + -- Carter Li Sun, 29 Sep 2024 13:31:25 +0800 + fastfetch (2.25.0) jammy; urgency=medium * Update to 2.25.0 diff --git a/debian/files b/debian/files index fc11a7155e..1d7ec558e0 100644 --- a/debian/files +++ b/debian/files @@ -1 +1 @@ -fastfetch_2.25.0_source.buildinfo universe/utils optional +fastfetch_2.26.0_source.buildinfo universe/utils optional From 73f98f9509396e6b1ddccc6778033a55aa5404d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Sun, 29 Sep 2024 14:18:23 +0800 Subject: [PATCH 2/5] CMake: allow to disable pacstall --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3f0a50900f..1a402b4b4d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -90,7 +90,7 @@ if(NOT BINARY_LINK_TYPE IN_LIST BINARY_LINK_TYPE_OPTIONS) message(FATAL_ERROR "BINARY_LINK_TYPE must be one of ${BINARY_LINK_TYPE_OPTIONS}") endif() -set(PACKAGE_MANAGERS AM APK BREW CHOCO DPKG EMERGE EOPKG FLATPAK GUIX LINGLONG LPKG LPKGBUILD MACPORTS NIX OPKG PACMAN PALUDIS PKG PKGTOOL RPM SCOOP SNAP SORCERY WINGET XBPS) +set(PACKAGE_MANAGERS AM APK BREW CHOCO DPKG EMERGE EOPKG FLATPAK GUIX LINGLONG LPKG LPKGBUILD MACPORTS NIX OPKG PACMAN PACSTALL PALUDIS PKG PKGTOOL RPM SCOOP SNAP SORCERY WINGET XBPS) foreach(package_manager ${PACKAGE_MANAGERS}) if(package_manager STREQUAL "WINGET") option(PACKAGES_DISABLE_${package_manager} "Disable ${package_manager} package manager detection by default" ON) From a7c749373338b71b7abfdaa2d2798d8d33904137 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Sun, 29 Sep 2024 15:34:57 +0800 Subject: [PATCH 3/5] GPU (Windows): fix uninitialized variables --- src/detection/gpu/gpu_windows.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/detection/gpu/gpu_windows.c b/src/detection/gpu/gpu_windows.c index 4e6939be18..cca4097258 100644 --- a/src/detection/gpu/gpu_windows.c +++ b/src/detection/gpu/gpu_windows.c @@ -47,7 +47,7 @@ const char* ffDetectGPUImpl(FF_MAYBE_UNUSED const FFGPUOptions* options, FFlist* gpu->deviceId = 0; gpu->frequency = FF_GPU_FREQUENCY_UNSET; - uint32_t pciBus, pciAddr, pciDev, pciFunc; + uint32_t pciBus = 0, pciAddr = UINT32_MAX, pciDev = 0, pciFunc = 0; if (SetupDiGetDeviceRegistryPropertyW(hdev, &did, SPDRP_BUSNUMBER, NULL, (PBYTE) &pciBus, sizeof(pciBus), NULL) && SetupDiGetDeviceRegistryPropertyW(hdev, &did, SPDRP_ADDRESS, NULL, (PBYTE) &pciAddr, sizeof(pciAddr), NULL)) { @@ -151,7 +151,7 @@ const char* ffDetectGPUImpl(FF_MAYBE_UNUSED const FFGPUOptions* options, FFlist* &(FFGpuDriverCondition) { .type = FF_GPU_DRIVER_CONDITION_TYPE_DEVICE_ID | (adapterLuid > 0 ? FF_GPU_DRIVER_CONDITION_TYPE_LUID : 0) - | (vendorId > 0 ? FF_GPU_DRIVER_CONDITION_TYPE_BUS_ID : 0), + | (pciAddr > 0 ? FF_GPU_DRIVER_CONDITION_TYPE_BUS_ID : 0), .pciDeviceId = { .deviceId = deviceId, .vendorId = vendorId, From 1901b9308fe7f47a020fc26137f4729dce388bb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Sun, 29 Sep 2024 15:41:55 +0800 Subject: [PATCH 4/5] GPU: use adapterLuid as deviceID for non-pci devices --- src/detection/gpu/gpu_windows.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/detection/gpu/gpu_windows.c b/src/detection/gpu/gpu_windows.c index cca4097258..2a29d83a97 100644 --- a/src/detection/gpu/gpu_windows.c +++ b/src/detection/gpu/gpu_windows.c @@ -92,7 +92,10 @@ const char* ffDetectGPUImpl(FF_MAYBE_UNUSED const FFGPUOptions* options, FFlist* gpu->shared.total = sharedSystemMemory; } - ffRegReadUint64(hDirectxKey, L"AdapterLuid", &adapterLuid, NULL); + if (ffRegReadUint64(hDirectxKey, L"AdapterLuid", &adapterLuid, NULL)) + { + if (!gpu->deviceId) gpu->deviceId = adapterLuid; + } uint32_t featureLevel = 0; if(ffRegReadUint(hDirectxKey, L"MaxD3D12FeatureLevel", &featureLevel, NULL) && featureLevel) From 73e61c2b8927d66819d1c97aec33d1b555fa4bb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Sun, 29 Sep 2024 15:35:07 +0800 Subject: [PATCH 5/5] Release: v2.26.1 --- CHANGELOG.md | 8 ++++++++ CMakeLists.txt | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ad1c1ae88a..57eda8efec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +# 2.26.1 + +Features: +* Allow to disable pacstall packager detection in CMake + +Bugfixes: +* Fix uninitialized variables (GPU, Windows) + # 2.26.0 Changes: diff --git a/CMakeLists.txt b/CMakeLists.txt index 1a402b4b4d..bbd9964dc7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.12.0) # target_link_libraries with OBJECT libs & project homepage url project(fastfetch - VERSION 2.26.0 + VERSION 2.26.1 LANGUAGES C DESCRIPTION "Fast neofetch-like system information tool" HOMEPAGE_URL "https://github.com/fastfetch-cli/fastfetch"