From 83b5cde41ddb8fd20de4536dd68eb08da42d013e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 17 Jul 2022 20:32:17 +0100 Subject: gentoo auto-resync : 17:07:2022 - 20:32:17 --- dev-libs/OpenNI/Manifest | 4 +- dev-libs/OpenNI/OpenNI-1.5.7.10-r2.ebuild | 111 ----------------------------- dev-libs/OpenNI/OpenNI-1.5.7.10-r3.ebuild | 114 ++++++++++++++++++++++++++++++ dev-libs/OpenNI/OpenNI-9999.ebuild | 11 +-- 4 files changed, 123 insertions(+), 117 deletions(-) delete mode 100644 dev-libs/OpenNI/OpenNI-1.5.7.10-r2.ebuild create mode 100644 dev-libs/OpenNI/OpenNI-1.5.7.10-r3.ebuild (limited to 'dev-libs/OpenNI') diff --git a/dev-libs/OpenNI/Manifest b/dev-libs/OpenNI/Manifest index 066943707d54..5303c145cb12 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-r2.ebuild 2499 BLAKE2B 79b5fab54da160dc7ad01119d69551aac6560a33e3b92e68a8be1ac0671c27de9849a1bb2b9c51aa7e3ac6f9464f4298444e4803b189a5c1731848b7d74b0f06 SHA512 4e0e6f4cbc61912163a3789b0c2186f499efb2c2e94769427b7441b51a8057ce7df5830e29745f1b4c838f7b965b603ba15462ef3e2417aed98f6321142075a1 -EBUILD OpenNI-9999.ebuild 2475 BLAKE2B d01e0a023d90224b78245198993c0a367aa297a0b541cac2b15629dae8fce78145867b2000b0834a0abd935bd93938fd25df0c686678a2c624bca2802cdc85c2 SHA512 eb3085ef6e21b372b33a040a11445263e2b5afc18a04c0b3d9b32010818b4f644db73f4f135bd23e04ee857fac3d9c2eecbba6ad6c369ad0b31bde3211109820 +EBUILD OpenNI-1.5.7.10-r3.ebuild 2575 BLAKE2B 9fe58e9a5cabcf8221428b74b493dc759ba08e83331ed3bc761841fc0f596d829709b24be4404b3eaabaeaf2fe64656c8f65058fe65913ae3928d57537945a4f SHA512 7f903d02dda123a9284a218e9a758cbc84a7abe3a906e2579a17c97f840d7b7c1f4cd0b5b4e951af1fe080af28f86962ebae06c3221d5e40ed22c2f84193e4ad +EBUILD OpenNI-9999.ebuild 2551 BLAKE2B 9d514718c31ba2bfd63799624fc6fcde862dc62aeef9a47697dc385879ecf992e866231ed7d9f97148371252f0062cb02a96ea8199f2e2fb4b9f66c7f3709f5f SHA512 3c9dd549842aea241e0ad6e49ddaaff676dcfd1373d74daab79ce43e5f82833528bd62ffd6821a4b1bc30399c088ec53e5da580e66ae9f6aa545f8aecb75eebd MISC metadata.xml 338 BLAKE2B 57b81adc9f4d40e4f9bc2af7e6ccd5023be4ee0fcdd61b2dee36bd451d22ff6c1d36e06f56fadb1b3a52743a3444751b86e5f0ba7d52b4c0560677aaa957343e SHA512 42212b13a7e8fdd7a60fe0a9a4c80ac7c379ed73a929aa1fbf59dc9fc746c00219e5ed012d5e09e198a0a69aaf721162af2adb2fa0de157439b582021fd07e1d diff --git a/dev-libs/OpenNI/OpenNI-1.5.7.10-r2.ebuild b/dev-libs/OpenNI/OpenNI-1.5.7.10-r2.ebuild deleted file mode 100644 index c20e1e338bd8..000000000000 --- a/dev-libs/OpenNI/OpenNI-1.5.7.10-r2.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2022 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/OpenNI/OpenNI" -fi - -inherit ${SCM} toolchain-funcs 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.8 ) -" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen ) - java? ( virtual/jdk:1.8 )" - -PATCHES=( - "${FILESDIR}/tinyxml.patch" - "${FILESDIR}/jpeg.patch" - "${FILESDIR}/soname.patch" - "${FILESDIR}/${P}-gcc6.patch" - "${FILESDIR}/betterdefines.patch" -) - -src_prepare() { - default - - 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 - docinto html - dodoc -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-r3.ebuild b/dev-libs/OpenNI/OpenNI-1.5.7.10-r3.ebuild new file mode 100644 index 000000000000..dd1ccb8c41f8 --- /dev/null +++ b/dev-libs/OpenNI/OpenNI-1.5.7.10-r3.ebuild @@ -0,0 +1,114 @@ +# Copyright 1999-2022 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/OpenNI/OpenNI" +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/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=" + 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 )" +BDEPEND="doc? ( app-doc/doxygen )" + +PATCHES=( + "${FILESDIR}/tinyxml.patch" + "${FILESDIR}/jpeg.patch" + "${FILESDIR}/soname.patch" + "${FILESDIR}/${P}-gcc6.patch" + "${FILESDIR}/betterdefines.patch" +) + +src_prepare() { + default + + 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() { + # bug #855671 + append-flags -fno-strict-aliasing + + 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 + docinto html + dodoc -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 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)" \ -- cgit v1.2.3