[gentoo-commits] repo/proj/guru:master commit in: media-libs/libjxl/

["Haelwenn Monnier" <contact@hacktivis.me>]

commit:     b9e2f79ecb5fd0e323c8a03f084fb703d617cc9a
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Thu Oct 28 14:32:29 2021 +0000
Commit:     Haelwenn Monnier <contact <AT> hacktivis <DOT> me>
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 <lssndrbarbieri <AT> 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 @@
 	<use>
 		<flag name="benchmark">Build JPEGXL benchmark tools</flag>
 		<flag name="devtools">Build JPEGXL developer tools</flag>
+		<!--<flag name="fuzzers">Build the fuzzers</flag>-->
 		<flag name="openexr">Build JPEGXL with support for OpenEXR</flag>
 		<flag name="plugins">Build third-party plugins to support JPEG XL in other applications</flag>
 		<flag name="sjpeg">Build JPEGXL with support for encoding with sjpeg</flag>