From 65685bacd830fa4b8048e060ee7b959071f0deb1 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Wed, 16 Mar 2022 12:05:22 +0100 Subject: [PATCH] Add patch to prettify info strings --- gnome-control-center.spec | 2 + prettify-info.patch | 447 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 449 insertions(+) create mode 100644 prettify-info.patch diff --git a/gnome-control-center.spec b/gnome-control-center.spec index 8c1dbd5..6b39c59 100644 --- a/gnome-control-center.spec +++ b/gnome-control-center.spec @@ -22,6 +22,8 @@ Source0: https://download.gnome.org/sources/gnome-control-center/42/gnome # https://gitlab.gnome.org/GNOME/gnome-control-center/-/merge_requests/965 Patch0: distro-logo.patch +# https://gitlab.gnome.org/GNOME/gnome-control-center/-/merge_requests/1144 +Patch1: prettify-info.patch BuildRequires: chrpath BuildRequires: cups-devel diff --git a/prettify-info.patch b/prettify-info.patch new file mode 100644 index 0000000..1e28aa7 --- /dev/null +++ b/prettify-info.patch @@ -0,0 +1,447 @@ +From f64df4e31d0ff714516552fcf647e773fa00ffd2 Mon Sep 17 00:00:00 2001 +From: Norbert Pfeiler +Date: Sat, 29 Jan 2022 08:01:08 +0100 +Subject: [PATCH 01/10] =?UTF-8?q?info-overview:=20There=20is=20no=20?= + =?UTF-8?q?=E2=80=9CAMD=C2=AE=E2=80=9D?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +AMD doesn’t have a registered trademark for the string only. +--- + panels/info-overview/info-cleanup.c | 1 - + tests/info/info-cleanup-test.txt | 10 +++++----- + 2 files changed, 5 insertions(+), 6 deletions(-) + +diff --git a/panels/info-overview/info-cleanup.c b/panels/info-overview/info-cleanup.c +index 5a7392722..b30bf4acc 100644 +--- a/panels/info-overview/info-cleanup.c ++++ b/panels/info-overview/info-cleanup.c +@@ -43,7 +43,6 @@ prettify_info (const char *info) + { "Gallium .* on (AMD .*)", "\\1"}, + { "(AMD .*) [(].*", "\\1"}, + { "(AMD [A-Z])(.*)", "\\1\\L\\2\\E"}, +- { "AMD", "AMD\302\256"}, + { "Graphics Controller", "Graphics"}, + }; + +diff --git a/tests/info/info-cleanup-test.txt b/tests/info/info-cleanup-test.txt +index 6dc72a56e..dd0ea8954 100644 +--- a/tests/info/info-cleanup-test.txt ++++ b/tests/info/info-cleanup-test.txt +@@ -1,8 +1,8 @@ + Intel(R) Core(TM) i5-4590T CPU @ 2.00GHz Intel® Core™ i5-4590T CPU @ 2.00GHz + Intel(R) Ivybridge Mobile Intel® Ivybridge Mobile + Intel(R) Ivybridge Mobile Intel® Ivybridge Mobile +-Gallium 0.4 on AMD KAVERI AMD® Kaveri +-AMD KAVERI (DRM 2.48.0 / 4.9.0-0.rc4.git2.2.fc26.x86_64, LLVM3) AMD® Kaveri +-AMD KAVERI (DRM 2.48.0 / 4.9.0-0.rc4.git2.2.fc26.x86_64, LLVM3 AMD® Kaveri +-Gallium 0.4 on AMD KAVERI (DRM 2.48.0 / 4.9.0-0.rc4.git2.2.fc26.x86_64, LLVM3) AMD® Kaveri +-Gallium 0.4 on AMD KAVERI (DRM 2.48.0 / 4.9.0-0.rc4.git2.2.fc26.x86_64, LLVM3 AMD® Kaveri ++Gallium 0.4 on AMD KAVERI AMD Kaveri ++AMD KAVERI (DRM 2.48.0 / 4.9.0-0.rc4.git2.2.fc26.x86_64, LLVM3) AMD Kaveri ++AMD KAVERI (DRM 2.48.0 / 4.9.0-0.rc4.git2.2.fc26.x86_64, LLVM3 AMD Kaveri ++Gallium 0.4 on AMD KAVERI (DRM 2.48.0 / 4.9.0-0.rc4.git2.2.fc26.x86_64, LLVM3) AMD Kaveri ++Gallium 0.4 on AMD KAVERI (DRM 2.48.0 / 4.9.0-0.rc4.git2.2.fc26.x86_64, LLVM3 AMD Kaveri +-- +2.35.1 + + +From 3851a5ca92633d8bf790116bf57143ba9eb85b2b Mon Sep 17 00:00:00 2001 +From: Norbert Pfeiler +Date: Sat, 29 Jan 2022 08:03:51 +0100 +Subject: [PATCH 02/10] info-overview: If names are all caps, leave them be +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This made everything AMD lower case after the second word +and is likely unintentional for something like EPYC™. + +e.g. was +AMD Ryzen threadripper 1950x 16-core processor +AMD Radeon rx 580 series +--- + panels/info-overview/info-cleanup.c | 1 - + tests/info/info-cleanup-test.txt | 13 ++++++++----- + 2 files changed, 8 insertions(+), 6 deletions(-) + +diff --git a/panels/info-overview/info-cleanup.c b/panels/info-overview/info-cleanup.c +index b30bf4acc..f723de6f4 100644 +--- a/panels/info-overview/info-cleanup.c ++++ b/panels/info-overview/info-cleanup.c +@@ -42,7 +42,6 @@ prettify_info (const char *info) + { "Atom[(]TM[)]", "Atom\342\204\242"}, + { "Gallium .* on (AMD .*)", "\\1"}, + { "(AMD .*) [(].*", "\\1"}, +- { "(AMD [A-Z])(.*)", "\\1\\L\\2\\E"}, + { "Graphics Controller", "Graphics"}, + }; + +diff --git a/tests/info/info-cleanup-test.txt b/tests/info/info-cleanup-test.txt +index dd0ea8954..c074fb6f5 100644 +--- a/tests/info/info-cleanup-test.txt ++++ b/tests/info/info-cleanup-test.txt +@@ -1,8 +1,11 @@ + Intel(R) Core(TM) i5-4590T CPU @ 2.00GHz Intel® Core™ i5-4590T CPU @ 2.00GHz + Intel(R) Ivybridge Mobile Intel® Ivybridge Mobile + Intel(R) Ivybridge Mobile Intel® Ivybridge Mobile +-Gallium 0.4 on AMD KAVERI AMD Kaveri +-AMD KAVERI (DRM 2.48.0 / 4.9.0-0.rc4.git2.2.fc26.x86_64, LLVM3) AMD Kaveri +-AMD KAVERI (DRM 2.48.0 / 4.9.0-0.rc4.git2.2.fc26.x86_64, LLVM3 AMD Kaveri +-Gallium 0.4 on AMD KAVERI (DRM 2.48.0 / 4.9.0-0.rc4.git2.2.fc26.x86_64, LLVM3) AMD Kaveri +-Gallium 0.4 on AMD KAVERI (DRM 2.48.0 / 4.9.0-0.rc4.git2.2.fc26.x86_64, LLVM3 AMD Kaveri ++Gallium 0.4 on AMD KAVERI AMD KAVERI ++AMD KAVERI (DRM 2.48.0 / 4.9.0-0.rc4.git2.2.fc26.x86_64, LLVM3) AMD KAVERI ++AMD KAVERI (DRM 2.48.0 / 4.9.0-0.rc4.git2.2.fc26.x86_64, LLVM3 AMD KAVERI ++Gallium 0.4 on AMD KAVERI (DRM 2.48.0 / 4.9.0-0.rc4.git2.2.fc26.x86_64, LLVM3) AMD KAVERI ++Gallium 0.4 on AMD KAVERI (DRM 2.48.0 / 4.9.0-0.rc4.git2.2.fc26.x86_64, LLVM3 AMD KAVERI ++AMD Ryzen Threadripper 1950X 16-Core Processor AMD Ryzen Threadripper 1950X 16-Core Processor ++AMD Radeon RX 580 Series (POLARIS10, DRM 3.42.0, 5.15.13-1-ck-generic-v3, LLVM 13.0.0) AMD Radeon RX 580 Series ++AMD EPYC 7251 8-Core Processor AMD EPYC 7251 8-Core Processor +-- +2.35.1 + + +From 8d44e51983e002c1cac3a9b84e8ba8b6158c1dde Mon Sep 17 00:00:00 2001 +From: Norbert Pfeiler +Date: Sat, 29 Jan 2022 08:06:49 +0100 +Subject: [PATCH 03/10] info-overview: Always omit Gallium, not just for AMD + +--- + panels/info-overview/info-cleanup.c | 2 +- + tests/info/info-cleanup-test.txt | 2 ++ + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/panels/info-overview/info-cleanup.c b/panels/info-overview/info-cleanup.c +index f723de6f4..a444389c7 100644 +--- a/panels/info-overview/info-cleanup.c ++++ b/panels/info-overview/info-cleanup.c +@@ -40,7 +40,7 @@ prettify_info (const char *info) + { "Intel[(]R[)]", "Intel\302\256"}, + { "Core[(]TM[)]", "Core\342\204\242"}, + { "Atom[(]TM[)]", "Atom\342\204\242"}, +- { "Gallium .* on (AMD .*)", "\\1"}, ++ { "Gallium \\d+\\.\\d+ on (.*)", "\\1"}, + { "(AMD .*) [(].*", "\\1"}, + { "Graphics Controller", "Graphics"}, + }; +diff --git a/tests/info/info-cleanup-test.txt b/tests/info/info-cleanup-test.txt +index c074fb6f5..637da42ab 100644 +--- a/tests/info/info-cleanup-test.txt ++++ b/tests/info/info-cleanup-test.txt +@@ -9,3 +9,5 @@ Gallium 0.4 on AMD KAVERI (DRM 2.48.0 / 4.9.0-0.rc4.git2.2.fc26.x86_64, LLVM3 AM + AMD Ryzen Threadripper 1950X 16-Core Processor AMD Ryzen Threadripper 1950X 16-Core Processor + AMD Radeon RX 580 Series (POLARIS10, DRM 3.42.0, 5.15.13-1-ck-generic-v3, LLVM 13.0.0) AMD Radeon RX 580 Series + AMD EPYC 7251 8-Core Processor AMD EPYC 7251 8-Core Processor ++Gallium 0.4 on SVGA3D SVGA3D ++Gallium 0.4 on llvmpipe (LLVM 3.4, 128 bits) llvmpipe (LLVM 3.4, 128 bits) +-- +2.35.1 + + +From 3cf413e65a3c30f514e5dd4f9d09e9b1aab7f4cb Mon Sep 17 00:00:00 2001 +From: Norbert Pfeiler +Date: Sat, 29 Jan 2022 08:25:21 +0100 +Subject: [PATCH 04/10] info-overview: Use a more generic regex to match the + Mesa infos + +--- + panels/info-overview/info-cleanup.c | 2 +- + tests/info/info-cleanup-test.txt | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/panels/info-overview/info-cleanup.c b/panels/info-overview/info-cleanup.c +index a444389c7..10418a5ec 100644 +--- a/panels/info-overview/info-cleanup.c ++++ b/panels/info-overview/info-cleanup.c +@@ -41,7 +41,7 @@ prettify_info (const char *info) + { "Core[(]TM[)]", "Core\342\204\242"}, + { "Atom[(]TM[)]", "Atom\342\204\242"}, + { "Gallium \\d+\\.\\d+ on (.*)", "\\1"}, +- { "(AMD .*) [(].*", "\\1"}, ++ { " [(][^)]*(DRM|MESA|LLVM)[^)]*[)]?", ""}, + { "Graphics Controller", "Graphics"}, + }; + +diff --git a/tests/info/info-cleanup-test.txt b/tests/info/info-cleanup-test.txt +index 637da42ab..2f4327977 100644 +--- a/tests/info/info-cleanup-test.txt ++++ b/tests/info/info-cleanup-test.txt +@@ -10,4 +10,4 @@ AMD Ryzen Threadripper 1950X 16-Core Processor AMD Ryzen Threadripper 1950X 16-C + AMD Radeon RX 580 Series (POLARIS10, DRM 3.42.0, 5.15.13-1-ck-generic-v3, LLVM 13.0.0) AMD Radeon RX 580 Series + AMD EPYC 7251 8-Core Processor AMD EPYC 7251 8-Core Processor + Gallium 0.4 on SVGA3D SVGA3D +-Gallium 0.4 on llvmpipe (LLVM 3.4, 128 bits) llvmpipe (LLVM 3.4, 128 bits) ++Gallium 0.4 on llvmpipe (LLVM 3.4, 128 bits) llvmpipe +-- +2.35.1 + + +From 71ecb8b1293e868ac1fb19eb6655436d71f445d3 Mon Sep 17 00:00:00 2001 +From: Norbert Pfeiler +Date: Sat, 29 Jan 2022 08:09:46 +0100 +Subject: [PATCH 05/10] info-overview: Replace the trademark symbols in a more + generic way + +--- + panels/info-overview/info-cleanup.c | 5 ++--- + tests/info/info-cleanup-test.txt | 2 ++ + 2 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/panels/info-overview/info-cleanup.c b/panels/info-overview/info-cleanup.c +index 10418a5ec..25d957a1d 100644 +--- a/panels/info-overview/info-cleanup.c ++++ b/panels/info-overview/info-cleanup.c +@@ -37,9 +37,8 @@ prettify_info (const char *info) + int i; + static const ReplaceStrings rs[] = { + { "Mesa DRI ", ""}, +- { "Intel[(]R[)]", "Intel\302\256"}, +- { "Core[(]TM[)]", "Core\342\204\242"}, +- { "Atom[(]TM[)]", "Atom\342\204\242"}, ++ { "[(]R[)]", "\302\256"}, ++ { "[(](tm|TM)[)]", "\342\204\242"}, + { "Gallium \\d+\\.\\d+ on (.*)", "\\1"}, + { " [(][^)]*(DRM|MESA|LLVM)[^)]*[)]?", ""}, + { "Graphics Controller", "Graphics"}, +diff --git a/tests/info/info-cleanup-test.txt b/tests/info/info-cleanup-test.txt +index 2f4327977..e8ca5da0f 100644 +--- a/tests/info/info-cleanup-test.txt ++++ b/tests/info/info-cleanup-test.txt +@@ -11,3 +11,5 @@ AMD Radeon RX 580 Series (POLARIS10, DRM 3.42.0, 5.15.13-1-ck-generic-v3, LLVM 1 + AMD EPYC 7251 8-Core Processor AMD EPYC 7251 8-Core Processor + Gallium 0.4 on SVGA3D SVGA3D + Gallium 0.4 on llvmpipe (LLVM 3.4, 128 bits) llvmpipe ++AMD FX(tm)-8350 Eight-Core Processor AMD FX™-8350 Eight-Core Processor ++AMD Athlon(tm) II X3 435 Processor AMD Athlon™ II X3 435 Processor +-- +2.35.1 + + +From 307b420c90763d03e8a32d74dc5cf23d39d1b689 Mon Sep 17 00:00:00 2001 +From: Norbert Pfeiler +Date: Sat, 29 Jan 2022 10:58:55 +0100 +Subject: [PATCH 06/10] info-overview: Remove some junk info, like PCIe and SSE + +--- + panels/info-overview/info-cleanup.c | 1 + + tests/info/info-cleanup-test.txt | 2 ++ + 2 files changed, 3 insertions(+) + +diff --git a/panels/info-overview/info-cleanup.c b/panels/info-overview/info-cleanup.c +index 25d957a1d..f0e8cc772 100644 +--- a/panels/info-overview/info-cleanup.c ++++ b/panels/info-overview/info-cleanup.c +@@ -40,6 +40,7 @@ prettify_info (const char *info) + { "[(]R[)]", "\302\256"}, + { "[(](tm|TM)[)]", "\342\204\242"}, + { "Gallium \\d+\\.\\d+ on (.*)", "\\1"}, ++ { " x86|/MMX|/SSE2|/PCIe", ""}, + { " [(][^)]*(DRM|MESA|LLVM)[^)]*[)]?", ""}, + { "Graphics Controller", "Graphics"}, + }; +diff --git a/tests/info/info-cleanup-test.txt b/tests/info/info-cleanup-test.txt +index e8ca5da0f..ce8084305 100644 +--- a/tests/info/info-cleanup-test.txt ++++ b/tests/info/info-cleanup-test.txt +@@ -13,3 +13,5 @@ Gallium 0.4 on SVGA3D SVGA3D + Gallium 0.4 on llvmpipe (LLVM 3.4, 128 bits) llvmpipe + AMD FX(tm)-8350 Eight-Core Processor AMD FX™-8350 Eight-Core Processor + AMD Athlon(tm) II X3 435 Processor AMD Athlon™ II X3 435 Processor ++NVIDIA GeForce GT 710/PCIe/SSE2 NVIDIA GeForce GT 710 ++Mesa DRI Intel(R) 965GM x86/MMX/SSE2 Intel® 965GM +-- +2.35.1 + + +From da98faf10360d8a278e672a44858c1c249101d53 Mon Sep 17 00:00:00 2001 +From: Norbert Pfeiler +Date: Sat, 29 Jan 2022 10:31:17 +0100 +Subject: [PATCH 07/10] info-overview: Remove redundant/elaborate info + +Remove redundant/elaborate in strings like CPU, Core and Processor. +--- + panels/info-overview/info-cleanup.c | 1 + + tests/info/info-cleanup-test.txt | 10 +++++----- + 2 files changed, 6 insertions(+), 5 deletions(-) + +diff --git a/panels/info-overview/info-cleanup.c b/panels/info-overview/info-cleanup.c +index f0e8cc772..21ea83dd3 100644 +--- a/panels/info-overview/info-cleanup.c ++++ b/panels/info-overview/info-cleanup.c +@@ -40,6 +40,7 @@ prettify_info (const char *info) + { "[(]R[)]", "\302\256"}, + { "[(](tm|TM)[)]", "\342\204\242"}, + { "Gallium \\d+\\.\\d+ on (.*)", "\\1"}, ++ { " CPU| Processor| \\S+-Core", ""}, + { " x86|/MMX|/SSE2|/PCIe", ""}, + { " [(][^)]*(DRM|MESA|LLVM)[^)]*[)]?", ""}, + { "Graphics Controller", "Graphics"}, +diff --git a/tests/info/info-cleanup-test.txt b/tests/info/info-cleanup-test.txt +index ce8084305..6de8e0bc5 100644 +--- a/tests/info/info-cleanup-test.txt ++++ b/tests/info/info-cleanup-test.txt +@@ -1,4 +1,4 @@ +-Intel(R) Core(TM) i5-4590T CPU @ 2.00GHz Intel® Core™ i5-4590T CPU @ 2.00GHz ++Intel(R) Core(TM) i5-4590T CPU @ 2.00GHz Intel® Core™ i5-4590T @ 2.00GHz + Intel(R) Ivybridge Mobile Intel® Ivybridge Mobile + Intel(R) Ivybridge Mobile Intel® Ivybridge Mobile + Gallium 0.4 on AMD KAVERI AMD KAVERI +@@ -6,12 +6,12 @@ AMD KAVERI (DRM 2.48.0 / 4.9.0-0.rc4.git2.2.fc26.x86_64, LLVM3) AMD KAVERI + AMD KAVERI (DRM 2.48.0 / 4.9.0-0.rc4.git2.2.fc26.x86_64, LLVM3 AMD KAVERI + Gallium 0.4 on AMD KAVERI (DRM 2.48.0 / 4.9.0-0.rc4.git2.2.fc26.x86_64, LLVM3) AMD KAVERI + Gallium 0.4 on AMD KAVERI (DRM 2.48.0 / 4.9.0-0.rc4.git2.2.fc26.x86_64, LLVM3 AMD KAVERI +-AMD Ryzen Threadripper 1950X 16-Core Processor AMD Ryzen Threadripper 1950X 16-Core Processor ++AMD Ryzen Threadripper 1950X 16-Core Processor AMD Ryzen Threadripper 1950X + AMD Radeon RX 580 Series (POLARIS10, DRM 3.42.0, 5.15.13-1-ck-generic-v3, LLVM 13.0.0) AMD Radeon RX 580 Series +-AMD EPYC 7251 8-Core Processor AMD EPYC 7251 8-Core Processor ++AMD EPYC 7251 8-Core Processor AMD EPYC 7251 + Gallium 0.4 on SVGA3D SVGA3D + Gallium 0.4 on llvmpipe (LLVM 3.4, 128 bits) llvmpipe +-AMD FX(tm)-8350 Eight-Core Processor AMD FX™-8350 Eight-Core Processor +-AMD Athlon(tm) II X3 435 Processor AMD Athlon™ II X3 435 Processor ++AMD FX(tm)-8350 Eight-Core Processor AMD FX™-8350 ++AMD Athlon(tm) II X3 435 Processor AMD Athlon™ II X3 435 + NVIDIA GeForce GT 710/PCIe/SSE2 NVIDIA GeForce GT 710 + Mesa DRI Intel(R) 965GM x86/MMX/SSE2 Intel® 965GM +-- +2.35.1 + + +From 4132e8856c8c1b6dfc64745e17d64078b4aa05cc Mon Sep 17 00:00:00 2001 +From: Norbert Pfeiler +Date: Sat, 29 Jan 2022 10:29:15 +0100 +Subject: [PATCH 08/10] info-overview: Remove some rare @ x.yz GHz + specification + +--- + panels/info-overview/info-cleanup.c | 2 +- + tests/info/info-cleanup-test.txt | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/panels/info-overview/info-cleanup.c b/panels/info-overview/info-cleanup.c +index 21ea83dd3..7d640bb64 100644 +--- a/panels/info-overview/info-cleanup.c ++++ b/panels/info-overview/info-cleanup.c +@@ -40,7 +40,7 @@ prettify_info (const char *info) + { "[(]R[)]", "\302\256"}, + { "[(](tm|TM)[)]", "\342\204\242"}, + { "Gallium \\d+\\.\\d+ on (.*)", "\\1"}, +- { " CPU| Processor| \\S+-Core", ""}, ++ { " CPU| Processor| \\S+-Core| @ \\d+\\.\\d+GHz", ""}, + { " x86|/MMX|/SSE2|/PCIe", ""}, + { " [(][^)]*(DRM|MESA|LLVM)[^)]*[)]?", ""}, + { "Graphics Controller", "Graphics"}, +diff --git a/tests/info/info-cleanup-test.txt b/tests/info/info-cleanup-test.txt +index 6de8e0bc5..72b92071a 100644 +--- a/tests/info/info-cleanup-test.txt ++++ b/tests/info/info-cleanup-test.txt +@@ -1,4 +1,4 @@ +-Intel(R) Core(TM) i5-4590T CPU @ 2.00GHz Intel® Core™ i5-4590T @ 2.00GHz ++Intel(R) Core(TM) i5-4590T CPU @ 2.00GHz Intel® Core™ i5-4590T + Intel(R) Ivybridge Mobile Intel® Ivybridge Mobile + Intel(R) Ivybridge Mobile Intel® Ivybridge Mobile + Gallium 0.4 on AMD KAVERI AMD KAVERI +-- +2.35.1 + + +From ad01dc194e5e1e9876da611e70ac451af9bd1442 Mon Sep 17 00:00:00 2001 +From: Norbert Pfeiler +Date: Sat, 29 Jan 2022 11:10:04 +0100 +Subject: [PATCH 09/10] info-overview: Add some commonly used trademarks +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Those are not always present in the device string. +Guidance was taken from the usage on vendor websites. + +NVIDIA actually has the rights to GTX™ but doesn’t seem to use it, +in contrast to RTX™. +--- + panels/info-overview/info-cleanup.c | 1 + + tests/info/info-cleanup-test.txt | 7 ++++--- + 2 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/panels/info-overview/info-cleanup.c b/panels/info-overview/info-cleanup.c +index 7d640bb64..ceeb61025 100644 +--- a/panels/info-overview/info-cleanup.c ++++ b/panels/info-overview/info-cleanup.c +@@ -39,6 +39,7 @@ prettify_info (const char *info) + { "Mesa DRI ", ""}, + { "[(]R[)]", "\302\256"}, + { "[(](tm|TM)[)]", "\342\204\242"}, ++ { "(ATI|EPYC|AMD FX|Radeon|Ryzen|Threadripper|GeForce RTX) ", "\\1\342\204\242 "}, + { "Gallium \\d+\\.\\d+ on (.*)", "\\1"}, + { " CPU| Processor| \\S+-Core| @ \\d+\\.\\d+GHz", ""}, + { " x86|/MMX|/SSE2|/PCIe", ""}, +diff --git a/tests/info/info-cleanup-test.txt b/tests/info/info-cleanup-test.txt +index 72b92071a..80be85135 100644 +--- a/tests/info/info-cleanup-test.txt ++++ b/tests/info/info-cleanup-test.txt +@@ -6,12 +6,13 @@ AMD KAVERI (DRM 2.48.0 / 4.9.0-0.rc4.git2.2.fc26.x86_64, LLVM3) AMD KAVERI + AMD KAVERI (DRM 2.48.0 / 4.9.0-0.rc4.git2.2.fc26.x86_64, LLVM3 AMD KAVERI + Gallium 0.4 on AMD KAVERI (DRM 2.48.0 / 4.9.0-0.rc4.git2.2.fc26.x86_64, LLVM3) AMD KAVERI + Gallium 0.4 on AMD KAVERI (DRM 2.48.0 / 4.9.0-0.rc4.git2.2.fc26.x86_64, LLVM3 AMD KAVERI +-AMD Ryzen Threadripper 1950X 16-Core Processor AMD Ryzen Threadripper 1950X +-AMD Radeon RX 580 Series (POLARIS10, DRM 3.42.0, 5.15.13-1-ck-generic-v3, LLVM 13.0.0) AMD Radeon RX 580 Series +-AMD EPYC 7251 8-Core Processor AMD EPYC 7251 ++AMD Ryzen Threadripper 1950X 16-Core Processor AMD Ryzen™ Threadripper™ 1950X ++AMD Radeon RX 580 Series (POLARIS10, DRM 3.42.0, 5.15.13-1-ck-generic-v3, LLVM 13.0.0) AMD Radeon™ RX 580 Series ++AMD EPYC 7251 8-Core Processor AMD EPYC™ 7251 + Gallium 0.4 on SVGA3D SVGA3D + Gallium 0.4 on llvmpipe (LLVM 3.4, 128 bits) llvmpipe + AMD FX(tm)-8350 Eight-Core Processor AMD FX™-8350 + AMD Athlon(tm) II X3 435 Processor AMD Athlon™ II X3 435 + NVIDIA GeForce GT 710/PCIe/SSE2 NVIDIA GeForce GT 710 + Mesa DRI Intel(R) 965GM x86/MMX/SSE2 Intel® 965GM ++NVIDIA GeForce RTX 3090/PCIe/SSE2 NVIDIA GeForce RTX™ 3090 +-- +2.35.1 + + +From 160fbfe8aa0cb396c1a0c31e1199f32da0c4c79e Mon Sep 17 00:00:00 2001 +From: Norbert Pfeiler +Date: Sat, 29 Jan 2022 10:56:33 +0100 +Subject: [PATCH 10/10] =?UTF-8?q?info-overview:=20Replace=20llvmpipe=20wit?= + =?UTF-8?q?h=20=E2=80=9CSoftware=20Rendering=E2=80=9D?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +--- + panels/info-overview/info-cleanup.c | 1 + + tests/info/info-cleanup-test.txt | 3 ++- + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/panels/info-overview/info-cleanup.c b/panels/info-overview/info-cleanup.c +index ceeb61025..5c3480ca7 100644 +--- a/panels/info-overview/info-cleanup.c ++++ b/panels/info-overview/info-cleanup.c +@@ -45,6 +45,7 @@ prettify_info (const char *info) + { " x86|/MMX|/SSE2|/PCIe", ""}, + { " [(][^)]*(DRM|MESA|LLVM)[^)]*[)]?", ""}, + { "Graphics Controller", "Graphics"}, ++ { ".*llvmpipe.*", "Software Rendering"}, + }; + + if (*info == '\0') +diff --git a/tests/info/info-cleanup-test.txt b/tests/info/info-cleanup-test.txt +index 80be85135..a0e25fbd0 100644 +--- a/tests/info/info-cleanup-test.txt ++++ b/tests/info/info-cleanup-test.txt +@@ -10,7 +10,8 @@ AMD Ryzen Threadripper 1950X 16-Core Processor AMD Ryzen™ Threadripper™ 1950 + AMD Radeon RX 580 Series (POLARIS10, DRM 3.42.0, 5.15.13-1-ck-generic-v3, LLVM 13.0.0) AMD Radeon™ RX 580 Series + AMD EPYC 7251 8-Core Processor AMD EPYC™ 7251 + Gallium 0.4 on SVGA3D SVGA3D +-Gallium 0.4 on llvmpipe (LLVM 3.4, 128 bits) llvmpipe ++Gallium 0.4 on llvmpipe (LLVM 3.4, 128 bits) Software Rendering ++llvmpipe (LLVM 12.0.1, 256 bits) Software Rendering + AMD FX(tm)-8350 Eight-Core Processor AMD FX™-8350 + AMD Athlon(tm) II X3 435 Processor AMD Athlon™ II X3 435 + NVIDIA GeForce GT 710/PCIe/SSE2 NVIDIA GeForce GT 710 +-- +2.35.1 +