gentoo resync : 31.05.2021

7 files changed, 91 insertions, 124 deletions

diff --git a/dev-libs/ncnn/Manifest b/dev-libs/ncnn/Manifest
index 7a5d7948ef49..f7d38573c4b7 100644
--- a/dev-libs/ncnn/Manifest
+++ b/dev-libs/ncnn/Manifest
@@ -1,10 +1,6 @@
-AUX ncnn-fix-glslang-include.patch 326 BLAKE2B 6791c4dea3e81f24ee4e08d9cd62960509f5b15ff458735a3c50877f27944af6a98531787c018dd61764dd30f67c91d813ad0a6d4ef7fc69e0e4bb926be6ac29 SHA512 5cd86899e0d943d83e336cc8da480cf8cc5a9381ae32f9885286473ef6f48fa6846406bf4dfd4c545dbbf2bcd90d81cb8a1ce33b1160163400d3a43ba87fb6d5
-DIST ncnn-20200226.tar.gz 10363010 BLAKE2B 3f5e22ecffc7d36d7babb8c316eb95785f60b2938672cc2fc4a56ae8e4cc79fef8d498032117998a1813b4a5491b4b99f6941ac41be3fe8d6c6e3276ae46396e SHA512 e91694692e2c48ba4b404b26b382939be62c61e8452a09b8c1cdad351adcda1ea8bd19ded671f6c4c6cf979ccc49c181dd47e501a351fe89ecdf17a5395b3fab
-DIST ncnn-20200413.tar.gz 10520160 BLAKE2B 10fc59f3a09d1a6b21a6c73b87dabd450279d2c30923b15266461360c6a63b7cc58f91e33c6563752161de3ca067098ed4f2d22963410fe3f72a8affbd39172e SHA512 3f3610f94cbfa6072347857675865b3b21e4cb330a3b889214e7e8cf6e7a558451979ee4ba727c28fc5919a38b27d3b0288dfbd1bfa06d92d3677b4035b019fd
-DIST ncnn-20200727.tar.gz 10989866 BLAKE2B 27ec105d4ea24b1bcccfb64074f47332515112b7fed7b6f833c6d3fd846542f14248254d076e3d1e63eb16cedb51d16dd156890ca805f4160d7e6ceb3de1b46a SHA512 122653ee4fcf6e45665154ff6014eb3291d48174ec153b27ccb9013bd705a81e664e4c4ad94df5cb3ea661891115929562db45c7c714747fb6f7673b09a16b68
+AUX ncnn-fix-glslang-include.patch 281 BLAKE2B ae6293b2c16ee870d65cde7398cfe615ba3cbfa682edd5da0e92072d80f37f46f0fdc84648bb3757a266e1406d3289025344cff462ae2c3d84e232460db40759 SHA512 7e424a89b3d2a8b9cd4630e2ea8fd789569bef9bfcbea39c11fecf2cb0d9ece9639bd01e88735715d28fe7d92aa5eee9231d59cade55829f8d4af7e33a4f4adf
 DIST ncnn-20210322.tar.gz 11339362 BLAKE2B 26848f8c6598c98e10e62717bf4aa86f803b425848bdeebd7dacd752f57174e4c3a7fe56d309cafa150be7cb80176fbd8f487c9fe79bc957e29157b1781fe849 SHA512 78862bdbba3ae4127d856f514ea37903098e8a9e827ccbdc85faa498d8a343b4c404465b7f55d368f2ea867063340f33facf286c2bad6a0587b903ba8bbf2394
-EBUILD ncnn-20200226.ebuild 692 BLAKE2B 3fb887404a2de19dd311439714ece71fd51d84484762f57fadd2a06059a569ae55b39b0cb924e3016312ce3474a03ba1917efe9b100a7d242f7bf9ea68168c35 SHA512 db08ff07cf73c967e31a9a64a361a0e40ac858a3ebb074309e0f0d120392040a5fb5874c6612f9163d2056fce9883d40aadedacbbff2a55ed17f6521b58c0a09
-EBUILD ncnn-20200413.ebuild 738 BLAKE2B 6d8d074297566d02f1d0758ec806100a85e6899c2297dbd826ff7404b7eaba50507cde5b856b80daf2746a5340e47d1d097f0d1b5def688df84c490d88b8d165 SHA512 71a813e6bed4ab60eface4dd4d011163e3168faa4e11f96891f69987d0b9bd6ad6969aaf13b4b21f1d74c6d92dc0f4cecddabb801e823c8b84f53dd4bc556d18
-EBUILD ncnn-20200727.ebuild 738 BLAKE2B 6d8d074297566d02f1d0758ec806100a85e6899c2297dbd826ff7404b7eaba50507cde5b856b80daf2746a5340e47d1d097f0d1b5def688df84c490d88b8d165 SHA512 71a813e6bed4ab60eface4dd4d011163e3168faa4e11f96891f69987d0b9bd6ad6969aaf13b4b21f1d74c6d92dc0f4cecddabb801e823c8b84f53dd4bc556d18
+DIST ncnn-20210525.tar.gz 11578821 BLAKE2B 1b6dc67cb89e4761c6de256c8854c3969c553159c11713d9bbbe04abd027e9439ffb694e8129da4d965807d1ec326d643c71c00ee1f032dbf4c2271c2699ceb2 SHA512 5d919b6830f5a75c751d64476f5bf2b9b71ced1cee29e4156c4f01a9d7d8833dfdf8420747c55979c5b39b29fd63b5bf4bc3d27b756a617ef39f4e2ce4da2f93
 EBUILD ncnn-20210322.ebuild 883 BLAKE2B 67350ea55f8bec9dde95b5ee61930d7eafccc59c57a977fd4443ec90552931f088a4bc550290b591d866b573ad2e11ab5729fea4940f21f2a3e13a760bd672f5 SHA512 b0bebef4edf4b905f842a5736868fd67a2c41b0b501e14dfee27011f06f459134f3f7b8c8ffcfbab5891d894d66a3ea124adc27f37540e2b3660f5b4a61a0d13
-MISC metadata.xml 329 BLAKE2B a70f4b06a9dffcd4c7182c52354bda1faa068fdcb5785a1e8ffa40115cf963c89a40a321688618e95ac79e5c5eec1f87772cce5fe2fdf924b57b2c8d914b6660 SHA512 3ba55224bd0842ba5354ce52680471a7e5a364acb96d530bae821c99d3ca4a9e74db67c7f854eb89a7760996e4e4d4f050fb9933077213af0bd5c9a138869f96
+EBUILD ncnn-20210525.ebuild 1804 BLAKE2B 32c7b8bb64ef7b4b177a940ca130048832f92a3190c6bb411786629b09d5a486bc306ba7753c1adebff6f40b989f048e1f5b2eaa0ab79767d936e68f51106b63 SHA512 893c53fdeeda50ba6cb4ea76eea68a961d7d77cc98fc4f93894ef3a5b944517480795d3a4f1233f66b7bb71741b74760ba9b7912b81d1a3a6597bd314266e05b
+MISC metadata.xml 617 BLAKE2B 3f4be1642c013d6f065fa54f8ede9c9929d934e79b44dc615c85437a6e13c772efeadf534c10c895fa9841855d8db3a00fd0df97f9490e5190574c79166a3874 SHA512 53192d182ea04c21a9d69c5bc1fff7e08a149168fd6dfca44d5bd6191b886a09324a60667114432280b3d2175b3fb920d71aa70f8bb5e46295ebc91d39e405e1
diff --git a/dev-libs/ncnn/files/ncnn-fix-glslang-include.patch b/dev-libs/ncnn/files/ncnn-fix-glslang-include.patch
index bd96a79e1755..00eb01f03fc3 100644
--- a/dev-libs/ncnn/files/ncnn-fix-glslang-include.patch
+++ b/dev-libs/ncnn/files/ncnn-fix-glslang-include.patch
@@ -1,13 +1,9 @@
-diff --git a/src/gpu.cpp b/src/gpu.cpp
-index ce1306c..468cd03 100644
+Needed to use system's glslang rather than bundled.
+https://github.com/Tencent/ncnn/issues/2622
 --- a/src/gpu.cpp
 +++ b/src/gpu.cpp
-@@ -21,7 +21,7 @@
- #include <vulkan/vulkan.h>
- 
+@@ -23,3 +23,3 @@
  #include "glslang/SPIRV/GlslangToSpv.h"
 -#include "glslang/glslang/Public/ShaderLang.h"
 +#include "glslang/Public/ShaderLang.h"
  
- #include "command.h"
- #include "layer.h"
diff --git a/dev-libs/ncnn/metadata.xml b/dev-libs/ncnn/metadata.xml
index 64723a6c0066..93b23a68d96a 100644
--- a/dev-libs/ncnn/metadata.xml
+++ b/dev-libs/ncnn/metadata.xml
@@ -5,6 +5,14 @@
 		<email>slashbeast@gentoo.org</email>
 		<name>Piotr Karbowski</name>
 	</maintainer>
+	<maintainer type="person" proxied="yes">
+		<email>sudinave@gmail.com</email>
+		<name>Ionen Wolkens</name>
+	</maintainer>
+	<use>
+		<flag name="tools">Enable installation of various tools in addition to the library</flag>
+		<flag name="vulkan">Enable vulkan compute support</flag>
+	</use>
 	<upstream>
 		<remote-id type="github">Tencent/ncnn</remote-id>
 	</upstream>
diff --git a/dev-libs/ncnn/ncnn-20200226.ebuild b/dev-libs/ncnn/ncnn-20200226.ebuild
deleted file mode 100644
index 50685e1b06c3..000000000000
--- a/dev-libs/ncnn/ncnn-20200226.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="A 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"
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-util/glslang
-	dev-util/vulkan-headers
-	media-libs/vulkan-loader"
-
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_TOOLCHAIN_FILE="${S}/toolchains/host.gcc.toolchain.cmake"
-		-DNCNN_BUILD_EXAMPLES=OFF
-		-DNCNN_BUILD_TOOLS=OFF
-		-DNCNN_VULKAN=ON
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/ncnn/ncnn-20200413.ebuild b/dev-libs/ncnn/ncnn-20200413.ebuild
deleted file mode 100644
index efda01091014..000000000000
--- a/dev-libs/ncnn/ncnn-20200413.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="A 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"
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-util/glslang
-	dev-util/vulkan-headers
-	media-libs/vulkan-loader"
-
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-RESTRICT=test # Tests tries to use real GPU.
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_TOOLCHAIN_FILE="${S}/toolchains/host.gcc.toolchain.cmake"
-		-DNCNN_BUILD_EXAMPLES=OFF
-		-DNCNN_BUILD_TOOLS=OFF
-		-DNCNN_VULKAN=ON
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/ncnn/ncnn-20200727.ebuild b/dev-libs/ncnn/ncnn-20200727.ebuild
deleted file mode 100644
index efda01091014..000000000000
--- a/dev-libs/ncnn/ncnn-20200727.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="A 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"
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-util/glslang
-	dev-util/vulkan-headers
-	media-libs/vulkan-loader"
-
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-RESTRICT=test # Tests tries to use real GPU.
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_TOOLCHAIN_FILE="${S}/toolchains/host.gcc.toolchain.cmake"
-		-DNCNN_BUILD_EXAMPLES=OFF
-		-DNCNN_BUILD_TOOLS=OFF
-		-DNCNN_VULKAN=ON
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/ncnn/ncnn-20210525.ebuild b/dev-libs/ncnn/ncnn-20210525.ebuild
new file mode 100644
index 000000000000..efac9e4e5810
--- /dev/null
+++ b/dev-libs/ncnn/ncnn-20210525.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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"
+KEYWORDS="~amd64 ~x86"
+IUSE="tools +vulkan"
+
+# Need the static library to run tests:
+# -DNCNN_BUILD_TESTS=ON, -DNCNN_SHARED_LIB=OFF, USE=-vulkan (skip GPU)
+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
+
+	# Workaround build issues on AVX without AVX2 (bug #730468)
+	# This can be removed if CXXFLAGS="-mavx -mno-avx2" builds after a bump.
+	find src -type f -exec sed -i s/__AVX__/__AVX2__/g {} + || 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
+}