svn commit: r403940 - in head/sysutils/intel-pcm: . files

[Warner Losh]

Author: imp
Date: Thu Dec 17 23:12:56 2015
New Revision: 403940
URL: https://svnweb.freebsd.org/changeset/ports/403940

Log:
  Update to Intel PCM v2.10

Added:
  head/sysutils/intel-pcm/files/
  head/sysutils/intel-pcm/files/patch-cpucounters.cpp   (contents, props changed)
  head/sysutils/intel-pcm/files/patch-cpucounters.h   (contents, props changed)
Modified:
  head/sysutils/intel-pcm/Makefile
  head/sysutils/intel-pcm/distinfo

Modified: head/sysutils/intel-pcm/Makefile
==============================================================================
--- head/sysutils/intel-pcm/Makefile	Thu Dec 17 21:57:09 2015	(r403939)
+++ head/sysutils/intel-pcm/Makefile	Thu Dec 17 23:12:56 2015	(r403940)
@@ -2,10 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	intel-pcm
-PORTVERSION=	2.8
+PORTVERSION=	2.10
 CATEGORIES=	sysutils
 MASTER_SITES=	LOCAL/imp
-DISTNAME=	intelperformancecountermonitorv${PORTVERSION}
+DISTNAME=	IntelPerformanceCounterMonitor-PCM-V${PORTVERSION}
 
 MAINTAINER=	imp at FreeBSD.org
 COMMENT=	Intel PCM toolkit
@@ -16,7 +16,7 @@ USES=		gmake compiler:c++11-lang zip
 
 ONLY_FOR_ARCHS=	i386 amd64
 
-WRKSRC=		${WRKDIR}/IntelPerformanceCounterMonitorV${PORTVERSION}
+WRKSRC=		${WRKDIR}/IntelPerformanceCounterMonitor-PCM-V${PORTVERSION}
 MAKE_ARGS=	CXX="${CXX}" LIB=-lpthread
 
 do-install:

Modified: head/sysutils/intel-pcm/distinfo
==============================================================================
--- head/sysutils/intel-pcm/distinfo	Thu Dec 17 21:57:09 2015	(r403939)
+++ head/sysutils/intel-pcm/distinfo	Thu Dec 17 23:12:56 2015	(r403940)
@@ -1,2 +1,2 @@
-SHA256 (intelperformancecountermonitorv2.8.zip) = 3c51b2fc7b772f16f746ea6fda0471d280c0f27bfd52fa51dd78433ca5a6ca6a
-SIZE (intelperformancecountermonitorv2.8.zip) = 931374
+SHA256 (IntelPerformanceCounterMonitor-PCM-V2.10.zip) = 46897ab2a8627ad5a58f05b19746b00b4f95126e8abccd9bed978b1f2675fc19
+SIZE (IntelPerformanceCounterMonitor-PCM-V2.10.zip) = 950922

Added: head/sysutils/intel-pcm/files/patch-cpucounters.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/intel-pcm/files/patch-cpucounters.cpp	Thu Dec 17 23:12:56 2015	(r403940)
@@ -0,0 +1,17 @@
+--- cpucounters.cpp.orig	2015-11-17 01:01:38.000000000 -0700
++++ cpucounters.cpp	2015-12-14 14:46:09.000000000 -0700
+@@ -1365,7 +1365,13 @@
+         cpu_model = ATOM;
+     }
+     if (cpu_model == HASWELL_ULT || cpu_model == HASWELL_2) cpu_model = HASWELL;
+-    if (cpu_model == BROADWELL_XEON_E3) cpu_model = BROADWELL;
++
++    if ((cpu_model == BROADWELL_XEON_E3) ||
++	(cpu_model == BROADWELL_XEON_E5) ||
++	(cpu_model == BROADWELL_XEON_E7)) {
++	cpu_model = BROADWELL;
++    }
++
+     if (cpu_model == SKL_UY) cpu_model = SKL;
+ 
+     if(!isCPUModelSupported((int)cpu_model))

Added: head/sysutils/intel-pcm/files/patch-cpucounters.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/intel-pcm/files/patch-cpucounters.h	Thu Dec 17 23:12:56 2015	(r403940)
@@ -0,0 +1,11 @@
+--- cpucounters.h.orig	2015-11-17 01:01:38.000000000 -0700
++++ cpucounters.h	2015-12-14 14:45:07.000000000 -0700
+@@ -709,6 +709,8 @@
+         HASWELLX = 63,
+         BROADWELL = 61,
+         BROADWELL_XEON_E3 = 71,
++	BROADWELL_XEON_E5 = 79,
++	BROADWELL_XEON_E7 = 86,
+         BDX_DE = 86,
+         SKL_UY = 78,
+         SKL = 94,