Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dev-libs/libclc/libclc-15.0.4-r1.ebuild81
-rw-r--r--dev-libs/libclc/libclc-15.0.4.9999.ebuild27
-rw-r--r--dev-libs/libclc/libclc-16.0.0.9999.ebuild32
-rw-r--r--dev-libs/libclc/libclc-16.0.0_pre20221104.ebuild32
-rw-r--r--dev-libs/libclc/metadata.xml3
-rw-r--r--eclass/verify-sig.eclass6
-rw-r--r--net-misc/icaclient/icaclient-22.9.0.21-r2.ebuild5
7 files changed, 165 insertions, 21 deletions
diff --git a/dev-libs/libclc/libclc-15.0.4-r1.ebuild b/dev-libs/libclc/libclc-15.0.4-r1.ebuild
new file mode 100644
index 000000000000..f68055e81f44
--- /dev/null
+++ b/dev-libs/libclc/libclc-15.0.4-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit cmake llvm llvm.org python-any-r1
+
+DESCRIPTION="OpenCL C library"
+HOMEPAGE="https://libclc.llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi"
+
+LLVM_MAX_SLOT=15
+BDEPEND="
+ ${PYTHON_DEPS}
+ || (
+ (
+ sys-devel/clang:15
+ spirv? ( dev-util/spirv-llvm-translator:15 )
+ )
+ (
+ sys-devel/clang:14
+ spirv? ( dev-util/spirv-llvm-translator:14 )
+ )
+ (
+ sys-devel/clang:13
+ spirv? ( dev-util/spirv-llvm-translator:13 )
+ )
+ )
+"
+
+LLVM_COMPONENTS=( libclc )
+llvm.org_set_globals
+
+llvm_check_deps() {
+ if use spirv; then
+ has_version -b "dev-util/spirv-llvm-translator:${LLVM_SLOT}" ||
+ return 1
+ fi
+ has_version -b "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+ # we do not need llvm_pkg_setup
+ python-any-r1_pkg_setup
+}
+
+src_configure() {
+ local libclc_targets=()
+
+ use spirv && libclc_targets+=(
+ "spirv-mesa3d-"
+ "spirv64-mesa3d-"
+ )
+ use video_cards_nvidia && libclc_targets+=(
+ "nvptx--"
+ "nvptx64--"
+ "nvptx--nvidiacl"
+ "nvptx64--nvidiacl"
+ )
+ use video_cards_r600 && libclc_targets+=(
+ "r600--"
+ )
+ use video_cards_radeonsi && libclc_targets+=(
+ "amdgcn--"
+ "amdgcn-mesa-mesa3d"
+ "amdgcn--amdhsa"
+ )
+ [[ ${#libclc_targets[@]} ]] || die "libclc target missing!"
+
+ libclc_targets=${libclc_targets[*]}
+ local mycmakeargs=(
+ -DLIBCLC_TARGETS_TO_BUILD="${libclc_targets// /;}"
+ -DLLVM_CONFIG="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config"
+ )
+ cmake_src_configure
+}
diff --git a/dev-libs/libclc/libclc-15.0.4.9999.ebuild b/dev-libs/libclc/libclc-15.0.4.9999.ebuild
index 340ab1225b37..94f834e120c6 100644
--- a/dev-libs/libclc/libclc-15.0.4.9999.ebuild
+++ b/dev-libs/libclc/libclc-15.0.4.9999.ebuild
@@ -12,16 +12,24 @@ HOMEPAGE="https://libclc.llvm.org/"
LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
SLOT="0"
KEYWORDS=""
-IUSE_VIDEO_CARDS="video_cards_nvidia video_cards_r600 video_cards_radeonsi"
-IUSE="${IUSE_VIDEO_CARDS}"
+IUSE="spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi"
LLVM_MAX_SLOT=15
BDEPEND="
${PYTHON_DEPS}
|| (
- sys-devel/clang:15
- sys-devel/clang:14
- sys-devel/clang:13
+ (
+ sys-devel/clang:15
+ spirv? ( dev-util/spirv-llvm-translator:15 )
+ )
+ (
+ sys-devel/clang:14
+ spirv? ( dev-util/spirv-llvm-translator:14 )
+ )
+ (
+ sys-devel/clang:13
+ spirv? ( dev-util/spirv-llvm-translator:13 )
+ )
)
"
@@ -29,6 +37,10 @@ LLVM_COMPONENTS=( libclc )
llvm.org_set_globals
llvm_check_deps() {
+ if use spirv; then
+ has_version -b "dev-util/spirv-llvm-translator:${LLVM_SLOT}" ||
+ return 1
+ fi
has_version -b "sys-devel/clang:${LLVM_SLOT}"
}
@@ -40,6 +52,10 @@ pkg_setup() {
src_configure() {
local libclc_targets=()
+ use spirv && libclc_targets+=(
+ "spirv-mesa3d-"
+ "spirv64-mesa3d-"
+ )
use video_cards_nvidia && libclc_targets+=(
"nvptx--"
"nvptx64--"
@@ -54,7 +70,6 @@ src_configure() {
"amdgcn-mesa-mesa3d"
"amdgcn--amdhsa"
)
- # TODO: spirv
[[ ${#libclc_targets[@]} ]] || die "libclc target missing!"
libclc_targets=${libclc_targets[*]}
diff --git a/dev-libs/libclc/libclc-16.0.0.9999.ebuild b/dev-libs/libclc/libclc-16.0.0.9999.ebuild
index 7a22bf15d80d..ed252b9ab52d 100644
--- a/dev-libs/libclc/libclc-16.0.0.9999.ebuild
+++ b/dev-libs/libclc/libclc-16.0.0.9999.ebuild
@@ -12,17 +12,28 @@ HOMEPAGE="https://libclc.llvm.org/"
LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
SLOT="0"
KEYWORDS=""
-IUSE_VIDEO_CARDS="video_cards_nvidia video_cards_r600 video_cards_radeonsi"
-IUSE="${IUSE_VIDEO_CARDS}"
+IUSE="spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi"
LLVM_MAX_SLOT=16
BDEPEND="
${PYTHON_DEPS}
|| (
- sys-devel/clang:16
- sys-devel/clang:15
- sys-devel/clang:14
- sys-devel/clang:13
+ (
+ sys-devel/clang:16
+ spirv? ( dev-util/spirv-llvm-translator:16 )
+ )
+ (
+ sys-devel/clang:15
+ spirv? ( dev-util/spirv-llvm-translator:15 )
+ )
+ (
+ sys-devel/clang:14
+ spirv? ( dev-util/spirv-llvm-translator:14 )
+ )
+ (
+ sys-devel/clang:13
+ spirv? ( dev-util/spirv-llvm-translator:13 )
+ )
)
"
@@ -30,6 +41,10 @@ LLVM_COMPONENTS=( libclc )
llvm.org_set_globals
llvm_check_deps() {
+ if use spirv; then
+ has_version -b "dev-util/spirv-llvm-translator:${LLVM_SLOT}" ||
+ return 1
+ fi
has_version -b "sys-devel/clang:${LLVM_SLOT}"
}
@@ -41,6 +56,10 @@ pkg_setup() {
src_configure() {
local libclc_targets=()
+ use spirv && libclc_targets+=(
+ "spirv-mesa3d-"
+ "spirv64-mesa3d-"
+ )
use video_cards_nvidia && libclc_targets+=(
"nvptx--"
"nvptx64--"
@@ -55,7 +74,6 @@ src_configure() {
"amdgcn-mesa-mesa3d"
"amdgcn--amdhsa"
)
- # TODO: spirv
[[ ${#libclc_targets[@]} ]] || die "libclc target missing!"
libclc_targets=${libclc_targets[*]}
diff --git a/dev-libs/libclc/libclc-16.0.0_pre20221104.ebuild b/dev-libs/libclc/libclc-16.0.0_pre20221104.ebuild
index 7a22bf15d80d..ed252b9ab52d 100644
--- a/dev-libs/libclc/libclc-16.0.0_pre20221104.ebuild
+++ b/dev-libs/libclc/libclc-16.0.0_pre20221104.ebuild
@@ -12,17 +12,28 @@ HOMEPAGE="https://libclc.llvm.org/"
LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
SLOT="0"
KEYWORDS=""
-IUSE_VIDEO_CARDS="video_cards_nvidia video_cards_r600 video_cards_radeonsi"
-IUSE="${IUSE_VIDEO_CARDS}"
+IUSE="spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi"
LLVM_MAX_SLOT=16
BDEPEND="
${PYTHON_DEPS}
|| (
- sys-devel/clang:16
- sys-devel/clang:15
- sys-devel/clang:14
- sys-devel/clang:13
+ (
+ sys-devel/clang:16
+ spirv? ( dev-util/spirv-llvm-translator:16 )
+ )
+ (
+ sys-devel/clang:15
+ spirv? ( dev-util/spirv-llvm-translator:15 )
+ )
+ (
+ sys-devel/clang:14
+ spirv? ( dev-util/spirv-llvm-translator:14 )
+ )
+ (
+ sys-devel/clang:13
+ spirv? ( dev-util/spirv-llvm-translator:13 )
+ )
)
"
@@ -30,6 +41,10 @@ LLVM_COMPONENTS=( libclc )
llvm.org_set_globals
llvm_check_deps() {
+ if use spirv; then
+ has_version -b "dev-util/spirv-llvm-translator:${LLVM_SLOT}" ||
+ return 1
+ fi
has_version -b "sys-devel/clang:${LLVM_SLOT}"
}
@@ -41,6 +56,10 @@ pkg_setup() {
src_configure() {
local libclc_targets=()
+ use spirv && libclc_targets+=(
+ "spirv-mesa3d-"
+ "spirv64-mesa3d-"
+ )
use video_cards_nvidia && libclc_targets+=(
"nvptx--"
"nvptx64--"
@@ -55,7 +74,6 @@ src_configure() {
"amdgcn-mesa-mesa3d"
"amdgcn--amdhsa"
)
- # TODO: spirv
[[ ${#libclc_targets[@]} ]] || die "libclc target missing!"
libclc_targets=${libclc_targets[*]}
diff --git a/dev-libs/libclc/metadata.xml b/dev-libs/libclc/metadata.xml
index 072910296ca3..7518ab30a1c7 100644
--- a/dev-libs/libclc/metadata.xml
+++ b/dev-libs/libclc/metadata.xml
@@ -7,4 +7,7 @@
<upstream>
<remote-id type="github">llvm/llvm-project</remote-id>
</upstream>
+ <use>
+ <flag name="spirv">Build SPIRV targets</flag>
+ </use>
</pkgmetadata>
diff --git a/eclass/verify-sig.eclass b/eclass/verify-sig.eclass
index 1d7c62d4dce2..394ce2e44427 100644
--- a/eclass/verify-sig.eclass
+++ b/eclass/verify-sig.eclass
@@ -141,6 +141,9 @@ verify-sig_verify_detached() {
einfo "Verifying ${filename} ..."
case ${VERIFY_SIG_METHOD} in
openpgp)
+ # gpg can't handle very long TMPDIR
+ # https://bugs.gentoo.org/854492
+ local -x TMPDIR=/tmp
gemato gpg-wrap -K "${key}" "${extra_args[@]}" -- \
gpg --verify "${sig}" "${file}" ||
die "PGP signature verification failed"
@@ -190,6 +193,9 @@ verify-sig_verify_message() {
einfo "Verifying ${filename} ..."
case ${VERIFY_SIG_METHOD} in
openpgp)
+ # gpg can't handle very long TMPDIR
+ # https://bugs.gentoo.org/854492
+ local -x TMPDIR=/tmp
gemato gpg-wrap -K "${key}" "${extra_args[@]}" -- \
gpg --verify --output="${output_file}" "${file}" ||
die "PGP signature verification failed"
diff --git a/net-misc/icaclient/icaclient-22.9.0.21-r2.ebuild b/net-misc/icaclient/icaclient-22.9.0.21-r2.ebuild
index 6d50e753d17b..1a81b36755a0 100644
--- a/net-misc/icaclient/icaclient-22.9.0.21-r2.ebuild
+++ b/net-misc/icaclient/icaclient-22.9.0.21-r2.ebuild
@@ -36,8 +36,11 @@ REQUIRES_EXCLUDE="${REQUIRES_EXCLUDE}
libgstreamer-0.10.so.0
"
RDEPEND="
+ || (
+ >=app-accessibility/at-spi2-core-2.46.0:2
+ dev-libs/atk
+ )
app-crypt/libsecret
- dev-libs/atk
dev-libs/glib:2
dev-libs/libxml2
media-fonts/font-adobe-100dpi