mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-14 03:10:47 +00:00
Code Issues Releases Activity

Version 3.2.2 was released for `sysutils/cpu-x', but it does not build on

Browse Source 
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
This commit is contained in:
Alexey Dokuchaev 2018-05-04 12:00:26 +00:00
parent b5c7892a23
commit 16b12f2282
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=469022
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sysutils/cpu-x/Makefile
View File

@ -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 \

19
sysutils/cpu-x/files/patch-src_databases.h Normal file
View File

@ -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)