commit:     13948f88725c37b101848aee1168e0081a4e2082
Author:     Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Mon Nov  4 12:48:51 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov  5 02:02:44 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13948f88

media-libs/opencv: only build jasper iff USE="jpeg2k -abi_x86_32"

Closes: https://bugs.gentoo.org/939924
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-libs/opencv/opencv-4.10.0.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/media-libs/opencv/opencv-4.10.0.ebuild 
b/media-libs/opencv/opencv-4.10.0.ebuild
index 332c5c9f7e8a..ded47e82a8eb 100644
--- a/media-libs/opencv/opencv-4.10.0.ebuild
+++ b/media-libs/opencv/opencv-4.10.0.ebuild
@@ -168,6 +168,7 @@ REQUIRED_USE="
        contribxfeatures2d? ( contrib )
        java? ( python )
        opengl? ( qt6 )
+       jasper? ( !abi_x86_32 )
        python? ( ${PYTHON_REQUIRED_USE} )
        tesseract? ( contrib )
        ?? ( gtk3 qt6 )
@@ -567,9 +568,9 @@ multilib_src_configure() {
                -DWITH_GTK="$(usex gtk3)"
                -DWITH_GTK_2_X="no" # only want gtk3 nowadays
                -DWITH_IPP="no"
-               -DWITH_JASPER="$(multilib_native_usex jasper)"
+               -DWITH_JASPER="$(usex jpeg2k "$(multilib_native_usex jasper)")"
                -DWITH_JPEG="$(usex jpeg)"
-               -DWITH_OPENJPEG="$(usex jpeg2k)"
+               -DWITH_OPENJPEG="$(usex jpeg2k "$(multilib_native_usex 
!jasper)")"
                -DWITH_WEBP="$(usex webp)"
                -DWITH_OPENEXR="$(multilib_native_usex openexr)"
                -DWITH_OPENGL="$(usex opengl)"

Reply via email to