From 16b12f228231f6abf3a0071758b32a9b47ba02f9 Mon Sep 17 00:00:00 2001 From: Alexey Dokuchaev Date: Fri, 4 May 2018 12:00:26 +0000 Subject: Version 3.2.2 was released for `sysutils/cpu-x', but it does not build on FreeBSD as is (was fixed in master later). The patch which fixes the build is actually larger than the functional difference between the two versions, which is added support for Zen+ (Pinnacle Ridge) CPUs, so cherry-pick that instead and instruct our dear portscout to ignore version 3.2.2 for now. Reported by: portscout --- sysutils/cpu-x/Makefile | 3 +++ sysutils/cpu-x/files/patch-src_databases.h | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 sysutils/cpu-x/files/patch-src_databases.h (limited to 'sysutils') diff --git a/sysutils/cpu-x/Makefile b/sysutils/cpu-x/Makefile index 0ad0675fa61a..6281d6da81f6 100644 --- a/sysutils/cpu-x/Makefile +++ b/sysutils/cpu-x/Makefile @@ -3,6 +3,7 @@ PORTNAME= cpu-x PORTVERSION= 3.2.1 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= sysutils @@ -11,6 +12,8 @@ COMMENT= Gathers information about CPU, motherboard, and more LICENSE= GPLv3 +PORTSCOUT= skipv:3.2.2 # useful parts of 3.2.2 were cherry-picked + BUILD_DEPENDS= nasm:devel/nasm LIB_DEPENDS= libcpuid.so:sysutils/libcpuid \ libpci.so:devel/libpci \ diff --git a/sysutils/cpu-x/files/patch-src_databases.h b/sysutils/cpu-x/files/patch-src_databases.h new file mode 100644 index 000000000000..ff50ae31cb47 --- /dev/null +++ b/sysutils/cpu-x/files/patch-src_databases.h @@ -0,0 +1,19 @@ +--- src/databases.h.orig 2018-03-24 17:05:43 UTC ++++ src/databases.h +@@ -101,7 +101,7 @@ const Technology_DB technology_amd[] = + { 1, -1, 20, 40 }, // Bobcat (Brazos Zacate) + { 1, 1, 21, 32 }, // Bulldozer + { 1, 96, 21, 28 }, // Bulldozer (Excavator: Carrizo) +- { 1, -1, 23, 14 }, // Zen (Summit Ridge) ++ { 1, -1, 23, 14 }, // Zen (Summit Ridge/Raven Ridge) + { 2, -1, 16, 65 }, // K10 (Kuma/Agena) + { 2, -1, 20, 40 }, // Bobcat (Brazos Desna/Ontario) + { 2, -1, 21, 32 }, // Bulldozer (Piledriver: Vishera) +@@ -115,6 +115,7 @@ const Technology_DB technology_amd[] = + { 8, -1, 6, 130 }, // K7 (Thoroughbred/Applebred) + { 8, -1, 15, 65 }, // K8 (Tyler) + { 8, -1, 21, 28 }, // Bulldozer (Steamroller: Godavari) ++ { 8, -1, 23, 12 }, // Zen+ (Pinnacle Ridge) + { 9, -1, 16, 45 }, // Magny-Cours (Opteron) + { 10, -1, 6, 130 }, // K7 (Barton) + { 10, -1, 16, 45 }, // K10 (Thuban) -- cgit v1.2.3