summaryrefslogtreecommitdiff
path: root/dev-libs/OpenNI
diff options
context:
space:
mode:
Diffstat (limited to 'dev-libs/OpenNI')
-rw-r--r--dev-libs/OpenNI/Manifest5
-rw-r--r--dev-libs/OpenNI/OpenNI-1.5.7.10-r2.ebuild (renamed from dev-libs/OpenNI/OpenNI-1.5.7.10-r1.ebuild)26
-rw-r--r--dev-libs/OpenNI/OpenNI-1.5.7.10.ebuild106
-rw-r--r--dev-libs/OpenNI/OpenNI-9999.ebuild24
4 files changed, 31 insertions, 130 deletions
diff --git a/dev-libs/OpenNI/Manifest b/dev-libs/OpenNI/Manifest
index 143e3f8642e3..48207e589ce6 100644
--- a/dev-libs/OpenNI/Manifest
+++ b/dev-libs/OpenNI/Manifest
@@ -4,7 +4,6 @@ AUX jpeg.patch 704 BLAKE2B a3261b7834fec0134929782a8283840bf9a5c2483272f57598c93
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 2498 BLAKE2B e02e60c1ffbb570d3b80fcddf5c973b87e0b3f3f4332ef55525a5108383fc655d247498634c1166ed137cab55f912f88e6c30281fa9b066c1b2266eb795d5ed8 SHA512 23019f8d71dcb79281f55532fc289e417f2bcedbdeffb46c08903f3d71e26f3c9b827bbf8f76dce516aa2c10d4267e6e70589a38ca1aa03a2a29aa05222d4ea6
-EBUILD OpenNI-1.5.7.10.ebuild 2460 BLAKE2B abaf9888f2191717f146984b27517338d45f3656c171e2be549286feb2f2f85a8e5289300e710fd26b886c5ae633355690367eb86e0c3381e8980ecd1c784302 SHA512 eb4299719bc83e44623ba51baed265cfc8a52037879843255789e7d0ce79223bd29a4ce57650d4e3d3b4ef620ac1656d0cbe20cba4b66884e67175622696bb1f
-EBUILD OpenNI-9999.ebuild 2470 BLAKE2B 074759ce736dde5fddd9d42953d9a5c67f1eb814379791c9696eb91758b7dee29147c40038e03aaf6ce8979c73a904d4f0829fba85f8f478db6826b33fd72666 SHA512 2e509bc7e0abeba476563d81f85c3973081214d3a8f28ea03fb443895ee17da4de1264625fb89e170ee11c51c39b9330fba89725ad9c4669f14b34ed5f7242d8
+EBUILD OpenNI-1.5.7.10-r2.ebuild 2500 BLAKE2B 6e6fa19a255712fd0c7fd9e42069e4757d548ec5e65bcf9be191536064623df17cf2d4ab7842d2ca060e87f6f5d7a41de02dbe46bea1ecc2ff48d4599a49ef6e SHA512 7009ce5e8234e9c7eaf1ddd48eab931d036f6377041c6d98afac921d185f8523d66e729a7b5f60fb09ab898a3a0df4073658d817dd4d47e8aec07df3e9f7758d
+EBUILD OpenNI-9999.ebuild 2475 BLAKE2B d01e0a023d90224b78245198993c0a367aa297a0b541cac2b15629dae8fce78145867b2000b0834a0abd935bd93938fd25df0c686678a2c624bca2802cdc85c2 SHA512 eb3085ef6e21b372b33a040a11445263e2b5afc18a04c0b3d9b32010818b4f644db73f4f135bd23e04ee857fac3d9c2eecbba6ad6c369ad0b31bde3211109820
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-r2.ebuild
index 9f94c92b6ba7..fcd54b00b17a 100644
--- a/dev-libs/OpenNI/OpenNI-1.5.7.10-r1.ebuild
+++ b/dev-libs/OpenNI/OpenNI-1.5.7.10-r2.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
SCM=""
if [ "${PV#9999}" != "${PV}" ] ; then
@@ -9,7 +9,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then
EGIT_REPO_URI="https://github.com/OpenNI/OpenNI"
fi
-inherit ${SCM} toolchain-funcs epatch multilib java-pkg-opt-2
+inherit ${SCM} toolchain-funcs multilib java-pkg-opt-2
if [ "${PV#9999}" != "${PV}" ] ; then
SRC_URI=""
@@ -31,19 +31,22 @@ RDEPEND="
virtual/jpeg:0
dev-libs/tinyxml
opengl? ( media-libs/freeglut !dev-libs/OpenNI2[opengl] )
- java? ( >=virtual/jre-1.5 )
+ java? ( virtual/jre:1.8 )
"
DEPEND="${RDEPEND}
doc? ( app-doc/doxygen )
- java? ( >=virtual/jdk-1.5 )"
+ java? ( virtual/jdk:1.8 )"
+
+PATCHES=(
+ "${FILESDIR}/tinyxml.patch"
+ "${FILESDIR}/jpeg.patch"
+ "${FILESDIR}/soname.patch"
+ "${FILESDIR}/${P}-gcc6.patch"
+ "${FILESDIR}/betterdefines.patch"
+)
src_prepare() {
- epatch \
- "${FILESDIR}/tinyxml.patch" \
- "${FILESDIR}/jpeg.patch" \
- "${FILESDIR}/soname.patch" \
- "${FILESDIR}/${P}-gcc6.patch" \
- "${FILESDIR}/betterdefines.patch"
+ default
rm -rf External/{LibJPEG,TinyXml}
for i in Platform/Linux/Build/Common/Platform.* Externals/PSCommon/Linux/Build/Platform.* ; do
@@ -90,7 +93,8 @@ src_install() {
dodoc Documentation/OpenNI_UserGuide.pdf CHANGES NOTICE README
if use doc ; then
- dohtml -r "${S}/Source/DoxyGen/html/"*
+ docinto html
+ dodoc -r "${S}/Source/DoxyGen/html/"*
dodoc Source/DoxyGen/Text/*.txt
fi
diff --git a/dev-libs/OpenNI/OpenNI-1.5.7.10.ebuild b/dev-libs/OpenNI/OpenNI-1.5.7.10.ebuild
deleted file mode 100644
index a936bb62b674..000000000000
--- a/dev-libs/OpenNI/OpenNI-1.5.7.10.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2021 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 epatch multilib java-pkg-opt-2
-
-if [ "${PV#9999}" != "${PV}" ] ; then
- 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"
-
- 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/OpenNI-9999.ebuild b/dev-libs/OpenNI/OpenNI-9999.ebuild
index aef879f68ea5..0febb7dba0b7 100644
--- a/dev-libs/OpenNI/OpenNI-9999.ebuild
+++ b/dev-libs/OpenNI/OpenNI-9999.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
SCM=""
if [ "${PV#9999}" != "${PV}" ] ; then
@@ -9,7 +9,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then
EGIT_REPO_URI="https://github.com/OpenNI/OpenNI"
fi
-inherit ${SCM} toolchain-funcs epatch multilib java-pkg-opt-2
+inherit ${SCM} toolchain-funcs multilib java-pkg-opt-2
if [ "${PV#9999}" != "${PV}" ] ; then
SRC_URI=""
@@ -31,18 +31,21 @@ RDEPEND="
virtual/jpeg:0
dev-libs/tinyxml
opengl? ( media-libs/freeglut !dev-libs/OpenNI2[opengl] )
- java? ( >=virtual/jre-1.5 )
+ java? ( virtual/jre:1.8 )
"
DEPEND="${RDEPEND}
doc? ( app-doc/doxygen )
- java? ( >=virtual/jdk-1.5 )"
+ java? ( virtual/jdk:1.8 )"
+
+PATCHES=(
+ "${FILESDIR}/tinyxml.patch"
+ "${FILESDIR}/jpeg.patch"
+ "${FILESDIR}/soname.patch"
+ "${FILESDIR}/${PN}-1.5.7.10-gcc6.patch"
+)
src_prepare() {
- epatch \
- "${FILESDIR}/tinyxml.patch" \
- "${FILESDIR}/jpeg.patch" \
- "${FILESDIR}/soname.patch" \
- "${FILESDIR}/${PN}-1.5.7.10-gcc6.patch"
+ default
rm -rf External/{LibJPEG,TinyXml}
for i in Platform/Linux/Build/Common/Platform.* Externals/PSCommon/Linux/Build/Platform.* ; do
@@ -89,7 +92,8 @@ src_install() {
dodoc Documentation/OpenNI_UserGuide.pdf CHANGES NOTICE README
if use doc ; then
- dohtml -r "${S}/Source/DoxyGen/html/"*
+ docinto html
+ dodoc -r "${S}/Source/DoxyGen/html/"*
dodoc Source/DoxyGen/Text/*.txt
fi