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 2B3EF158086 for ; Thu, 28 Oct 2021 15:18:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3D164E08BB; Thu, 28 Oct 2021 15:18:22 +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 15ED6E0896 for ; Thu, 28 Oct 2021 15:18:22 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EC613343490 for ; Thu, 28 Oct 2021 15:18:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 35C8417D for ; Thu, 28 Oct 2021 15:18:19 +0000 (UTC) From: "Alessandro Barbieri" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alessandro Barbieri" Message-ID: <1635431549.b9e2f79ecb5fd0e323c8a03f084fb703d617cc9a.Alessandro-Barbieri@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-0.6-r1.ebuild media-libs/libjxl/libjxl-0.6-r2.ebuild media-libs/libjxl/metadata.xml X-VCS-Directories: media-libs/libjxl/ X-VCS-Committer: Alessandro-Barbieri X-VCS-Committer-Name: Alessandro Barbieri X-VCS-Revision: b9e2f79ecb5fd0e323c8a03f084fb703d617cc9a X-VCS-Branch: dev Date: Thu, 28 Oct 2021 15:18:19 +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: d9307ca4-ee7d-4321-9fb5-7c91cb89e9ff X-Archives-Hash: 10f340c777b95cc5657b8af0c9c60a10 commit: b9e2f79ecb5fd0e323c8a03f084fb703d617cc9a Author: Alessandro Barbieri gmail com> AuthorDate: Thu Oct 28 14:32:29 2021 +0000 Commit: Alessandro Barbieri gmail com> CommitDate: Thu Oct 28 14:32:29 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b9e2f79e media-libs/libjxl: install more stuff Signed-off-by: Alessandro Barbieri gmail.com> .../{libjxl-0.6-r1.ebuild => libjxl-0.6-r2.ebuild} | 47 ++++++++++++++++++---- media-libs/libjxl/metadata.xml | 1 + 2 files changed, 41 insertions(+), 7 deletions(-) diff --git a/media-libs/libjxl/libjxl-0.6-r1.ebuild b/media-libs/libjxl/libjxl-0.6-r2.ebuild similarity index 73% rename from media-libs/libjxl/libjxl-0.6-r1.ebuild rename to media-libs/libjxl/libjxl-0.6-r2.ebuild index d8cf76855..0637e43b0 100644 --- a/media-libs/libjxl/libjxl-0.6-r1.ebuild +++ b/media-libs/libjxl/libjxl-0.6-r2.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/libjxl/libjxl/archive/refs/tags/v${PV}.tar.gz -> ${P KEYWORDS="~amd64" LICENSE="Apache-2.0" SLOT="0" -IUSE="abi_x86_64 cpu_flags_arm_neon benchmark devtools examples java man +openexr plugins profile +sjpeg +skcms tcmalloc tools viewers" #emscripten +IUSE="abi_x86_64 cpu_flags_arm_neon benchmark devtools examples java man +openexr plugins profile +sjpeg +skcms tcmalloc tools viewers" #emscripten fuzzers CDEPEND=" app-arch/brotli @@ -69,6 +69,8 @@ PATCHES=( "${FILESDIR}/${P}-system-libs.patch" ) REQUIRED_USE="tcmalloc? ( abi_x86_64 )" DOCS=( AUTHORS README.md SECURITY.md PATENTS CONTRIBUTORS CHANGELOG.md ) +CMAKE_IN_SOURCE_BUILD=1 + src_prepare() { # remove bundled libs cmake rm third_party/*.cmake || die @@ -111,13 +113,44 @@ src_install() { cmake_src_install einstalldocs #TODO: install documentation + exeinto "/usr/libexec/${PN}" + if use examples; then + doexe {en,de}code_oneshot + dobin jxlinfo + fi pushd "${BUILD_DIR}/tools" || die - exeinto "/usr/libexe/${PN}" - doexe conformance/djxl_conformance tests/libjxl_test - use devtools && doexe box/box_list - use viewers && doexe comparison_viewer/compare_{codec,image}s flicker_test/flicker_test viewer/viewe - use benchmark && doexe benchmark_xl insinto "/usr/share/${PN}" - use java && doins *.jar + doins progressive_saliency.conf example_tree.txt + if use java; then + dolib.so libjxl_jni.so + rm libjxl_jni.so || die + doins *.jar + fi + if use benchmark; then + docinto "/usr/share/doc/${PF}/benchmark/hm" + dodoc benchmark/hm/README.md + else + rm -r benchmark || die + fi + # remove non executable or non .m files + find . -type f \! -name '*.m' \! -executable -delete || die + # delete empty dirs + find . -type d -empty -print -delete || die + mkdir -p "${ED}/usr/libexec/${PN}/tools/" || die + # install tools + cp -r . "${ED}/usr/libexec/${PN}/tools/" || die + + # keep in /usr/bin only the executables with jxl in the name + rm -f "${ED}"/usr/libexec/${PN}/tools/*jxl* || die + rm -f "${ED}"/usr/bin{fuzzer_corpus,*_main,decode_and_encode,*_hlg,tone_map,xyb_range} || die + find "${D}" -name '*.a' -delete || die } + +pkg_postinst() { + xdg_mimeinfo_database_update +} + +pkg_postrm() { + xdg_mimeinfo_database_update +} diff --git a/media-libs/libjxl/metadata.xml b/media-libs/libjxl/metadata.xml index ac9483923..5c6f84710 100644 --- a/media-libs/libjxl/metadata.xml +++ b/media-libs/libjxl/metadata.xml @@ -8,6 +8,7 @@ Build JPEGXL benchmark tools Build JPEGXL developer tools + Build JPEGXL with support for OpenEXR Build third-party plugins to support JPEG XL in other applications Build JPEGXL with support for encoding with sjpeg