From 417ef5d7c7bd36af15766ab14554600fbe7daed7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 1 Feb 2025 22:43:06 +0000 Subject: gentoo auto-resync : 01:02:2025 - 22:43:06 --- dev-libs/OpenNI2/Manifest | 6 +- dev-libs/OpenNI2/OpenNI2-2.2_beta2-r1.ebuild | 108 ------------------------- dev-libs/OpenNI2/OpenNI2-2.2_beta2-r2.ebuild | 113 +++++++++++++++++++++++++++ dev-libs/OpenNI2/OpenNI2-9999.ebuild | 53 +++++++------ dev-libs/OpenNI2/metadata.xml | 2 +- 5 files changed, 146 insertions(+), 136 deletions(-) delete mode 100644 dev-libs/OpenNI2/OpenNI2-2.2_beta2-r1.ebuild create mode 100644 dev-libs/OpenNI2/OpenNI2-2.2_beta2-r2.ebuild (limited to 'dev-libs/OpenNI2') diff --git a/dev-libs/OpenNI2/Manifest b/dev-libs/OpenNI2/Manifest index 31ce537d9c47..d4f42c692f79 100644 --- a/dev-libs/OpenNI2/Manifest +++ b/dev-libs/OpenNI2/Manifest @@ -5,6 +5,6 @@ AUX pthread.patch 977 BLAKE2B ce3989613ea9672b67deecd0ca35f5f4bb31d8bcd6cd46985e AUX rpath.patch 569 BLAKE2B 5a9433fb5ef61c73c08b22d942f8f9a4b5340bf3e8f7fe834f56025dac0d4a65c17065a0e8151d36c2fbcd7651a3e6c4d4c7579ad1dfff6f552877197c619345 SHA512 86adda790d6814b0339ff969e262b78282c977ff4dc16268d4e7831e1086886aefee5c37c5bae9e97b7caf3e9f22e922f87e429e586fafc8e5503b4f99ef4adc AUX soname.patch 674 BLAKE2B ba4b8038016ced8d573e57257cbcc7a61f175ec29a720f2d86c04aeacbd5608d315ee54e8ef260daf1548788a59ebe2cafe0d911cedf58b7eae9f8c0b9c6dec6 SHA512 fec4ab17efd29e1fc05a880584aa63559d311a248ef6def36af9c7c652f93aa0ba77f600115f0e4093b7c5c0b446955a4d36d9663196882f5c460a26d99498be DIST OpenNI2-2.2_beta2.tar.gz 8681740 BLAKE2B b5191fefd93a5b10e43412d4f0c1ae095a5168ea788d0e2b325daff3ee0329a47f3341c0d712c3a186d23cb3f9fa03478f3342acbd634502cc92aaed0d97d185 SHA512 60a3a3043679f3069aea869e92dc5881328ce4393d4140ea8d089027321ac501ae27d283657214e2834d216d0d49bf4f29a4b3d3e43df27a6ed21f889cd0083f -EBUILD OpenNI2-2.2_beta2-r1.ebuild 2666 BLAKE2B f9d7548e26c7663dd863973cf10f3f1e0f293452eac21387a5a6bae8577e7e720a4ed171d3aa2924f878b1586137e855891ad83ec7d4f0c40a47b8918b39024d SHA512 087beb8e15edc312b893edfc0fe118fb3beb555cf45da2edb7e2cb804e6df5e1d3d63dda0465d83f60ad4116d26552c729b39607be00808767b617e164a80355 -EBUILD OpenNI2-9999.ebuild 2614 BLAKE2B 5005c2eea31d3276c7e57495ef8da4daa960b586cfda3def61acf20a3fa69bc85d0264660026b68e492cf21ae538c351de80df2faf9bf4b68bfcb3dbf8229932 SHA512 049f3057d6932c0bb4e78235ac7b32e66cdbf633345fcad81ca2269e7665be9e0b18a37000d1d2ac47e091840f0d8837853457e014236eea9409b1eb789b4bf2 -MISC metadata.xml 342 BLAKE2B 79de2b17743b42d3994a610f70f25ee5b5a31b47c7b26a0e59bf0d3bfdede42785b35528bda8cc60197b7e83d0546d36a985dc1c96f5b2f9e35d541e3cb4077d SHA512 2bcf413ed30f3e964530038b75e9e1b01bc952e900a168ab614f1124218807e1293815787d4e7420ba354b26e70cf1676a2833576447cb909c8deb2f97e8c684 +EBUILD OpenNI2-2.2_beta2-r2.ebuild 2701 BLAKE2B 9f3c1f83d46bb25ef679096581d4715eef3f667359c257706b222074355250afce5a6912440650280c1b672a3c42862df8a47e95e746d3f893f93c6570f66a5d SHA512 bded99953dd79e5d77dda209eb5a55269abcee5f31824d1fc7063a68f67dd6623700ed9cafe3c6ab845b978c8a85208fa367f2173f1f4c548a408a560b885ded +EBUILD OpenNI2-9999.ebuild 2647 BLAKE2B 4e922d0def5a74552aa26d39fd29f63f2f132d5446a4d92119123cb6f0e22731c03b8a9af624284c227ae3e1b30272f5c31c14eb5a0cb40abd07251913df6569 SHA512 8b34bb8d836092c1e2e6f4fdfb5de7b9bd7969b6a27b8c7924201b70d31d7b0ea8f42664896e2d228c251a0b3b0fad60d9a559dd0dc603930716b087b44fb14d +MISC metadata.xml 344 BLAKE2B effe78302b033712e77f33d23235fa8cf49caa8190afebce676a809393157601b89116514078a15d0f414cfe6e940e95cf3bb16ce40c80b4b91a607a952f0d5e SHA512 d8d1cd995679f4750b8486e9ce7255105933d962b88dcf2f2e4ed870e07dc920657d5c90055fdd514afd6eeaaf8589e61ac91107265d5ab83473eedefac1c4df diff --git a/dev-libs/OpenNI2/OpenNI2-2.2_beta2-r1.ebuild b/dev-libs/OpenNI2/OpenNI2-2.2_beta2-r1.ebuild deleted file mode 100644 index 606cfeb0619a..000000000000 --- a/dev-libs/OpenNI2/OpenNI2-2.2_beta2-r1.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -SCM="" -if [ "${PV#9999}" != "${PV}" ] ; then - SCM="git-r3" - EGIT_REPO_URI="https://github.com/occipital/openni2" -fi - -inherit ${SCM} flag-o-matic toolchain-funcs java-pkg-opt-2 - -if [ "${PV#9999}" != "${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="cpu_flags_arm_neon doc java opengl static-libs" - -RDEPEND=" - media-libs/libjpeg-turbo:= - virtual/libusb:1 - virtual/libudev - opengl? ( media-libs/freeglut ) - java? ( virtual/jre:1.8 ) -" -DEPEND="${RDEPEND} - doc? ( app-text/doxygen ) - java? ( virtual/jdk:1.8 )" - -PATCHES=( - "${FILESDIR}/jpeg.patch" - "${FILESDIR}/rpath.patch" - "${FILESDIR}/soname.patch" - "${FILESDIR}/pthread.patch" - "${FILESDIR}/c++14.patch" -) - -src_prepare() { - default - - rm -rf ThirdParty/LibJPEG - for i in ThirdParty/PSCommon/BuildSystem/Platform.* ; do - echo "" > ${i} - done -} - -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)" \ - 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 - docinto html - dodoc -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 -} diff --git a/dev-libs/OpenNI2/OpenNI2-2.2_beta2-r2.ebuild b/dev-libs/OpenNI2/OpenNI2-2.2_beta2-r2.ebuild new file mode 100644 index 000000000000..3545f1ca97c4 --- /dev/null +++ b/dev-libs/OpenNI2/OpenNI2-2.2_beta2-r2.ebuild @@ -0,0 +1,113 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/occipital/openni2" +fi + +inherit flag-o-matic toolchain-funcs java-pkg-opt-2 + +if [[ ${PV} != 9999 ]]; then + KEYWORDS="amd64 ~arm" + SRC_URI="https://github.com/structureio/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="cpu_flags_arm_neon doc java opengl static-libs" + +COMMON_DEPEND=" + media-libs/libjpeg-turbo:= + virtual/libusb:1 + virtual/libudev + opengl? ( media-libs/freeglut ) +" + +DEPEND=" + ${COMMON_DEPEND} + doc? ( app-text/doxygen ) + java? ( >=virtual/jdk-1.8:* !dev-libs/OpenNI[java] ) +" + +RDEPEND=" + ${COMMON_DEPEND} + java? ( >=virtual/jre-1.8:* !dev-libs/OpenNI[java] ) +" + +PATCHES=( + "${FILESDIR}/jpeg.patch" + "${FILESDIR}/rpath.patch" + "${FILESDIR}/soname.patch" + "${FILESDIR}/pthread.patch" + "${FILESDIR}/c++14.patch" +) + +src_prepare() { + default + + rm -rf ThirdParty/LibJPEG + for i in ThirdParty/PSCommon/BuildSystem/Platform.* ; do + echo "" > ${i} || die + done +} + +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)" \ + 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 Source/Documentation || die + doxygen || die + fi +} + +src_install() { + dolib.so Bin/*Release/*.so + cp -a Bin/*Release/OpenNI2 "${ED}/usr/$(get_libdir)" || die + + use static-libs && dolib.a Bin/*Release/*.a + + insinto /usr/include/openni2 + doins -r Include/* + + dobin Bin/*Release/{PS1080Console,PSLinkConsole,SimpleRead,EventBasedRead,MultipleStreamRead,MWClosestPointApp} + use opengl && dobin Bin/*Release/{NiViewer,SimpleViewer,MultiDepthViewer,ClosestPointViewer} + + if use java ; then + java-pkg_dojar 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 + + dodoc CHANGES.txt NOTICE README ReleaseNotes.txt Source/Documentation/Text/*.txt + + if use doc ; then + docinto html + dodoc -r 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 +} diff --git a/dev-libs/OpenNI2/OpenNI2-9999.ebuild b/dev-libs/OpenNI2/OpenNI2-9999.ebuild index fc73839fa7df..413f8a32f97e 100644 --- a/dev-libs/OpenNI2/OpenNI2-9999.ebuild +++ b/dev-libs/OpenNI2/OpenNI2-9999.ebuild @@ -1,40 +1,44 @@ -# 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 - SCM="git-r3" +if [[ ${PV} == 9999 ]]; then + inherit git-r3 EGIT_REPO_URI="https://github.com/occipital/openni2" fi -inherit ${SCM} flag-o-matic toolchain-funcs java-pkg-opt-2 +inherit flag-o-matic toolchain-funcs java-pkg-opt-2 -if [ "${PV#9999}" != "${PV}" ] ; then - SRC_URI="" -else +if [[ ${PV} != 9999 ]]; then 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" +HOMEPAGE="https://structure.io/openni/" LICENSE="Apache-2.0" SLOT="0" IUSE="cpu_flags_arm_neon doc java opengl static-libs" -RDEPEND=" +COMMON_DEPEND=" media-libs/libjpeg-turbo:= virtual/libusb:1 virtual/libudev opengl? ( media-libs/freeglut ) - java? ( virtual/jre:1.8 ) " -DEPEND="${RDEPEND} + +DEPEND=" + ${COMMON_DEPEND} doc? ( app-text/doxygen ) - java? ( virtual/jdk:1.8 )" + java? ( >=virtual/jdk-1.8:* !dev-libs/OpenNI[java] ) +" + +RDEPEND=" + ${COMMON_DEPEND} + java? ( >=virtual/jre-1.8:* !dev-libs/OpenNI[java] ) +" PATCHES=( "${FILESDIR}/jpeg.patch" @@ -47,7 +51,7 @@ src_prepare() { rm -rf ThirdParty/LibJPEG for i in ThirdParty/PSCommon/BuildSystem/Platform.* ; do - echo "" > ${i} + echo "" > ${i} || die done } @@ -68,26 +72,27 @@ src_compile() { $(usex java "" JAVA_SAMPLES="") if use doc ; then - cd "${S}/Source/Documentation" + cd Source/Documentation || die doxygen || die fi } src_install() { - dolib.so "${S}/Bin/"*Release/*.so - cp -a "${S}/Bin/"*Release/OpenNI2 "${ED}/usr/$(get_libdir)" + dolib.so Bin/*Release/*.so + cp -a Bin/*Release/OpenNI2 "${ED}/usr/$(get_libdir)" || die - use static-libs && dolib.a "${S}/Bin/"*Release/*.a + use static-libs && dolib.a 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} + dobin Bin/*Release/{PS1080Console,PSLinkConsole,SimpleRead,EventBasedRead,MultipleStreamRead,MWClosestPointApp} + use opengl && dobin 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 + java-pkg_dojar 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 @@ -95,7 +100,7 @@ src_install() { if use doc ; then docinto html - dodoc -r "${S}/Source/Documentation/html/"* + dodoc -r Source/Documentation/html/* fi dodir /usr/$(get_libdir)/pkgconfig diff --git a/dev-libs/OpenNI2/metadata.xml b/dev-libs/OpenNI2/metadata.xml index 6aa04fabbca1..6a172c677d91 100644 --- a/dev-libs/OpenNI2/metadata.xml +++ b/dev-libs/OpenNI2/metadata.xml @@ -6,6 +6,6 @@ Alexis Ballier - occipital/OpenNI2 + structureio/OpenNI2 -- cgit v1.2.3