gentoo resync : 30.05.2020

3 files changed, 126 insertions, 0 deletions

diff --git a/dev-libs/OpenNI/Manifest b/dev-libs/OpenNI/Manifest
index 56dbcdbb4c8a..4de7c81deccf 100644
--- a/dev-libs/OpenNI/Manifest
+++ b/dev-libs/OpenNI/Manifest
@@ -1,8 +1,10 @@
 AUX OpenNI-1.5.7.10-gcc6.patch 5012 BLAKE2B e5cb8535a1df4a2f8f4c4d34955004ed6e2c3d32a8fb41ea452576715f146794697ecc8ae0377f68f551fd85f153ce10156d6dff42c0b290ef426c35da9ec53a SHA512 129eedc33941df3b3a126528f8d0503c2808930276aa0350c89af42b9b34642eafb8304610443699b839f0158c0412a38bf3a4722af7497534519ecf753e99ac
+AUX betterdefines.patch 670 BLAKE2B 616b3d78de981d735ba5ade80059c76046b811c8a493b4299ddeb9e289a80adb44e52dde34f8a1d430ffb80205f94c3e93d658b3b2399126b00f215ebf87ff1c SHA512 b647a813d41f30bdd3af6c0625e1a250b962df9115f47f9498cf996e8797f67c1982cca34d888154646aeba962c7ab981b914c232186d63765a432455c3e3cc2
 AUX jpeg.patch 704 BLAKE2B a3261b7834fec0134929782a8283840bf9a5c2483272f57598c93d635707a58c2ec14f57877032bab6bce2cc3c94a560fa99f29ab759fc51c406226535b987cc SHA512 4276584d5252fd2ce9f7fc7b4389d079276f3626fe140344bd7ba5083f7190455a82aee98742bbf3e8f527947c3128281f63e940c114e85f92be94f71819a117
 AUX soname.patch 670 BLAKE2B 2fa9843c9be26474a9ba7d5a45ce258ff97ac32ffd4e32c23d572de94f9b7b3722e8f6a61ec5f6ed7d96837eb7e423163536960f07a5b4ecb86c96835ef841b8 SHA512 422c90b220b9366320f2513798d00c2d8a17b0db0ccb87150038c2f237d22c7f0d28206e6d00a7c73b758b6b021886a666a8860586f27fe9b57ddb14094ba7f4
 AUX tinyxml.patch 828 BLAKE2B 33698417dada91b4dbefe81de4f41f0fb9990478a1b0db9e4cc6fea4bb6951c49f7bdf09830cce81c4faf87213318fd0137e8058a7f4dc83b5ed9d688ec2655e SHA512 97cdcbbcd1d4ab4990c7a96ce21c4da983347f73c8064959bbb66d49cc9cda5e293b0273f19d1595ef5b26a6c32267b54cdd45fd4a86b2d8881501a3cea5724a
 DIST OpenNI-1.5.7.10.tar.gz 23378582 BLAKE2B c3532e3fb03bce9a30c94dc950591064d7b62d9eec8d5321c4dc65433be47652f9323a12401b8cbe4d3b81516120712720c1497ab51f220889b26fb33a4fcbc8 SHA512 f7b6106198c4314584cf327744e9d8b193ff9f2e8d416769aafb2aeeda0593ccbb37c3187ed75f1960d2ae8e80e8f30e0fced9ff82e20fe6f24c54246f77d512
+EBUILD OpenNI-1.5.7.10-r1.ebuild 2511 BLAKE2B 5daab8302831e9b5d8ea458e0e8b7549be14b5f35a1160e7d855b2b51d2dfd1a2e513d7e58b25f8c34f62fa34c61bf87c5d8676df5d9260f546e0373e3b096a2 SHA512 f1e1f672e815617d7d17421a98de866ab2796b2149d739cce8e948b5ccfd7a0f2b8ba2ad2ad05771aed004bc476907a7321d0eea021fed5bcfdab74d6e26decb
 EBUILD OpenNI-1.5.7.10.ebuild 2473 BLAKE2B e3a90c1a8a86b3c41272ba282b9522bc366d33533bafd1a3d4264662afaf84a1fd12f0f2665e89a306fa2d9a61bc0e08ea271c7513f0f3465f7bccf6e2ad8bff SHA512 c64a68f6495f0cfef657c6ec24104ec9af66b6d3ab5624c74b72faa3681c6b3a6d68775b6cd3e8d46f1610b081f26d9ef3cf7e027182f6d5940a7b212ff7ad8c
 EBUILD OpenNI-9999.ebuild 2483 BLAKE2B 362b271856cc9c01c4f4e4459404581b6611496de0c449fc5a8f4ef309a5230aea4695468692867d30e3dbbf9f205a8e09f4eacbdd9c439abd8a538022da45d3 SHA512 84ee0a656058d83265ab8ea7ce5774242571d6b31cd3df46788c81aaf7b34e2608d946ae2d638e965ebb9085dbd658fd8963ba581a90b035d8ae159cfb826a83
 MISC metadata.xml 337 BLAKE2B cd1617fea5ee8e8c5a39708ca2fe56342ac9bc77d7bd6a82ee1c2a3a81b16d5af8e4e90d916164fc9e998d523cfac65bdf5ea03e80e6e3f64c00a35bee310186 SHA512 31029665f81cf415898ab97a48804b3ddd5efae31f7800348a7b96dfd3a7faf1d4ae3275f039a8397040c6a3c83868252671ce1dcd35b6f1135d221b325ba5b8
diff --git a/dev-libs/OpenNI/OpenNI-1.5.7.10-r1.ebuild b/dev-libs/OpenNI/OpenNI-1.5.7.10-r1.ebuild
new file mode 100644
index 000000000000..674ccb33fff4
--- /dev/null
+++ b/dev-libs/OpenNI/OpenNI-1.5.7.10-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/OpenNI/OpenNI"
+fi
+
+inherit ${SCM} toolchain-funcs eutils multilib java-pkg-opt-2
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~arm"
+	SRC_URI="https://github.com/OpenNI/OpenNI/archive/Stable-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-Stable-${PV}"
+fi
+
+DESCRIPTION="OpenNI SDK"
+HOMEPAGE="https://github.com/OpenNI/OpenNI"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc java opengl"
+
+RDEPEND="
+	virtual/libusb:1
+	virtual/libudev
+	virtual/jpeg:0
+	dev-libs/tinyxml
+	opengl? ( media-libs/freeglut !dev-libs/OpenNI2[opengl] )
+	java? ( >=virtual/jre-1.5 )
+"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	java? ( >=virtual/jdk-1.5 )"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/tinyxml.patch" \
+		"${FILESDIR}/jpeg.patch" \
+		"${FILESDIR}/soname.patch" \
+		"${FILESDIR}/${P}-gcc6.patch" \
+		"${FILESDIR}/betterdefines.patch"
+
+	rm -rf External/{LibJPEG,TinyXml}
+	for i in Platform/Linux/Build/Common/Platform.* Externals/PSCommon/Linux/Build/Platform.* ; do
+		echo "" > ${i}
+	done
+
+	find . -type f -print0 | xargs -0 sed -i "s:\".*/SamplesConfig.xml:\"${EPREFIX}/usr/share/${PN}/SamplesConfig.xml:" || die
+}
+
+src_compile() {
+	emake -C "${S}/Platform/Linux/Build" \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		GLUT_SUPPORTED="$(usex opengl 1 0)" \
+		$(usex java "" ALL_JAVA_PROJS="") \
+		$(usex java "" JAVA_SAMPLES="") \
+		ALL_MONO_PROJS="" \
+		MONO_SAMPLES="" \
+		MONO_FORMS_SAMPLES=""
+
+	if use doc ; then
+		cd "${S}/Source/DoxyGen"
+		doxygen || die
+	fi
+}
+
+src_install() {
+	dolib.so "${S}/Platform/Linux/Bin/"*Release/*.so
+
+	insinto /usr/include/openni
+	doins -r Include/*
+
+	dobin "${S}/Platform/Linux/Bin/"*Release/{ni*,Ni*,Sample-*}
+
+	if use java ; then
+		java-pkg_dojar "${S}/Platform/Linux/Bin/"*Release/*.jar
+		echo "java -jar ${JAVA_PKG_JARDEST}/org.openni.Samples.SimpleViewer.jar" > org.openni.Samples.SimpleViewer
+		dobin org.openni.Samples.SimpleViewer
+	fi
+
+	insinto /usr/share/${PN}
+	doins Data/*
+
+	dodoc Documentation/OpenNI_UserGuide.pdf CHANGES NOTICE README
+
+	if use doc ; then
+		dohtml -r "${S}/Source/DoxyGen/html/"*
+		dodoc Source/DoxyGen/Text/*.txt
+	fi
+
+	keepdir /var/lib/ni
+}
+
+pkg_postinst() {
+	if [ "${ROOT:-/}" = "/" ] ; then
+		for i in "${EROOR}/usr/$(get_libdir)"/libnim*.so ; do
+			einfo "Registering module ${i}"
+			niReg -r "${i}"
+		done
+	fi
+}
diff --git a/dev-libs/OpenNI/files/betterdefines.patch b/dev-libs/OpenNI/files/betterdefines.patch
new file mode 100644
index 000000000000..5fd2eaed5d7e
--- /dev/null
+++ b/dev-libs/OpenNI/files/betterdefines.patch
@@ -0,0 +1,16 @@
+Index: OpenNI-Stable-1.5.7.10/Include/XnPlatform.h
+===================================================================
+--- OpenNI-Stable-1.5.7.10.orig/Include/XnPlatform.h
++++ OpenNI-Stable-1.5.7.10/Include/XnPlatform.h
+@@ -61,9 +61,9 @@
+ 	#include "Win32/XnPlatformWin32.h"

+ #elif defined(ANDROID) && defined(__arm__)

+ 	#include "Android-Arm/XnPlatformAndroid-Arm.h"

+-#elif (linux && (i386 || __x86_64__))

++#elif (defined(__linux__) && (i386 || __x86_64__))

+ 	#include "Linux-x86/XnPlatformLinux-x86.h"

+-#elif (linux && __arm__)

++#elif (defined(__linux__) && __arm__)

+ 	#include "Linux-Arm/XnPlatformLinux-Arm.h"

+ #elif _ARC

+ 	#include "ARC/XnPlatformARC.h"