Skip to content

Commit db6e4f4

Browse files
CarterLiCarterLi
authored
Merge pull request #1625 from fastfetch-cli/dev
Release: v2.39.0
2 parents 1b219a9 + b662db4 commit db6e4f4

Some content is hidden

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

46 files changed

+1625
-1045
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
run: uname -a
3636

3737
- name: configure project
38-
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_XFCONF=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_OSMESA=OFF -DENABLE_OPENCL=OFF -DENABLE_FREETYPE=OFF -DENABLE_PULSE=OFF -DENABLE_DDCUTIL=OFF -DENABLE_ELF=OFF -DENABLE_DIRECTX_HEADERS=OFF -DENABLE_THREADS=OFF
38+
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_XFCONF=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
3939

4040
- name: build project
4141
run: cmake --build . --target package --verbose -j4
@@ -80,7 +80,7 @@ jobs:
8080
run: cat /proc/cpuinfo
8181

8282
- name: install required packages
83-
run: sudo apt-get update && sudo apt-get install -y libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libxfconf-0-dev libsqlite3-dev librpm-dev libegl-dev libglx-dev libosmesa6-dev ocl-icd-opencl-dev libpulse-dev libdrm-dev libelf-dev directx-headers-dev
83+
run: sudo apt-get update && sudo apt-get install -y libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libxfconf-0-dev libsqlite3-dev librpm-dev libegl-dev libglx-dev ocl-icd-opencl-dev libpulse-dev libdrm-dev libelf-dev directx-headers-dev
8484

8585
- name: install linuxbrew packages
8686
run: |
@@ -149,7 +149,7 @@ jobs:
149149
run: cat /proc/cpuinfo
150150

151151
- name: install required packages
152-
run: sudo apt-get update && sudo apt-get install -y libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libxfconf-0-dev libsqlite3-dev librpm-dev libegl-dev libglx-dev libosmesa6-dev ocl-icd-opencl-dev libpulse-dev libdrm-dev libelf-dev directx-headers-dev libchafa-dev libddcutil-dev rpm
152+
run: sudo apt-get update && sudo apt-get install -y libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libxfconf-0-dev libsqlite3-dev librpm-dev libegl-dev libglx-dev ocl-icd-opencl-dev libpulse-dev libdrm-dev libelf-dev directx-headers-dev libchafa-dev libddcutil-dev rpm
153153

154154
- name: configure project
155155
run: cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_EMBEDDED_PCIIDS=On -DENABLE_EMBEDDED_AMDGPUIDS=On -DCMAKE_INSTALL_PREFIX=/usr .
@@ -208,7 +208,7 @@ jobs:
208208
# CMake installed by apt has bug `list sub-command REMOVE_ITEM requires two or more arguments`
209209
wget --no-check-certificate https://apt.kitware.com/ubuntu/pool/main/c/cmake/{cmake_3.29.2-0kitware1ubuntu20.04.1_armhf.deb,cmake-data_3.29.2-0kitware1ubuntu20.04.1_all.deb}
210210
dpkg -i *.deb
211-
apt-get install -y make g++ libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libxfconf-0-dev libsqlite3-dev librpm-dev libegl-dev libglx-dev libosmesa6-dev ocl-icd-opencl-dev libpulse-dev libdrm-dev libelf-dev directx-headers-dev rpm
211+
apt-get install -y make g++ libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libxfconf-0-dev libsqlite3-dev librpm-dev libegl-dev libglx-dev ocl-icd-opencl-dev libpulse-dev libdrm-dev libelf-dev directx-headers-dev rpm
212212
cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DCMAKE_INSTALL_PREFIX=/usr .
213213
cmake --build . --target package --verbose -j4
214214
./fastfetch --list-features
@@ -244,7 +244,7 @@ jobs:
244244
run: |
245245
uname -a
246246
apt-get update && apt-get install -y wget
247-
apt-get install -y cmake make g++ libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libxfconf-0-dev libsqlite3-dev librpm-dev libegl-dev libglx-dev libosmesa6-dev ocl-icd-opencl-dev libpulse-dev libdrm-dev libelf-dev directx-headers-dev rpm
247+
apt-get install -y cmake make g++ libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libxfconf-0-dev libsqlite3-dev librpm-dev libegl-dev libglx-dev ocl-icd-opencl-dev libpulse-dev libdrm-dev libelf-dev directx-headers-dev rpm
248248
cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DCMAKE_INSTALL_PREFIX=/usr .
249249
cmake --build . --target package --verbose -j4
250250
./fastfetch --list-features
@@ -279,7 +279,7 @@ jobs:
279279
githubToken: ${{ github.token }}
280280
run: |
281281
uname -a
282-
apt-get update && apt-get install -y cmake make g++ libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libxfconf-0-dev libsqlite3-dev librpm-dev libegl-dev libglx-dev libosmesa6-dev ocl-icd-opencl-dev libpulse-dev libdrm-dev libddcutil-dev libchafa-dev libelf-dev directx-headers-dev rpm
282+
apt-get update && apt-get install -y cmake make g++ libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libxfconf-0-dev libsqlite3-dev librpm-dev libegl-dev libglx-dev ocl-icd-opencl-dev libpulse-dev libdrm-dev libddcutil-dev libchafa-dev libelf-dev directx-headers-dev rpm
283283
cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DCMAKE_INSTALL_PREFIX=/usr .
284284
cmake --build . --target package --verbose -j4
285285
./fastfetch --list-features
@@ -314,7 +314,7 @@ jobs:
314314
githubToken: ${{ github.token }}
315315
run: |
316316
uname -a
317-
apt-get update && apt-get install -y cmake make g++ libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libxfconf-0-dev libsqlite3-dev librpm-dev libegl-dev libglx-dev libosmesa6-dev ocl-icd-opencl-dev libpulse-dev libdrm-dev libchafa-dev libelf-dev directx-headers-dev rpm
317+
apt-get update && apt-get install -y cmake make g++ libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libxfconf-0-dev libsqlite3-dev librpm-dev libegl-dev libglx-dev ocl-icd-opencl-dev libpulse-dev libdrm-dev libchafa-dev libelf-dev directx-headers-dev rpm
318318
cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DCMAKE_INSTALL_PREFIX=/usr .
319319
cmake --build . --target package --verbose -j4
320320
./fastfetch --list-features
@@ -349,7 +349,7 @@ jobs:
349349
githubToken: ${{ github.token }}
350350
run: |
351351
uname -a
352-
apt-get update && apt-get install -y cmake make g++ libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libxfconf-0-dev libsqlite3-dev librpm-dev libegl-dev libglx-dev libosmesa6-dev ocl-icd-opencl-dev libpulse-dev libdrm-dev libchafa-dev libelf-dev directx-headers-dev rpm
352+
apt-get update && apt-get install -y cmake make g++ libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libxfconf-0-dev libsqlite3-dev librpm-dev libegl-dev libglx-dev ocl-icd-opencl-dev libpulse-dev libdrm-dev libchafa-dev libelf-dev directx-headers-dev rpm
353353
cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DCMAKE_INSTALL_PREFIX=/usr .
354354
cmake --build . --target package --verbose -j4
355355
./fastfetch --list-features
@@ -504,7 +504,7 @@ jobs:
504504
run: |
505505
uname -a
506506
sudo pkg update
507-
sudo pkg install -y cmake git pkgconf binutils wayland vulkan-headers vulkan-loader libxcb libXrandr libX11 libdrm glib dconf dbus sqlite3-tcl xfce4-conf egl libosmesa opencl ocl-icd v4l_compat chafa
507+
sudo pkg install -y cmake git pkgconf binutils wayland vulkan-headers vulkan-loader libxcb libXrandr libX11 libdrm glib dconf dbus sqlite3-tcl xfce4-conf egl opencl ocl-icd v4l_compat chafa
508508
cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_EMBEDDED_PCIIDS=On -DENABLE_EMBEDDED_AMDGPUIDS=On .
509509
cmake --build . --target package --verbose -j4
510510
./fastfetch --list-features
@@ -537,7 +537,7 @@ jobs:
537537
prepare: |
538538
uname -a
539539
pkg update
540-
pkg install -y cmake git pkgconf binutils wayland vulkan-headers vulkan-loader libxcb libXrandr libX11 libdrm glib dconf dbus sqlite3-tcl xfce4-conf egl libosmesa opencl ocl-icd v4l_compat chafa libelf
540+
pkg install -y cmake git pkgconf binutils wayland vulkan-headers vulkan-loader libxcb libXrandr libX11 libdrm glib dconf dbus sqlite3-tcl xfce4-conf egl opencl ocl-icd v4l_compat chafa libelf
541541
542542
run: |
543543
cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_EMBEDDED_PCIIDS=On -DENABLE_EMBEDDED_AMDGPUIDS=On .
@@ -575,7 +575,7 @@ jobs:
575575
version: '7.6'
576576
run: |
577577
uname -a
578-
sudo pkg_add -r cmake git pkgconf wayland vulkan-headers vulkan-loader glib2 dconf dbus sqlite3 xfconf imagemagick chafa pulseaudio hwdata
578+
sudo pkg_add -r cmake git pkgconf wayland vulkan-headers vulkan-loader glib2 dconf dbus sqlite3 xfconf imagemagick chafa
579579
cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_EMBEDDED_PCIIDS=On -DENABLE_EMBEDDED_AMDGPUIDS=On .
580580
cmake --build . --target package --verbose -j4
581581
./fastfetch --list-features
@@ -611,7 +611,7 @@ jobs:
611611
version: '10.1'
612612
run: |
613613
uname -a
614-
sudo pkgin -y install cmake git pkgconf wayland vulkan-headers dconf dbus sqlite3 ImageMagick pulseaudio opencl-headers ocl-icd
614+
sudo pkgin -y install cmake git pkgconf wayland vulkan-headers dconf dbus sqlite3 ImageMagick opencl-headers ocl-icd
615615
cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_EMBEDDED_PCIIDS=On -DENABLE_EMBEDDED_AMDGPUIDS=On .
616616
cmake --build . --target package --verbose -j4
617617
./fastfetch --list-features

‎CHANGELOG.md‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
1+
# 2.39.0
2+
3+
Changes:
4+
* OSMesa backend for OpenGL detection is removed (#1618)
5+
* Fastfetch no longer tries to use the private framework `Apple80211` to acquire SSID for Wifi module, which is only useful for macOS Sonoma (Wifi, macOS)
6+
7+
Features:
8+
* Improve accuracy of HDR support on Windows 11 24H2 (Display, Windows)
9+
* Improve performance of SSID detection on macOS Sequoia (Wifi, macOS, #1597)
10+
* Support warp terminal version detection on Windows (Terminal, Windows)
11+
* Support default route detection on OpenBSD & DragonFly BSD (LocalIP, OpenBSD / DragonFly)
12+
* Improve bash completion script
13+
* Improve performance of networking (PublicIP / Weather)
14+
* Support pkgsrc package manager detection on Linux (Packages, Linux)
15+
16+
Logo:
17+
* Add Common Torizon OS
18+
* Change FoxOS to WolfOS
19+
* Add Bredos
20+
* Add NetBSD2
21+
122
# 2.38.0
223

324
Bugfixes:

‎CMakeLists.txt‎

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cmake_minimum_required(VERSION 3.12.0) # target_link_libraries with OBJECT libs & project homepage url
22

33
project(fastfetch
4-
VERSION 2.38.0
4+
VERSION 2.39.0
55
LANGUAGES C
66
DESCRIPTION "Fast neofetch-like system information tool"
77
HOMEPAGE_URL "https://github.com/fastfetch-cli/fastfetch"
@@ -74,7 +74,6 @@ cmake_dependent_option(ENABLE_CHAFA "Enable chafa" ON "ENABLE_IMAGEMAGICK6 OR EN
7474
cmake_dependent_option(ENABLE_ZLIB "Enable zlib" ON "ENABLE_IMAGEMAGICK6 OR ENABLE_IMAGEMAGICK7" OFF)
7575
cmake_dependent_option(ENABLE_EGL "Enable egl" ON "LINUX OR FreeBSD OR OpenBSD OR NetBSD OR ANDROID OR WIN32 OR SunOS OR Haiku" OFF)
7676
cmake_dependent_option(ENABLE_GLX "Enable glx" ON "LINUX OR FreeBSD OR OpenBSD OR NetBSD OR ANDROID OR SunOS" OFF)
77-
cmake_dependent_option(ENABLE_OSMESA "Enable osmesa" ON "LINUX OR FreeBSD OR OpenBSD OR NetBSD OR SunOS OR Haiku" OFF)
7877
cmake_dependent_option(ENABLE_OPENCL "Enable opencl" ON "LINUX OR FreeBSD OR OpenBSD OR NetBSD OR WIN32 OR ANDROID OR SunOS OR Haiku" OFF)
7978
cmake_dependent_option(ENABLE_FREETYPE "Enable freetype" ON "ANDROID" OFF)
8079
cmake_dependent_option(ENABLE_PULSE "Enable pulse" ON "LINUX OR SunOS" OFF)
@@ -365,6 +364,7 @@ set(LIBFASTFETCH_SRC
365364
src/common/library.c
366365
src/common/modules.c
367366
src/common/netif/netif.c
367+
src/common/networking/networking_common.c
368368
src/common/option.c
369369
src/common/parsing.c
370370
src/common/printing.c
@@ -493,7 +493,7 @@ if(LINUX)
493493
src/common/dbus.c
494494
src/common/io/io_unix.c
495495
src/common/netif/netif_linux.c
496-
src/common/networking_linux.c
496+
src/common/networking/networking_linux.c
497497
src/common/processing_linux.c
498498
src/detection/battery/battery_linux.c
499499
src/detection/bios/bios_linux.c
@@ -574,7 +574,7 @@ elseif(ANDROID)
574574
list(APPEND LIBFASTFETCH_SRC
575575
src/common/io/io_unix.c
576576
src/common/netif/netif_linux.c
577-
src/common/networking_linux.c
577+
src/common/networking/networking_linux.c
578578
src/common/processing_linux.c
579579
src/detection/battery/battery_android.c
580580
src/detection/bios/bios_android.c
@@ -640,7 +640,7 @@ elseif(FreeBSD)
640640
src/common/dbus.c
641641
src/common/io/io_unix.c
642642
src/common/netif/netif_bsd.c
643-
src/common/networking_linux.c
643+
src/common/networking/networking_linux.c
644644
src/common/processing_linux.c
645645
src/common/sysctl.c
646646
src/detection/battery/battery_bsd.c
@@ -731,7 +731,7 @@ elseif(NetBSD)
731731
src/common/dbus.c
732732
src/common/io/io_unix.c
733733
src/common/netif/netif_bsd.c
734-
src/common/networking_linux.c
734+
src/common/networking/networking_linux.c
735735
src/common/processing_linux.c
736736
src/common/sysctl.c
737737
src/detection/battery/battery_nbsd.c
@@ -813,7 +813,7 @@ elseif(OpenBSD)
813813
src/common/dbus.c
814814
src/common/io/io_unix.c
815815
src/common/netif/netif_bsd.c
816-
src/common/networking_linux.c
816+
src/common/networking/networking_linux.c
817817
src/common/processing_linux.c
818818
src/common/sysctl.c
819819
src/detection/battery/battery_obsd.c
@@ -894,7 +894,7 @@ elseif(APPLE)
894894
list(APPEND LIBFASTFETCH_SRC
895895
src/common/io/io_unix.c
896896
src/common/netif/netif_bsd.c
897-
src/common/networking_linux.c
897+
src/common/networking/networking_linux.c
898898
src/common/processing_linux.c
899899
src/common/sysctl.c
900900
src/detection/battery/battery_apple.c
@@ -965,7 +965,7 @@ elseif(WIN32)
965965
list(APPEND LIBFASTFETCH_SRC
966966
src/common/io/io_windows.c
967967
src/common/netif/netif_windows.c
968-
src/common/networking_windows.c
968+
src/common/networking/networking_windows.c
969969
src/common/processing_windows.c
970970
src/detection/battery/battery_windows.c
971971
src/detection/bios/bios_windows.c
@@ -1034,13 +1034,14 @@ elseif(WIN32)
10341034
src/util/windows/version.c
10351035
src/util/platform/FFPlatform_windows.c
10361036
src/util/binary_windows.c
1037+
src/util/debug_windows.c
10371038
)
10381039
elseif(SunOS)
10391040
list(APPEND LIBFASTFETCH_SRC
10401041
src/common/dbus.c
10411042
src/common/io/io_unix.c
10421043
src/common/netif/netif_bsd.c
1043-
src/common/networking_linux.c
1044+
src/common/networking/networking_linux.c
10441045
src/common/processing_linux.c
10451046
src/detection/battery/battery_nosupport.c
10461047
src/detection/bios/bios_windows.c
@@ -1121,7 +1122,7 @@ elseif(Haiku)
11211122
src/common/dbus.c
11221123
src/common/io/io_unix.c
11231124
src/common/netif/netif_haiku.c
1124-
src/common/networking_linux.c
1125+
src/common/networking/networking_linux.c
11251126
src/common/processing_linux.c
11261127
src/detection/battery/battery_haiku.c
11271128
src/detection/bios/bios_windows.c
@@ -1478,10 +1479,6 @@ else()
14781479
"GL"
14791480
)
14801481
endif()
1481-
ff_lib_enable(OSMESA
1482-
"osmesa"
1483-
"OSMesa"
1484-
)
14851482
ff_lib_enable(OPENCL
14861483
"OpenCL"
14871484
"OpenCL"
@@ -1575,7 +1572,6 @@ elseif(APPLE)
15751572
PRIVATE "-F /System/Library/PrivateFrameworks"
15761573
PRIVATE "-weak_framework DisplayServices"
15771574
PRIVATE "-weak_framework MediaRemote"
1578-
PRIVATE "-weak_framework Apple80211"
15791575
)
15801576
elseif(WIN32)
15811577
target_link_libraries(libfastfetch

0 commit comments

Comments
 (0)