[gentoo-commits] repo/gentoo:master commit in: dev-libs/OpenNI2/
commit: 4284176d4423a366a93ba7b381384f5eae561565 Author: Sam James gentoo org> AuthorDate: Sun Jan 15 21:50:53 2023 + Commit: Sam James gentoo org> CommitDate: Sun Jan 15 21:50:59 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4284176d dev-libs/OpenNI2: invert debugging hack Bug: https://bugs.gentoo.org/716346 Fixes: a7713d3db8cfaf20ad059849f859785bb91e2584 Signed-off-by: Sam James gentoo.org> dev-libs/OpenNI2/OpenNI2-2.2_beta2-r1.ebuild | 2 +- dev-libs/OpenNI2/OpenNI2-.ebuild | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-libs/OpenNI2/OpenNI2-2.2_beta2-r1.ebuild b/dev-libs/OpenNI2/OpenNI2-2.2_beta2-r1.ebuild index cb6ab6415daa..f6f44ab31fe4 100644 --- a/dev-libs/OpenNI2/OpenNI2-2.2_beta2-r1.ebuild +++ b/dev-libs/OpenNI2/OpenNI2-2.2_beta2-r1.ebuild @@ -54,7 +54,7 @@ src_prepare() { } src_compile() { - if use elibc_glibc ; then + if ! use elibc_glibc ; then # Build system doesn't respect CPPFLAGS. # bug #716346 append-flags -DXN_PLATFORM_LINUX_NO_GLIBC -DXN_PLATFORM_HAS_NO_SCHED_PARAM diff --git a/dev-libs/OpenNI2/OpenNI2-.ebuild b/dev-libs/OpenNI2/OpenNI2-.ebuild index dafb9834ae95..2c75c2c95808 100644 --- a/dev-libs/OpenNI2/OpenNI2-.ebuild +++ b/dev-libs/OpenNI2/OpenNI2-.ebuild @@ -9,7 +9,7 @@ if [ "${PV#}" != "${PV}" ] ; then EGIT_REPO_URI="https://github.com/occipital/openni2"; fi -inherit ${SCM} toolchain-funcs java-pkg-opt-2 +inherit ${SCM} flag-o-matic toolchain-funcs java-pkg-opt-2 if [ "${PV#}" != "${PV}" ] ; then SRC_URI="" @@ -52,7 +52,7 @@ src_prepare() { } src_compile() { - if use elibc_glibc ; then + if ! use elibc_glibc ; then # Build system doesn't respect CPPFLAGS. # bug #716346 append-flags -DXN_PLATFORM_LINUX_NO_GLIBC -DXN_PLATFORM_HAS_NO_SCHED_PARAM
[gentoo-commits] repo/gentoo:master commit in: dev-libs/OpenNI2/
commit: a7713d3db8cfaf20ad059849f859785bb91e2584 Author: Sam James gentoo org> AuthorDate: Sun Jan 15 21:47:00 2023 + Commit: Sam James gentoo org> CommitDate: Sun Jan 15 21:49:57 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7713d3d dev-libs/OpenNI2: fix build w/ musl Upstream don't do any sort of configure-time detection for functionality, but conveniently, they do provide macros to let us disable use of and glibc internals like __sched_param (ew). (Use append-flags rather than cppflags because OpenNI2 is already on life-support in my view and I don't really want to have to add even more patches to fix the build system...) Closes: https://bugs.gentoo.org/716346 Thanks-to: Waiting for the Rain Signed-off-by: Sam James gentoo.org> dev-libs/OpenNI2/OpenNI2-2.2_beta2-r1.ebuild | 10 -- dev-libs/OpenNI2/OpenNI2-.ebuild | 8 +++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dev-libs/OpenNI2/OpenNI2-2.2_beta2-r1.ebuild b/dev-libs/OpenNI2/OpenNI2-2.2_beta2-r1.ebuild index 13ddc4a27916..cb6ab6415daa 100644 --- a/dev-libs/OpenNI2/OpenNI2-2.2_beta2-r1.ebuild +++ b/dev-libs/OpenNI2/OpenNI2-2.2_beta2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ if [ "${PV#}" != "${PV}" ] ; then EGIT_REPO_URI="https://github.com/occipital/openni2"; fi -inherit ${SCM} toolchain-funcs java-pkg-opt-2 +inherit ${SCM} flag-o-matic toolchain-funcs java-pkg-opt-2 if [ "${PV#}" != "${PV}" ] ; then SRC_URI="" @@ -54,6 +54,12 @@ src_prepare() { } src_compile() { + if use elibc_glibc ; then + # Build system doesn't respect CPPFLAGS. + # bug #716346 + append-flags -DXN_PLATFORM_LINUX_NO_GLIBC -DXN_PLATFORM_HAS_NO_SCHED_PARAM + fi + use cpu_flags_arm_neon && export CFLAGS="${CFLAGS} -DXN_NEON" emake \ CC="$(tc-getCC)" \ diff --git a/dev-libs/OpenNI2/OpenNI2-.ebuild b/dev-libs/OpenNI2/OpenNI2-.ebuild index ffd87acd6445..dafb9834ae95 100644 --- a/dev-libs/OpenNI2/OpenNI2-.ebuild +++ b/dev-libs/OpenNI2/OpenNI2-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -52,6 +52,12 @@ src_prepare() { } src_compile() { + if use elibc_glibc ; then + # Build system doesn't respect CPPFLAGS. + # bug #716346 + append-flags -DXN_PLATFORM_LINUX_NO_GLIBC -DXN_PLATFORM_HAS_NO_SCHED_PARAM + fi + use cpu_flags_arm_neon && export CFLAGS="${CFLAGS} -DXN_NEON" emake \ CC="$(tc-getCC)" \
[gentoo-commits] repo/gentoo:master commit in: dev-libs/OpenNI2/
commit: 742917f8c621f168617e55d17722fa8d7521c562 Author: David Seifert gentoo org> AuthorDate: Fri Jul 15 07:58:05 2022 + Commit: David Seifert gentoo org> CommitDate: Fri Jul 15 07:58:05 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=742917f8 dev-libs/OpenNI2: neon -> cpu_flags_arm_neon Closes: https://bugs.gentoo.org/694070 Signed-off-by: David Seifert gentoo.org> dev-libs/OpenNI2/OpenNI2-2.2_beta2-r1.ebuild | 8 dev-libs/OpenNI2/OpenNI2-.ebuild | 10 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dev-libs/OpenNI2/OpenNI2-2.2_beta2-r1.ebuild b/dev-libs/OpenNI2/OpenNI2-2.2_beta2-r1.ebuild index a74f713947b0..13ddc4a27916 100644 --- a/dev-libs/OpenNI2/OpenNI2-2.2_beta2-r1.ebuild +++ b/dev-libs/OpenNI2/OpenNI2-2.2_beta2-r1.ebuild @@ -9,7 +9,7 @@ if [ "${PV#}" != "${PV}" ] ; then EGIT_REPO_URI="https://github.com/occipital/openni2"; fi -inherit ${SCM} toolchain-funcs multilib java-pkg-opt-2 flag-o-matic +inherit ${SCM} toolchain-funcs java-pkg-opt-2 if [ "${PV#}" != "${PV}" ] ; then SRC_URI="" @@ -23,12 +23,12 @@ DESCRIPTION="OpenNI2 SDK" HOMEPAGE="https://structure.io/openni"; LICENSE="Apache-2.0" SLOT="0" -IUSE="doc java neon opengl static-libs" +IUSE="cpu_flags_arm_neon doc java opengl static-libs" RDEPEND=" + media-libs/libjpeg-turbo:= virtual/libusb:1 virtual/libudev - virtual/jpeg:0 opengl? ( media-libs/freeglut ) java? ( virtual/jre:1.8 ) " @@ -54,7 +54,7 @@ src_prepare() { } src_compile() { - use neon && export CFLAGS="${CFLAGS} -DXN_NEON" + use cpu_flags_arm_neon && export CFLAGS="${CFLAGS} -DXN_NEON" emake \ CC="$(tc-getCC)" \ CXX="$(tc-getCXX)" \ diff --git a/dev-libs/OpenNI2/OpenNI2-.ebuild b/dev-libs/OpenNI2/OpenNI2-.ebuild index 210a3efeea3a..ffd87acd6445 100644 --- a/dev-libs/OpenNI2/OpenNI2-.ebuild +++ b/dev-libs/OpenNI2/OpenNI2-.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#}" != "${PV}" ] ; then EGIT_REPO_URI="https://github.com/occipital/openni2"; fi -inherit ${SCM} toolchain-funcs multilib java-pkg-opt-2 flag-o-matic +inherit ${SCM} toolchain-funcs java-pkg-opt-2 if [ "${PV#}" != "${PV}" ] ; then SRC_URI="" @@ -23,12 +23,12 @@ DESCRIPTION="OpenNI2 SDK" HOMEPAGE="https://structure.io/openni"; LICENSE="Apache-2.0" SLOT="0" -IUSE="doc java neon opengl static-libs" +IUSE="cpu_flags_arm_neon doc java opengl static-libs" RDEPEND=" + media-libs/libjpeg-turbo:= virtual/libusb:1 virtual/libudev - virtual/jpeg:0 opengl? ( media-libs/freeglut ) java? ( virtual/jre:1.8 ) " @@ -52,7 +52,7 @@ src_prepare() { } src_compile() { - use neon && export CFLAGS="${CFLAGS} -DXN_NEON" + use cpu_flags_arm_neon && export CFLAGS="${CFLAGS} -DXN_NEON" emake \ CC="$(tc-getCC)" \ CXX="$(tc-getCXX)" \
[gentoo-commits] repo/gentoo:master commit in: dev-libs/OpenNI2/
commit: a7a740257636f669f51f55174cace88f298db722 Author: Joonas Niilola gentoo org> AuthorDate: Thu May 19 12:10:46 2022 + Commit: Joonas Niilola gentoo org> CommitDate: Thu May 19 12:10:46 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7a74025 dev-libs/OpenNI2: Stabilize 2.2_beta2-r1 amd64, #829841 Signed-off-by: Joonas Niilola gentoo.org> dev-libs/OpenNI2/OpenNI2-2.2_beta2-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-libs/OpenNI2/OpenNI2-2.2_beta2-r1.ebuild b/dev-libs/OpenNI2/OpenNI2-2.2_beta2-r1.ebuild index 8650fe294537..a74f713947b0 100644 --- a/dev-libs/OpenNI2/OpenNI2-2.2_beta2-r1.ebuild +++ b/dev-libs/OpenNI2/OpenNI2-2.2_beta2-r1.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 flag-o-matic if [ "${PV#}" != "${PV}" ] ; then SRC_URI="" else - KEYWORDS="~amd64 ~arm" + KEYWORDS="amd64 ~arm" SRC_URI="https://github.com/occipital/OpenNI2/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${P/_/-}" fi
[gentoo-commits] repo/gentoo:master commit in: dev-libs/OpenNI2/
commit: 5c85975050825e50eb49be893ee6321d0021b363 Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Thu Jun 24 15:37:46 2021 + Commit: Joonas Niilola gentoo org> CommitDate: Thu Jul 8 10:42:19 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c859750 dev-libs/OpenNI2: remove obsolete Closes: https://bugs.gentoo.org/787356 Package-Manager: Portage-3.0.20, Repoman-3.0.2 Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/21407 Signed-off-by: Joonas Niilola gentoo.org> dev-libs/OpenNI2/OpenNI2-2.2_beta2.ebuild | 98 --- 1 file changed, 98 deletions(-) diff --git a/dev-libs/OpenNI2/OpenNI2-2.2_beta2.ebuild b/dev-libs/OpenNI2/OpenNI2-2.2_beta2.ebuild deleted file mode 100644 index 2edb89b3f14..000 --- a/dev-libs/OpenNI2/OpenNI2-2.2_beta2.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -SCM="" -if [ "${PV#}" != "${PV}" ] ; then - SCM="git-r3" - EGIT_REPO_URI="https://github.com/occipital/openni2"; -fi - -inherit ${SCM} toolchain-funcs epatch multilib java-pkg-opt-2 flag-o-matic - -if [ "${PV#}" != "${PV}" ] ; then - SRC_URI="" -else - KEYWORDS="~amd64 ~arm" - SRC_URI="https://github.com/occipital/OpenNI2/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${P/_/-}" -fi - -DESCRIPTION="OpenNI2 SDK" -HOMEPAGE="https://structure.io/openni"; -LICENSE="Apache-2.0" -SLOT="0" -IUSE="doc java neon opengl static-libs" - -RDEPEND=" - virtual/libusb:1 - virtual/libudev - virtual/jpeg:0 - opengl? ( media-libs/freeglut ) - java? ( >=virtual/jre-1.5:* ) -" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen ) - java? ( >=virtual/jdk-1.5:* )" - -src_prepare() { - epatch \ - "${FILESDIR}/jpeg.patch" \ - "${FILESDIR}/rpath.patch" \ - "${FILESDIR}/soname.patch" \ - "${FILESDIR}/pthread.patch" \ - "${FILESDIR}/c++14.patch" - - rm -rf ThirdParty/LibJPEG - for i in ThirdParty/PSCommon/BuildSystem/Platform.* ; do - echo "" > ${i} - done -} - -src_compile() { - use neon && export CFLAGS="${CFLAGS} -DXN_NEON" - emake \ - CC="$(tc-getCC)" \ - CXX="$(tc-getCXX)" \ - ALLOW_WARNINGS=1 \ - GLUT_SUPPORTED="$(usex opengl 1 0)" \ - $(usex java "" ALL_WRAPPERS="") \ - $(usex java "" JAVA_SAMPLES="") - - if use doc ; then - cd "${S}/Source/Documentation" - doxygen || die - fi -} - -src_install() { - dolib.so "${S}/Bin/"*Release/*.so - cp -a "${S}/Bin/"*Release/OpenNI2 "${ED}/usr/$(get_libdir)" - - use static-libs && dolib.a "${S}/Bin/"*Release/*.a - - insinto /usr/include/openni2 - doins -r Include/* - - dobin "${S}/Bin/"*Release/{PS1080Console,PSLinkConsole,SimpleRead,EventBasedRead,MultipleStreamRead,MWClosestPointApp} - use opengl && dobin "${S}/Bin/"*Release/{NiViewer,SimpleViewer,MultiDepthViewer,ClosestPointViewer} - - if use java ; then - java-pkg_dojar "${S}/Bin/"*Release/*.jar - echo "java -jar ${JAVA_PKG_JARDEST}/org.openni.Samples.SimpleViewer.jar" > org.openni.Samples.SimpleViewer - dobin org.openni.Samples.SimpleViewer - fi - - dodoc CHANGES.txt NOTICE README ReleaseNotes.txt Source/Documentation/Text/*.txt - - if use doc ; then - dohtml -r "${S}/Source/Documentation/html/"* - fi - - dodir /usr/$(get_libdir)/pkgconfig - sed \ - -e "s/@libdir@/$(get_libdir)/" \ - -e "s/@version@/${PV}/" \ - "${FILESDIR}/libopenni2.pc.in" > "${ED}/usr/$(get_libdir)/pkgconfig/libopenni2.pc" || die -}
[gentoo-commits] repo/gentoo:master commit in: dev-libs/OpenNI2/
commit: dc51531bfd51c2792c0855fc4168eed258ce6834 Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Thu Jun 24 15:35:39 2021 + Commit: Joonas Niilola gentoo org> CommitDate: Thu Jul 8 10:42:19 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc51531b dev-libs/OpenNI2: min java 1.8 Bug: https://bugs.gentoo.org/787356 Package-Manager: Portage-3.0.20, Repoman-3.0.2 Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Signed-off-by: Joonas Niilola gentoo.org> ...NI2-.ebuild => OpenNI2-2.2_beta2-r1.ebuild} | 26 +- dev-libs/OpenNI2/OpenNI2-.ebuild | 22 ++ 2 files changed, 29 insertions(+), 19 deletions(-) diff --git a/dev-libs/OpenNI2/OpenNI2-.ebuild b/dev-libs/OpenNI2/OpenNI2-2.2_beta2-r1.ebuild similarity index 82% copy from dev-libs/OpenNI2/OpenNI2-.ebuild copy to dev-libs/OpenNI2/OpenNI2-2.2_beta2-r1.ebuild index 13ff01010ca..8650fe29453 100644 --- a/dev-libs/OpenNI2/OpenNI2-.ebuild +++ b/dev-libs/OpenNI2/OpenNI2-2.2_beta2-r1.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#}" != "${PV}" ] ; then @@ -9,7 +9,7 @@ if [ "${PV#}" != "${PV}" ] ; then EGIT_REPO_URI="https://github.com/occipital/openni2"; fi -inherit ${SCM} toolchain-funcs epatch multilib java-pkg-opt-2 flag-o-matic +inherit ${SCM} toolchain-funcs multilib java-pkg-opt-2 flag-o-matic if [ "${PV#}" != "${PV}" ] ; then SRC_URI="" @@ -30,17 +30,22 @@ RDEPEND=" virtual/libudev virtual/jpeg:0 opengl? ( media-libs/freeglut ) - 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}/jpeg.patch" + "${FILESDIR}/rpath.patch" + "${FILESDIR}/soname.patch" + "${FILESDIR}/pthread.patch" + "${FILESDIR}/c++14.patch" +) src_prepare() { - epatch \ - "${FILESDIR}/jpeg.patch" \ - "${FILESDIR}/rpath.patch" \ - "${FILESDIR}/soname.patch" + default rm -rf ThirdParty/LibJPEG for i in ThirdParty/PSCommon/BuildSystem/Platform.* ; do @@ -82,10 +87,11 @@ src_install() { dobin org.openni.Samples.SimpleViewer fi - dodoc CHANGES.txt NOTICE README.md ReleaseNotes.txt Source/Documentation/Text/*.txt + dodoc CHANGES.txt NOTICE README ReleaseNotes.txt Source/Documentation/Text/*.txt if use doc ; then - dohtml -r "${S}/Source/Documentation/html/"* + docinto html + dodoc -r "${S}/Source/Documentation/html/"* fi dodir /usr/$(get_libdir)/pkgconfig diff --git a/dev-libs/OpenNI2/OpenNI2-.ebuild b/dev-libs/OpenNI2/OpenNI2-.ebuild index 13ff01010ca..210a3efeea3 100644 --- a/dev-libs/OpenNI2/OpenNI2-.ebuild +++ b/dev-libs/OpenNI2/OpenNI2-.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#}" != "${PV}" ] ; then @@ -9,7 +9,7 @@ if [ "${PV#}" != "${PV}" ] ; then EGIT_REPO_URI="https://github.com/occipital/openni2"; fi -inherit ${SCM} toolchain-funcs epatch multilib java-pkg-opt-2 flag-o-matic +inherit ${SCM} toolchain-funcs multilib java-pkg-opt-2 flag-o-matic if [ "${PV#}" != "${PV}" ] ; then SRC_URI="" @@ -30,17 +30,20 @@ RDEPEND=" virtual/libudev virtual/jpeg:0 opengl? ( media-libs/freeglut ) - 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}/jpeg.patch" + "${FILESDIR}/rpath.patch" + "${FILESDIR}/soname.patch" +) src_prepare() { - epatch \ - "${FILESDIR}/jpeg.patch" \ - "${FILESDIR}/rpath.patch" \ - "${FILESDIR}/soname.patch" + default rm -rf ThirdParty/LibJPEG for i in ThirdParty/PSCommon/BuildSystem/Platform.* ; do @@ -85,7 +88,8 @@ src_install() { dodoc CHANGES.txt NOTICE README.md ReleaseNotes.txt Source/Documentation/Text/*.txt if use doc ; then - dohtml -r "${S}/Source/Documentation/html/"* + docinto html + dodoc -r "${S}/Source/Documentation/html/"* fi dodir /usr/$(get_libdir)/pkgconfig
[gentoo-commits] repo/gentoo:master commit in: dev-libs/OpenNI2/
commit: 473d75a00afe53d215d4e3e93782ae2c3953168c Author: Michał Górny gentoo org> AuthorDate: Fri Aug 30 14:57:28 2019 + Commit: Michał Górny gentoo org> CommitDate: Wed Sep 25 17:31:40 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=473d75a0 dev-libs/OpenNI2: Remove unnecessary Python dep Closes: https://bugs.gentoo.org/615916 Signed-off-by: Michał Górny gentoo.org> dev-libs/OpenNI2/OpenNI2-2.2_beta2.ebuild | 3 +-- dev-libs/OpenNI2/OpenNI2-.ebuild | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dev-libs/OpenNI2/OpenNI2-2.2_beta2.ebuild b/dev-libs/OpenNI2/OpenNI2-2.2_beta2.ebuild index 4f39df7f406..e3fb3e2b667 100644 --- a/dev-libs/OpenNI2/OpenNI2-2.2_beta2.ebuild +++ b/dev-libs/OpenNI2/OpenNI2-2.2_beta2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -34,7 +34,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/OpenNI2/OpenNI2-.ebuild b/dev-libs/OpenNI2/OpenNI2-.ebuild index 1ced5f727b7..f9609af50af 100644 --- a/dev-libs/OpenNI2/OpenNI2-.ebuild +++ b/dev-libs/OpenNI2/OpenNI2-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -34,7 +34,6 @@ RDEPEND=" java? ( >=virtual/jre-1.5:* ) " DEPEND="${RDEPEND} - dev-lang/python doc? ( app-doc/doxygen ) java? ( >=virtual/jdk-1.5:* )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/OpenNI2/
commit: cb04c132b4d521e9db0f96a56d6c5053c0b6f65c Author: Michael Mair-Keimberger gmail com> AuthorDate: Thu Feb 22 17:28:04 2018 + Commit: Alexis Ballier gentoo org> CommitDate: Thu Feb 22 20:18:29 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb04c132 dev-libs/OpenNI2: use HTTPS dev-libs/OpenNI2/OpenNI2-2.2_beta2.ebuild | 4 ++-- dev-libs/OpenNI2/OpenNI2-.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dev-libs/OpenNI2/OpenNI2-2.2_beta2.ebuild b/dev-libs/OpenNI2/OpenNI2-2.2_beta2.ebuild index 218a3a477fa..4f39df7f406 100644 --- a/dev-libs/OpenNI2/OpenNI2-2.2_beta2.ebuild +++ b/dev-libs/OpenNI2/OpenNI2-2.2_beta2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -21,7 +21,7 @@ else fi DESCRIPTION="OpenNI2 SDK" -HOMEPAGE="http://structure.io/openni"; +HOMEPAGE="https://structure.io/openni"; LICENSE="Apache-2.0" SLOT="0" IUSE="doc java neon opengl static-libs" diff --git a/dev-libs/OpenNI2/OpenNI2-.ebuild b/dev-libs/OpenNI2/OpenNI2-.ebuild index ced4cfb2c9e..1ced5f727b7 100644 --- a/dev-libs/OpenNI2/OpenNI2-.ebuild +++ b/dev-libs/OpenNI2/OpenNI2-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -21,7 +21,7 @@ else fi DESCRIPTION="OpenNI2 SDK" -HOMEPAGE="http://structure.io/openni"; +HOMEPAGE="https://structure.io/openni"; LICENSE="Apache-2.0" SLOT="0" IUSE="doc java neon opengl static-libs"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/OpenNI2/
commit: 055a751ac114080c7b2701808de05d33c158862f Author: David Seifert gentoo org> AuthorDate: Sun Jan 29 09:12:31 2017 + Commit: David Seifert gentoo org> CommitDate: Sun Jan 29 09:12:51 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=055a751a dev-libs/OpenNI2: Any jre/jdk SLOT is acceptable Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-libs/OpenNI2/OpenNI2-.ebuild | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-libs/OpenNI2/OpenNI2-.ebuild b/dev-libs/OpenNI2/OpenNI2-.ebuild index 8dfe5af..1777b00 100644 --- a/dev-libs/OpenNI2/OpenNI2-.ebuild +++ b/dev-libs/OpenNI2/OpenNI2-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -32,12 +32,12 @@ RDEPEND=" virtual/libudev virtual/jpeg:0 opengl? ( media-libs/freeglut ) - java? ( >=virtual/jre-1.5 ) + java? ( >=virtual/jre-1.5:* ) " DEPEND="${RDEPEND} dev-lang/python doc? ( app-doc/doxygen ) - java? ( >=virtual/jdk-1.5 )" + java? ( >=virtual/jdk-1.5:* )" src_prepare() { epatch \
[gentoo-commits] repo/gentoo:master commit in: dev-libs/OpenNI2/files/, dev-libs/OpenNI2/
commit: 59fbcc5eef1b6b865839a8e3d721d0ad6d0ff082 Author: David Seifert gentoo org> AuthorDate: Sun Jan 29 09:10:36 2017 + Commit: David Seifert gentoo org> CommitDate: Sun Jan 29 09:12:48 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59fbcc5e dev-libs/OpenNI2: Rename 'equivalent' to avoid C++14 name clash Gentoo-bug: 594910 Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-libs/OpenNI2/OpenNI2-2.2_beta2.ebuild | 9 +- dev-libs/OpenNI2/files/c++14.patch| 145 ++ 2 files changed, 150 insertions(+), 4 deletions(-) diff --git a/dev-libs/OpenNI2/OpenNI2-2.2_beta2.ebuild b/dev-libs/OpenNI2/OpenNI2-2.2_beta2.ebuild index 0a2acf4..acae8b5 100644 --- a/dev-libs/OpenNI2/OpenNI2-2.2_beta2.ebuild +++ b/dev-libs/OpenNI2/OpenNI2-2.2_beta2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -32,19 +32,20 @@ RDEPEND=" virtual/libudev virtual/jpeg:0 opengl? ( media-libs/freeglut ) - java? ( >=virtual/jre-1.5 ) + java? ( >=virtual/jre-1.5:* ) " DEPEND="${RDEPEND} dev-lang/python doc? ( app-doc/doxygen ) - java? ( >=virtual/jdk-1.5 )" + java? ( >=virtual/jdk-1.5:* )" src_prepare() { epatch \ "${FILESDIR}/jpeg.patch" \ "${FILESDIR}/rpath.patch" \ "${FILESDIR}/soname.patch" \ - "${FILESDIR}/pthread.patch" + "${FILESDIR}/pthread.patch" \ + "${FILESDIR}/c++14.patch" rm -rf ThirdParty/LibJPEG for i in ThirdParty/PSCommon/BuildSystem/Platform.* ; do diff --git a/dev-libs/OpenNI2/files/c++14.patch b/dev-libs/OpenNI2/files/c++14.patch new file mode 100644 index ..95343a6 --- /dev/null +++ b/dev-libs/OpenNI2/files/c++14.patch @@ -0,0 +1,145 @@ +The 'equivalent' macro clashes with equivalent() member functions of the +std::error_category::equivalent class in C++11 and above. +See also: +https://bugs.gentoo.org/show_bug.cgi?id=594910 + +--- a/ThirdParty/GL/glh/glh_linear.h b/ThirdParty/GL/glh/glh_linear.h +@@ -77,7 +77,7 @@ + #define GLH_EPSILON GLH_REAL(10e-6) + #define GLH_PI GLH_REAL(3.1415926535897932384626433832795) + +-#define equivalent(a,b) (((a < b + GLH_EPSILON) && (a > b - GLH_EPSILON)) ? true : false) ++#define equivalent_(a,b) (((a < b + GLH_EPSILON) && (a > b - GLH_EPSILON)) ? true : false) + + namespace glh + { +@@ -1093,7 +1093,7 @@ + + real norm = q[0] * q[0] + q[1] * q[1] + q[2] * q[2] + q[3] * q[3]; + +-s = (equivalent(norm,GLH_ZERO)) ? GLH_ZERO : ( GLH_TWO / norm ); ++s = (equivalent_(norm,GLH_ZERO)) ? GLH_ZERO : ( GLH_TWO / norm ); + + xs = q[0] * s; + ys = q[1] * s; +@@ -1194,7 +1194,7 @@ + theta *= real(0.5); + real sin_theta = real(sin(theta)); + +-if (!equivalent(sqnorm,GLH_ONE)) ++if (!equivalent_(sqnorm,GLH_ONE)) + sin_theta /= real(sqrt(sqnorm)); + x = sin_theta * axis.v[0]; + y = sin_theta * axis.v[1]; +@@ -1216,14 +1216,14 @@ + + alpha = p1.dot(p2); + +-if(equivalent(alpha,GLH_ONE)) ++if(equivalent_(alpha,GLH_ONE)) + { + *this = identity(); + return *this; + } + + // ensures that the anti-parallel case leads to a positive dot +-if(equivalent(alpha,-GLH_ONE)) ++if(equivalent_(alpha,-GLH_ONE)) + { + vec3 v; + +@@ -1280,7 +1280,7 @@ + void normalize() + { + real rnorm = GLH_ONE / real(sqrt(w * w + x * x + y * y + z * z)); +-if (equivalent(rnorm, GLH_ZERO)) ++if (equivalent_(rnorm, GLH_ZERO)) + return; + x *= rnorm; + y *= rnorm; +@@ -1439,10 +1439,10 @@ + inline + bool operator == ( const quaternion & q1, const quaternion & q2 ) + { +-return (equivalent(q1.x, q2.x) && +- equivalent(q1.y, q2.y) && +- equivalent(q1.z, q2.z) && +- equivalent(q1.w, q2.w) ); ++return (equivalent_(q1.x, q2.x) && ++ equivalent_(q1.y, q2.y) && ++ equivalent_(q1.z, q2.z) && ++ equivalent_(q1.w, q2.w) ); + } + + inline +--- a/ThirdParty/PSCommon/XnLib/ThirdParty/GL/glh/glh_linear.h b/ThirdParty/PSCommon/XnLib/ThirdParty/GL/glh/glh_linear.h +@@ -77,7 +77,7 @@ + #define GLH_EPSILON GLH_REAL(10e-6) + #define GLH_PI GLH_REAL(3.1415926535897932384626433832795) + +-#define equivalent(a,b) (((a < b + GLH_EPSILON) && (a > b - GLH_EPSILON)) ? true : false) ++#define equivalent_(a,b) (((a < b + GLH_EPSILON) && (a > b - GLH_EPSILON)) ? true : false) + +