From 36fc50e36ed1a4686bb7202aeaff3170b2206124 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sat, 23 Mar 2024 19:01:15 +0000
Subject: gentoo auto-resync : 23:03:2024 - 19:01:14

---
 dev-libs/ncnn/Manifest                |  2 +-
 dev-libs/ncnn/ncnn-20240102-r1.ebuild | 64 +++++++++++++++++++++++++++++++++++
 dev-libs/ncnn/ncnn-20240102.ebuild    | 55 ------------------------------
 3 files changed, 65 insertions(+), 56 deletions(-)
 create mode 100644 dev-libs/ncnn/ncnn-20240102-r1.ebuild
 delete mode 100644 dev-libs/ncnn/ncnn-20240102.ebuild

(limited to 'dev-libs/ncnn')

diff --git a/dev-libs/ncnn/Manifest b/dev-libs/ncnn/Manifest
index 8f2723215e78..b28f188d1fc8 100644
--- a/dev-libs/ncnn/Manifest
+++ b/dev-libs/ncnn/Manifest
@@ -1,3 +1,3 @@
 DIST ncnn-20240102.tar.gz 12791570 BLAKE2B 8a84353343d32bea1ef163a83cdef783a8a6077282e94a012d21a17b2e0d8c78c576ebd1dc5c9ec89364942b4ce69ab44d544648fe2dbd5fda4797b3b65adfd8 SHA512 31bc3c2f461a00241fb8f69ca6ea8cc590af6618856b1b84a048bde924e4b474fd883ad5d54dbfbdd1e5b59015889e15ffc4fbafccb3e42e052a02071f2017b1
-EBUILD ncnn-20240102.ebuild 1239 BLAKE2B d3eee28ccb6e0657d05d5a256df9b1a7555570f8e40419c4485486a3359bad97d7cd402b7ba8e028ffa415f169b30e6691b9155dbefe2815486cc4331fa60273 SHA512 5c72323cdfff1e45a80bea6245676b26bf4d8153f28a1063e5058cbb855a3825e63d8cbb007a5ec01673e8b6a3248f96df69e13aca368eeaca8dce02375e5a93
+EBUILD ncnn-20240102-r1.ebuild 1457 BLAKE2B 36c0951ea8fb9383b5d40fe1577285ee48776b722638a24f18877329a28cb9e4a75b597aaf8a40b93042cde92bc8049dc618408f9753a7b9857415c45e8ea120 SHA512 2e841112d9880c8fa5ecf71db43d9041b4da5f904fba44efcf245a19438f41667f69cf20063f8380f9727f1941bc95fd6e383e35865e365311a2bcdbab4717ab
 MISC metadata.xml 430 BLAKE2B 2623eadab618d93544c297f5c5bbb29575a769e0d4660aa619c66db2ad1909349f2753a426789d6c280a13a452b3434d5ffa2e781aee59b4487a71b023792327 SHA512 0693c619982557394bbabab2ceee6ba06445bcc208bb9e751392a371ca3efbf56b39685fb2d20d4e3da443c5bf7a482ed4581a7349734ad44c1e58dfb6dc241e
diff --git a/dev-libs/ncnn/ncnn-20240102-r1.ebuild b/dev-libs/ncnn/ncnn-20240102-r1.ebuild
new file mode 100644
index 000000000000..0a726c51cc3e
--- /dev/null
+++ b/dev-libs/ncnn/ncnn-20240102-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake toolchain-funcs
+
+DESCRIPTION="High-performance neural network inference framework"
+HOMEPAGE="https://github.com/Tencent/ncnn/"
+SRC_URI="
+	https://github.com/Tencent/ncnn/archive/refs/tags/${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+
+LICENSE="BSD ZLIB"
+SLOT="0/${PV}" # currently has unstable ABI that often requires rebuilds
+KEYWORDS="amd64 ~x86"
+IUSE="openmp tools +vulkan"
+
+# Need the static library to run tests + skip vulkan / GPU:
+# -DNCNN_BUILD_TESTS=ON -DNCNN_SHARED_LIB=OFF -DNCNN_VULKAN=OFF
+RESTRICT="test"
+
+RDEPEND="
+	tools? (
+		dev-cpp/abseil-cpp:=
+		dev-libs/protobuf:=
+	)
+	vulkan? (
+		dev-util/glslang:=
+		media-libs/vulkan-loader
+	)
+"
+DEPEND="
+	${RDEPEND}
+	vulkan? ( dev-util/vulkan-headers )
+"
+
+DOCS=( README.md docs/. )
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DGLSLANG_TARGET_DIR="${ESYSROOT}"/usr/$(get_libdir)/cmake
+		-DNCNN_BUILD_EXAMPLES=no
+		-DNCNN_BUILD_TOOLS=$(usex tools)
+		-DNCNN_OPENMP=$(usex openmp)
+		-DNCNN_PYTHON=no # todo if something needs it
+		-DNCNN_SHARED_LIB=yes
+		-DNCNN_SIMPLEVK=no
+		-DNCNN_SYSTEM_GLSLANG=yes
+		-DNCNN_VERSION=${PV} # avoids libncnn.so.*.%Y%m%d using build date
+		-DNCNN_VULKAN=$(usex vulkan)
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/ncnn/ncnn-20240102.ebuild b/dev-libs/ncnn/ncnn-20240102.ebuild
deleted file mode 100644
index d2e68b1ee053..000000000000
--- a/dev-libs/ncnn/ncnn-20240102.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="High-performance neural network inference framework"
-HOMEPAGE="https://github.com/Tencent/ncnn/"
-SRC_URI="
-	https://github.com/Tencent/ncnn/archive/refs/tags/${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="BSD ZLIB"
-SLOT="0/${PV}" # currently has unstable ABI that often requires rebuilds
-KEYWORDS="amd64 ~x86"
-IUSE="tools +vulkan"
-
-# Need the static library to run tests + skip vulkan / GPU:
-# -DNCNN_BUILD_TESTS=ON -DNCNN_SHARED_LIB=OFF -DNCNN_VULKAN=OFF
-RESTRICT="test"
-
-RDEPEND="
-	tools? (
-		dev-cpp/abseil-cpp:=
-		dev-libs/protobuf:=
-	)
-	vulkan? (
-		dev-util/glslang:=
-		media-libs/vulkan-loader
-	)
-"
-DEPEND="
-	${RDEPEND}
-	vulkan? ( dev-util/vulkan-headers )
-"
-
-DOCS=( README.md docs/. )
-
-src_configure() {
-	local mycmakeargs=(
-		-DGLSLANG_TARGET_DIR="${ESYSROOT}"/usr/$(get_libdir)/cmake
-		-DNCNN_BUILD_EXAMPLES=no
-		-DNCNN_BUILD_TOOLS=$(usex tools)
-		-DNCNN_PYTHON=no # todo if something needs it
-		-DNCNN_SHARED_LIB=yes
-		-DNCNN_SIMPLEVK=no
-		-DNCNN_SYSTEM_GLSLANG=yes
-		-DNCNN_VERSION=${PV} # avoids libncnn.so.*.%Y%m%d using build date
-		-DNCNN_VULKAN=$(usex vulkan)
-	)
-
-	cmake_src_configure
-}
-- 
cgit v1.2.3