summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIonen Wolkens <ionen@gentoo.org>2022-07-11 18:43:05 -0400
committerIonen Wolkens <ionen@gentoo.org>2022-07-11 18:56:11 -0400
commitbe1bf30c595989c033994179a8512121fc7f1eec (patch)
tree31501c7cf0260644fa3e48fa8716aa7d1b8b7f3e /dev-libs/ncnn
parentapp-emulation/ruffle: drop 0_p20220614 (diff)
downloadgentoo-be1bf30c595989c033994179a8512121fc7f1eec.tar.gz
gentoo-be1bf30c595989c033994179a8512121fc7f1eec.tar.bz2
gentoo-be1bf30c595989c033994179a8512121fc7f1eec.zip
dev-libs/ncnn: drop 20220420
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
Diffstat (limited to 'dev-libs/ncnn')
-rw-r--r--dev-libs/ncnn/Manifest1
-rw-r--r--dev-libs/ncnn/files/ncnn-fix-glslang-include.patch9
-rw-r--r--dev-libs/ncnn/ncnn-20220420.ebuild73
3 files changed, 0 insertions, 83 deletions
diff --git a/dev-libs/ncnn/Manifest b/dev-libs/ncnn/Manifest
index 38f8273d8755..44746ed474a8 100644
--- a/dev-libs/ncnn/Manifest
+++ b/dev-libs/ncnn/Manifest
@@ -1,2 +1 @@
-DIST ncnn-20220420.tar.gz 12158916 BLAKE2B fcecf395e54ff683bb8301365d805b99439b3797493e419fa8c99a325ebd1dfd80e65b08cffd9283fe453010a0cdde221aeeffa37e154335d2f6d7f6c6b9b138 SHA512 7c567bcd75cf36be7fbb16dba7f978ae965478afed8948e9e1c6f8c681ea678f769e64fae337a5c1d0bc1549bf922c1761b51a7822153a1eb4d267ef8adf1ecd
DIST ncnn-20220701.tar.gz 12220010 BLAKE2B 3038500683c9ea1634777cb4158aea0d6c6e640cb4a31302b99c546f000fb91f5d75d01328cf35896b7579dc3172512d120612f973ae9881b4f95d101607adcb SHA512 4b7f539213c8f06a426d1633e881ceeabee84b5419e890eaa95447868a511cad8a4528d1e311c87ed322ccabbcfb38cc1725592fb6299ef9be7e068c43bbd0b2
diff --git a/dev-libs/ncnn/files/ncnn-fix-glslang-include.patch b/dev-libs/ncnn/files/ncnn-fix-glslang-include.patch
deleted file mode 100644
index 00eb01f03fc3..000000000000
--- a/dev-libs/ncnn/files/ncnn-fix-glslang-include.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-Needed to use system's glslang rather than bundled.
-https://github.com/Tencent/ncnn/issues/2622
---- a/src/gpu.cpp
-+++ b/src/gpu.cpp
-@@ -23,3 +23,3 @@
- #include "glslang/SPIRV/GlslangToSpv.h"
--#include "glslang/glslang/Public/ShaderLang.h"
-+#include "glslang/Public/ShaderLang.h"
-
diff --git a/dev-libs/ncnn/ncnn-20220420.ebuild b/dev-libs/ncnn/ncnn-20220420.ebuild
deleted file mode 100644
index da09a4cf9ffd..000000000000
--- a/dev-libs/ncnn/ncnn-20220420.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2022 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/${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="
- dev-util/glslang
- tools? ( dev-libs/protobuf:= )
- vulkan? ( media-libs/vulkan-loader )"
-DEPEND="
- ${RDEPEND}
- vulkan? ( dev-util/vulkan-headers )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-fix-glslang-include.patch
-)
-
-DOCS=( README.md docs/. )
-
-src_prepare() {
- cmake_src_prepare
-
- sed -i "/DESTINATION/s| lib| $(get_libdir)|" src/CMakeLists.txt || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_SKIP_RPATH=ON # for tools
- -DGLSLANG_TARGET_DIR="${ESYSROOT}"/usr/$(get_libdir)/cmake
- -DNCNN_BUILD_EXAMPLES=OFF
- -DNCNN_BUILD_TOOLS=$(usex tools)
- -DNCNN_PYTHON=OFF # missing portalocker, and nothing needs this for now
- -DNCNN_SHARED_LIB=ON
- -DNCNN_SYSTEM_GLSLANG=ON
- -DNCNN_VERSION=${PV} # avoids libncnn.so.*.%Y%m%d (build date)
- -DNCNN_VULKAN=$(usex vulkan)
- )
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- if use tools; then
- local tools=(
- caffe/caffe2ncnn
- darknet/darknet2ncnn
- mxnet/mxnet2ncnn
- ncnn2mem
- ncnnmerge
- ncnnoptimize
- onnx/onnx2ncnn
- quantize/{ncnn2int8,ncnn2table}
- )
- dobin "${tools[@]/#/${BUILD_DIR}/tools/}"
- fi
-}