| 1 |
commit: dc51531bfd51c2792c0855fc4168eed258ce6834 |
| 2 |
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> |
| 3 |
AuthorDate: Thu Jun 24 15:35:39 2021 +0000 |
| 4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jul 8 10:42:19 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc51531b |
| 7 |
|
| 8 |
dev-libs/OpenNI2: min java 1.8 |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/787356 |
| 11 |
Package-Manager: Portage-3.0.20, Repoman-3.0.2 |
| 12 |
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> |
| 13 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
| 14 |
|
| 15 |
...NI2-9999.ebuild => OpenNI2-2.2_beta2-r1.ebuild} | 26 +++++++++++++--------- |
| 16 |
dev-libs/OpenNI2/OpenNI2-9999.ebuild | 22 ++++++++++-------- |
| 17 |
2 files changed, 29 insertions(+), 19 deletions(-) |
| 18 |
|
| 19 |
diff --git a/dev-libs/OpenNI2/OpenNI2-9999.ebuild b/dev-libs/OpenNI2/OpenNI2-2.2_beta2-r1.ebuild |
| 20 |
similarity index 82% |
| 21 |
copy from dev-libs/OpenNI2/OpenNI2-9999.ebuild |
| 22 |
copy to dev-libs/OpenNI2/OpenNI2-2.2_beta2-r1.ebuild |
| 23 |
index 13ff01010ca..8650fe29453 100644 |
| 24 |
--- a/dev-libs/OpenNI2/OpenNI2-9999.ebuild |
| 25 |
+++ b/dev-libs/OpenNI2/OpenNI2-2.2_beta2-r1.ebuild |
| 26 |
@@ -1,7 +1,7 @@ |
| 27 |
# Copyright 1999-2021 Gentoo Authors |
| 28 |
# Distributed under the terms of the GNU General Public License v2 |
| 29 |
|
| 30 |
-EAPI=5 |
| 31 |
+EAPI=7 |
| 32 |
|
| 33 |
SCM="" |
| 34 |
if [ "${PV#9999}" != "${PV}" ] ; then |
| 35 |
@@ -9,7 +9,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then |
| 36 |
EGIT_REPO_URI="https://github.com/occipital/openni2" |
| 37 |
fi |
| 38 |
|
| 39 |
-inherit ${SCM} toolchain-funcs epatch multilib java-pkg-opt-2 flag-o-matic |
| 40 |
+inherit ${SCM} toolchain-funcs multilib java-pkg-opt-2 flag-o-matic |
| 41 |
|
| 42 |
if [ "${PV#9999}" != "${PV}" ] ; then |
| 43 |
SRC_URI="" |
| 44 |
@@ -30,17 +30,22 @@ RDEPEND=" |
| 45 |
virtual/libudev |
| 46 |
virtual/jpeg:0 |
| 47 |
opengl? ( media-libs/freeglut ) |
| 48 |
- java? ( >=virtual/jre-1.5:* ) |
| 49 |
+ java? ( virtual/jre:1.8 ) |
| 50 |
" |
| 51 |
DEPEND="${RDEPEND} |
| 52 |
doc? ( app-doc/doxygen ) |
| 53 |
- java? ( >=virtual/jdk-1.5:* )" |
| 54 |
+ java? ( virtual/jdk:1.8 )" |
| 55 |
+ |
| 56 |
+PATCHES=( |
| 57 |
+ "${FILESDIR}/jpeg.patch" |
| 58 |
+ "${FILESDIR}/rpath.patch" |
| 59 |
+ "${FILESDIR}/soname.patch" |
| 60 |
+ "${FILESDIR}/pthread.patch" |
| 61 |
+ "${FILESDIR}/c++14.patch" |
| 62 |
+) |
| 63 |
|
| 64 |
src_prepare() { |
| 65 |
- epatch \ |
| 66 |
- "${FILESDIR}/jpeg.patch" \ |
| 67 |
- "${FILESDIR}/rpath.patch" \ |
| 68 |
- "${FILESDIR}/soname.patch" |
| 69 |
+ default |
| 70 |
|
| 71 |
rm -rf ThirdParty/LibJPEG |
| 72 |
for i in ThirdParty/PSCommon/BuildSystem/Platform.* ; do |
| 73 |
@@ -82,10 +87,11 @@ src_install() { |
| 74 |
dobin org.openni.Samples.SimpleViewer |
| 75 |
fi |
| 76 |
|
| 77 |
- dodoc CHANGES.txt NOTICE README.md ReleaseNotes.txt Source/Documentation/Text/*.txt |
| 78 |
+ dodoc CHANGES.txt NOTICE README ReleaseNotes.txt Source/Documentation/Text/*.txt |
| 79 |
|
| 80 |
if use doc ; then |
| 81 |
- dohtml -r "${S}/Source/Documentation/html/"* |
| 82 |
+ docinto html |
| 83 |
+ dodoc -r "${S}/Source/Documentation/html/"* |
| 84 |
fi |
| 85 |
|
| 86 |
dodir /usr/$(get_libdir)/pkgconfig |
| 87 |
|
| 88 |
diff --git a/dev-libs/OpenNI2/OpenNI2-9999.ebuild b/dev-libs/OpenNI2/OpenNI2-9999.ebuild |
| 89 |
index 13ff01010ca..210a3efeea3 100644 |
| 90 |
--- a/dev-libs/OpenNI2/OpenNI2-9999.ebuild |
| 91 |
+++ b/dev-libs/OpenNI2/OpenNI2-9999.ebuild |
| 92 |
@@ -1,7 +1,7 @@ |
| 93 |
# Copyright 1999-2021 Gentoo Authors |
| 94 |
# Distributed under the terms of the GNU General Public License v2 |
| 95 |
|
| 96 |
-EAPI=5 |
| 97 |
+EAPI=7 |
| 98 |
|
| 99 |
SCM="" |
| 100 |
if [ "${PV#9999}" != "${PV}" ] ; then |
| 101 |
@@ -9,7 +9,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then |
| 102 |
EGIT_REPO_URI="https://github.com/occipital/openni2" |
| 103 |
fi |
| 104 |
|
| 105 |
-inherit ${SCM} toolchain-funcs epatch multilib java-pkg-opt-2 flag-o-matic |
| 106 |
+inherit ${SCM} toolchain-funcs multilib java-pkg-opt-2 flag-o-matic |
| 107 |
|
| 108 |
if [ "${PV#9999}" != "${PV}" ] ; then |
| 109 |
SRC_URI="" |
| 110 |
@@ -30,17 +30,20 @@ RDEPEND=" |
| 111 |
virtual/libudev |
| 112 |
virtual/jpeg:0 |
| 113 |
opengl? ( media-libs/freeglut ) |
| 114 |
- java? ( >=virtual/jre-1.5:* ) |
| 115 |
+ java? ( virtual/jre:1.8 ) |
| 116 |
" |
| 117 |
DEPEND="${RDEPEND} |
| 118 |
doc? ( app-doc/doxygen ) |
| 119 |
- java? ( >=virtual/jdk-1.5:* )" |
| 120 |
+ java? ( virtual/jdk:1.8 )" |
| 121 |
+ |
| 122 |
+PATCHES=( |
| 123 |
+ "${FILESDIR}/jpeg.patch" |
| 124 |
+ "${FILESDIR}/rpath.patch" |
| 125 |
+ "${FILESDIR}/soname.patch" |
| 126 |
+) |
| 127 |
|
| 128 |
src_prepare() { |
| 129 |
- epatch \ |
| 130 |
- "${FILESDIR}/jpeg.patch" \ |
| 131 |
- "${FILESDIR}/rpath.patch" \ |
| 132 |
- "${FILESDIR}/soname.patch" |
| 133 |
+ default |
| 134 |
|
| 135 |
rm -rf ThirdParty/LibJPEG |
| 136 |
for i in ThirdParty/PSCommon/BuildSystem/Platform.* ; do |
| 137 |
@@ -85,7 +88,8 @@ src_install() { |
| 138 |
dodoc CHANGES.txt NOTICE README.md ReleaseNotes.txt Source/Documentation/Text/*.txt |
| 139 |
|
| 140 |
if use doc ; then |
| 141 |
- dohtml -r "${S}/Source/Documentation/html/"* |
| 142 |
+ docinto html |
| 143 |
+ dodoc -r "${S}/Source/Documentation/html/"* |
| 144 |
fi |
| 145 |
|
| 146 |
dodir /usr/$(get_libdir)/pkgconfig |
Archives