From nobody Thu Feb 23 22:58:43 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PN7jv3gHXz3stC8; Thu, 23 Feb 2023 22:58:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PN7jv3DhYz3rsH; Thu, 23 Feb 2023 22:58:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677193123; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dHaRCYRn0RRvhoAQx6rgkmAPo5OGSAMUghcoHBrBDBc=; b=kJeYm+66DxfNWMeJcJbJMBJA+pZxGLi1xOvMpMC5jYmY6SturBPAFgkLDeQopvboviFXib iDs8eW0hGT9K0U3li/iynMRXC19rdUDuDaN0yoiiYrHq9Q1kRbo4K0JPT7Xjesx9liJhsu TYRv8XccxDKQxlsntLKFW8BtabJtuECki8y2yYEiK+pIgphZ6/nm4OgVbIs0s3m6OHmOl+ RYs6wuNCNJTUgvxQtjnYHu/OwuBcjlyAHbK2CiklbZr4iuHoE4VGDJB5cJjMHsZWvrEeaH 0M/eGbgYoQmsHmvyJaTRWPzce8LzU5KTghnH7mXdivpfbrdTQTukz1m4miu3PQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677193123; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dHaRCYRn0RRvhoAQx6rgkmAPo5OGSAMUghcoHBrBDBc=; b=QARSgSz23EYcCZH8uTfB4G+hv5nm6g+89hyDFBiwOyHhLDEYi60kP2O59jZXsfrBn5WXqI U1P4321hFyjsJ+shE3RIxhl/nJB0rhPavAtkGOCJX0u5btOyJHuEAOQbZ3VeapWVdBusSu pzuZnZDAJP9A8IQcZ6jaj0fQRCDVCNRt+bpXAlcbjai2wnuP4mb4aSQZp+1EJkElueZdAw 4T/3lopC5z1MrVMCpbngAsOsLsImt5gdDQjVP0Z6Mw4tSoHPrkYOsitovZZ9y4Zi+1yMzi omrz9iVaDZIGo9KQEbTHhiksvWDouksEP5ejNB7kwZVGv8pLwfsejw5gQ8joxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677193123; a=rsa-sha256; cv=none; b=SRNXXqqb2JWcyv9J4i9zTNwUrLoLNdFQhckTQ6KGVjukJPb6L+HDd1IIncp8mGi/iCKu+J Te64SbUEHhvtTlxtPiVUNxNFy+7h7UanrVHE3reU966dB/mDJgtb+DW/RA9oGTjQMuoz+u +QGVo2m7qqKx+CKEbeJZ+FcFprUl6CEuuo5+BcwEPMfmcHzj0w61lrHTYQNPCBu/U/kK3S Wm80DTzmuq5Z5cANS5GRlnq3KkqUSP6Ir7dn6pN69jq/WHW5d08hW3WsTzHgCHH0BmgeDZ Ds/p0muQpkzueGDDj+oB+QZLwbwj484MYeHL0+E6bdDNPltulyp3DSehUQKFzA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PN7jv22FFz10kf; Thu, 23 Feb 2023 22:58:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31NMwh8f006925; Thu, 23 Feb 2023 22:58:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31NMwhv2006924; Thu, 23 Feb 2023 22:58:43 GMT (envelope-from git) Date: Thu, 23 Feb 2023 22:58:43 GMT Message-Id: <202302232258.31NMwhv2006924@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Warner Losh Subject: git: 54e6f989275a - main - sysutils/intel-pcm: Fix plist and paths List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 54e6f989275ae7b21551429c72f111d414fd3c39 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/ports/commit/?id=54e6f989275ae7b21551429c72f111d414fd3c39 commit 54e6f989275ae7b21551429c72f111d414fd3c39 Author: Warner Losh AuthorDate: 2023-02-23 22:51:10 +0000 Commit: Warner Losh CommitDate: 2023-02-23 22:56:39 +0000 sysutils/intel-pcm: Fix plist and paths Some code migrated from pcm-iio.cpp to utils.cpp with hard-coded paths, but the REINPLACE commands were wrong. Additional binaries and files are present in newer versions that were neglected in the last commit. PR: 268730 Fixes: fc33bc299d1e Sponsored by: Netflix --- sysutils/intel-pcm/Makefile | 5 +++-- sysutils/intel-pcm/pkg-plist | 6 ++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/sysutils/intel-pcm/Makefile b/sysutils/intel-pcm/Makefile index efe63cdc1de6..8d39fa5e80e9 100644 --- a/sysutils/intel-pcm/Makefile +++ b/sysutils/intel-pcm/Makefile @@ -1,5 +1,6 @@ PORTNAME= intel-pcm DISTVERSION= 202302 +PORTREVISION= 1 CATEGORIES= sysutils MAINTAINER= imp@FreeBSD.org @@ -30,10 +31,10 @@ post-patch: ${PATCH_WRKSRC}/src/CMakeLists.txt @${REINPLACE_CMD} -e 's|$${CMAKE_INSTALL_DOCDIR}|$${CMAKE_INSTALL_DATADIR}/doc/${PORTNAME}|g' \ ${PATCH_WRKSRC}/src/CMakeLists.txt - @${REINPLACE_CMD} -e 's|/usr/share/pcm/|${DATADIR}/|g' \ - ${PATCH_WRKSRC}/src/pcm-iio.cpp @${REINPLACE_CMD} -e 's|/usr/share/pcm/|${DATADIR}/|g' \ ${PATCH_WRKSRC}/src/pcm-raw.cpp + @${REINPLACE_CMD} -e 's|/usr/share/pcm/|${DATADIR}/|g' \ + ${PATCH_WRKSRC}/src/utils.cpp post-install: ${RM} -r ${STAGEDIR}${PREFIX}/share/licenses diff --git a/sysutils/intel-pcm/pkg-plist b/sysutils/intel-pcm/pkg-plist index 18c9d5b16031..565cb141d141 100644 --- a/sysutils/intel-pcm/pkg-plist +++ b/sysutils/intel-pcm/pkg-plist @@ -1,4 +1,5 @@ sbin/pcm +sbin/pcm-accel sbin/pcm-bw-histogram sbin/pcm-core sbin/pcm-iio @@ -13,12 +14,17 @@ sbin/pcm-pcie sbin/pcm-power sbin/pcm-raw sbin/pcm-sensor +sbin/pcm-sensor-server sbin/pcm-tsx +%%DATADIR%%/PMURegisterDeclarations/GenuineIntel-6-4F-1.json %%DATADIR%%/PMURegisterDeclarations/GenuineIntel-6-55-4.json %%DATADIR%%/PMURegisterDeclarations/GenuineIntel-6-55-7.json %%DATADIR%%/PMURegisterDeclarations/GenuineIntel-6-6A-6.json %%DATADIR%%/PMURegisterDeclarations/GenuineIntel-6-86-5.json %%DATADIR%%/PMURegisterDeclarations/GenuineIntel-6-8E-C.json +%%DATADIR%%/PMURegisterDeclarations/GenuineIntel-6-8F-6.json %%DATADIR%%/opCode-106.txt %%DATADIR%%/opCode-134.txt +%%DATADIR%%/opCode-143-accel.txt +%%DATADIR%%/opCode-143.txt %%DATADIR%%/opCode-85.txt