diff options
Diffstat (limited to 'dev-libs/OpenNI2')
| -rw-r--r-- | dev-libs/OpenNI2/Manifest | 4 | ||||
| -rw-r--r-- | dev-libs/OpenNI2/OpenNI2-2.2_beta2-r1.ebuild (renamed from dev-libs/OpenNI2/OpenNI2-2.2_beta2.ebuild) | 26 | ||||
| -rw-r--r-- | dev-libs/OpenNI2/OpenNI2-9999.ebuild | 22 |
3 files changed, 30 insertions, 22 deletions
diff --git a/dev-libs/OpenNI2/Manifest b/dev-libs/OpenNI2/Manifest index 0b69b59d2d7e..15e6291fa21a 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.ebuild 2467 BLAKE2B e35c984cefcaffb793902ceae3a459ce10e60994e149869b7de46bcbcddf396154ffcebc322e68d1ed46e06731f41fc7088234d18f94846482c351198223b3ec SHA512 dc1b394b9628ff536adfeff3837ab036c4e34e8531ee7a5d2407558c403d014d216b81dee0b32f79acbff8c116cd92013961943594963e2a6a4e98b6c75b4e38 -EBUILD OpenNI2-9999.ebuild 2408 BLAKE2B c283d2936dee2ad41ba640bb7241888cc9ddc21e20c02b09b537b4d87b354a85fe36ec64783c761a96a17cc238e2375a092ddbdf1b097d38eff1e04304f64d7a SHA512 ca1a2a7a5654767261e2a3e7b833b69034b959419b8f5d838ce0cc4deba40d3c5c7c93d0eb330b3067350e9ccd712c4877cc586c5916ac0a8ffc9322a7471911 +EBUILD OpenNI2-2.2_beta2-r1.ebuild 2465 BLAKE2B 4c01ff55fc8ddd2280a426976824045acd2fce0ca052365975c2dd92c8d2986cee78724cda8a623ba38891f5f40f549251d09ce9334465f85cec3d8b441d2593 SHA512 1d21d1b545d376e1fcb800e41a993a05d2669ebdc5edbed08dc43af776db8800503fa9600ce3e976dd5c789d019841cc2e918dd766d9fc70c6af482383e0367f +EBUILD OpenNI2-9999.ebuild 2412 BLAKE2B 79170f9c10e8df722109df4d125be0f2ff21a02cf01ab955742b633e685bf4690a3e0f5d9a38da976f610e2ea653bc209d6ae5f2ab1779d5a94ff8509769f102 SHA512 b1e1777d2e221a54704afe0c016324aac677ec9a3cfbc3f13e8dfd985c079ac003e8322121667571563e7a9186999c05b2d18b82c45c8c9a0462a719c9ed7834 MISC metadata.xml 341 BLAKE2B 5cf0f39369a82aea80badc678a0766aa9f9d2d2fef2108fa27bca9f7233d443371298334b356ba6253edba043d941a0ce821e23f5c1a119cddcedd8e79b1c9b7 SHA512 414b64e60046dc1628494ab50ae5f4c5594b9fe71daf7cdc844428200e6122bc471e27f982fa4eaaed6db6f93fb53312118a35dd52e01c576e8597f3e21b23c8 diff --git a/dev-libs/OpenNI2/OpenNI2-2.2_beta2.ebuild b/dev-libs/OpenNI2/OpenNI2-2.2_beta2-r1.ebuild index 2edb89b3f146..8650fe294537 100644 --- a/dev-libs/OpenNI2/OpenNI2-2.2_beta2.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#9999}" != "${PV}" ] ; then @@ -9,7 +9,7 @@ if [ "${PV#9999}" != "${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#9999}" != "${PV}" ] ; then SRC_URI="" @@ -30,19 +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" \ - "${FILESDIR}/pthread.patch" \ - "${FILESDIR}/c++14.patch" + default rm -rf ThirdParty/LibJPEG for i in ThirdParty/PSCommon/BuildSystem/Platform.* ; do @@ -87,7 +90,8 @@ src_install() { 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-9999.ebuild b/dev-libs/OpenNI2/OpenNI2-9999.ebuild index 13ff01010ca9..210a3efeea3a 100644 --- a/dev-libs/OpenNI2/OpenNI2-9999.ebuild +++ b/dev-libs/OpenNI2/OpenNI2-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/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#9999}" != "${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 |