From 28bd8a5764d4cbd994113b0761dd80cd8ab8869da817223f2fb07589d6ea34db Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 16 Mar 2023 20:42:43 +0000 Subject: [PATCH] Accepting request 1072186 from home:malcolmlewis:branches:utilities - Add build requires to enable Vulkan support. - Add cpu-x-update-database.patch: Update database.h to include cpu information for Clarkdale (Core i3) and Haswell-EP. OBS-URL: https://build.opensuse.org/request/show/1072186 OBS-URL: https://build.opensuse.org/package/show/utilities/cpu-x?expand=0&rev=22 --- cpu-x-update-database.patch | 22 ++++++++++++++++++++++ cpu-x.changes | 7 +++++++ cpu-x.spec | 5 ++++- 3 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 cpu-x-update-database.patch diff --git a/cpu-x-update-database.patch b/cpu-x-update-database.patch new file mode 100644 index 0000000..073ed33 --- /dev/null +++ b/cpu-x-update-database.patch @@ -0,0 +1,22 @@ +diff -Naur a/src/databases.h b/src/databases.h +--- a/src/databases.h 2022-11-12 11:27:40.000000000 -0600 ++++ b/src/databases.h 2023-03-15 14:51:11.822420193 -0500 +@@ -57,7 +57,9 @@ + { 6, 6, 6, 250 }, // PII Dixon / Celeron Mendocino + { 6, 6, 15, 65 }, // P4 Cedar Mill / PD Presler + { 6, 22, -1, 65 }, // C2 Conroe-L ++ { 6, 37, 6, 32 }, // Clarkdale (Core i3) + { 6, 54, -1, 32 }, // Atom Cedarview ++ { 6, 63, 5, 22 }, // Haswell-EP + { 6, 70, -1, 22 }, // Haswell (Crystalwell, L4 cache) + { 6, 102, -1, 10 }, // Cannon Lake + { 6, 150, -1, 10 }, // Tremont (Elkhart Lake) +@@ -177,6 +179,8 @@ + { "Pentium D (SmithField)", NULL, "LGA 775" }, + { "Pentium D (Presler)", NULL, "LGA 775" }, + { "Bloomfield", NULL, "LGA 1366" }, ++ { "Xeon (Woodcrest)", "Intel(R) Xeon(R) CPU E5-2690 v3", "FCLGA2011-3" }, ++ { "Clarkdale (Core i3)", "Intel(R) Core™ i3 CPU 540", "FCLGA1156" }, + { NULL, "Intel(R) Core(TM)2 Duo CPU E7400", "LGA 775" }, + { NULL, "Intel(R) Core(TM) i5-2520M CPU", "rPGA 988B" }, + { NULL, "Intel(R) Xeon(R) CPU E31275", "LGA 1155" }, diff --git a/cpu-x.changes b/cpu-x.changes index 2e6e1bb..7df8cde 100644 --- a/cpu-x.changes +++ b/cpu-x.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Mar 15 19:52:07 UTC 2023 - malcolmlewis@opensuse.org + +- Add build requires to enable Vulkan support. +- Add cpu-x-update-database.patch: Update database.h to include cpu + information for Clarkdale (Core i3) and Haswell-EP. + ------------------------------------------------------------------- Thu Nov 17 15:53:06 UTC 2022 - Jan Engelhardt diff --git a/cpu-x.spec b/cpu-x.spec index 978428f..6a2a3c3 100644 --- a/cpu-x.spec +++ b/cpu-x.spec @@ -1,7 +1,7 @@ # # spec file for package cpu-x # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,6 +26,8 @@ Group: System/X11/Utilities URL: https://github.com/TheTumultuousUnicornOfDarkness/CPU-X Source: https://github.com/TheTumultuousUnicornOfDarkness/CPU-X/archive/refs/tags/v%version.tar.gz Patch1: no-no-pie.patch +#PATCH-FIX-OPENSUSE cpu-x-update-database.patch malcolmlewis@opensuse.org -- Update database to include cpu information. +Patch2: cpu-x-update-database.patch BuildRequires: cmake BuildRequires: gettext-tools %ifarch %ix86 x86_64 @@ -39,6 +41,7 @@ BuildRequires: pkgconfig(libcpuid) >= 0.6.0 BuildRequires: pkgconfig(libpci) BuildRequires: pkgconfig(libprocps) BuildRequires: pkgconfig(ncursesw) +BuildRequires: pkgconfig(vulkan) # https://github.com/TheTumultuousUnicornOfDarkness/CPU-X/issues/105 Provides: bundled(bandwidth) = 1.5.1 Provides: bundled(dmidecode) = 3.4.20220922.f50b925