Skip to content

Commit e5d6006

Browse files
CarterLiCarterLi
authored
Merge pull request #2244 from fastfetch-cli/dev
Release: v2.61.0
2 parents 06ecc9c + 18f3809 commit e5d6006

200 files changed

Lines changed: 5454 additions & 2285 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/ci.yml‎

Lines changed: 19 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
run: uname -a
3939

4040
- name: configure project
41-
run: cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DCMAKE_INSTALL_PREFIX=/usr . -DENABLE_VULKAN=OFF -DENABLE_WAYLAND=OFF -DENABLE_XCB_RANDR=OFF -DENABLE_XCB=OFF -DENABLE_XRANDR=OFF -DENABLE_X11=OFF -DENABLE_DRM=OFF -DENABLE_DRM_AMDGPU=OFF -DENABLE_GIO=OFF -DENABLE_DCONF=OFF -DENABLE_DBUS=OFF -DENABLE_SQLITE3=OFF -DENABLE_RPM=OFF -DENABLE_IMAGEMAGICK7=OFF -DENABLE_IMAGEMAGICK6=OFF -DENABLE_CHAFA=OFF -DENABLE_ZLIB=OFF -DENABLE_EGL=OFF -DENABLE_GLX=OFF -DENABLE_OPENCL=OFF -DENABLE_FREETYPE=OFF -DENABLE_PULSE=OFF -DENABLE_DDCUTIL=OFF -DENABLE_ELF=OFF -DENABLE_DIRECTX_HEADERS=OFF -DENABLE_THREADS=OFF
41+
run: cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DCMAKE_INSTALL_PREFIX=/usr . -DENABLE_VULKAN=OFF -DENABLE_WAYLAND=OFF -DENABLE_XCB_RANDR=OFF -DENABLE_XCB=OFF -DENABLE_XRANDR=OFF -DENABLE_X11=OFF -DENABLE_DRM=OFF -DENABLE_DRM_AMDGPU=OFF -DENABLE_GIO=OFF -DENABLE_DCONF=OFF -DENABLE_DBUS=OFF -DENABLE_SQLITE3=OFF -DENABLE_RPM=OFF -DENABLE_IMAGEMAGICK7=OFF -DENABLE_IMAGEMAGICK6=OFF -DENABLE_CHAFA=OFF -DENABLE_ZLIB=OFF -DENABLE_EGL=OFF -DENABLE_GLX=OFF -DENABLE_OPENCL=OFF -DENABLE_FREETYPE=OFF -DENABLE_PULSE=OFF -DENABLE_DDCUTIL=OFF -DENABLE_ELF=OFF -DENABLE_THREADS=OFF
4242

4343
- name: build project
4444
run: cmake --build . --target package --verbose -j4
@@ -93,7 +93,7 @@ jobs:
9393
run: sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
9494

9595
- name: install required packages
96-
run: sudo apt-get update && sudo apt-get install -y gcc-13 g++-13 libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libsqlite3-dev librpm-dev libegl-dev libglx-dev ocl-icd-opencl-dev libpulse-dev libdrm-dev libelf-dev libddcutil-dev directx-headers-dev rpm ninja-build
96+
run: sudo apt-get update && sudo apt-get install -y gcc-13 libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libsqlite3-dev librpm-dev libegl-dev libglx-dev ocl-icd-opencl-dev libpulse-dev libdrm-dev libelf-dev libddcutil-dev rpm ninja-build
9797

9898
- name: install linuxbrew packages
9999
run: |
@@ -107,7 +107,7 @@ jobs:
107107
languages: c
108108

109109
- name: configure project
110-
run: CC=gcc-13 CXX=g++-13 PKG_CONFIG_PATH=/home/linuxbrew/.linuxbrew/lib/pkgconfig:$PKG_CONFIG_PATH cmake -GNinja -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_EMBEDDED_PCIIDS=On -DENABLE_EMBEDDED_AMDGPUIDS=On -DCMAKE_INSTALL_PREFIX=/usr .
110+
run: CC=gcc-13 PKG_CONFIG_PATH=/home/linuxbrew/.linuxbrew/lib/pkgconfig:$PKG_CONFIG_PATH cmake -GNinja -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_EMBEDDED_PCIIDS=On -DENABLE_EMBEDDED_AMDGPUIDS=On -DCMAKE_INSTALL_PREFIX=/usr .
111111

112112
- name: build project
113113
run: cmake --build . --target package --verbose -j4
@@ -190,7 +190,7 @@ jobs:
190190
run: cmake --version
191191

192192
- name: configure project
193-
run: CC=gcc-13 PKG_CONFIG_PATH=/home/linuxbrew/.linuxbrew/lib/pkgconfig:$PKG_CONFIG_PATH cmake -DCMAKE_C_FLAGS="-m32 -march=i686 -mtune=i686" -DCMAKE_SYSTEM_PROCESSOR_OVERRIDE=i686 -DCPACK_DEBIAN_PACKAGE_ARCHITECTURE=i386 -GNinja -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_EMBEDDED_PCIIDS=On -DENABLE_EMBEDDED_AMDGPUIDS=On -DCMAKE_INSTALL_PREFIX=/usr -DENABLE_DIRECTX_HEADERS=Off .
193+
run: CC=gcc-13 PKG_CONFIG_PATH=/home/linuxbrew/.linuxbrew/lib/pkgconfig:$PKG_CONFIG_PATH cmake -DCMAKE_C_FLAGS="-m32 -march=i686 -mtune=i686" -DCMAKE_SYSTEM_PROCESSOR_OVERRIDE=i686 -DCPACK_DEBIAN_PACKAGE_ARCHITECTURE=i386 -GNinja -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_EMBEDDED_PCIIDS=On -DENABLE_EMBEDDED_AMDGPUIDS=On -DCMAKE_INSTALL_PREFIX=/usr .
194194

195195
- name: build project
196196
run: cmake --build . --target package --verbose -j4
@@ -237,17 +237,17 @@ jobs:
237237
id: runcmd
238238
with:
239239
arch: armv7
240-
distro: ubuntu20.04
240+
distro: ubuntu22.04
241241
githubToken: ${{ github.token }}
242242
run: |
243243
uname -a
244244
apt-get update && apt-get install -y software-properties-common ca-certificates gpg curl
245245
add-apt-repository -y ppa:ubuntu-toolchain-r/test
246246
curl -L https://apt.kitware.com/keys/kitware-archive-latest.asc | gpg --dearmor - | tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null
247-
echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ focal main' | tee /etc/apt/sources.list.d/kitware.list >/dev/null
247+
echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ jammy main' | tee /etc/apt/sources.list.d/kitware.list >/dev/null
248248
echo -e 'Acquire::https::Verify-Peer "false";\nAcquire::https::Verify-Host "false";' >> /etc/apt/apt.conf.d/99ignore-certificates
249249
apt-get update && apt-get install -y cmake make gcc-13 libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libsqlite3-dev librpm-dev libegl-dev libglx-dev ocl-icd-opencl-dev libpulse-dev libdrm-dev libelf-dev rpm
250-
CC=gcc-13 cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_DIRECTX_HEADERS=Off -DCMAKE_INSTALL_PREFIX=/usr .
250+
CC=gcc-13 cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DCMAKE_INSTALL_PREFIX=/usr .
251251
cmake --build . --target package --verbose -j4
252252
./fastfetch --list-features
253253
time ./fastfetch -c presets/ci.jsonc --stat false
@@ -283,7 +283,7 @@ jobs:
283283
uname -a
284284
apt-get update && apt-get install -y wget
285285
apt-get install -y cmake make gcc libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libsqlite3-dev librpm-dev libegl-dev libglx-dev ocl-icd-opencl-dev libpulse-dev libdrm-dev libelf-dev rpm
286-
cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_DIRECTX_HEADERS=Off -DCMAKE_INSTALL_PREFIX=/usr .
286+
cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DCMAKE_INSTALL_PREFIX=/usr .
287287
cmake --build . --target package --verbose -j4
288288
./fastfetch --list-features
289289
time ./fastfetch -c presets/ci.jsonc --stat false
@@ -326,7 +326,7 @@ jobs:
326326
apt-get update && apt-get install -y software-properties-common
327327
add-apt-repository -y ppa:ubuntu-toolchain-r/test
328328
apt-get update && apt-get install -y cmake make gcc-13 libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libsqlite3-dev librpm-dev libegl-dev libglx-dev ocl-icd-opencl-dev libpulse-dev libdrm-dev libchafa-dev libelf-dev rpm
329-
CC=gcc-13 cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_DIRECTX_HEADERS=Off -DCMAKE_INSTALL_PREFIX=/usr .
329+
CC=gcc-13 cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DCMAKE_INSTALL_PREFIX=/usr .
330330
cmake --build . --target package --verbose -j4
331331
./fastfetch --list-features
332332
time ./fastfetch -c presets/ci.jsonc --stat false
@@ -413,10 +413,10 @@ jobs:
413413
run: ./fastfetch --list-features
414414

415415
- name: run fastfetch
416-
run: time ./fastfetch -c presets/ci.jsonc --stat false
416+
run: time ./fastfetch -c presets/ci.jsonc --structure-disabled vulkan --stat false
417417

418418
- name: run fastfetch --format json
419-
run: time ./fastfetch -c presets/ci.jsonc --format json
419+
run: time ./fastfetch -c presets/ci.jsonc --structure-disabled vulkan --format json
420420

421421
- name: run flashfetch
422422
run: time ./flashfetch
@@ -690,7 +690,7 @@ jobs:
690690
path: ./fastfetch-*.*
691691

692692
windows-hosts:
693-
name: Windows-${{ matrix.arch }}${{ matrix.win7-compat-postfix }}
693+
name: Windows-${{ matrix.arch }}
694694
runs-on: ${{ matrix.runs-on }}
695695
permissions:
696696
security-events: write
@@ -703,22 +703,11 @@ jobs:
703703
msystem: CLANG64
704704
msystem-lower: clang64
705705
msys-arch: x86_64
706-
win7-compat-flag: OFF
707-
win7-compat-postfix: ""
708-
- arch: amd64
709-
runs-on: windows-latest
710-
msystem: CLANG64
711-
msystem-lower: clang64
712-
msys-arch: x86_64
713-
win7-compat-flag: ON
714-
win7-compat-postfix: "-win7"
715706
- arch: aarch64
716707
runs-on: windows-11-arm
717708
msystem: CLANGARM64
718709
msystem-lower: clangarm64
719710
msys-arch: aarch64
720-
win7-compat-flag: OFF
721-
win7-compat-postfix: ""
722711
defaults:
723712
run:
724713
shell: msys2 {0}
@@ -731,13 +720,13 @@ jobs:
731720
with:
732721
msystem: ${{ matrix.msystem }}
733722
update: true
734-
install: git mingw-w64-clang-${{ matrix.msys-arch }}-7zip mingw-w64-clang-${{ matrix.msys-arch }}-cmake mingw-w64-clang-${{ matrix.msys-arch }}-clang mingw-w64-clang-${{ matrix.msys-arch }}-vulkan-loader mingw-w64-clang-${{ matrix.msys-arch }}-vulkan-headers mingw-w64-clang-${{ matrix.msys-arch }}-opencl-icd mingw-w64-clang-${{ matrix.msys-arch }}-opencl-headers mingw-w64-clang-${{ matrix.msys-arch }}-cppwinrt mingw-w64-clang-${{ matrix.msys-arch }}-imagemagick mingw-w64-clang-${{ matrix.msys-arch }}-chafa
723+
install: git mingw-w64-clang-${{ matrix.msys-arch }}-7zip mingw-w64-clang-${{ matrix.msys-arch }}-cmake mingw-w64-clang-${{ matrix.msys-arch }}-clang mingw-w64-clang-${{ matrix.msys-arch }}-vulkan-loader mingw-w64-clang-${{ matrix.msys-arch }}-vulkan-headers mingw-w64-clang-${{ matrix.msys-arch }}-opencl-icd mingw-w64-clang-${{ matrix.msys-arch }}-opencl-headers mingw-w64-clang-${{ matrix.msys-arch }}-cppwinrt mingw-w64-clang-${{ matrix.msys-arch }}-imagemagick mingw-w64-clang-${{ matrix.msys-arch }}-chafa mingw-w64-clang-${{ matrix.msys-arch }}-directx-headers
735724

736725
- name: print msys version
737726
run: uname -a
738727

739728
- name: configure project
740-
run: env PKG_CONFIG_PATH=/${{ matrix.msystem-lower }}/lib/pkgconfig/:$PKG_CONFIG_PATH cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_WIN7_COMPAT=${{ matrix.win7-compat-flag }} .
729+
run: env PKG_CONFIG_PATH=/${{ matrix.msystem-lower }}/lib/pkgconfig/:$PKG_CONFIG_PATH cmake -DSET_TWEAK=Off -DBUILD_TESTS=On .
741730

742731
- name: build project
743732
run: cmake --build . --verbose -j4
@@ -768,7 +757,7 @@ jobs:
768757
name: upload artifacts for signing
769758
uses: actions/upload-artifact@v7
770759
with:
771-
name: fastfetch-windows-${{ matrix.arch }}${{ matrix.win7-compat-postfix }}
760+
name: fastfetch-windows-${{ matrix.arch }}
772761
path: |
773762
*.dll
774763
fastfetch.exe
@@ -787,16 +776,16 @@ jobs:
787776
output-artifact-directory: '.'
788777

789778
- name: create zip archive
790-
run: 7z a -tzip -mx9 -bd -y fastfetch-windows-${{ matrix.arch }}${{ matrix.win7-compat-postfix }}.zip LICENSE *.dll fastfetch.exe flashfetch.exe presets
779+
run: 7z a -tzip -mx9 -bd -y fastfetch-windows-${{ matrix.arch }}.zip LICENSE *.dll fastfetch.exe flashfetch.exe presets
791780

792781
- name: create 7z archive
793-
run: 7z a -t7z -mx9 -bd -y fastfetch-windows-${{ matrix.arch }}${{ matrix.win7-compat-postfix }}.7z LICENSE *.dll fastfetch.exe flashfetch.exe presets
782+
run: 7z a -t7z -mx9 -bd -y fastfetch-windows-${{ matrix.arch }}.7z LICENSE *.dll fastfetch.exe flashfetch.exe presets
794783

795784
- name: upload true artifacts
796785
uses: actions/upload-artifact@v7
797786
with:
798-
name: fastfetch-windows-${{ matrix.arch }}${{ matrix.win7-compat-postfix }}
799-
path: ./fastfetch-windows-${{ matrix.arch }}${{ matrix.win7-compat-postfix }}.*
787+
name: fastfetch-windows-${{ matrix.arch }}
788+
path: ./fastfetch-windows-${{ matrix.arch }}.*
800789
overwrite: true
801790

802791
release:

‎CHANGELOG.md‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,34 @@
1+
# 2.61.0
2+
3+
Changes:
4+
* Support for Windows 7 and 8 has been removed.
5+
* Windows 8.1 is now the oldest version supported by fastfetch.
6+
* The GPU module on WSL no longer relies on `DXCore`.
7+
* The `directx-headers` dependency is no longer required.
8+
* Fastfetch on Linux is now pure C; a C++ compiler is no longer required.
9+
* GPU type detection is now slightly less accurate, but detection speed should be slightly faster.
10+
* The GPU module on Windows now uses `DXCore` for more accurate GPU type detection (requires Windows 10 or later).
11+
* This feature is built only when `DXCore` headers are available, which requires installing `mingw-w64-<msystem>-x86_64-directx-headers` on MSYS2.
12+
13+
Features:
14+
* Adds a `brightness` option for color display configuration (#2238, Colors)
15+
* Adds support for detecting Bluetooth keyboards on Linux (#2220, Keyboard)
16+
* Adds support for detecting GlazeWM (WM, macOS)
17+
* Adds a `showEmptySlots` option to display empty memory slots on Linux (#2222, PhysicalMemory)
18+
* Adds marketing product name detection on Asahi Linux (Host, Linux)
19+
* Adds support for new M5 Mac models (Host, macOS)
20+
* Improves SMBIOS robustness by validating malformed data and improving error handling
21+
* Improves reliability when terminating child processes (Processing, Windows)
22+
* Improves Intel Mac support by querying SMBIOS data directly (Global, macOS)
23+
* Includes numerous internal cleanups and optimizations
24+
25+
Bugfixes:
26+
* Fixes missing memory devices on some machines (PhysicalMemory)
27+
* Fixes CPUCache deduplication for shared caches (#2228, CPUCache, Linux)
28+
* Fixes WM version reporting for niri (#2218, WM, Linux)
29+
* Fixes SSID decoding issues from `iw` output (Wifi, Linux)
30+
* Fixes the CMD code page being changed after running fastfetch on Windows (#2245, Windows)
31+
132
# 2.60.0
233

334
Changes:

0 commit comments

Comments
 (0)