diff options
Diffstat (limited to 'dev-libs')
-rw-r--r-- | dev-libs/Manifest.gz | bin | 99977 -> 100002 bytes | |||
-rw-r--r-- | dev-libs/OpenNI/Manifest | 4 | ||||
-rw-r--r-- | dev-libs/OpenNI/OpenNI-1.5.7.10-r4.ebuild (renamed from dev-libs/OpenNI/OpenNI-1.5.7.10-r3.ebuild) | 53 | ||||
-rw-r--r-- | dev-libs/OpenNI/OpenNI-9999.ebuild | 53 | ||||
-rw-r--r-- | dev-libs/OpenNI2/Manifest | 6 | ||||
-rw-r--r-- | dev-libs/OpenNI2/OpenNI2-2.2_beta2-r2.ebuild (renamed from dev-libs/OpenNI2/OpenNI2-2.2_beta2-r1.ebuild) | 55 | ||||
-rw-r--r-- | dev-libs/OpenNI2/OpenNI2-9999.ebuild | 53 | ||||
-rw-r--r-- | dev-libs/OpenNI2/metadata.xml | 2 | ||||
-rw-r--r--[-rwxr-xr-x] | dev-libs/collada-dom/files/take_snapshot.sh | 0 |
9 files changed, 127 insertions, 99 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz Binary files differindex 704186d5aac5..f7f08cd273c2 100644 --- a/dev-libs/Manifest.gz +++ b/dev-libs/Manifest.gz diff --git a/dev-libs/OpenNI/Manifest b/dev-libs/OpenNI/Manifest index 30f7d3d72c0f..f11db25b6b74 100644 --- a/dev-libs/OpenNI/Manifest +++ b/dev-libs/OpenNI/Manifest @@ -4,6 +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-r3.ebuild 2576 BLAKE2B b54fd247e804217ea5dbfccc639d017cff5eba3dd35f2942802bc7abe3f56134b27a484778d6550933de44d337e47507317c5328a57146f0956d3277c97f9ef5 SHA512 4a2b5902ea5fbf7d49faf9b387b913962d7c789119c3af3542366e99ada9f40e941aafda6677841e458b2c31de0d2e30b275bb4e3014892ef18960b1bdebefda -EBUILD OpenNI-9999.ebuild 2552 BLAKE2B 4bfef35132d2f9c3c07e299f05271b224d9a2922d3229b8a5ca7fbebb9b206dd12dedc2a8e8030f83b72f9b5f4afc68ecbb669a1fbc10c12220ff016e953017b SHA512 a51b140962228fa174143dc2f0a2cb60a26ede6f3f1f11737aaa4cdf88d36f07f44c573a71305fb67efff28ad6da6ade2dc6b8fed7f4ae4644dc3bf86b865b8e +EBUILD OpenNI-1.5.7.10-r4.ebuild 2738 BLAKE2B ceff84938c4c0e4832781ac8e7331e97b5f4e0ef42a4b2d405edefafabdfbf9cc3b80dbb8b4e15c2fc0ff9e3fc58708fc50bc62181f89b3e6f762bc5d07d8a7c SHA512 3236da3022d1ac972611e0ba4acfc36a2844daafc55f3822510cb34ebac2f1af25875d2152b7cda7dba54b80b989fa8783b608c32e9b006e10c739e09673a17f +EBUILD OpenNI-9999.ebuild 2714 BLAKE2B 1e478d0b45cd18977fd3d784d61d8b610e42ffedb85b583ec42f635f021daa0d2253a7fa539b7bc441328107735fb9bcf2015d084a8ceb6bc20e5375bb935c8f SHA512 4da3a049c46f4e74b954f39b87f527312d43c200069c2c448d0e0b93bb7a8f7ce6684bf20a3752458fca19b8ce797dc1114be41da714ee6b731433b0495ae275 MISC metadata.xml 338 BLAKE2B 57b81adc9f4d40e4f9bc2af7e6ccd5023be4ee0fcdd61b2dee36bd451d22ff6c1d36e06f56fadb1b3a52743a3444751b86e5f0ba7d52b4c0560677aaa957343e SHA512 42212b13a7e8fdd7a60fe0a9a4c80ac7c379ed73a929aa1fbf59dc9fc746c00219e5ed012d5e09e198a0a69aaf721162af2adb2fa0de157439b582021fd07e1d diff --git a/dev-libs/OpenNI/OpenNI-1.5.7.10-r3.ebuild b/dev-libs/OpenNI/OpenNI-1.5.7.10-r4.ebuild index 1f0d665ef90f..5bfdd8618663 100644 --- a/dev-libs/OpenNI/OpenNI-1.5.7.10-r3.ebuild +++ b/dev-libs/OpenNI/OpenNI-1.5.7.10-r4.ebuild @@ -1,19 +1,16 @@ -# 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/OpenNI/OpenNI" fi -inherit ${SCM} flag-o-matic toolchain-funcs java-pkg-opt-2 +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}" @@ -25,16 +22,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=( @@ -50,10 +55,13 @@ 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 - find . -type f -print0 | xargs -0 sed -i "s:\".*/SamplesConfig.xml:\"${EPREFIX}/usr/share/${PN}/SamplesConfig.xml:" || die + 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})" } src_compile() { @@ -71,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 @@ -97,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 @@ -105,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 c9fcc45b7700..df0ce9a54b7a 100644 --- a/dev-libs/OpenNI/OpenNI-9999.ebuild +++ b/dev-libs/OpenNI/OpenNI-9999.ebuild @@ -1,19 +1,16 @@ -# 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/OpenNI/OpenNI" fi -inherit ${SCM} flag-o-matic toolchain-funcs java-pkg-opt-2 +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}" @@ -25,16 +22,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=( @@ -49,10 +54,13 @@ 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 - find . -type f -print0 | xargs -0 sed -i "s:\".*/SamplesConfig.xml:\"${EPREFIX}/usr/share/${PN}/SamplesConfig.xml:" || die + 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})" } src_compile() { @@ -70,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 @@ -96,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 @@ -104,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}" 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-r2.ebuild index 606cfeb0619a..3545f1ca97c4 100644 --- a/dev-libs/OpenNI2/OpenNI2-2.2_beta2-r1.ebuild +++ b/dev-libs/OpenNI2/OpenNI2-2.2_beta2-r2.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" + 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" +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" @@ -49,7 +53,7 @@ src_prepare() { rm -rf ThirdParty/LibJPEG for i in ThirdParty/PSCommon/BuildSystem/Platform.* ; do - echo "" > ${i} + echo "" > ${i} || die done } @@ -70,26 +74,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 @@ -97,7 +102,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/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 @@ <name>Alexis Ballier</name> </maintainer> <upstream> - <remote-id type="github">occipital/OpenNI2</remote-id> + <remote-id type="github">structureio/OpenNI2</remote-id> </upstream> </pkgmetadata> diff --git a/dev-libs/collada-dom/files/take_snapshot.sh b/dev-libs/collada-dom/files/take_snapshot.sh index fcf9c75e3423..fcf9c75e3423 100755..100644 --- a/dev-libs/collada-dom/files/take_snapshot.sh +++ b/dev-libs/collada-dom/files/take_snapshot.sh |