public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/OpenNI/
@ 2021-07-08 10:42 Joonas Niilola
  0 siblings, 0 replies; 8+ messages in thread
From: Joonas Niilola @ 2021-07-08 10:42 UTC (permalink / raw
  To: gentoo-commits

commit:     1aa58ef166e215fabe14931238a80bfc3a728ff0
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Thu Jun 24 15:13:10 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Jul  8 10:42:18 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1aa58ef1

dev-libs/OpenNI: min java 1.8:*

Bug: https://bugs.gentoo.org/787359
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 ...penNI-9999.ebuild => OpenNI-1.5.7.10-r2.ebuild} | 25 +++++++++++++---------
 dev-libs/OpenNI/OpenNI-9999.ebuild                 | 24 ++++++++++++---------
 2 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/dev-libs/OpenNI/OpenNI-9999.ebuild b/dev-libs/OpenNI/OpenNI-1.5.7.10-r2.ebuild
similarity index 86%
copy from dev-libs/OpenNI/OpenNI-9999.ebuild
copy to dev-libs/OpenNI/OpenNI-1.5.7.10-r2.ebuild
index aef879f68ea..fcd54b00b17 100644
--- a/dev-libs/OpenNI/OpenNI-9999.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,18 +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}/${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 +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-9999.ebuild b/dev-libs/OpenNI/OpenNI-9999.ebuild
index aef879f68ea..0febb7dba0b 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
 


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/OpenNI/
@ 2025-02-01 10:51 Florian Schmaus
  0 siblings, 0 replies; 8+ messages in thread
From: Florian Schmaus @ 2025-02-01 10:51 UTC (permalink / raw
  To: gentoo-commits

commit:     9f156f818dbe003dcd4989eb7f498895bf580ed1
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Mon Jan 20 11:44:53 2025 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sat Feb  1 10:50:44 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f156f81

dev-libs/OpenNI: introduce eapi9-pipestatus

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/39848
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 dev-libs/OpenNI/OpenNI-1.5.7.10-r4.ebuild | 6 ++++--
 dev-libs/OpenNI/OpenNI-9999.ebuild        | 5 +++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/dev-libs/OpenNI/OpenNI-1.5.7.10-r4.ebuild b/dev-libs/OpenNI/OpenNI-1.5.7.10-r4.ebuild
index ddb774905643..953a8814d8d8 100644
--- a/dev-libs/OpenNI/OpenNI-1.5.7.10-r4.ebuild
+++ b/dev-libs/OpenNI/OpenNI-1.5.7.10-r4.ebuild
@@ -9,7 +9,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 	EGIT_REPO_URI="https://github.com/OpenNI/OpenNI"
 fi
 
-inherit ${SCM} flag-o-matic toolchain-funcs java-pkg-opt-2
+inherit ${SCM} eapi9-pipestatus flag-o-matic java-pkg-opt-2 toolchain-funcs
 
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
@@ -61,8 +61,10 @@ src_prepare() {
 		echo "" > ${i}
 	done
 
+	local status
 	find . -type f -print0 |
-		xargs -0 sed -i "s:\".*/SamplesConfig.xml:\"${EPREFIX}/usr/share/${PN}/SamplesConfig.xml:" || die
+		xargs -0 sed -i "s:\".*/SamplesConfig.xml:\"${EPREFIX}/usr/share/${PN}/SamplesConfig.xml:"
+	status=$(pipestatus -v) || die "fails to sed SamplesConfig, (PIPESTATUS: ${status})"
 }
 
 src_compile() {

diff --git a/dev-libs/OpenNI/OpenNI-9999.ebuild b/dev-libs/OpenNI/OpenNI-9999.ebuild
index be002df28a15..49cb5d355e76 100644
--- a/dev-libs/OpenNI/OpenNI-9999.ebuild
+++ b/dev-libs/OpenNI/OpenNI-9999.ebuild
@@ -9,7 +9,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 	EGIT_REPO_URI="https://github.com/OpenNI/OpenNI"
 fi
 
-inherit ${SCM} flag-o-matic toolchain-funcs java-pkg-opt-2
+inherit ${SCM} eapi9-pipestatus flag-o-matic java-pkg-opt-2 toolchain-funcs
 
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
@@ -61,7 +61,8 @@ src_prepare() {
 	done
 
 	find . -type f -print0 |
-		xargs -0 sed -i "s:\".*/SamplesConfig.xml:\"${EPREFIX}/usr/share/${PN}/SamplesConfig.xml:" || die
+		xargs -0 sed -i "s:\".*/SamplesConfig.xml:\"${EPREFIX}/usr/share/${PN}/SamplesConfig.xml:"
+	status=$(pipestatus -v) || die "fails to sed SamplesConfig, (PIPESTATUS: ${status})"
 }
 
 src_compile() {


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/OpenNI/
@ 2025-02-01 10:51 Florian Schmaus
  0 siblings, 0 replies; 8+ messages in thread
From: Florian Schmaus @ 2025-02-01 10:51 UTC (permalink / raw
  To: gentoo-commits

commit:     eaec3cd47b054a268f01405fe25f0fe4b4258a57
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  1 10:25:31 2025 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sat Feb  1 10:50:45 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eaec3cd4

dev-libs/OpenNI: improve ebuild: add missing die, use bash test builtin, …

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 dev-libs/OpenNI/OpenNI-1.5.7.10-r4.ebuild | 28 +++++++++++++---------------
 dev-libs/OpenNI/OpenNI-9999.ebuild        | 29 ++++++++++++++---------------
 2 files changed, 27 insertions(+), 30 deletions(-)

diff --git a/dev-libs/OpenNI/OpenNI-1.5.7.10-r4.ebuild b/dev-libs/OpenNI/OpenNI-1.5.7.10-r4.ebuild
index 953a8814d8d8..5bfdd8618663 100644
--- a/dev-libs/OpenNI/OpenNI-1.5.7.10-r4.ebuild
+++ b/dev-libs/OpenNI/OpenNI-1.5.7.10-r4.ebuild
@@ -3,17 +3,14 @@
 
 EAPI=8
 
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/OpenNI/OpenNI"
 fi
 
-inherit ${SCM} eapi9-pipestatus flag-o-matic java-pkg-opt-2 toolchain-funcs
+inherit eapi9-pipestatus flag-o-matic java-pkg-opt-2 toolchain-funcs
 
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-else
+if [[ ${PV} != 9999 ]]; then
 	KEYWORDS="amd64 ~arm"
 	SRC_URI="https://github.com/OpenNI/OpenNI/archive/Stable-${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-Stable-${PV}"
@@ -58,7 +55,7 @@ src_prepare() {
 
 	rm -rf External/{LibJPEG,TinyXml}
 	for i in Platform/Linux/Build/Common/Platform.* Externals/PSCommon/Linux/Build/Platform.* ; do
-		echo "" > ${i}
+		echo "" > ${i} || die
 	done
 
 	local status
@@ -82,22 +79,23 @@ src_compile() {
 		MONO_FORMS_SAMPLES=""
 
 	if use doc ; then
-		cd "${S}/Source/DoxyGen"
+		cd Source/DoxyGen || die
 		doxygen || die
 	fi
 }
 
 src_install() {
-	dolib.so "${S}/Platform/Linux/Bin/"*Release/*.so
+	dolib.so Platform/Linux/Bin/*Release/*.so
 
 	insinto /usr/include/openni
 	doins -r Include/*
 
-	dobin "${S}/Platform/Linux/Bin/"*Release/{ni*,Ni*,Sample-*}
+	dobin 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
+		java-pkg_dojar Platform/Linux/Bin/*Release/*.jar
+		echo "java -jar ${JAVA_PKG_JARDEST}/org.openni.Samples.SimpleViewer.jar" \
+			 > org.openni.Samples.SimpleViewer || die
 		dobin org.openni.Samples.SimpleViewer
 	fi
 
@@ -108,7 +106,7 @@ src_install() {
 
 	if use doc ; then
 		docinto html
-		dodoc -r "${S}/Source/DoxyGen/html/"*
+		dodoc -r Source/DoxyGen/html/*
 		dodoc Source/DoxyGen/Text/*.txt
 	fi
 
@@ -116,7 +114,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [ "${ROOT:-/}" = "/" ] ; then
+	if [[ "${ROOT:-/}" = "/" ]]; then
 		for i in "${EROOR}/usr/$(get_libdir)"/libnim*.so ; do
 			einfo "Registering module ${i}"
 			niReg -r "${i}"

diff --git a/dev-libs/OpenNI/OpenNI-9999.ebuild b/dev-libs/OpenNI/OpenNI-9999.ebuild
index 49cb5d355e76..df0ce9a54b7a 100644
--- a/dev-libs/OpenNI/OpenNI-9999.ebuild
+++ b/dev-libs/OpenNI/OpenNI-9999.ebuild
@@ -3,17 +3,14 @@
 
 EAPI=8
 
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/OpenNI/OpenNI"
 fi
 
-inherit ${SCM} eapi9-pipestatus flag-o-matic java-pkg-opt-2 toolchain-funcs
+inherit eapi9-pipestatus flag-o-matic java-pkg-opt-2 toolchain-funcs
 
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-else
+if [[ ${PV} != 9999 ]]; then
 	KEYWORDS="~amd64 ~arm"
 	SRC_URI="https://github.com/OpenNI/OpenNI/archive/Stable-${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-Stable-${PV}"
@@ -57,9 +54,10 @@ src_prepare() {
 
 	rm -rf External/{LibJPEG,TinyXml}
 	for i in Platform/Linux/Build/Common/Platform.* Externals/PSCommon/Linux/Build/Platform.* ; do
-		echo "" > ${i}
+		echo "" > ${i} || die
 	done
 
+	local status
 	find . -type f -print0 |
 		xargs -0 sed -i "s:\".*/SamplesConfig.xml:\"${EPREFIX}/usr/share/${PN}/SamplesConfig.xml:"
 	status=$(pipestatus -v) || die "fails to sed SamplesConfig, (PIPESTATUS: ${status})"
@@ -80,22 +78,23 @@ src_compile() {
 		MONO_FORMS_SAMPLES=""
 
 	if use doc ; then
-		cd "${S}/Source/DoxyGen"
+		cd Source/DoxyGen || die
 		doxygen || die
 	fi
 }
 
 src_install() {
-	dolib.so "${S}/Platform/Linux/Bin/"*Release/*.so
+	dolib.so Platform/Linux/Bin/*Release/*.so
 
 	insinto /usr/include/openni
 	doins -r Include/*
 
-	dobin "${S}/Platform/Linux/Bin/"*Release/{ni*,Ni*,Sample-*}
+	dobin 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
+		java-pkg_dojar Platform/Linux/Bin/*Release/*.jar
+		echo "java -jar ${JAVA_PKG_JARDEST}/org.openni.Samples.SimpleViewer.jar" \
+			 > org.openni.Samples.SimpleViewer || die
 		dobin org.openni.Samples.SimpleViewer
 	fi
 
@@ -106,7 +105,7 @@ src_install() {
 
 	if use doc ; then
 		docinto html
-		dodoc -r "${S}/Source/DoxyGen/html/"*
+		dodoc -r Source/DoxyGen/html/*
 		dodoc Source/DoxyGen/Text/*.txt
 	fi
 
@@ -114,7 +113,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [ "${ROOT:-/}" = "/" ] ; then
+	if [[ "${ROOT:-/}" = "/" ]]; then
 		for i in "${EROOR}/usr/$(get_libdir)"/libnim*.so ; do
 			einfo "Registering module ${i}"
 			niReg -r "${i}"


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/OpenNI/
@ 2025-02-01 10:51 Florian Schmaus
  0 siblings, 0 replies; 8+ messages in thread
From: Florian Schmaus @ 2025-02-01 10:51 UTC (permalink / raw
  To: gentoo-commits

commit:     59be1c4cba9b62e9b3b61c33c2e8f8aeef1ceb05
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sat Dec 28 00:01:42 2024 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sat Feb  1 10:50:43 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59be1c4c

dev-libs/OpenNI: allow Java higher than 1.8

ebuilds which are pinned to 1.8 should go away before eol of openjdk:8

Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 ....5.7.10-r3.ebuild => OpenNI-1.5.7.10-r4.ebuild} | 23 +++++++++++++++-------
 dev-libs/OpenNI/OpenNI-9999.ebuild                 | 23 +++++++++++++++-------
 2 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/dev-libs/OpenNI/OpenNI-1.5.7.10-r3.ebuild b/dev-libs/OpenNI/OpenNI-1.5.7.10-r4.ebuild
similarity index 87%
rename from dev-libs/OpenNI/OpenNI-1.5.7.10-r3.ebuild
rename to dev-libs/OpenNI/OpenNI-1.5.7.10-r4.ebuild
index 1f0d665ef90f..ddb774905643 100644
--- a/dev-libs/OpenNI/OpenNI-1.5.7.10-r3.ebuild
+++ b/dev-libs/OpenNI/OpenNI-1.5.7.10-r4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -25,16 +25,24 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="doc java opengl"
 
-RDEPEND="
+COMMON_DEPEND="
 	media-libs/libjpeg-turbo:=
 	virtual/libusb:1
 	virtual/libudev
 	dev-libs/tinyxml
 	opengl? ( media-libs/freeglut !dev-libs/OpenNI2[opengl] )
-	java? ( virtual/jre:1.8 )
 "
-DEPEND="${RDEPEND}
-	java? ( virtual/jdk:1.8 )"
+
+DEPEND="
+	${COMMON_DEPEND}
+	java? ( >=virtual/jdk-1.8:* !dev-libs/OpenNI2[java] )
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	java? ( >=virtual/jre-1.8:* !dev-libs/OpenNI2[java] )
+"
+
 BDEPEND="doc? ( app-text/doxygen )"
 
 PATCHES=(
@@ -53,7 +61,8 @@ src_prepare() {
 		echo "" > ${i}
 	done
 
-	find . -type f -print0 | xargs -0 sed -i "s:\".*/SamplesConfig.xml:\"${EPREFIX}/usr/share/${PN}/SamplesConfig.xml:" || die
+	find . -type f -print0 |
+		xargs -0 sed -i "s:\".*/SamplesConfig.xml:\"${EPREFIX}/usr/share/${PN}/SamplesConfig.xml:" || die
 }
 
 src_compile() {

diff --git a/dev-libs/OpenNI/OpenNI-9999.ebuild b/dev-libs/OpenNI/OpenNI-9999.ebuild
index c9fcc45b7700..be002df28a15 100644
--- a/dev-libs/OpenNI/OpenNI-9999.ebuild
+++ b/dev-libs/OpenNI/OpenNI-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -25,16 +25,24 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="doc java opengl"
 
-RDEPEND="
+COMMON_DEPEND="
 	media-libs/libjpeg-turbo:=
 	virtual/libusb:1
 	virtual/libudev
 	dev-libs/tinyxml
 	opengl? ( media-libs/freeglut !dev-libs/OpenNI2[opengl] )
-	java? ( virtual/jre:1.8 )
 "
-DEPEND="${RDEPEND}
-	java? ( virtual/jdk:1.8 )"
+
+DEPEND="
+	${COMMON_DEPEND}
+	java? ( >=virtual/jdk-1.8:* !dev-libs/OpenNI2[java] )
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	java? ( >=virtual/jre-1.8:* !dev-libs/OpenNI2[java] )
+"
+
 BDEPEND="doc? ( app-text/doxygen )"
 
 PATCHES=(
@@ -52,7 +60,8 @@ src_prepare() {
 		echo "" > ${i}
 	done
 
-	find . -type f -print0 | xargs -0 sed -i "s:\".*/SamplesConfig.xml:\"${EPREFIX}/usr/share/${PN}/SamplesConfig.xml:" || die
+	find . -type f -print0 |
+		xargs -0 sed -i "s:\".*/SamplesConfig.xml:\"${EPREFIX}/usr/share/${PN}/SamplesConfig.xml:" || die
 }
 
 src_compile() {


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/OpenNI/
@ 2022-07-17 15:39 Sam James
  0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2022-07-17 15:39 UTC (permalink / raw
  To: gentoo-commits

commit:     fac3d0202ece002c52b02a95d0cf0476d1dc446f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 17 15:33:13 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 17 15:34:35 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fac3d020

dev-libs/OpenNI: force -fno-strict-aliasing

Closes: https://bugs.gentoo.org/855671
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../{OpenNI-1.5.7.10-r2.ebuild => OpenNI-1.5.7.10-r3.ebuild}  |  9 ++++++---
 dev-libs/OpenNI/OpenNI-9999.ebuild                            | 11 +++++++----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/dev-libs/OpenNI/OpenNI-1.5.7.10-r2.ebuild b/dev-libs/OpenNI/OpenNI-1.5.7.10-r3.ebuild
similarity index 93%
rename from dev-libs/OpenNI/OpenNI-1.5.7.10-r2.ebuild
rename to dev-libs/OpenNI/OpenNI-1.5.7.10-r3.ebuild
index c20e1e338bd8..dd1ccb8c41f8 100644
--- a/dev-libs/OpenNI/OpenNI-1.5.7.10-r2.ebuild
+++ b/dev-libs/OpenNI/OpenNI-1.5.7.10-r3.ebuild
@@ -9,7 +9,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 	EGIT_REPO_URI="https://github.com/OpenNI/OpenNI"
 fi
 
-inherit ${SCM} toolchain-funcs multilib java-pkg-opt-2
+inherit ${SCM} flag-o-matic toolchain-funcs java-pkg-opt-2
 
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
@@ -26,16 +26,16 @@ SLOT="0"
 IUSE="doc java opengl"
 
 RDEPEND="
+	media-libs/libjpeg-turbo:=
 	virtual/libusb:1
 	virtual/libudev
-	virtual/jpeg:0
 	dev-libs/tinyxml
 	opengl? ( media-libs/freeglut !dev-libs/OpenNI2[opengl] )
 	java? ( virtual/jre:1.8 )
 "
 DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
 	java? ( virtual/jdk:1.8 )"
+BDEPEND="doc? ( app-doc/doxygen )"
 
 PATCHES=(
 	"${FILESDIR}/tinyxml.patch"
@@ -57,6 +57,9 @@ src_prepare() {
 }
 
 src_compile() {
+	# bug #855671
+	append-flags -fno-strict-aliasing
+
 	emake -C "${S}/Platform/Linux/Build" \
 		CC="$(tc-getCC)" \
 		CXX="$(tc-getCXX)" \

diff --git a/dev-libs/OpenNI/OpenNI-9999.ebuild b/dev-libs/OpenNI/OpenNI-9999.ebuild
index 0febb7dba0b7..a200d7f1be3e 100644
--- a/dev-libs/OpenNI/OpenNI-9999.ebuild
+++ b/dev-libs/OpenNI/OpenNI-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 	EGIT_REPO_URI="https://github.com/OpenNI/OpenNI"
 fi
 
-inherit ${SCM} toolchain-funcs multilib java-pkg-opt-2
+inherit ${SCM} flag-o-matic toolchain-funcs java-pkg-opt-2
 
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
@@ -26,16 +26,16 @@ SLOT="0"
 IUSE="doc java opengl"
 
 RDEPEND="
+	media-libs/libjpeg-turbo:=
 	virtual/libusb:1
 	virtual/libudev
-	virtual/jpeg:0
 	dev-libs/tinyxml
 	opengl? ( media-libs/freeglut !dev-libs/OpenNI2[opengl] )
 	java? ( virtual/jre:1.8 )
 "
 DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
 	java? ( virtual/jdk:1.8 )"
+BDEPEND="doc? ( app-doc/doxygen )"
 
 PATCHES=(
 	"${FILESDIR}/tinyxml.patch"
@@ -56,6 +56,9 @@ src_prepare() {
 }
 
 src_compile() {
+	# bug #855671
+	append-flags -fno-strict-aliasing
+
 	emake -C "${S}/Platform/Linux/Build" \
 		CC="$(tc-getCC)" \
 		CXX="$(tc-getCXX)" \


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/OpenNI/
@ 2022-05-19 12:12 Joonas Niilola
  0 siblings, 0 replies; 8+ messages in thread
From: Joonas Niilola @ 2022-05-19 12:12 UTC (permalink / raw
  To: gentoo-commits

commit:     f4bfc352542a44f1e779ac2dd90ae30d0de1a86f
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Thu May 19 12:10:53 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu May 19 12:10:53 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4bfc352

dev-libs/OpenNI: Stabilize 1.5.7.10-r2 amd64, #829841

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 dev-libs/OpenNI/OpenNI-1.5.7.10-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-libs/OpenNI/OpenNI-1.5.7.10-r2.ebuild b/dev-libs/OpenNI/OpenNI-1.5.7.10-r2.ebuild
index fcd54b00b17a..c20e1e338bd8 100644
--- a/dev-libs/OpenNI/OpenNI-1.5.7.10-r2.ebuild
+++ b/dev-libs/OpenNI/OpenNI-1.5.7.10-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ inherit ${SCM} toolchain-funcs multilib java-pkg-opt-2
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
 else
-	KEYWORDS="~amd64 ~arm"
+	KEYWORDS="amd64 ~arm"
 	SRC_URI="https://github.com/OpenNI/OpenNI/archive/Stable-${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-Stable-${PV}"
 fi


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/OpenNI/
@ 2021-07-08 10:42 Joonas Niilola
  0 siblings, 0 replies; 8+ messages in thread
From: Joonas Niilola @ 2021-07-08 10:42 UTC (permalink / raw
  To: gentoo-commits

commit:     99466d5ed74ba746160dd5e16f96690e86d84c26
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Thu Jun 24 15:15:36 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Jul  8 10:42:18 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99466d5e

dev-libs/OpenNI: remove obsolete

Closes: https://bugs.gentoo.org/787359
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 dev-libs/OpenNI/OpenNI-1.5.7.10-r1.ebuild | 107 ------------------------------
 dev-libs/OpenNI/OpenNI-1.5.7.10.ebuild    | 106 -----------------------------
 2 files changed, 213 deletions(-)

diff --git a/dev-libs/OpenNI/OpenNI-1.5.7.10-r1.ebuild b/dev-libs/OpenNI/OpenNI-1.5.7.10-r1.ebuild
deleted file mode 100644
index 9f94c92b6ba..00000000000
--- a/dev-libs/OpenNI/OpenNI-1.5.7.10-r1.ebuild
+++ /dev/null
@@ -1,107 +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" \
-		"${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/OpenNI-1.5.7.10.ebuild b/dev-libs/OpenNI/OpenNI-1.5.7.10.ebuild
deleted file mode 100644
index a936bb62b67..00000000000
--- 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
-}


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/OpenNI/
@ 2019-09-25 17:31 Michał Górny
  0 siblings, 0 replies; 8+ messages in thread
From: Michał Górny @ 2019-09-25 17:31 UTC (permalink / raw
  To: gentoo-commits

commit:     534f2e086c7629cd8e0a0c7d0c000c431ca03812
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 30 14:55:31 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Sep 25 17:31:39 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=534f2e08

dev-libs/OpenNI: Remove unnecessary Python dep

Bug: https://bugs.gentoo.org/615916
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-libs/OpenNI/OpenNI-1.5.7.10.ebuild | 3 +--
 dev-libs/OpenNI/OpenNI-9999.ebuild     | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/dev-libs/OpenNI/OpenNI-1.5.7.10.ebuild b/dev-libs/OpenNI/OpenNI-1.5.7.10.ebuild
index af12cd1ce87..e2c08a5c23d 100644
--- a/dev-libs/OpenNI/OpenNI-1.5.7.10.ebuild
+++ b/dev-libs/OpenNI/OpenNI-1.5.7.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -35,7 +35,6 @@ RDEPEND="
 	java? ( >=virtual/jre-1.5 )
 "
 DEPEND="${RDEPEND}
-	dev-lang/python
 	doc? ( app-doc/doxygen )
 	java? ( >=virtual/jdk-1.5 )"
 

diff --git a/dev-libs/OpenNI/OpenNI-9999.ebuild b/dev-libs/OpenNI/OpenNI-9999.ebuild
index 79a0be764ee..2d37b651a91 100644
--- a/dev-libs/OpenNI/OpenNI-9999.ebuild
+++ b/dev-libs/OpenNI/OpenNI-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -35,7 +35,6 @@ RDEPEND="
 	java? ( >=virtual/jre-1.5 )
 "
 DEPEND="${RDEPEND}
-	dev-lang/python
 	doc? ( app-doc/doxygen )
 	java? ( >=virtual/jdk-1.5 )"
 


^ permalink raw reply related	[flat|nested] 8+ messages in thread
end of thread, other threads:[~2025-02-01 10:51 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-07-08 10:42 [gentoo-commits] repo/gentoo:master commit in: dev-libs/OpenNI/ Joonas Niilola
  -- strict thread matches above, loose matches on Subject: below --
2025-02-01 10:51 Florian Schmaus
2025-02-01 10:51 Florian Schmaus
2025-02-01 10:51 Florian Schmaus
2022-07-17 15:39 Sam James
2022-05-19 12:12 Joonas Niilola
2021-07-08 10:42 Joonas Niilola
2019-09-25 17:31 Michał Górny

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox