| 1 |
commit: 1aa58ef166e215fabe14931238a80bfc3a728ff0 |
| 2 |
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> |
| 3 |
AuthorDate: Thu Jun 24 15:13:10 2021 +0000 |
| 4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jul 8 10:42:18 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1aa58ef1 |
| 7 |
|
| 8 |
dev-libs/OpenNI: min java 1.8:* |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/787359 |
| 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 |
...penNI-9999.ebuild => OpenNI-1.5.7.10-r2.ebuild} | 25 +++++++++++++--------- |
| 16 |
dev-libs/OpenNI/OpenNI-9999.ebuild | 24 ++++++++++++--------- |
| 17 |
2 files changed, 29 insertions(+), 20 deletions(-) |
| 18 |
|
| 19 |
diff --git a/dev-libs/OpenNI/OpenNI-9999.ebuild b/dev-libs/OpenNI/OpenNI-1.5.7.10-r2.ebuild |
| 20 |
similarity index 86% |
| 21 |
copy from dev-libs/OpenNI/OpenNI-9999.ebuild |
| 22 |
copy to dev-libs/OpenNI/OpenNI-1.5.7.10-r2.ebuild |
| 23 |
index aef879f68ea..fcd54b00b17 100644 |
| 24 |
--- a/dev-libs/OpenNI/OpenNI-9999.ebuild |
| 25 |
+++ b/dev-libs/OpenNI/OpenNI-1.5.7.10-r2.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/OpenNI/OpenNI" |
| 37 |
fi |
| 38 |
|
| 39 |
-inherit ${SCM} toolchain-funcs epatch multilib java-pkg-opt-2 |
| 40 |
+inherit ${SCM} toolchain-funcs multilib java-pkg-opt-2 |
| 41 |
|
| 42 |
if [ "${PV#9999}" != "${PV}" ] ; then |
| 43 |
SRC_URI="" |
| 44 |
@@ -31,18 +31,22 @@ RDEPEND=" |
| 45 |
virtual/jpeg:0 |
| 46 |
dev-libs/tinyxml |
| 47 |
opengl? ( media-libs/freeglut !dev-libs/OpenNI2[opengl] ) |
| 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}/tinyxml.patch" |
| 58 |
+ "${FILESDIR}/jpeg.patch" |
| 59 |
+ "${FILESDIR}/soname.patch" |
| 60 |
+ "${FILESDIR}/${P}-gcc6.patch" |
| 61 |
+ "${FILESDIR}/betterdefines.patch" |
| 62 |
+) |
| 63 |
|
| 64 |
src_prepare() { |
| 65 |
- epatch \ |
| 66 |
- "${FILESDIR}/tinyxml.patch" \ |
| 67 |
- "${FILESDIR}/jpeg.patch" \ |
| 68 |
- "${FILESDIR}/soname.patch" \ |
| 69 |
- "${FILESDIR}/${PN}-1.5.7.10-gcc6.patch" |
| 70 |
+ default |
| 71 |
|
| 72 |
rm -rf External/{LibJPEG,TinyXml} |
| 73 |
for i in Platform/Linux/Build/Common/Platform.* Externals/PSCommon/Linux/Build/Platform.* ; do |
| 74 |
@@ -89,7 +93,8 @@ src_install() { |
| 75 |
dodoc Documentation/OpenNI_UserGuide.pdf CHANGES NOTICE README |
| 76 |
|
| 77 |
if use doc ; then |
| 78 |
- dohtml -r "${S}/Source/DoxyGen/html/"* |
| 79 |
+ docinto html |
| 80 |
+ dodoc -r "${S}/Source/DoxyGen/html/"* |
| 81 |
dodoc Source/DoxyGen/Text/*.txt |
| 82 |
fi |
| 83 |
|
| 84 |
|
| 85 |
diff --git a/dev-libs/OpenNI/OpenNI-9999.ebuild b/dev-libs/OpenNI/OpenNI-9999.ebuild |
| 86 |
index aef879f68ea..0febb7dba0b 100644 |
| 87 |
--- a/dev-libs/OpenNI/OpenNI-9999.ebuild |
| 88 |
+++ b/dev-libs/OpenNI/OpenNI-9999.ebuild |
| 89 |
@@ -1,7 +1,7 @@ |
| 90 |
# Copyright 1999-2021 Gentoo Authors |
| 91 |
# Distributed under the terms of the GNU General Public License v2 |
| 92 |
|
| 93 |
-EAPI=5 |
| 94 |
+EAPI=7 |
| 95 |
|
| 96 |
SCM="" |
| 97 |
if [ "${PV#9999}" != "${PV}" ] ; then |
| 98 |
@@ -9,7 +9,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then |
| 99 |
EGIT_REPO_URI="https://github.com/OpenNI/OpenNI" |
| 100 |
fi |
| 101 |
|
| 102 |
-inherit ${SCM} toolchain-funcs epatch multilib java-pkg-opt-2 |
| 103 |
+inherit ${SCM} toolchain-funcs multilib java-pkg-opt-2 |
| 104 |
|
| 105 |
if [ "${PV#9999}" != "${PV}" ] ; then |
| 106 |
SRC_URI="" |
| 107 |
@@ -31,18 +31,21 @@ RDEPEND=" |
| 108 |
virtual/jpeg:0 |
| 109 |
dev-libs/tinyxml |
| 110 |
opengl? ( media-libs/freeglut !dev-libs/OpenNI2[opengl] ) |
| 111 |
- java? ( >=virtual/jre-1.5 ) |
| 112 |
+ java? ( virtual/jre:1.8 ) |
| 113 |
" |
| 114 |
DEPEND="${RDEPEND} |
| 115 |
doc? ( app-doc/doxygen ) |
| 116 |
- java? ( >=virtual/jdk-1.5 )" |
| 117 |
+ java? ( virtual/jdk:1.8 )" |
| 118 |
+ |
| 119 |
+PATCHES=( |
| 120 |
+ "${FILESDIR}/tinyxml.patch" |
| 121 |
+ "${FILESDIR}/jpeg.patch" |
| 122 |
+ "${FILESDIR}/soname.patch" |
| 123 |
+ "${FILESDIR}/${PN}-1.5.7.10-gcc6.patch" |
| 124 |
+) |
| 125 |
|
| 126 |
src_prepare() { |
| 127 |
- epatch \ |
| 128 |
- "${FILESDIR}/tinyxml.patch" \ |
| 129 |
- "${FILESDIR}/jpeg.patch" \ |
| 130 |
- "${FILESDIR}/soname.patch" \ |
| 131 |
- "${FILESDIR}/${PN}-1.5.7.10-gcc6.patch" |
| 132 |
+ default |
| 133 |
|
| 134 |
rm -rf External/{LibJPEG,TinyXml} |
| 135 |
for i in Platform/Linux/Build/Common/Platform.* Externals/PSCommon/Linux/Build/Platform.* ; do |
| 136 |
@@ -89,7 +92,8 @@ src_install() { |
| 137 |
dodoc Documentation/OpenNI_UserGuide.pdf CHANGES NOTICE README |
| 138 |
|
| 139 |
if use doc ; then |
| 140 |
- dohtml -r "${S}/Source/DoxyGen/html/"* |
| 141 |
+ docinto html |
| 142 |
+ dodoc -r "${S}/Source/DoxyGen/html/"* |
| 143 |
dodoc Source/DoxyGen/Text/*.txt |
| 144 |
fi |
Archives