Merge pull request #1509 from fastfetch-cli/dev

Release: v2.34.1

Author: CarterLi

CHANGELOG.md

@@ -1,3 +1,25 @@
+# 2.34.1
+
+An early release to fix KDE Plasma 6.3 compatibility. Hopefully it can be accepted by package managers before KDE 6.3 is officially released.
+
+To package managers: if you find fastfetch bugs, it's highly appreciated if you can report them to the upstream, so that all users can benefit from the fix, instead of maintaining out-of-tree patches. Thanks!
+
+Features:
+* Report vendor name when detecting GPUs by OpenGL
+    * Note: the vendor name is actually the creator of the OpenGL driver (such as `Mesa`) and may not be the same as the GPU vendor.
+
+Bugfixes:
+* Fix Ghostty termfont detection (#1495, TerminalFont, macOS)
+* Fix compatibility with KDE Plasma 6.3 (#1504, Display, Linux)
+* Make memory usage detection logic consistent with other systems (Memory, OpenBSD / NetBSD)
+* Report media file name if media title is not available (Media)
+* Fix max frequency detection for CPUs with both performance and efficiency cores (CPU, FreeBSD)
+
+Logo:
+* Add HeliumOS
+* Add Oreon
+* Update SnigdhaOS
+
 # 2.34.0
 
 Changes:

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.34.0
+    VERSION 2.34.1
     LANGUAGES C
     DESCRIPTION "Fast neofetch-like system information tool"
     HOMEPAGE_URL "https://github.com/fastfetch-cli/fastfetch"
@@ -752,7 +752,7 @@ elseif(NetBSD)
         src/detection/localip/localip_linux.c
         src/detection/gamepad/gamepad_nosupport.c
         src/detection/media/media_linux.c
-        src/detection/memory/memory_obsd.c
+        src/detection/memory/memory_nbsd.c
         src/detection/mouse/mouse_nosupport.c
         src/detection/netio/netio_bsd.c
         src/detection/opengl/opengl_linux.c

debian/changelog

@@ -1,3 +1,9 @@
+fastfetch (2.34.0) jammy; urgency=medium
+
+  * Update to 2.34.0
+
+ -- Carter Li <[email protected]>  Thu, 09 Jan 2025 09:03:17 +0800
+
 fastfetch (2.33.0) jammy; urgency=medium
 
   * Update to 2.33.0

debian/files

@@ -1 +1 @@
-fastfetch_2.33.0_source.buildinfo universe/utils optional
+fastfetch_2.34.0_source.buildinfo universe/utils optional

src/detection/cpu/cpu_bsd.c

@@ -1,6 +1,12 @@
 #include "cpu.h"
 #include "common/sysctl.h"
 
+#include <sys/param.h>
+#if __has_include(<sys/cpuset.h>)
+    #include <sys/cpuset.h>
+    #define FF_HAVE_CPUSET 1
+#endif
+
 static const char* detectCpuTemp(double* current)
 {
     int temp = ffSysctlGetInt("dev.cpu.0.temperature", -999999);
@@ -60,9 +66,19 @@ const char* ffDetectCPUImpl(const FFCPUOptions* options, FFCPUResult* cpu)
         }
     }
 
+#if FF_HAVE_CPUSET && (__x86_64__ || __i386__)
+    // Bind current process to the first two cores, which is *usually* a performance core
+    cpuset_t currentCPU;
+    CPU_ZERO(&currentCPU);
+    CPU_SET(1, &currentCPU);
+    CPU_SET(2, &currentCPU);
+    cpuset_setaffinity(CPU_LEVEL_WHICH, CPU_WHICH_TID, -1, sizeof(cpuset_t), &currentCPU);
+#endif
+
     ffCPUDetectSpeedByCpuid(cpu);
 
-    cpu->frequencyBase = (uint32_t) ffSysctlGetInt("hw.clockrate", 0);
+    uint32_t clockrate = (uint32_t) ffSysctlGetInt("hw.clockrate", 0);
+    if (clockrate > cpu->frequencyBase) cpu->frequencyBase = clockrate;
     cpu->temperature = FF_CPU_TEMP_UNSET;
 
     if (options->temp)

src/detection/cpu/cpu_nbsd.c

@@ -58,8 +58,7 @@ const char* ffDetectCPUImpl(const FFCPUOptions* options, FFCPUResult* cpu)
     ffCPUDetectSpeedByCpuid(cpu);
 
     uint32_t freq = (uint32_t) ffSysctlGetInt("machdep.cpu.frequency.target", 0);
-    if (freq > cpu->frequencyBase)
-        cpu->frequencyBase = freq;
+    if (freq > cpu->frequencyBase) cpu->frequencyBase = freq;
 
     cpu->temperature = FF_CPU_TEMP_UNSET;
 

src/detection/cpu/cpu_obsd.c

@@ -15,7 +15,9 @@ const char* ffDetectCPUImpl(const FFCPUOptions* options, FFCPUResult* cpu)
 
     ffCPUDetectSpeedByCpuid(cpu);
 
-    cpu->frequencyBase = (uint32_t) ffSysctlGetInt(CTL_HW, HW_CPUSPEED, 0);
+    uint32_t cpuspeed = (uint32_t) ffSysctlGetInt(CTL_HW, HW_CPUSPEED, 0);
+    if (cpuspeed > cpu->frequencyBase) cpu->frequencyBase = cpuspeed;
+
     cpu->temperature = FF_CPU_TEMP_UNSET;
     if (options->temp)
     {

src/detection/diskio/diskio_bsd.c

@@ -99,8 +99,7 @@ const char* ffDiskIOGetIoCounters(FFlist* result, FFDiskIOOptions* options)
         device->writeCount = current->num_writes;
     }
 
-    if (stats.dinfo->mem_ptr)
-        free(stats.dinfo->mem_ptr);
+    free(stats.dinfo->mem_ptr);
     free(stats.dinfo);
 
     return NULL;

src/detection/displayserver/linux/wayland/kde-output-device-v2-client-protocol.h

@@ -1,4 +1,4 @@
-/* Generated by wayland-scanner 1.22.0 */
+/* Generated by wayland-scanner 1.23.1 */
 
 #ifndef KDE_OUTPUT_DEVICE_V2_CLIENT_PROTOCOL_H
 #define KDE_OUTPUT_DEVICE_V2_CLIENT_PROTOCOL_H
@@ -53,6 +53,11 @@ struct kde_output_device_v2;
  * This object is published as global during start up for every available
  * display devices, or when one later becomes available, for example by
  * being hotplugged via a physical connector.
+ *
+ * Warning! The protocol described in this file is a desktop environment
+ * implementation detail. Regular clients must not use this protocol.
+ * Backward incompatible changes may be added without bumping the major
+ * version of the extension.
  * @section page_iface_kde_output_device_v2_api API
  * See @ref iface_kde_output_device_v2.
  */
@@ -75,6 +80,11 @@ struct kde_output_device_v2;
  * This object is published as global during start up for every available
  * display devices, or when one later becomes available, for example by
  * being hotplugged via a physical connector.
+ *
+ * Warning! The protocol described in this file is a desktop environment
+ * implementation detail. Regular clients must not use this protocol.
+ * Backward incompatible changes may be added without bumping the major
+ * version of the extension.
  */
 extern const struct wl_interface kde_output_device_v2_interface;
 #endif
@@ -199,6 +209,11 @@ enum kde_output_device_v2_capability {
 	 * @since 5
 	 */
 	KDE_OUTPUT_DEVICE_V2_CAPABILITY_ICC_PROFILE = 0x40,
+	/**
+	 * if this outputdevice supports the brightness setting
+	 * @since 9
+	 */
+	KDE_OUTPUT_DEVICE_V2_CAPABILITY_BRIGHTNESS = 0x80,
 };
 /**
  * @ingroup iface_kde_output_device_v2
@@ -216,6 +231,10 @@ enum kde_output_device_v2_capability {
  * @ingroup iface_kde_output_device_v2
  */
 #define KDE_OUTPUT_DEVICE_V2_CAPABILITY_ICC_PROFILE_SINCE_VERSION 5
+/**
+ * @ingroup iface_kde_output_device_v2
+ */
+#define KDE_OUTPUT_DEVICE_V2_CAPABILITY_BRIGHTNESS_SINCE_VERSION 9
 #endif /* KDE_OUTPUT_DEVICE_V2_CAPABILITY_ENUM */
 
 #ifndef KDE_OUTPUT_DEVICE_V2_VRR_POLICY_ENUM
@@ -274,6 +293,29 @@ enum kde_output_device_v2_color_profile_source {
 };
 #endif /* KDE_OUTPUT_DEVICE_V2_COLOR_PROFILE_SOURCE_ENUM */
 
+#ifndef KDE_OUTPUT_DEVICE_V2_COLOR_POWER_TRADEOFF_ENUM
+#define KDE_OUTPUT_DEVICE_V2_COLOR_POWER_TRADEOFF_ENUM
+/**
+ * @ingroup iface_kde_output_device_v2
+ * tradeoff between power and accuracy
+ *
+ * The compositor can do a lot of things that trade between
+ * performance, power and color accuracy. This setting describes
+ * a high level preference from the user about in which direction
+ * that tradeoff should be made.
+ */
+enum kde_output_device_v2_color_power_tradeoff {
+	/**
+	 * prefer efficiency and performance
+	 */
+	KDE_OUTPUT_DEVICE_V2_COLOR_POWER_TRADEOFF_EFFICIENCY = 0,
+	/**
+	 * prefer accuracy
+	 */
+	KDE_OUTPUT_DEVICE_V2_COLOR_POWER_TRADEOFF_ACCURACY = 1,
+};
+#endif /* KDE_OUTPUT_DEVICE_V2_COLOR_POWER_TRADEOFF_ENUM */
+
 /**
  * @ingroup iface_kde_output_device_v2
  * @struct kde_output_device_v2_listener
@@ -593,6 +635,29 @@ struct kde_output_device_v2_listener {
 	void (*brightness)(void *data,
 			   struct kde_output_device_v2 *kde_output_device_v2,
 			   uint32_t brightness);
+	/**
+	 * the preferred color/power tradeoff
+	 *
+	 *
+	 * @since 10
+	 */
+	void (*color_power_tradeoff)(void *data,
+				     struct kde_output_device_v2 *kde_output_device_v2,
+				     uint32_t preference);
+	/**
+	 * dimming multiplier
+	 *
+	 * This is the dimming multiplier of the output. This is similar
+	 * to the brightness setting, except it's meant to be a temporary
+	 * setting only, not persistent and may be implemented differently
+	 * depending on the display. 0 is the minimum dimming factor (not
+	 * completely dark) and 10000 means the output is not dimmed.
+	 * @param multiplier multiplier in 0-10000
+	 * @since 11
+	 */
+	void (*dimming)(void *data,
+			struct kde_output_device_v2 *kde_output_device_v2,
+			uint32_t multiplier);
 };
 
 /**
@@ -706,34 +771,42 @@ kde_output_device_v2_add_listener(struct kde_output_device_v2 *kde_output_device
  * @ingroup iface_kde_output_device_v2
  */
 #define KDE_OUTPUT_DEVICE_V2_BRIGHTNESS_SINCE_VERSION 8
+/**
+ * @ingroup iface_kde_output_device_v2
+ */
+#define KDE_OUTPUT_DEVICE_V2_COLOR_POWER_TRADEOFF_SINCE_VERSION 10
+/**
+ * @ingroup iface_kde_output_device_v2
+ */
+#define KDE_OUTPUT_DEVICE_V2_DIMMING_SINCE_VERSION 11
 
 
-// /** @ingroup iface_kde_output_device_v2 */
-// static inline void
-// kde_output_device_v2_set_user_data(struct kde_output_device_v2 *kde_output_device_v2, void *user_data)
-// {
-// 	wl_proxy_set_user_data((struct wl_proxy *) kde_output_device_v2, user_data);
-// }
+/** @ingroup iface_kde_output_device_v2 */
+static inline void
+kde_output_device_v2_set_user_data(struct kde_output_device_v2 *kde_output_device_v2, void *user_data)
+{
+	wl_proxy_set_user_data((struct wl_proxy *) kde_output_device_v2, user_data);
+}
 
-// /** @ingroup iface_kde_output_device_v2 */
-// static inline void *
-// kde_output_device_v2_get_user_data(struct kde_output_device_v2 *kde_output_device_v2)
-// {
-// 	return wl_proxy_get_user_data((struct wl_proxy *) kde_output_device_v2);
-// }
+/** @ingroup iface_kde_output_device_v2 */
+static inline void *
+kde_output_device_v2_get_user_data(struct kde_output_device_v2 *kde_output_device_v2)
+{
+	return wl_proxy_get_user_data((struct wl_proxy *) kde_output_device_v2);
+}
 
-// static inline uint32_t
-// kde_output_device_v2_get_version(struct kde_output_device_v2 *kde_output_device_v2)
-// {
-// 	return wl_proxy_get_version((struct wl_proxy *) kde_output_device_v2);
-// }
+static inline uint32_t
+kde_output_device_v2_get_version(struct kde_output_device_v2 *kde_output_device_v2)
+{
+	return wl_proxy_get_version((struct wl_proxy *) kde_output_device_v2);
+}
 
-// /** @ingroup iface_kde_output_device_v2 */
-// static inline void
-// kde_output_device_v2_destroy(struct kde_output_device_v2 *kde_output_device_v2)
-// {
-// 	wl_proxy_destroy((struct wl_proxy *) kde_output_device_v2);
-// }
+/** @ingroup iface_kde_output_device_v2 */
+static inline void
+kde_output_device_v2_destroy(struct kde_output_device_v2 *kde_output_device_v2)
+{
+	wl_proxy_destroy((struct wl_proxy *) kde_output_device_v2);
+}
 
 /**
  * @ingroup iface_kde_output_device_mode_v2
@@ -811,32 +884,32 @@ kde_output_device_mode_v2_add_listener(struct kde_output_device_mode_v2 *kde_out
 #define KDE_OUTPUT_DEVICE_MODE_V2_REMOVED_SINCE_VERSION 1
 
 
-// /** @ingroup iface_kde_output_device_mode_v2 */
-// static inline void
-// kde_output_device_mode_v2_set_user_data(struct kde_output_device_mode_v2 *kde_output_device_mode_v2, void *user_data)
-// {
-// 	wl_proxy_set_user_data((struct wl_proxy *) kde_output_device_mode_v2, user_data);
-// }
+/** @ingroup iface_kde_output_device_mode_v2 */
+static inline void
+kde_output_device_mode_v2_set_user_data(struct kde_output_device_mode_v2 *kde_output_device_mode_v2, void *user_data)
+{
+	wl_proxy_set_user_data((struct wl_proxy *) kde_output_device_mode_v2, user_data);
+}
 
-// /** @ingroup iface_kde_output_device_mode_v2 */
-// static inline void *
-// kde_output_device_mode_v2_get_user_data(struct kde_output_device_mode_v2 *kde_output_device_mode_v2)
-// {
-// 	return wl_proxy_get_user_data((struct wl_proxy *) kde_output_device_mode_v2);
-// }
+/** @ingroup iface_kde_output_device_mode_v2 */
+static inline void *
+kde_output_device_mode_v2_get_user_data(struct kde_output_device_mode_v2 *kde_output_device_mode_v2)
+{
+	return wl_proxy_get_user_data((struct wl_proxy *) kde_output_device_mode_v2);
+}
 
-// static inline uint32_t
-// kde_output_device_mode_v2_get_version(struct kde_output_device_mode_v2 *kde_output_device_mode_v2)
-// {
-// 	return wl_proxy_get_version((struct wl_proxy *) kde_output_device_mode_v2);
-// }
+static inline uint32_t
+kde_output_device_mode_v2_get_version(struct kde_output_device_mode_v2 *kde_output_device_mode_v2)
+{
+	return wl_proxy_get_version((struct wl_proxy *) kde_output_device_mode_v2);
+}
 
-// /** @ingroup iface_kde_output_device_mode_v2 */
-// static inline void
-// kde_output_device_mode_v2_destroy(struct kde_output_device_mode_v2 *kde_output_device_mode_v2)
-// {
-// 	wl_proxy_destroy((struct wl_proxy *) kde_output_device_mode_v2);
-// }
+/** @ingroup iface_kde_output_device_mode_v2 */
+static inline void
+kde_output_device_mode_v2_destroy(struct kde_output_device_mode_v2 *kde_output_device_mode_v2)
+{
+	wl_proxy_destroy((struct wl_proxy *) kde_output_device_mode_v2);
+}
 
 #ifdef  __cplusplus
 }

src/detection/displayserver/linux/wayland/kde-output-device-v2-protocol.c

@@ -1,6 +1,6 @@
 #ifdef FF_HAVE_WAYLAND
 
-/* Generated by wayland-scanner 1.22.0 */
+/* Generated by wayland-scanner 1.23.1 */
 
 /*
  * SPDX-FileCopyrightText: 2008-2011 Kristian Høgsberg
@@ -12,6 +12,7 @@
  * SPDX-License-Identifier: MIT-CMU
  */
 
+#include <stdbool.h>
 #include <stdlib.h>
 #include <stdint.h>
 #include <wayland-util.h>
@@ -57,12 +58,14 @@ static const struct wl_message kde_output_device_v2_events[] = {
 	{ "sdr_gamut_wideness", "6u", kde_output_device_v2_types + 0 },
 	{ "color_profile_source", "7u", kde_output_device_v2_types + 0 },
 	{ "brightness", "8u", kde_output_device_v2_types + 0 },
+	{ "color_power_tradeoff", "10u", kde_output_device_v2_types + 0 },
+	{ "dimming", "11u", kde_output_device_v2_types + 0 },
 };
 
 WL_EXPORT const struct wl_interface kde_output_device_v2_interface = {
-	"kde_output_device_v2", 8,
+	"kde_output_device_v2", 11,
 	0, NULL,
-	25, kde_output_device_v2_events,
+	27, kde_output_device_v2_events,
 };
 
 static const struct wl_message kde_output_device_mode_v2_events[] = {