commit: 8bf10763574482ee29614a2b4c40c74e87cbcbf6
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Wed Oct 27 10:50:16 2021 +0000
Commit: Haelwenn Monnier <contact <AT> hacktivis <DOT> me>
CommitDate: Wed Oct 27 10:51:07 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8bf10763
media-libs/libjxl: install more stuff
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
.../libjxl/files/libjxl-0.6-system-libs.patch | 53 +++++++++++++++++++---
.../{libjxl-0.6.ebuild => libjxl-0.6-r1.ebuild} | 48 ++++++++++++++++----
2 files changed, 86 insertions(+), 15 deletions(-)
diff --git a/media-libs/libjxl/files/libjxl-0.6-system-libs.patch
b/media-libs/libjxl/files/libjxl-0.6-system-libs.patch
index 8ca51d6f8..3a7aa9194 100644
--- a/media-libs/libjxl/files/libjxl-0.6-system-libs.patch
+++ b/media-libs/libjxl/files/libjxl-0.6-system-libs.patch
@@ -1,5 +1,5 @@
---- a/lib/jxl.cmake
-+++ b/lib/jxl.cmake
+--- /var/tmp/portage/media-libs/libjxl-0.6/work/libjxl-0.6/lib/jxl.cmake
++++ libjxl-0.6/lib/jxl.cmake
@@ -387,17 +387,6 @@
target_link_libraries(jxl_enc-obj PUBLIC jxl_profiler)
endif()
@@ -18,8 +18,24 @@
# Headers for exporting/importing public headers
include(GenerateExportHeader)
set_target_properties(jxl_dec-obj PROPERTIES
---- a/plugins/gdk-pixbuf/CMakeLists.txt
-+++ b/plugins/gdk-pixbuf/CMakeLists.txt
+--- /var/tmp/portage/media-libs/libjxl-0.6/work/libjxl-0.6/lib/jxl_extras.cmake
++++ libjxl-0.6/lib/jxl_extras.cmake
+@@ -92,7 +92,7 @@
+ endif ()
+
+ if (JPEGXL_ENABLE_OPENEXR)
+-pkg_check_modules(OpenEXR IMPORTED_TARGET OpenEXR)
++pkg_check_modules(OpenEXR IMPORTED_TARGET OpenEXR-3)
+ if (OpenEXR_FOUND)
+ target_sources(jxl_extras-static PRIVATE
+ extras/codec_exr.cc
+@@ -114,3 +114,4 @@
+ endif()
+ endif() # OpenEXR_FOUND
+ endif() # JPEGXL_ENABLE_OPENEXR
++
+---
/var/tmp/portage/media-libs/libjxl-0.6/work/libjxl-0.6/plugins/gdk-pixbuf/CMakeLists.txt
++++ libjxl-0.6/plugins/gdk-pixbuf/CMakeLists.txt
@@ -23,7 +23,7 @@
# Note: This only needs the decoder library, but we don't install the decoder
@@ -29,8 +45,8 @@
pkg_get_variable(GDK_PIXBUF_MODULEDIR gdk-pixbuf-2.0 gdk_pixbuf_moduledir)
install(TARGETS pixbufloader-jxl LIBRARY DESTINATION
"${GDK_PIXBUF_MODULEDIR}")
---- a/third_party/CMakeLists.txt
-+++ b/third_party/CMakeLists.txt
+---
/var/tmp/portage/media-libs/libjxl-0.6/work/libjxl-0.6/third_party/CMakeLists.txt
++++ libjxl-0.6/third_party/CMakeLists.txt
@@ -113,15 +113,6 @@
endif() # JPEGXL_DEP_LICENSE_DIR
endif()
@@ -82,3 +98,28 @@
- ${PROJECT_BINARY_DIR}/LICENSE.sjpeg COPYONLY)
-endif ()
-
+---
/var/tmp/portage/media-libs/libjxl-0.6/work/libjxl-0.6/tools/comparison_viewer/CMakeLists.txt
++++ libjxl-0.6/tools/comparison_viewer/CMakeLists.txt
+@@ -24,9 +24,6 @@
+ image_loading.cc
+ image_loading.h
+ )
+-target_include_directories(image_loading PRIVATE
+- $<TARGET_PROPERTY:lcms2,INCLUDE_DIRECTORIES>
+-)
+ target_link_libraries(image_loading PUBLIC
+ Qt5::Widgets
+ jxl-static
+---
/var/tmp/portage/media-libs/libjxl-0.6/work/libjxl-0.6/tools/viewer/CMakeLists.txt
++++ libjxl-0.6/tools/viewer/CMakeLists.txt
+@@ -26,10 +26,6 @@
+ viewer_window.h
+ viewer_window.ui
+ )
+-target_include_directories(viewer PRIVATE
+- $<TARGET_PROPERTY:lcms2,INCLUDE_DIRECTORIES>
+- "${PROJECT_SOURCE_DIR}"
+-)
+ target_link_libraries(viewer
+ Qt5::Widgets
+ icc_detect
diff --git a/media-libs/libjxl/libjxl-0.6.ebuild
b/media-libs/libjxl/libjxl-0.6-r1.ebuild
similarity index 68%
rename from media-libs/libjxl/libjxl-0.6.ebuild
rename to media-libs/libjxl/libjxl-0.6-r1.ebuild
index afd6ae0c0..d8cf76855 100644
--- a/media-libs/libjxl/libjxl-0.6.ebuild
+++ b/media-libs/libjxl/libjxl-0.6-r1.ebuild
@@ -1,9 +1,9 @@
# Copyright 2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=8
+EAPI=7
-inherit xdg cmake
+inherit xdg cmake java-pkg-opt-2
DESCRIPTION="JPEG XL image format reference implementation"
HOMEPAGE="https://github.com/libjxl/libjxl";
@@ -12,17 +12,21 @@
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 man +openexr
plugins profile +sjpeg +skcms tcmalloc tools viewers" #java
+IUSE="abi_x86_64 cpu_flags_arm_neon benchmark devtools examples java man
+openexr plugins profile +sjpeg +skcms tcmalloc tools viewers" #emscripten
-RDEPEND="
+CDEPEND="
app-arch/brotli
dev-cpp/highway:=
media-libs/libpng
media-libs/lodepng:=
media-libs/giflib
sys-libs/zlib
- virtual/jpeg
+ benchmark? (
+ media-libs/libavif
+ media-libs/libwebp
+ virtual/jpeg
+ )
openexr? ( media-libs/openexr:= )
plugins? (
dev-libs/glib:2
@@ -37,17 +41,33 @@ RDEPEND="
!skcms? ( media-libs/lcms )
skcms? ( media-libs/skcms:= )
tcmalloc? ( dev-util/google-perftools )
- viewers? ( media-libs/lcms )
+ viewers? (
+ dev-qt/qtconcurrent
+ dev-qt/qtwidgets
+ dev-qt/qtx11extras
+ media-libs/lcms
+ x11-libs/libxcb
+ )
+"
+RDEPEND="
+ ${CDEPEND}
+ java? ( virtual/jre:1.8 )
"
DEPEND="
- ${RDEPEND}
+ ${CDEPEND}
dev-cpp/gtest
+ kde-frameworks/extra-cmake-modules
+ java? ( virtual/jdk:1.8 )
plugins? ( x11-misc/xdg-utils )
"
-BDEPEND="man? ( app-text/asciidoc )"
+BDEPEND="
+ virtual/pkgconfig
+ man? ( app-text/asciidoc )
+"
PATCHES=( "${FILESDIR}/${P}-system-libs.patch" )
REQUIRED_USE="tcmalloc? ( abi_x86_64 )"
+DOCS=( AUTHORS README.md SECURITY.md PATENTS CONTRIBUTORS CHANGELOG.md )
src_prepare() {
# remove bundled libs cmake
@@ -60,6 +80,7 @@ src_configure() {
-DJPEGXL_ENABLE_BENCHMARK=$(usex benchmark)
-DJPEGXL_ENABLE_DEVTOOLS=$(usex devtools)
-DJPEGXL_ENABLE_EXAMPLES=$(usex examples)
+ -DJPEGXL_ENABLE_JNI=$(usex java)
-DJPEGXL_ENABLE_MANPAGES=$(usex man)
-DJPEGXL_ENABLE_OPENEXR=$(usex openexr)
-DJPEGXL_ENABLE_PLUGINS=$(usex plugins)
@@ -88,6 +109,15 @@ src_configure() {
src_install() {
cmake_src_install
- find "${D}" -name '*.a' -delete || die
+ einstalldocs
#TODO: install documentation
+ 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
+ find "${D}" -name '*.a' -delete || die
}
