Gentoo Archives: gentoo-commits

From: Ionen Wolkens <ionen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/ncnn/
Date: Fri, 13 May 2022 14:51:31
Message-Id: 1652453431.cb4694e94d2cc9d3c86070a1c90154852f951c89.ionen@gentoo
1 commit: cb4694e94d2cc9d3c86070a1c90154852f951c89
2 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
3 AuthorDate: Fri May 13 14:31:44 2022 +0000
4 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
5 CommitDate: Fri May 13 14:50:31 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb4694e9
7
8 dev-libs/ncnn: drop 20210525-r1
9
10 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
11
12 dev-libs/ncnn/Manifest | 1 -
13 dev-libs/ncnn/ncnn-20210525-r1.ebuild | 76 -----------------------------------
14 2 files changed, 77 deletions(-)
15
16 diff --git a/dev-libs/ncnn/Manifest b/dev-libs/ncnn/Manifest
17 index c04a066daf14..ac715a325fcf 100644
18 --- a/dev-libs/ncnn/Manifest
19 +++ b/dev-libs/ncnn/Manifest
20 @@ -1,2 +1 @@
21 -DIST ncnn-20210525.tar.gz 11578821 BLAKE2B 1b6dc67cb89e4761c6de256c8854c3969c553159c11713d9bbbe04abd027e9439ffb694e8129da4d965807d1ec326d643c71c00ee1f032dbf4c2271c2699ceb2 SHA512 5d919b6830f5a75c751d64476f5bf2b9b71ced1cee29e4156c4f01a9d7d8833dfdf8420747c55979c5b39b29fd63b5bf4bc3d27b756a617ef39f4e2ce4da2f93
22 DIST ncnn-20220420.tar.gz 12158916 BLAKE2B fcecf395e54ff683bb8301365d805b99439b3797493e419fa8c99a325ebd1dfd80e65b08cffd9283fe453010a0cdde221aeeffa37e154335d2f6d7f6c6b9b138 SHA512 7c567bcd75cf36be7fbb16dba7f978ae965478afed8948e9e1c6f8c681ea678f769e64fae337a5c1d0bc1549bf922c1761b51a7822153a1eb4d267ef8adf1ecd
23
24 diff --git a/dev-libs/ncnn/ncnn-20210525-r1.ebuild b/dev-libs/ncnn/ncnn-20210525-r1.ebuild
25 deleted file mode 100644
26 index a6aa54a5132f..000000000000
27 --- a/dev-libs/ncnn/ncnn-20210525-r1.ebuild
28 +++ /dev/null
29 @@ -1,76 +0,0 @@
30 -# Copyright 1999-2022 Gentoo Authors
31 -# Distributed under the terms of the GNU General Public License v2
32 -
33 -EAPI=7
34 -
35 -inherit cmake
36 -
37 -DESCRIPTION="High-performance neural network inference framework"
38 -HOMEPAGE="https://github.com/Tencent/ncnn"
39 -SRC_URI="https://github.com/Tencent/ncnn/archive/${PV}.tar.gz -> ${P}.tar.gz"
40 -
41 -LICENSE="BSD ZLIB"
42 -SLOT="0/${PV}" # currently has unstable ABI that often requires rebuilds
43 -KEYWORDS="~amd64 ~x86"
44 -IUSE="tools +vulkan"
45 -
46 -# Need the static library to run tests:
47 -# -DNCNN_BUILD_TESTS=ON, -DNCNN_SHARED_LIB=OFF, USE=-vulkan (skip GPU)
48 -RESTRICT="test"
49 -
50 -RDEPEND="
51 - dev-util/glslang
52 - tools? ( dev-libs/protobuf:= )
53 - vulkan? ( media-libs/vulkan-loader )"
54 -DEPEND="
55 - ${RDEPEND}
56 - vulkan? ( dev-util/vulkan-headers )"
57 -
58 -PATCHES=(
59 - "${FILESDIR}"/${PN}-fix-glslang-include.patch
60 -)
61 -DOCS=( README.md docs/. )
62 -
63 -src_prepare() {
64 - cmake_src_prepare
65 -
66 - sed -i "/DESTINATION/s| lib| $(get_libdir)|" src/CMakeLists.txt || die
67 -
68 - # Workaround build issues on AVX without AVX2 (bug #730468)
69 - # This can be removed if CXXFLAGS="-mavx -mno-avx2" builds after a bump.
70 - find src -type f -exec sed -i s/__AVX__/__AVX2__/g {} + || die
71 -}
72 -
73 -src_configure() {
74 - local mycmakeargs=(
75 - -DCMAKE_SKIP_RPATH=ON # for tools
76 - -DGLSLANG_TARGET_DIR="${ESYSROOT}"/usr/$(get_libdir)/cmake
77 - -DNCNN_BUILD_EXAMPLES=OFF
78 - -DNCNN_BUILD_TOOLS=$(usex tools)
79 - -DNCNN_PYTHON=OFF # missing portalocker, and nothing needs this for now
80 - -DNCNN_SHARED_LIB=ON
81 - -DNCNN_SYSTEM_GLSLANG=ON
82 - -DNCNN_VERSION=${PV} # avoids libncnn.so.*.%Y%m%d (build date)
83 - -DNCNN_VULKAN=$(usex vulkan)
84 - )
85 -
86 - cmake_src_configure
87 -}
88 -
89 -src_install() {
90 - cmake_src_install
91 -
92 - if use tools; then
93 - local tools=(
94 - caffe/caffe2ncnn
95 - darknet/darknet2ncnn
96 - mxnet/mxnet2ncnn
97 - ncnn2mem
98 - ncnnmerge
99 - ncnnoptimize
100 - onnx/onnx2ncnn
101 - quantize/{ncnn2int8,ncnn2table}
102 - )
103 - dobin "${tools[@]/#/${BUILD_DIR}/tools/}"
104 - fi
105 -}