Merge updates from master

This commit is contained in:
Repository mirror & CI
2025-09-24 01:33:36 +00:00
41 changed files with 637 additions and 127 deletions

View File

@@ -12,7 +12,7 @@ S="${WORKDIR}/admin/${P}/src"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="static"
src_configure() {

View File

@@ -18,7 +18,7 @@ else
https://github.com/NVIDIA/${PN}/archive/v${PV/_rc/-rc.}.tar.gz -> ${P}.tar.gz
"
S="${WORKDIR}/${PN}-${PV/_rc/-rc.}"
KEYWORDS="~amd64"
KEYWORDS="amd64"
fi
LICENSE="Apache-2.0"

View File

@@ -1,3 +1,2 @@
DIST p11-kit-0.25.10.tar.xz 1053532 BLAKE2B 9f5a1be36a5b67ac35b294afdacf1b3a5c1c579b04e3407ea7bc6899cfe74330682653da50975a13e443b3a79379fdf6c6ed2a778933cf5dbba4fdf6dc52c99a SHA512 c5a5dfb6bd46e8964a70f2fc601bd5b61bf88f79d1011c70e6f37a62130c4aad692d8bac83aff2fd2728543274e198d2946ded7a53636835aefb13b9a3155527
DIST p11-kit-0.25.5.tar.xz 1002056 BLAKE2B 96d6a9c2807586abafae4da4df89f566672733963997d6a83e00aaf83a7a0c0e2995638f505e98fb87a90c60bde28814f1e8b7d5071bf0af96bb0467105a1ddc SHA512 177ec6ff5eb891901078306dce2bf3f5c1a0e5c2a8c493bdf5a08ae1ff1240fdf6952961e973c373f80ac3d1d5a9927e07f4da49e4ff92269d992e744889fc94
DIST p11-kit-0.25.8.tar.xz 1060504 BLAKE2B d351b7b015920d7ecf1b9d3b4f1f3fc62c7ef46c1dc9ed3475b9ac7f5dbf5a47b2d2a19049e7eef81e35d0f993a860ee5df1864f0341596dca143140ae14e5c4 SHA512 4a3852459a4a5e4ea71eea5d23ef74deeb51c66b28d095be30a263f10d1f47853341f8628eb0c43c88247503059a4c1f67017965a70cd3c7df31d86e458a8162
DIST p11-kit-0.25.9.tar.xz 530960 BLAKE2B d9895b1479179b39c9b50878deefc40afbd29a291814e62e345b6758c4fde8023383b2708701ab1f684e7874a8657a5a988ed453d10802f5b3b51267d7a689ab SHA512 8232839f398e058325bc6f3666fcec293a85ed8d655bdf285ee267db4dd71bbdb8c5ab7b225bb6524a2536e4c1b00ac6ceeaf9053638da691a04882fb9b73c42

View File

@@ -1,76 +0,0 @@
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{11..14} )
inherit shell-completion meson-multilib python-any-r1
DESCRIPTION="Provides a standard configuration setup for installing PKCS#11"
HOMEPAGE="https://p11-glue.github.io/p11-glue/p11-kit.html"
SRC_URI="https://github.com/p11-glue/p11-kit/releases/download/${PV}/${P}.tar.xz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
IUSE="+libffi gtk-doc nls systemd test"
RESTRICT="!test? ( test )"
RDEPEND="
app-misc/ca-certificates
>=dev-libs/libtasn1-3.4:=[${MULTILIB_USEDEP}]
libffi? ( dev-libs/libffi:=[${MULTILIB_USEDEP}] )
systemd? ( sys-apps/systemd )
"
DEPEND="${RDEPEND}"
BDEPEND="
${PYTHON_DEPS}
app-text/docbook-xsl-stylesheets
dev-libs/libxslt
virtual/pkgconfig
gtk-doc? ( dev-util/gtk-doc )
nls? ( sys-devel/gettext )
"
src_prepare() {
default
# Relies on dlopen which won't work for multilib tests (bug #913971)
cat <<-EOF > "${S}"/p11-kit/test-server.sh || die
#!/bin/sh
exit 77
EOF
}
multilib_src_configure() {
# Disable unsafe tests, bug#502088
export FAKED_MODE=1
local native_file="${T}"/meson.${CHOST}.${ABI}.ini.local
# p11-kit doesn't need this to build and castxml needs Clang. To get
# a deterministic non-automagic build, always disable the search for
# castxml.
cat >> ${native_file} <<-EOF || die
[binaries]
castxml='castxml-falseified'
EOF
local emesonargs=(
--native-file "${native_file}"
-Dbash_completion=enabled
-Dzsh_completion=enabled
-Dbashcompdir="$(get_bashcompdir)"
-Dzshcompdir="$(get_zshcompdir)"
-Dtrust_module=enabled
-Dtrust_paths="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt
$(meson_feature libffi)
$(meson_use nls)
$(meson_use test)
$(meson_native_use_bool gtk-doc gtk_doc)
$(meson_native_true man)
$(meson_native_use_feature systemd)
)
meson_src_configure
}

View File

@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
LICENSE="LGPL-2.1+"
SLOT="5"
KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
KEYWORDS="amd64 ~arm64 ~loong ~riscv ~x86"
IUSE="test"
RESTRICT="!test? ( test )"

View File

@@ -16,7 +16,7 @@ SRC_URI="https://download.fcitx-im.org/fcitx5/${MY_PN}/${MY_PN}-${PV}.tar.zst ->
S="${WORKDIR}/${MY_PN}-${PV}"
LICENSE="LGPL-2.1+"
SLOT="5"
KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
KEYWORDS="amd64 ~arm64 ~loong ~riscv ~x86"
IUSE="+dlopen test"
REQUIRED_USE="${LUA_REQUIRED_USE}"
RESTRICT="!test? ( test )"

View File

@@ -14,7 +14,7 @@ SRC_URI="https://download.fcitx-im.org/fcitx5/${MY_PN}/${MY_PN}-${PV}.tar.zst ->
S="${WORKDIR}/${MY_PN}-${PV}"
LICENSE="LGPL-2.1+"
SLOT="5"
KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
KEYWORDS="amd64 ~arm64 ~loong ~riscv ~x86"
IUSE="test"
RESTRICT="!test? ( test )"

View File

@@ -14,7 +14,7 @@ S="${WORKDIR}/${P}/src"
LICENSE="BSD-4"
SLOT="0"
KEYWORDS="~amd64 ~arm arm64 ~x86"
KEYWORDS="amd64 ~arm arm64 ~x86"
IUSE="lua ods plots tmux wayland X xls xlsx"
REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"

View File

@@ -107,7 +107,7 @@ LICENSE+="
"
SLOT="0"
KEYWORDS="~amd64"
KEYWORDS="amd64"
# rust does not use *FLAGS from make.conf, silence portage warning
QA_FLAGS_IGNORED="usr/bin/${PN}"

View File

@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv"
KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv"
IUSE="doc test"
RESTRICT="!test? ( test )"

View File

@@ -14,7 +14,7 @@ S="${WORKDIR}/tiled-${COMMIT}"
LICENSE="BSD BSD-2 GPL-2+"
SLOT="0"
KEYWORDS="~amd64"
KEYWORDS="amd64"
IUSE="minimal python"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"

View File

@@ -0,0 +1,37 @@
# Copyright 2023-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{11..14} )
inherit cmake python-any-r1
DESCRIPTION="a fast cryptographic hash function"
HOMEPAGE="https://github.com/BLAKE3-team/BLAKE3"
SRC_URI="https://github.com/BLAKE3-team/BLAKE3/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/BLAKE3-${PV}/c"
LICENSE="|| ( CC0-1.0 Apache-2.0 )"
SLOT="0/0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
IUSE="test"
RESTRICT="!test? ( test )"
BDEPEND="test? ( ${PYTHON_DEPS} )"
PATCHES=(
"${FILESDIR}/${PN}-1.5.3-backport-pr405.patch"
"${FILESDIR}/${PN}-1.8.2-x32.patch"
)
pkg_setup() {
use test && python-any-r1_pkg_setup
}
src_configure() {
local mycmakeargs=(
-DBLAKE3_BUILD_TESTING="$(usex test)"
-DBLAKE3_USE_TBB=OFF # TODO
)
cmake_src_configure
}

View File

@@ -0,0 +1,538 @@
https://bugs.gentoo.org/942562
https://github.com/BLAKE3-team/BLAKE3/issues/499
https://github.com/BLAKE3-team/BLAKE3/pull/500
From 93958a2775a8453f0549ed3560c82c3d487b24d8 Mon Sep 17 00:00:00 2001
From: Harald van Dijk <harald@gigawatt.nl>
Date: Sat, 19 Jul 2025 11:43:32 +0100
Subject: [PATCH] [x32] Fix assembly
The x86-64 assembly implementations of BLAKE3 are used both in 64-bit
and in 32-bit pointer mode, but only worked in 64-bit pointer mode. This
PR adds support to also allow them to work in 32-bit pointer mode.
---
c/blake3_avx2_x86-64_unix.S | 43 +++++++++++++++++
c/blake3_avx512_x86-64_unix.S | 91 +++++++++++++++++++++++++++++++++++
c/blake3_sse2_x86-64_unix.S | 28 +++++++++++
c/blake3_sse41_x86-64_unix.S | 28 +++++++++++
4 files changed, 190 insertions(+)
diff --git a/blake3_avx2_x86-64_unix.S b/blake3_avx2_x86-64_unix.S
index 812bb856..e977627c 100644
--- a/blake3_avx2_x86-64_unix.S
+++ b/blake3_avx2_x86-64_unix.S
@@ -33,6 +33,10 @@ blake3_hash_many_avx2:
mov rbp, rsp
sub rsp, 680
and rsp, 0xFFFFFFFFFFFFFFC0
+#ifdef _ILP32
+ mov esi, esi
+ mov edx, edx
+#endif
neg r9d
vmovd xmm0, r9d
vpbroadcastd ymm0, xmm0
@@ -65,6 +69,7 @@ blake3_hash_many_avx2:
vpbroadcastd ymm5, dword ptr [rcx+0x14]
vpbroadcastd ymm6, dword ptr [rcx+0x18]
vpbroadcastd ymm7, dword ptr [rcx+0x1C]
+#ifndef _ILP32
mov r8, qword ptr [rdi]
mov r9, qword ptr [rdi+0x8]
mov r10, qword ptr [rdi+0x10]
@@ -73,6 +78,16 @@ blake3_hash_many_avx2:
mov r13, qword ptr [rdi+0x28]
mov r14, qword ptr [rdi+0x30]
mov r15, qword ptr [rdi+0x38]
+#else
+ mov r8d, dword ptr [rdi]
+ mov r9d, dword ptr [rdi+0x4]
+ mov r10d, dword ptr [rdi+0x8]
+ mov r11d, dword ptr [rdi+0xc]
+ mov r12d, dword ptr [rdi+0x10]
+ mov r13d, dword ptr [rdi+0x14]
+ mov r14d, dword ptr [rdi+0x18]
+ mov r15d, dword ptr [rdi+0x1c]
+#endif
movzx eax, byte ptr [rbp+0x38]
movzx ebx, byte ptr [rbp+0x40]
or eax, ebx
@@ -1293,7 +1308,11 @@ blake3_hash_many_avx2:
vmovdqa ymm0, ymmword ptr [rsp+0x260]
vpsubd ymm2, ymm0, ymm2
vmovdqa ymmword ptr [rsp+0x260], ymm2
+#ifndef _ILP32
add rdi, 64
+#else
+ add rdi, 32
+#endif
add rbx, 256
mov qword ptr [rbp+0x50], rbx
sub rsi, 8
@@ -1334,10 +1353,17 @@ blake3_hash_many_avx2:
vpblendd ymm15, ymm15, ymm12, 0x44
vmovdqa ymmword ptr [rsp], ymm14
vmovdqa ymmword ptr [rsp+0x20], ymm15
+#ifndef _ILP32
mov r8, qword ptr [rdi]
mov r9, qword ptr [rdi+0x8]
mov r10, qword ptr [rdi+0x10]
mov r11, qword ptr [rdi+0x18]
+#else
+ mov r8d, dword ptr [rdi]
+ mov r9d, dword ptr [rdi+0x4]
+ mov r10d, dword ptr [rdi+0x8]
+ mov r11d, dword ptr [rdi+0xc]
+#endif
movzx eax, byte ptr [rbp+0x40]
or eax, r13d
xor edx, edx
@@ -1545,7 +1571,11 @@ blake3_hash_many_avx2:
vmovaps xmmword ptr [rsp+0x240], xmm0
vmovaps xmmword ptr [rsp+0x260], xmm2
add rbx, 128
+#ifndef _ILP32
add rdi, 32
+#else
+ add rdi, 16
+#endif
sub rsi, 4
3:
test rsi, 0x2
@@ -1561,8 +1591,13 @@ blake3_hash_many_avx2:
vinserti128 ymm13, ymm13, xmm14, 0x01
vbroadcasti128 ymm14, xmmword ptr [ROT16+rip]
vbroadcasti128 ymm15, xmmword ptr [ROT8+rip]
+#ifndef _ILP32
mov r8, qword ptr [rdi]
mov r9, qword ptr [rdi+0x8]
+#else
+ mov r8d, dword ptr [rdi]
+ mov r9d, dword ptr [rdi+0x4]
+#endif
movzx eax, byte ptr [rbp+0x40]
or eax, r13d
xor edx, edx
@@ -1671,7 +1706,11 @@ blake3_hash_many_avx2:
vmovaps ymmword ptr [rsp+0x240], ymm0
vmovaps ymmword ptr [rsp+0x260], ymm2
add rbx, 64
+#ifndef _ILP32
add rdi, 16
+#else
+ add rdi, 8
+#endif
sub rsi, 2
3:
test rsi, 0x1
@@ -1683,7 +1722,11 @@ blake3_hash_many_avx2:
vpinsrd xmm13, xmm3, dword ptr [BLAKE3_BLOCK_LEN+rip], 2
vmovdqa xmm14, xmmword ptr [ROT16+rip]
vmovdqa xmm15, xmmword ptr [ROT8+rip]
+#ifndef _ILP32
mov r8, qword ptr [rdi]
+#else
+ mov r8d, dword ptr [rdi]
+#endif
movzx eax, byte ptr [rbp+0x40]
or eax, r13d
xor edx, edx
diff --git a/blake3_avx512_x86-64_unix.S b/blake3_avx512_x86-64_unix.S
index 9642e413..7c09704e 100644
--- a/blake3_avx512_x86-64_unix.S
+++ b/blake3_avx512_x86-64_unix.S
@@ -41,6 +41,10 @@ blake3_hash_many_avx512:
sub rsp, 144
and rsp, 0xFFFFFFFFFFFFFFC0
neg r9
+#ifdef _ILP32
+ mov esi, esi
+ mov edx, edx
+#endif
kmovw k1, r9d
vmovd xmm0, r8d
vpbroadcastd ymm0, xmm0
@@ -89,6 +93,7 @@ blake3_hash_many_avx512:
cmp rdx, qword ptr [rsp+0x80]
cmove eax, ebx
mov dword ptr [rsp+0x88], eax
+#ifndef _ILP32
mov r8, qword ptr [rdi]
mov r9, qword ptr [rdi+0x8]
mov r10, qword ptr [rdi+0x10]
@@ -97,6 +102,16 @@ blake3_hash_many_avx512:
mov r13, qword ptr [rdi+0x48]
mov r14, qword ptr [rdi+0x50]
mov r15, qword ptr [rdi+0x58]
+#else
+ mov r8d, dword ptr [rdi]
+ mov r9d, dword ptr [rdi+0x4]
+ mov r10d, dword ptr [rdi+0x8]
+ mov r11d, dword ptr [rdi+0xc]
+ mov r12d, dword ptr [rdi+0x20]
+ mov r13d, dword ptr [rdi+0x24]
+ mov r14d, dword ptr [rdi+0x28]
+ mov r15d, dword ptr [rdi+0x2c]
+#endif
vmovdqu32 ymm16, ymmword ptr [rdx+r8-0x2*0x20]
vinserti64x4 zmm16, zmm16, ymmword ptr [rdx+r12-0x2*0x20], 0x01
vmovdqu32 ymm17, ymmword ptr [rdx+r9-0x2*0x20]
@@ -109,6 +124,7 @@ blake3_hash_many_avx512:
vinserti64x4 zmm19, zmm19, ymmword ptr [rdx+r15-0x2*0x20], 0x01
vpunpcklqdq zmm10, zmm18, zmm19
vpunpckhqdq zmm11, zmm18, zmm19
+#ifndef _ILP32
mov r8, qword ptr [rdi+0x20]
mov r9, qword ptr [rdi+0x28]
mov r10, qword ptr [rdi+0x30]
@@ -117,6 +133,16 @@ blake3_hash_many_avx512:
mov r13, qword ptr [rdi+0x68]
mov r14, qword ptr [rdi+0x70]
mov r15, qword ptr [rdi+0x78]
+#else
+ mov r8d, dword ptr [rdi+0x10]
+ mov r9d, dword ptr [rdi+0x14]
+ mov r10d, dword ptr [rdi+0x18]
+ mov r11d, dword ptr [rdi+0x1c]
+ mov r12d, dword ptr [rdi+0x30]
+ mov r13d, dword ptr [rdi+0x34]
+ mov r14d, dword ptr [rdi+0x38]
+ mov r15d, dword ptr [rdi+0x3c]
+#endif
vmovdqu32 ymm16, ymmword ptr [rdx+r8-0x2*0x20]
vinserti64x4 zmm16, zmm16, ymmword ptr [rdx+r12-0x2*0x20], 0x01
vmovdqu32 ymm17, ymmword ptr [rdx+r9-0x2*0x20]
@@ -151,6 +177,7 @@ blake3_hash_many_avx512:
vmovdqa32 zmm23, zmm19
vpermt2d zmm19, zmm27, zmm8
vpermt2d zmm23, zmm31, zmm8
+#ifndef _ILP32
mov r8, qword ptr [rdi]
mov r9, qword ptr [rdi+0x8]
mov r10, qword ptr [rdi+0x10]
@@ -159,6 +186,16 @@ blake3_hash_many_avx512:
mov r13, qword ptr [rdi+0x48]
mov r14, qword ptr [rdi+0x50]
mov r15, qword ptr [rdi+0x58]
+#else
+ mov r8d, dword ptr [rdi]
+ mov r9d, dword ptr [rdi+0x4]
+ mov r10d, dword ptr [rdi+0x8]
+ mov r11d, dword ptr [rdi+0xc]
+ mov r12d, dword ptr [rdi+0x20]
+ mov r13d, dword ptr [rdi+0x24]
+ mov r14d, dword ptr [rdi+0x28]
+ mov r15d, dword ptr [rdi+0x2c]
+#endif
vmovdqu32 ymm24, ymmword ptr [r8+rdx-0x1*0x20]
vinserti64x4 zmm24, zmm24, ymmword ptr [r12+rdx-0x1*0x20], 0x01
vmovdqu32 ymm25, ymmword ptr [r9+rdx-0x1*0x20]
@@ -179,6 +216,7 @@ blake3_hash_many_avx512:
prefetcht0 [r14+rdx+0x80]
prefetcht0 [r11+rdx+0x80]
prefetcht0 [r15+rdx+0x80]
+#ifndef _ILP32
mov r8, qword ptr [rdi+0x20]
mov r9, qword ptr [rdi+0x28]
mov r10, qword ptr [rdi+0x30]
@@ -187,6 +225,16 @@ blake3_hash_many_avx512:
mov r13, qword ptr [rdi+0x68]
mov r14, qword ptr [rdi+0x70]
mov r15, qword ptr [rdi+0x78]
+#else
+ mov r8d, dword ptr [rdi+0x10]
+ mov r9d, dword ptr [rdi+0x14]
+ mov r10d, dword ptr [rdi+0x18]
+ mov r11d, dword ptr [rdi+0x1c]
+ mov r12d, dword ptr [rdi+0x30]
+ mov r13d, dword ptr [rdi+0x34]
+ mov r14d, dword ptr [rdi+0x38]
+ mov r15d, dword ptr [rdi+0x3c]
+#endif
vmovdqu32 ymm24, ymmword ptr [r8+rdx-0x1*0x20]
vinserti64x4 zmm24, zmm24, ymmword ptr [r12+rdx-0x1*0x20], 0x01
vmovdqu32 ymm25, ymmword ptr [r9+rdx-0x1*0x20]
@@ -1077,7 +1125,11 @@ blake3_hash_many_avx512:
vpaddd zmm1 {k2}, zmm1, dword ptr [ADD1+rip] {1to16}
vmovdqa32 zmmword ptr [rsp], zmm2
vmovdqa32 zmmword ptr [rsp+0x1*0x40], zmm1
+#ifndef _ILP32
add rdi, 128
+#else
+ add rdi, 64
+#endif
add rbx, 512
mov qword ptr [rbp+0x50], rbx
sub rsi, 16
@@ -1107,6 +1159,7 @@ blake3_hash_many_avx512:
vpbroadcastd ymm5, dword ptr [rcx+0x14]
vpbroadcastd ymm6, dword ptr [rcx+0x18]
vpbroadcastd ymm7, dword ptr [rcx+0x1C]
+#ifndef _ILP32
mov r8, qword ptr [rdi]
mov r9, qword ptr [rdi+0x8]
mov r10, qword ptr [rdi+0x10]
@@ -1115,6 +1168,16 @@ blake3_hash_many_avx512:
mov r13, qword ptr [rdi+0x28]
mov r14, qword ptr [rdi+0x30]
mov r15, qword ptr [rdi+0x38]
+#else
+ mov r8d, dword ptr [rdi]
+ mov r9d, dword ptr [rdi+0x4]
+ mov r10d, dword ptr [rdi+0x8]
+ mov r11d, dword ptr [rdi+0xc]
+ mov r12d, dword ptr [rdi+0x10]
+ mov r13d, dword ptr [rdi+0x14]
+ mov r14d, dword ptr [rdi+0x18]
+ mov r15d, dword ptr [rdi+0x1c]
+#endif
movzx eax, byte ptr [rbp+0x38]
movzx ebx, byte ptr [rbp+0x40]
or eax, ebx
@@ -2037,7 +2100,11 @@ blake3_hash_many_avx512:
vmovdqa ymmword ptr [rsp+0x2*0x20], ymm2
add rbx, 256
mov qword ptr [rbp+0x50], rbx
+#ifndef _ILP32
add rdi, 64
+#else
+ add rdi, 32
+#endif
sub rsi, 8
3:
mov rbx, qword ptr [rbp+0x50]
@@ -2060,10 +2127,17 @@ blake3_hash_many_avx512:
kmovw k2, eax
vpblendmd zmm13 {k2}, zmm13, zmm12
vbroadcasti32x4 zmm15, xmmword ptr [BLAKE3_IV+rip]
+#ifndef _ILP32
mov r8, qword ptr [rdi]
mov r9, qword ptr [rdi+0x8]
mov r10, qword ptr [rdi+0x10]
mov r11, qword ptr [rdi+0x18]
+#else
+ mov r8d, dword ptr [rdi]
+ mov r9d, dword ptr [rdi+0x4]
+ mov r10d, dword ptr [rdi+0x8]
+ mov r11d, dword ptr [rdi+0xc]
+#endif
mov eax, 43690
kmovw k3, eax
mov eax, 34952
@@ -2177,7 +2251,11 @@ blake3_hash_many_avx512:
vmovdqa xmmword ptr [rsp], xmm0
vmovdqa xmmword ptr [rsp+0x40], xmm2
add rbx, 128
+#ifndef _ILP32
add rdi, 32
+#else
+ add rdi, 16
+#endif
sub rsi, 4
3:
test esi, 0x2
@@ -2191,8 +2269,13 @@ blake3_hash_many_avx512:
vpinsrd xmm14, xmm14, dword ptr [rsp+0x44], 1
vpinsrd xmm14, xmm14, dword ptr [BLAKE3_BLOCK_LEN+rip], 2
vinserti128 ymm13, ymm13, xmm14, 0x01
+#ifndef _ILP32
mov r8, qword ptr [rdi]
mov r9, qword ptr [rdi+0x8]
+#else
+ mov r8d, dword ptr [rdi]
+ mov r9d, dword ptr [rdi+0x4]
+#endif
movzx eax, byte ptr [rbp+0x40]
or eax, r13d
xor edx, edx
@@ -2290,7 +2373,11 @@ blake3_hash_many_avx512:
vmovdqa xmmword ptr [rsp], xmm0
vmovdqa xmmword ptr [rsp+0x4*0x10], xmm2
add rbx, 64
+#ifndef _ILP32
add rdi, 16
+#else
+ add rdi, 8
+#endif
sub rsi, 2
3:
test esi, 0x1
@@ -2301,7 +2388,11 @@ blake3_hash_many_avx512:
vpinsrd xmm14, xmm14, dword ptr [rsp+0x40], 1
vpinsrd xmm14, xmm14, dword ptr [BLAKE3_BLOCK_LEN+rip], 2
vmovdqa xmm15, xmmword ptr [BLAKE3_IV+rip]
+#ifndef _ILP32
mov r8, qword ptr [rdi]
+#else
+ mov r8d, dword ptr [rdi]
+#endif
movzx eax, byte ptr [rbp+0x40]
or eax, r13d
xor edx, edx
diff --git a/blake3_sse2_x86-64_unix.S b/blake3_sse2_x86-64_unix.S
index 99f033fe..b3d368c4 100644
--- a/blake3_sse2_x86-64_unix.S
+++ b/blake3_sse2_x86-64_unix.S
@@ -38,6 +38,10 @@ blake3_hash_many_sse2:
sub rsp, 360
and rsp, 0xFFFFFFFFFFFFFFC0
neg r9d
+#ifdef _ILP32
+ mov esi, esi
+ mov edx, edx
+#endif
movd xmm0, r9d
pshufd xmm0, xmm0, 0x00
movdqa xmmword ptr [rsp+0x130], xmm0
@@ -75,10 +79,17 @@ blake3_hash_many_sse2:
pshufd xmm5, xmm7, 0x55
pshufd xmm6, xmm7, 0xAA
pshufd xmm7, xmm7, 0xFF
+#ifndef _ILP32
mov r8, qword ptr [rdi]
mov r9, qword ptr [rdi+0x8]
mov r10, qword ptr [rdi+0x10]
mov r11, qword ptr [rdi+0x18]
+#else
+ mov r8d, dword ptr [rdi]
+ mov r9d, dword ptr [rdi+0x4]
+ mov r10d, dword ptr [rdi+0x8]
+ mov r11d, dword ptr [rdi+0xc]
+#endif
movzx eax, byte ptr [rbp+0x40]
or eax, r13d
xor edx, edx
@@ -1632,7 +1643,11 @@ blake3_hash_many_sse2:
psubd xmm1, xmm0
movdqa xmmword ptr [rsp+0x120], xmm1
add rbx, 128
+#ifndef _ILP32
add rdi, 32
+#else
+ add rdi, 16
+#endif
sub rsi, 4
cmp rsi, 4
jnc 2b
@@ -1663,8 +1678,13 @@ blake3_hash_many_sse2:
movd xmm13, dword ptr [rsp+0x124]
punpckldq xmm14, xmm13
movaps xmmword ptr [rsp+0x10], xmm14
+#ifndef _ILP32
mov r8, qword ptr [rdi]
mov r9, qword ptr [rdi+0x8]
+#else
+ mov r8d, dword ptr [rdi]
+ mov r9d, dword ptr [rdi+0x4]
+#endif
movzx eax, byte ptr [rbp+0x40]
or eax, r13d
xor edx, edx
@@ -1893,7 +1913,11 @@ blake3_hash_many_sse2:
mov r11d, dword ptr [rsp+0x120+8*rax]
mov dword ptr [rsp+0x110], r10d
mov dword ptr [rsp+0x120], r11d
+#ifndef _ILP32
add rdi, 16
+#else
+ add rdi, 8
+#endif
add rbx, 64
sub rsi, 2
3:
@@ -1904,7 +1928,11 @@ blake3_hash_many_sse2:
movd xmm13, dword ptr [rsp+0x110]
movd xmm14, dword ptr [rsp+0x120]
punpckldq xmm13, xmm14
+#ifndef _ILP32
mov r8, qword ptr [rdi]
+#else
+ mov r8d, dword ptr [rdi]
+#endif
movzx eax, byte ptr [rbp+0x40]
or eax, r13d
xor edx, edx
diff --git a/blake3_sse41_x86-64_unix.S b/blake3_sse41_x86-64_unix.S
index a3ff6426..9f797299 100644
--- a/blake3_sse41_x86-64_unix.S
+++ b/blake3_sse41_x86-64_unix.S
@@ -38,6 +38,10 @@ blake3_hash_many_sse41:
sub rsp, 360
and rsp, 0xFFFFFFFFFFFFFFC0
neg r9d
+#ifdef _ILP32
+ mov esi, esi
+ mov edx, edx
+#endif
movd xmm0, r9d
pshufd xmm0, xmm0, 0x00
movdqa xmmword ptr [rsp+0x130], xmm0
@@ -75,10 +79,17 @@ blake3_hash_many_sse41:
pshufd xmm5, xmm7, 0x55
pshufd xmm6, xmm7, 0xAA
pshufd xmm7, xmm7, 0xFF
+#ifndef _ILP32
mov r8, qword ptr [rdi]
mov r9, qword ptr [rdi+0x8]
mov r10, qword ptr [rdi+0x10]
mov r11, qword ptr [rdi+0x18]
+#else
+ mov r8d, dword ptr [rdi]
+ mov r9d, dword ptr [rdi+0x4]
+ mov r10d, dword ptr [rdi+0x8]
+ mov r11d, dword ptr [rdi+0xc]
+#endif
movzx eax, byte ptr [rbp+0x40]
or eax, r13d
xor edx, edx
@@ -1436,7 +1447,11 @@ blake3_hash_many_sse41:
psubd xmm1, xmm0
movdqa xmmword ptr [rsp+0x120], xmm1
add rbx, 128
+#ifndef _ILP32
add rdi, 32
+#else
+ add rdi, 16
+#endif
sub rsi, 4
cmp rsi, 4
jnc 2b
@@ -1467,8 +1482,13 @@ blake3_hash_many_sse41:
pinsrd xmm14, dword ptr [rsp+0x124], 1
pinsrd xmm14, dword ptr [BLAKE3_BLOCK_LEN+rip], 2
movaps xmmword ptr [rsp+0x10], xmm14
+#ifndef _ILP32
mov r8, qword ptr [rdi]
mov r9, qword ptr [rdi+0x8]
+#else
+ mov r8d, dword ptr [rdi]
+ mov r9d, dword ptr [rdi+0x4]
+#endif
movzx eax, byte ptr [rbp+0x40]
or eax, r13d
xor edx, edx
@@ -1670,7 +1690,11 @@ blake3_hash_many_sse41:
blendvps xmm2, xmm4, xmm0
movdqa xmmword ptr [rsp+0x110], xmm1
movdqa xmmword ptr [rsp+0x120], xmm2
+#ifndef _ILP32
add rdi, 16
+#else
+ add rdi, 8
+#endif
add rbx, 64
sub rsi, 2
3:
@@ -1683,7 +1707,11 @@ blake3_hash_many_sse41:
pinsrd xmm13, dword ptr [BLAKE3_BLOCK_LEN+rip], 2
movaps xmm14, xmmword ptr [ROT8+rip]
movaps xmm15, xmmword ptr [ROT16+rip]
+#ifndef _ILP32
mov r8, qword ptr [rdi]
+#else
+ mov r8d, dword ptr [rdi]
+#endif
movzx eax, byte ptr [rbp+0x40]
or eax, r13d
xor edx, edx

View File

@@ -9,7 +9,7 @@ SRC_URI="https://github.com/opensourcerouting/c-capnproto/releases/download/${P}
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 arm arm64"
KEYWORDS="amd64 arm arm64"
BDEPEND="app-arch/xz-utils"

View File

@@ -12,4 +12,4 @@ HOMEPAGE="https://github.com/tree-sitter/tree-sitter-bash"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"

View File

@@ -13,4 +13,4 @@ SRC_URI="https://github.com/tree-sitter-grammars/tree-sitter-lua/archive/v${PV}.
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"

View File

@@ -24,7 +24,7 @@ LICENSE+="
MPL-2.0 Unicode-3.0 Unicode-DFS-2016
" # crates
SLOT="0"
KEYWORDS="~amd64 arm arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
KEYWORDS="amd64 arm arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
IUSE="doc +ssl test"
RESTRICT="!test? ( test )"

View File

@@ -237,7 +237,7 @@ if [ ${PV} == "9999" ] ; then
else
SRC_URI="https://github.com/apognu/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
${CARGO_CRATE_URIS}"
KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv"
fi
LICENSE="GPL-3+"

View File

@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_SRC}"
LICENSE="|| ( IBM EPL-2.0 )"
SLOT="0"
KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
IUSE="+berkdb cdb dovecot-sasl +eai ldap ldap-bind lmdb mbox memcached mongodb mysql nis pam postgres sasl selinux sqlite ssl tlsrpt"

View File

@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-v${PV}"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
KEYWORDS="amd64 ~x86"
IUSE="test"
RESTRICT="test"

View File

@@ -15,7 +15,7 @@ else
# to diff against upstream (apparently not stable):
# https://chromium.googlesource.com/libyuv/libyuv.git/+archive/${commit}.tar.gz
SRC_URI="https://github.com/N-R-K/stable-tarball-host/releases/download/0/libyuv-${PV}.tar.bz2"
KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~riscv x86"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~riscv x86"
fi
LICENSE="BSD"

View File

@@ -19,7 +19,7 @@ SRC_URI="https://github.com/greenbone/pontos/archive/refs/tags/v${PV}.tar.gz ->
LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="~amd64"
KEYWORDS="amd64"
RDEPEND="
>=dev-python/colorful-0.5.4[${PYTHON_USEDEP}]

View File

@@ -12,7 +12,7 @@ S=${WORKDIR}/${P/_/.}
LICENSE="GPL-2 public-domain"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
IUSE="ssl nls kerberos tk selinux socks"
RDEPEND="acct-user/fetchmail

View File

@@ -11,7 +11,7 @@ SRC_URI="https://bird.nic.cz/download/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~loong ~x86 ~x64-macos"
KEYWORDS="amd64 ~arm64 ~loong ~x86 ~x64-macos"
IUSE="+client custom-cflags debug libssh"
RDEPEND="

View File

@@ -30,7 +30,7 @@ fi
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
IUSE="caps gnutls pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test ecap"
IUSE+=" esi ssl-crtd mysql postgres sqlite systemd perl qos tproxy +htcp valgrind +wccp +wccpv2"
RESTRICT="!test? ( test )"

View File

@@ -15,7 +15,7 @@ S="${WORKDIR}/CalcMySky-${PV}"
LICENSE="GPL-3"
# subslot is soversion
SLOT="0/15"
KEYWORDS="~amd64 ~ppc ~riscv ~x86"
KEYWORDS="amd64 ~ppc ~riscv ~x86"
DEPEND="
dev-cpp/eigen:3

View File

@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 arm64 ~ppc64 ~x86"
KEYWORDS="amd64 arm64 ~ppc64 ~x86"
RDEPEND="
dev-qt/qtbase:6=[concurrent,gui,network,opengl,sql,widgets]

View File

@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PN}-${MY_P}/CPP"
LICENSE="Boost-1.0"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~x86"
KEYWORDS="amd64 ~arm64 ~x86"
IUSE="test"
RESTRICT="!test? ( test )"

View File

@@ -249,7 +249,7 @@ LICENSE="EUPL-1.2"
# Dependent crate licenses
LICENSE+=" Apache-2.0 MIT MPL-2.0 Unicode-3.0"
SLOT="0"
KEYWORDS="~amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv ~x86"
IUSE="+git"
BDEPEND="virtual/pkgconfig"

View File

@@ -1,15 +0,0 @@
# Fixes #945124
diff --git a/src/device-info.h b/src/device-info.h
index 6cb3683..f3e6c8a 100644
--- a/src/device-info.h
+++ b/src/device-info.h
@@ -10,6 +10,9 @@
// glib
#include <glib.h>
+// POSIX
+#include <sys/stat.h>
+
// udev
#include <libudev.h>
#include <fcntl.h>

View File

@@ -0,0 +1,20 @@
--- a/src/udevil.c
+++ b/src/udevil.c
@@ -4795,7 +4795,7 @@ static int command_info( CommandData* data )
return ret;
}
-void command_monitor_finalize()
+void command_monitor_finalize(int signal)
{
//if (signal == SIGINT || signal == SIGTERM)
//printf( "\nudevil: SIGINT || SIGTERM\n");
@@ -4913,7 +4913,7 @@ finish_:
return 1;
}
-void command_interrupt()
+void command_interrupt(int signal)
{
if ( udev )
{

View File

@@ -1,7 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<maintainer type="person" proxied="yes">
<email>hoelbezier@riseup.net</email>
<name>Hoël Bézier</name>
</maintainer>
<maintainer type="project" proxied="proxy">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
<upstream>
<remote-id type="github">IgnorantGuru/udevil</remote-id>
</upstream>

View File

@@ -32,8 +32,8 @@ PATCHES=(
"${FILESDIR}"/${PN}-0.4.4-include-sysmacros.patch
"${FILESDIR}"/${PN}-0.4.4-no-libtool.patch
"${FILESDIR}"/${PN}-0.4.4-no-conf.d.patch
"${FILESDIR}"/${PN}-0.4.4-include-sysstat.patch
"${FILESDIR}"/${PN}-0.4.4-remove-exfat-options.patch
"${FILESDIR}"/${PN}-0.4.4-signal-handlers.patch
)
src_prepare() {

View File

@@ -11,7 +11,7 @@ SRC_URI="https://github.com/linuxmint/xdg-desktop-portal-xapp/archive/${PV}.tar.
LICENSE="LGPL-2.1+"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv x86"
KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv x86"
DEPEND="
>=dev-libs/glib-2.44:2

View File

@@ -13,7 +13,7 @@ SRC_URI="https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git/snapshot/mmc-uti
LICENSE="GPL-2 BSD"
SLOT="0"
KEYWORDS="~amd64 ~arm64"
KEYWORDS="amd64 ~arm64"
IUSE="doc"

View File

@@ -30,7 +30,7 @@ LICENSE+="
Apache-2.0 BSD-2 BSD CC0-1.0 ISC MIT MPL-2.0 Unicode-3.0 ZLIB
"
SLOT="0"
KEYWORDS="~amd64"
KEYWORDS="amd64"
IUSE="systemd"
DEPEND="

View File

@@ -11,7 +11,7 @@ SRC_URI="https://github.com/maxmind/mod_maxminddb/releases/download/${PV}/${P}.t
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 x86"
KEYWORDS="amd64 x86"
DEPEND="dev-libs/libmaxminddb:="
RDEPEND="${DEPEND}"

View File

@@ -9,7 +9,7 @@ SRC_URI="https://github.com/Icinga/icingadb-web/archive/refs/tags/v${PV}.tar.gz
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm64"
KEYWORDS="amd64 ~arm64"
RDEPEND="
|| (

View File

@@ -28,7 +28,7 @@ S="${WORKDIR}/${PN}-$(ver_cut 1-2)"
# SpecialElite.ttf -- Apache-2.0
LICENSE="BSD fonts? ( MIT Apache-2.0 ) systemd? ( ISC )"
SLOT="0"
KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="elogind ffmpeg fonts gdm gles glx jpeg +locking logind-idle-hint new-login offensive pam +perl selinux suid systemd xinerama wayland"
REQUIRED_USE="
gles? ( !glx )

View File

@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.gz
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~riscv ~x86"
KEYWORDS="amd64 ~ppc ~riscv ~x86"
RDEPEND="
app-accessibility/at-spi2-core:2