From ed23eb0fdefd81d131494c370adc297af8fbc559 Mon Sep 17 00:00:00 2001 From: Jonathan Wright <8390543+jonathanspw@users.noreply.github.com> Date: Mon, 23 Jan 2023 20:09:26 -0600 Subject: [PATCH 1/6] Fix builds on s390x (#402) Fixes #401 --- src/fastfetch.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/fastfetch.c b/src/fastfetch.c index 18c130ef2..dd2b5dbc6 100644 --- a/src/fastfetch.c +++ b/src/fastfetch.c @@ -879,6 +879,8 @@ static void parseOption(FFinstance* instance, FFdata* data, const char* key, con #define FF_ARCHITECTURE "powerpc" #elif defined(__riscv__) || defined(__riscv) #define FF_ARCHITECTURE "riscv" + #elif defined(__s390x__) + #define FF_ARCHITECTURE "s390x" #elif #define FF_ARCHITECTURE "unknown" #endif From d6d204ae5fe5d209c8236d8aefde9dcd55e53ab7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Tue, 24 Jan 2023 10:11:35 +0800 Subject: [PATCH 2/6] Fastfetch: fix builds on unknown platform (#402) --- src/fastfetch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fastfetch.c b/src/fastfetch.c index dd2b5dbc6..398ed03fe 100644 --- a/src/fastfetch.c +++ b/src/fastfetch.c @@ -881,7 +881,7 @@ static void parseOption(FFinstance* instance, FFdata* data, const char* key, con #define FF_ARCHITECTURE "riscv" #elif defined(__s390x__) #define FF_ARCHITECTURE "s390x" - #elif + #else #define FF_ARCHITECTURE "unknown" #endif From 4c7d479e9353818878f6cabd8e9f6b53ebec5f7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Tue, 24 Jan 2023 10:14:59 +0800 Subject: [PATCH 3/6] Release: 1.9.1 --- CHANGELOG.md | 6 ++++++ CMakeLists.txt | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b4fba05d4..1e4771a8c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# 1.9.1 + +Bugfixes: + +* Fix builds on s390x (@jonathanspw, #402) + # 1.9.0 Notable Changes: diff --git a/CMakeLists.txt b/CMakeLists.txt index 0d257dab7..a64416d1b 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 1.9.0 + VERSION 1.9.1 LANGUAGES C DESCRIPTION "Fast system information tool" HOMEPAGE_URL "https://github.com/LinusDierheimer/fastfetch" From ebe30394f2dd2062c49411b9cecf9e9127adfb61 Mon Sep 17 00:00:00 2001 From: Carter Li Date: Tue, 24 Jan 2023 11:21:08 +0800 Subject: [PATCH 4/6] Display (macOS): fix zero refresh rate on some monitors --- CHANGELOG.md | 1 + CMakeLists.txt | 1 + .../displayserver/displayserver_apple.c | 18 +++++++++++++++++- 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e4771a8c..05015dd38 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ Bugfixes: * Fix builds on s390x (@jonathanspw, #402) +* Fix zero refresh rate on some monitors (macOS) # 1.9.0 diff --git a/CMakeLists.txt b/CMakeLists.txt index a64416d1b..072394f28 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -666,6 +666,7 @@ if(APPLE) PRIVATE "-framework OpenCL" PRIVATE "-framework Cocoa" PRIVATE "-framework CoreWLAN" + PRIVATE "-framework CoreVideo" PRIVATE "-weak_framework MediaRemote -F /System/Library/PrivateFrameworks" PRIVATE "-weak_framework DisplayServices -F /System/Library/PrivateFrameworks" ) diff --git a/src/detection/displayserver/displayserver_apple.c b/src/detection/displayserver/displayserver_apple.c index 065e218b7..bbc03aedf 100644 --- a/src/detection/displayserver/displayserver_apple.c +++ b/src/detection/displayserver/displayserver_apple.c @@ -6,6 +6,7 @@ #include #include #include +#include static void detectDisplays(FFDisplayServerResult* ds) { @@ -20,10 +21,25 @@ static void detectDisplays(FFDisplayServerResult* ds) CGDisplayModeRef mode = CGDisplayCopyDisplayMode(screen); if(mode) { + //https://github.com/glfw/glfw/commit/aab08712dd8142b642e2042e7b7ba563acd07a45 + double refreshRate = CGDisplayModeGetRefreshRate(mode); + + if (refreshRate == 0) + { + CVDisplayLinkRef link; + if(CVDisplayLinkCreateWithCGDisplay(screen, &link) == kCVReturnSuccess) + { + const CVTime time = CVDisplayLinkGetNominalOutputVideoRefreshPeriod(link); + if (!(time.flags & kCVTimeIsIndefinite)) + refreshRate = time.timeScale / (double) time.timeValue + 0.5; //59.97... + CVDisplayLinkRelease(link); + } + } + ffdsAppendDisplay(ds, (uint32_t)CGDisplayModeGetPixelWidth(mode), (uint32_t)CGDisplayModeGetPixelHeight(mode), - (uint32_t)CGDisplayModeGetRefreshRate(mode), + (uint32_t)refreshRate, (uint32_t)CGDisplayModeGetWidth(mode), (uint32_t)CGDisplayModeGetHeight(mode) ); From 298d091e2e958ef5aef47d19fd350ff7e57b0c8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Tue, 24 Jan 2023 11:30:25 +0800 Subject: [PATCH 5/6] Wifi: fix the default output formatting --- src/modules/wifi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/wifi.c b/src/modules/wifi.c index fa9d19caf..06c3768fc 100644 --- a/src/modules/wifi.c +++ b/src/modules/wifi.c @@ -34,9 +34,9 @@ void ffPrintWifi(FFinstance* instance) { ffStrbufWriteTo(&item->conn.ssid, stdout); if(item->conn.protocol.length) - printf("- %s", item->conn.protocol.chars); + printf(" - %s", item->conn.protocol.chars); if(item->conn.security.length) - printf("- %s", item->conn.security.chars); + printf(" - %s", item->conn.security.chars); putchar('\n'); } else From d7b84bed9fe865f5f909777deb6afd7d7ea7e0d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Tue, 24 Jan 2023 16:16:08 +0800 Subject: [PATCH 6/6] Doc: update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 05015dd38..273bc02a0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ Bugfixes: * Fix builds on s390x (@jonathanspw, #402) * Fix zero refresh rate on some monitors (macOS) +* Fix default formatting of Wifi module # 1.9.0