From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 723DC15808B for ; Fri, 18 Mar 2022 15:03:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 57A96E07F9; Fri, 18 Mar 2022 15:03:24 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 05767E07F9 for ; Fri, 18 Mar 2022 15:03:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 06880343484 for ; Fri, 18 Mar 2022 15:03:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 29D7832A for ; Fri, 18 Mar 2022 15:03:21 +0000 (UTC) From: "Daniel Novomesky" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Daniel Novomesky" Message-ID: <1647615744.f2c9a6b86f8078b4b721126fa4f3b5545a9c6677.dnovomesky@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: media-libs/libjxl/ X-VCS-Repository: repo/proj/guru X-VCS-Files: media-libs/libjxl/libjxl-9999.ebuild X-VCS-Directories: media-libs/libjxl/ X-VCS-Committer: dnovomesky X-VCS-Committer-Name: Daniel Novomesky X-VCS-Revision: f2c9a6b86f8078b4b721126fa4f3b5545a9c6677 X-VCS-Branch: dev Date: Fri, 18 Mar 2022 15:03:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4c5f68e3-c29a-4fcf-9b07-a842e3087235 X-Archives-Hash: 38d612fb43ddcf2434bae20c7ea28292 commit: f2c9a6b86f8078b4b721126fa4f3b5545a9c6677 Author: Daniel Novomesky gmail com> AuthorDate: Fri Mar 18 15:02:24 2022 +0000 Commit: Daniel Novomesky gmail com> CommitDate: Fri Mar 18 15:02:24 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f2c9a6b8 media-libs/libjxl: multilib support in live ebuild Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Daniel Novomesky gmail.com> media-libs/libjxl/libjxl-9999.ebuild | 46 +++++++++++++++++++++++------------- 1 file changed, 30 insertions(+), 16 deletions(-) diff --git a/media-libs/libjxl/libjxl-9999.ebuild b/media-libs/libjxl/libjxl-9999.ebuild index c77bf8e49..3bd059b1f 100644 --- a/media-libs/libjxl/libjxl-9999.ebuild +++ b/media-libs/libjxl/libjxl-9999.ebuild @@ -3,7 +3,8 @@ EAPI=8 -inherit cmake git-r3 xdg +CMAKE_ECLASS=cmake +inherit cmake-multilib git-r3 xdg DESCRIPTION="JPEG XL image format reference implementation" HOMEPAGE="https://github.com/libjxl/libjxl" @@ -15,14 +16,14 @@ LICENSE="BSD" SLOT="0" IUSE="examples gdk-pixbuf gimp210 openexr" -DEPEND="app-arch/brotli - dev-cpp/gflags - >=dev-cpp/highway-0.16.0 - media-libs/giflib - media-libs/libpng +DEPEND="app-arch/brotli[${MULTILIB_USEDEP}] + dev-cpp/gflags[${MULTILIB_USEDEP}] + >=dev-cpp/highway-0.16.0[${MULTILIB_USEDEP}] + media-libs/giflib[${MULTILIB_USEDEP}] + media-libs/libpng[${MULTILIB_USEDEP}] openexr? ( media-libs/openexr:= ) - sys-libs/zlib - virtual/jpeg + sys-libs/zlib[${MULTILIB_USEDEP}] + virtual/jpeg[${MULTILIB_USEDEP}] x11-misc/shared-mime-info gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 ) gimp210? ( >=media-gfx/gimp-2.10.28:0/2 ) @@ -32,7 +33,7 @@ BDEPEND="" RDEPEND="${DEPEND}" -src_configure() { +multilib_src_configure() { local mycmakeargs=( -DCMAKE_SKIP_RPATH=ON -DBUILD_TESTING=OFF @@ -43,12 +44,7 @@ src_configure() { -DJPEGXL_WARNINGS_AS_ERRORS=OFF -DJPEGXL_ENABLE_SKCMS=ON - -DJPEGXL_ENABLE_EXAMPLES=$(usex examples) - -DJPEGXL_ENABLE_OPENEXR=$(usex openexr) -DJPEGXL_ENABLE_VIEWERS=OFF - -DJPEGXL_ENABLE_PLUGINS=ON - -DJPEGXL_ENABLE_PLUGIN_GDKPIXBUF=$(usex gdk-pixbuf) - -DJPEGXL_ENABLE_PLUGIN_GIMP210=$(usex gimp210) -DJPEGXL_FORCE_SYSTEM_BROTLI=ON -DJPEGXL_FORCE_SYSTEM_HWY=ON -DJPEGXL_ENABLE_DOXYGEN=OFF @@ -57,12 +53,30 @@ src_configure() { -DJPEGXL_ENABLE_TCMALLOC=OFF ) + if multilib_is_native_abi; then + mycmakeargs+=( + -DJPEGXL_ENABLE_TOOLS=ON + -DJPEGXL_ENABLE_EXAMPLES=$(usex examples) + -DJPEGXL_ENABLE_OPENEXR=$(usex openexr) + -DJPEGXL_ENABLE_PLUGINS=ON + -DJPEGXL_ENABLE_PLUGIN_GDKPIXBUF=$(usex gdk-pixbuf) + -DJPEGXL_ENABLE_PLUGIN_GIMP210=$(usex gimp210) + ) + else + mycmakeargs+=( + -DJPEGXL_ENABLE_TOOLS=OFF + -DJPEGXL_ENABLE_EXAMPLES=OFF + -DJPEGXL_ENABLE_OPENEXR=OFF + -DJPEGXL_ENABLE_PLUGINS=OFF + ) + fi + cmake_src_configure } -src_install() { +multilib_src_install() { cmake_src_install - if use examples; then + if use examples && multilib_is_native_abi; then dobin "${BUILD_DIR}/jxlinfo" fi }