From: subnut <subnut@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] Update libcpuid, CPU-X. Orphan CPU-X.
Date: Mon, 30 Jan 2023 19:32:56 +0100 [thread overview]
Message-ID: <20230130183256.I5Z8jTZNFrZXUTxAzM242UP2pZyG-_Sdf2QUiWnbYAw@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-41979@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1289 bytes --]
There is an updated pull request by subnut against master on the void-packages repository
https://github.com/subnut/void-packages cpu-x
https://github.com/void-linux/void-packages/pull/41979
Update libcpuid, CPU-X. Orphan CPU-X.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES** (except `nix`)
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.|**briefly**|**NO**
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/41979.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cpu-x-41979.patch --]
[-- Type: text/x-diff, Size: 4453 bytes --]
From d498044a6b0407e9705cd55084a64da3ef8ac148 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Mon, 30 Jan 2023 23:53:36 +0530
Subject: [PATCH 1/3] libcpuid: update to 0.6.2
---
common/shlibs | 2 +-
srcpkgs/libcpuid/template | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index edb8a2c5dd73..f570d5892f1b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -670,7 +670,7 @@ libatasmart.so.4 libatasmart-0.17_1
libsgutils2-1.45.so.2 libsgutils-1.45_1
liblvm2app.so.2.2 liblvm2app-2.02.54_1
libcpufreq.so.0 libcpufreq-007_1
-libcpuid.so.15 libcpuid-0.5.0_1
+libcpuid.so.16 libcpuid-0.6.2_1
libgucharmap_2_90.so.7 gucharmap-3.0.0_1
libgphoto2.so.6 libgphoto2-2.5.7_1
libgphoto2_port.so.12 libgphoto2-2.5.7_1
diff --git a/srcpkgs/libcpuid/template b/srcpkgs/libcpuid/template
index 3cfeb869ba2a..257eacb71890 100644
--- a/srcpkgs/libcpuid/template
+++ b/srcpkgs/libcpuid/template
@@ -1,6 +1,6 @@
# Template file for 'libcpuid'
pkgname=libcpuid
-version=0.5.1
+version=0.6.2
revision=1
archs="i686* x86_64*"
build_style=cmake
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
homepage="https://github.com/anrieff/libcpuid"
changelog="https://raw.githubusercontent.com/anrieff/libcpuid/master/ChangeLog"
distfiles="https://github.com/anrieff/libcpuid/archive/v${version}.tar.gz"
-checksum=36d62842ef43c749c0ba82237b10ede05b298d79a0e39ef5fd1115ba1ff8e126
+checksum=d2723e113408308d3ee974a40f307ccb1f565cb578c3ffdc3bdc1b7e73e74841
post_install() {
vlicense COPYING
From 47e4752544e7249baee8c7a98597b1e849415edd Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Mon, 30 Jan 2023 23:54:06 +0530
Subject: [PATCH 2/3] nix: revbump for libcpuid-0.6.2
---
srcpkgs/nix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template
index 1c9bd931df65..6c842fa336c3 100644
--- a/srcpkgs/nix/template
+++ b/srcpkgs/nix/template
@@ -1,7 +1,7 @@
# Template file for 'nix'
pkgname=nix
version=2.11.0
-revision=2
+revision=3
build_style=gnu-configure
build_helper=qemu
# Use /nix/var as suggested by the official Manual.
From a2822917214d144629034c8d97aef9761fb05bff Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Mon, 30 Jan 2023 23:54:38 +0530
Subject: [PATCH 3/3] CPU-X: update to 4.5.2, orphan
---
srcpkgs/CPU-X/template | 30 ++++++++++++++++--------------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/CPU-X/template b/srcpkgs/CPU-X/template
index e132a629bbfb..6700fe8328f2 100644
--- a/srcpkgs/CPU-X/template
+++ b/srcpkgs/CPU-X/template
@@ -1,25 +1,27 @@
# Template file for 'CPU-X'
pkgname=CPU-X
-version=4.3.0
-revision=2
+version=4.5.2
+revision=1
archs="x86_64* i686*"
build_style=cmake
hostmakedepends="pkg-config nasm"
makedepends="ncurses-devel gettext-devel libcpuid-devel pciutils-devel
- glfw-devel ocl-icd-devel procps-ng-devel libstatgrab
- $(vopt_if gtk3 gtk+3-devel)"
+ glfw-devel ocl-icd-devel procps-ng-devel libstatgrab gtk+3-devel
+ vulkan-loader Vulkan-Headers"
+checkdepends="mawk nawk grep"
short_desc="Free software that gathers information on CPU, motherboard and more"
-maintainer="Subhaditya Nath <sn03.general@gmail.com>"
+maintainer="Orphan <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
-homepage="https://x0rg.github.io/CPU-X/"
-changelog="https://raw.githubusercontent.com/X0rg/CPU-X/master/ChangeLog.md"
-distfiles="https://github.com/X0rg/CPU-X/archive/v${version}.tar.gz"
-checksum=6ad7a8ac2d6c687a38a895fbbfbf2de690311676ac374d5857588bb983839433
-build_options="gtk3"
-build_options_default="gtk3"
-# needs grep -P which is not available in chroot-grep and replacing it with
-# grep breaks base-chroot
-make_check=no
+homepage="https://thetumultuousunicornofdarkness.github.io/CPU-X/"
+changelog="https://github.com/TheTumultuousUnicornOfDarkness/CPU-X/blob/master/ChangeLog.md"
+distfiles="https://github.com/thetumultuousunicornofdarkness/CPU-X/archive/v${version}.tar.gz"
+checksum=6cdab38928ca5684b22f7b8d868d42a25a48be6da813743b6b59a88d6e9f25d1
+
+if [ "$XBPS_BUILD_ENVIRONMENT" != void-packages-ci ]; then
+ # Installing the packages in checkdepends causes base-chroot to break.
+ # So, only run the checks in CI, where the chroot is ethereal anyway.
+ make_check=no
+fi
if [ "$XBPS_TARGET_LIBC" = musl ]; then
makedepends+=" libexecinfo-devel"
next prev parent reply other threads:[~2023-01-30 18:32 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-30 18:26 [PR PATCH] " subnut
2023-01-30 18:27 ` subnut
2023-01-30 18:32 ` subnut [this message]
2023-01-30 18:38 ` [PR PATCH] [Updated] " subnut
2023-02-01 19:09 ` subnut
2023-02-01 19:09 ` subnut
2023-02-01 19:10 ` subnut
2023-02-05 10:19 ` paper42
2023-02-05 10:20 ` [PR REVIEW] " paper42
2023-02-06 18:08 ` subnut
2023-02-06 18:22 ` subnut
2023-02-22 18:25 ` [PR REVIEW] " mhmdanas
2023-02-23 4:43 ` subnut
2023-02-23 4:43 ` [PR PATCH] [Updated] " subnut
2023-02-23 21:40 ` mhmdanas
2023-02-24 5:10 ` subnut
2023-02-24 5:11 ` subnut
2023-02-24 5:11 ` [PR PATCH] [Closed]: " subnut
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230130183256.I5Z8jTZNFrZXUTxAzM242UP2pZyG-_Sdf2QUiWnbYAw@z \
--to=subnut@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).