From d498044a6b0407e9705cd55084a64da3ef8ac148 Mon Sep 17 00:00:00 2001 From: Subhaditya Nath 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 9f87efc7fe8999723eb85725ca071640dc241284 Mon Sep 17 00:00:00 2001 From: Subhaditya Nath Date: Mon, 30 Jan 2023 23:54:06 +0530 Subject: [PATCH 2/3] nix: revbump for libcpuid-0.6.2 --- srcpkgs/nix/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template index 1c9bd931df65..c6c6d08dbc35 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. @@ -22,7 +22,7 @@ license="LGPL-2.1-or-later" homepage="https://nixos.org/nix/" changelog="https://nixos.org/releases/${pkgname}/${pkgname}-${version}/manual/#sec-relnotes" distfiles="https://github.com/NixOS/nix/archive/refs/tags/${version}.tar.gz" -checksum=6a90e144352eaccfab7ef7ed470bad382c4f92d62336b327df99627adba67a7c +checksum=cd551cd6fd7454458e5d71d066a23403ebc78dc8a71eb152c38db331d7335a43 # disable_parallel_build="build is fine, only linking test" if [ "$XBPS_TARGET_LIBC" = "musl" ]; then From c955bb97cf5fb491c87874051a70ac167715994e Mon Sep 17 00:00:00 2001 From: Subhaditya Nath 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..2f8c171f9681 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 " +maintainer="Orphan " 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=e3c060997a6eb3528e3127ff5eeaca35d65ee62ae3f8e2556ddddb6ec91b84fe + +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"