Accepting request 1084971 from home:pluskalm:branches:utilities

- Update to version 4.5.3: * Add BAR size for Intel discrete GPU * Add total VRAM size via Vulkan API for checking ResizableBAR * Update databases (Intel Alder Lake, Intel Raptor Lake-S/P/U) * Disable OpenCL support by default * Update brand logos for AMD and Intel * Make yellow brighter for dark themes in GTK GUI * Patch dmidecode to version 3.5.484f893 * Update 'Technology' label in CPU tab for new node name (like Intel 7) and change prefix for technology nodes >= 100nm to µm - Drop no longer needed cpu-x-update-database.patch OBS-URL: https://build.opensuse.org/request/show/1084971 OBS-URL: https://build.opensuse.org/package/show/utilities/cpu-x?expand=0&rev=24
2023-05-05 09:47:33 +00:00 · 2023-05-05 09:47:33 +00:00 · 98806db483
commit 98806db483
parent 28bd8a5764
6 changed files with 25 additions and 33 deletions
--- a/cpu-x-update-database.patch
+++ b/cpu-x-update-database.patch
@ -1,22 +0,0 @@
-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"       },
--- a/cpu-x.changes
+++ b/cpu-x.changes
@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Fri May  5 07:24:21 UTC 2023 - Martin Pluskal <mpluskal@suse.com>
+
+- Update to version 4.5.3:
+  * Add BAR size for Intel discrete GPU
+  * Add total VRAM size via Vulkan API for checking ResizableBAR
+  * Update databases (Intel Alder Lake, Intel Raptor Lake-S/P/U)
+  * Disable OpenCL support by default
+  * Update brand logos for AMD and Intel
+  * Make yellow brighter for dark themes in GTK GUI
+  * Patch dmidecode to version 3.5.484f893
+  * Update 'Technology' label in CPU tab for new node name (like
+    Intel 7) and change prefix for technology nodes >= 100nm to µm
+- Drop no longer needed cpu-x-update-database.patch
+
 -------------------------------------------------------------------
 Wed Mar 15 19:52:07 UTC 2023 - malcolmlewis@opensuse.org

--- a/cpu-x.spec
+++ b/cpu-x.spec
@ -18,7 +18,7 @@

 %define src_name CPU-X-%version
 Name:           cpu-x
-Version:        4.5.2
+Version:        4.5.3
 Release:        0
 Summary:        Hardware overview utility
 License:        GPL-3.0-or-later
@ -26,8 +26,6 @@ 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
@ -44,7 +42,7 @@ 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
+Provides:       bundled(dmidecode) = 3.5.484f893

 %description
 CPU-X is a software that gathers information about CPU, motherboard
@ -85,7 +83,8 @@ Shell completion definitions from %name for %name.
 %autosetup -p1 -n %src_name

 %build
-%cmake
+%cmake \
+  -DWITH_OPENCL=1
 %cmake_build

 %install
--- a/no-no-pie.patch
+++ b/no-no-pie.patch
@ -8,10 +8,10 @@ Why is this flag even here...
 CMakeLists.txt |    1 -
 1 file changed, 1 deletion(-)

-Index: CPU-X/CMakeLists.txt
+Index: CPU-X-4.5.3/CMakeLists.txt
 ===================================================================
--- CPU-X.orig/CMakeLists.txt
-+++ CPU-X/CMakeLists.txt
+--- CPU-X-4.5.3.orig/CMakeLists.txt
+++ CPU-X-4.5.3/CMakeLists.txt
@@ -38,7 +38,6 @@ set(CMAKE_EXE_LINKER_FLAGS    "${CMAKE_E
 include(CheckCCompilerFlag)
 check_c_compiler_flag("-no-pie" HAS_NO_PIE)
--- a/v4.5.2.tar.gz
+++ b/v4.5.2.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6cdab38928ca5684b22f7b8d868d42a25a48be6da813743b6b59a88d6e9f25d1
-size 1919087
--- a/v4.5.3.tar.gz
+++ b/v4.5.3.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:aeef04fb5c2da85f8790ab74bd66e2e72c9595579d5f64d2d08f093ef69d81f9
+size 1910854