[gentoo-commits] repo/gentoo:master commit in: dev-libs/OpenNI/

["Sam James" <sam@gentoo.org>]

commit:     fac3d0202ece002c52b02a95d0cf0476d1dc446f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 17 15:33:13 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 17 15:34:35 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fac3d020

dev-libs/OpenNI: force -fno-strict-aliasing

Closes: https://bugs.gentoo.org/855671
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../{OpenNI-1.5.7.10-r2.ebuild => OpenNI-1.5.7.10-r3.ebuild}  |  9 ++++++---
 dev-libs/OpenNI/OpenNI-9999.ebuild                            | 11 +++++++----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/dev-libs/OpenNI/OpenNI-1.5.7.10-r2.ebuild b/dev-libs/OpenNI/OpenNI-1.5.7.10-r3.ebuild
similarity index 93%
rename from dev-libs/OpenNI/OpenNI-1.5.7.10-r2.ebuild
rename to dev-libs/OpenNI/OpenNI-1.5.7.10-r3.ebuild
index c20e1e338bd8..dd1ccb8c41f8 100644
--- a/dev-libs/OpenNI/OpenNI-1.5.7.10-r2.ebuild
+++ b/dev-libs/OpenNI/OpenNI-1.5.7.10-r3.ebuild
@@ -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"
@@ -57,6 +57,9 @@ src_prepare() {
 }
 
 src_compile() {
+	# bug #855671
+	append-flags -fno-strict-aliasing
+
 	emake -C "${S}/Platform/Linux/Build" \
 		CC="$(tc-getCC)" \
 		CXX="$(tc-getCXX)" \

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)" \