[gentoo-commits] repo/proj/guru:dev commit in: media-libs/libjxl/, media-libs/libjxl/files/
commit: f7541e25085023f2a7698ad2188ac328923a0f81
Author: Daniel Novomesky gmail com>
AuthorDate: Thu Mar 24 13:16:58 2022 +
Commit: Daniel Novomesky gmail com>
CommitDate: Thu Mar 24 13:18:25 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f7541e25
media-libs/libjxl: remove package, moved to ::gentoo
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Daniel Novomesky gmail.com>
media-libs/libjxl/Manifest | 1 -
.../libjxl/files/libjxl-0.6-system-libs.patch | 125
media-libs/libjxl/libjxl-0.6.1.ebuild | 159 -
media-libs/libjxl/libjxl-.ebuild | 82 ---
media-libs/libjxl/metadata.xml | 22 ---
5 files changed, 389 deletions(-)
diff --git a/media-libs/libjxl/Manifest b/media-libs/libjxl/Manifest
deleted file mode 100644
index 4d30078bf..0
--- a/media-libs/libjxl/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libjxl-0.6.1.tar.gz 16953185 BLAKE2B
d1e906480e80458635a65bd89ce79f13d463e8cf4fb0dfccf6c473e7649fdc5593669effdf85afbb176920c89e61c65c4907834225f7c9e6da4c611996b201e3
SHA512
302935d722160b0b288ac63301f9e95caf82eccf6ad76c4f4da6316a0314ee3562115932b1ceacb0d02708de0a07788992d3478cae73af0b90193f5769f9fb52
diff --git a/media-libs/libjxl/files/libjxl-0.6-system-libs.patch
b/media-libs/libjxl/files/libjxl-0.6-system-libs.patch
deleted file mode 100644
index 8b8d0a269..0
--- a/media-libs/libjxl/files/libjxl-0.6-system-libs.patch
+++ /dev/null
@@ -1,125 +0,0 @@
a/lib/jxl.cmake
-+++ b/lib/jxl.cmake
-@@ -387,17 +387,6 @@
- target_link_libraries(jxl_enc-obj PUBLIC jxl_profiler)
- endif()
-
--#TODO(lode): don't depend on CMS for the core library
--if (JPEGXL_ENABLE_SKCMS)
-- target_include_directories(jxl_enc-obj PRIVATE
--$
-- )
--else ()
-- target_include_directories(jxl_enc-obj PRIVATE
--$
-- )
--endif ()
--
- # Headers for exporting/importing public headers
- include(GenerateExportHeader)
- set_target_properties(jxl_dec-obj PROPERTIES
a/lib/jxl_extras.cmake
-+++ b/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
-+
a/plugins/gdk-pixbuf/CMakeLists.txt
-+++ b/plugins/gdk-pixbuf/CMakeLists.txt
-@@ -23,7 +23,7 @@
-
- # Note: This only needs the decoder library, but we don't install the decoder
- # shared library.
--target_link_libraries(pixbufloader-jxl jxl jxl_threads skcms-interface
PkgConfig::Gdk-Pixbuf)
-+target_link_libraries(pixbufloader-jxl jxl jxl_threads skcms
PkgConfig::Gdk-Pixbuf)
-
- 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
-@@ -113,15 +113,6 @@
- endif() # JPEGXL_DEP_LICENSE_DIR
- endif()
-
--# lodepng
--if( NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/lodepng/lodepng.h" )
-- message(FATAL_ERROR "Please run ${PROJECT_SOURCE_DIR}/deps.sh to fetch the "
-- "build dependencies.")
--endif()
--include(lodepng.cmake)
--configure_file("${CMAKE_CURRENT_SOURCE_DIR}/lodepng/LICENSE"
-- ${PROJECT_BINARY_DIR}/LICENSE.lodepng COPYONLY)
--
- # brotli
- if (NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/brotli/c/include/brotli/decode.h"
OR
- JPEGXL_FORCE_SYSTEM_BROTLI)
-@@ -190,34 +181,3 @@
- endforeach()
- endif() # BROTLI_EMSCRIPTEN
- endif()
--
--# *cms
--if (JPEGXL_ENABLE_SKCMS OR JPEGXL_ENABLE_PLUGINS)
-- if( NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/skcms/skcms.h" )
--message(FATAL_ERROR "Please run ${PROJECT_SOURCE_DIR}/deps.sh to fetch
the "
--"build dependencies.")
-- endif()
-- include(skcms.cmake)
-- configure_file("${CMAKE_CURRENT_SOURCE_DIR}/skcms/LICENSE"
-- ${PROJECT_BINARY_DIR}/LICENSE.skcms COPYONLY)
--endif ()
--if (JPEGXL_ENABLE_VIEWERS OR NOT JPEGXL_ENABLE_SKCMS)
-- if( NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/lcms/.git" )
--message(SEND_ERROR "Please run git submodule update --init")
-- endif()
-- include(lcms2.cmake)
-- configure_file("${CMAKE_CURRENT_SOURCE_DIR}/lcms/COPYING"
-- ${PROJECT_BINARY_DIR}/LICENSE.lcms COPYONLY)
--endif()
--
--# sjpeg
--if (JPEGXL_ENABLE_SJPEG)
-- if (NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/sjpeg/CMakeLists.txt")
--message(FATAL_ERROR "Please run ${PROJECT_SOURCE_DIR}/deps.sh to fetch
the "
--"build dependencies.")
-- endif()
-- include(sjpeg.cmake)
-- configure_file("${CMAKE_CURRENT_SOURCE_DIR}/sjpeg/COPYING"
-- ${PROJECT_BINARY_DIR}/LICENSE.sjpeg COPYONLY)
--endif ()
--
[gentoo-commits] repo/proj/guru:dev commit in: media-libs/libjxl/
commit: f2c9a6b86f8078b4b721126fa4f3b5545a9c6677
Author: Daniel Novomesky gmail com>
AuthorDate: Fri Mar 18 15:02:24 2022 +
Commit: Daniel Novomesky gmail com>
CommitDate: Fri Mar 18 15:02:24 2022 +
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-.ebuild | 46 +++-
1 file changed, 30 insertions(+), 16 deletions(-)
diff --git a/media-libs/libjxl/libjxl-.ebuild
b/media-libs/libjxl/libjxl-.ebuild
index c77bf8e49..3bd059b1f 100644
--- a/media-libs/libjxl/libjxl-.ebuild
+++ b/media-libs/libjxl/libjxl-.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
}
[gentoo-commits] repo/proj/guru:dev commit in: media-libs/libjxl/
commit: d66c851fe717d8eb87d98b70a775c63ff8460d78
Author: Daniel Novomesky gmail com>
AuthorDate: Sun Mar 13 11:23:39 2022 +
Commit: Daniel Novomesky gmail com>
CommitDate: Sun Mar 13 11:23:39 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d66c851f
media-libs/libjxl: update live ebuild
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Daniel Novomesky gmail.com>
media-libs/libjxl/libjxl-.ebuild | 18 --
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/media-libs/libjxl/libjxl-.ebuild
b/media-libs/libjxl/libjxl-.ebuild
index a4bc11844..c77bf8e49 100644
--- a/media-libs/libjxl/libjxl-.ebuild
+++ b/media-libs/libjxl/libjxl-.ebuild
@@ -9,24 +9,20 @@ DESCRIPTION="JPEG XL image format reference implementation"
HOMEPAGE="https://github.com/libjxl/libjxl;
EGIT_REPO_URI="https://github.com/libjxl/libjxl.git;
+EGIT_SUBMODULES=(third_party/skcms)
LICENSE="BSD"
SLOT="0"
-IUSE="examples gdk-pixbuf gimp210"
+IUSE="examples gdk-pixbuf gimp210 openexr"
DEPEND="app-arch/brotli
dev-cpp/gflags
- dev-cpp/gtest
- dev-cpp/highway
- dev-util/google-perftools
- media-libs/freeglut
+ >=dev-cpp/highway-0.16.0
media-libs/giflib
- media-libs/lcms
media-libs/libpng
- media-libs/openexr:=
+ openexr? ( media-libs/openexr:= )
sys-libs/zlib
virtual/jpeg
- virtual/opengl
x11-misc/shared-mime-info
gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 )
gimp210? ( >=media-gfx/gimp-2.10.28:0/2 )
@@ -48,15 +44,17 @@ src_configure() {
-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_FORCE_SYSTEM_GTEST=ON
- -DJPEGXL_FORCE_SYSTEM_LCMS2=ON
+ -DJPEGXL_ENABLE_DOXYGEN=OFF
-DJPEGXL_ENABLE_MANPAGES=OFF
+ -DJPEGXL_ENABLE_JNI=OFF
+ -DJPEGXL_ENABLE_TCMALLOC=OFF
)
cmake_src_configure
[gentoo-commits] repo/proj/guru:dev commit in: media-libs/libjxl/
commit: 5b5a4332904eb14153d43fec380f0eda927c2624
Author: Daniel Novomesky gmail com>
AuthorDate: Fri Mar 11 11:41:21 2022 +
Commit: Daniel Novomesky gmail com>
CommitDate: Fri Mar 11 11:41:21 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5b5a4332
media-libs/libjxl: do not build man pages
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Daniel Novomesky gmail.com>
media-libs/libjxl/libjxl-.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/media-libs/libjxl/libjxl-.ebuild
b/media-libs/libjxl/libjxl-.ebuild
index 2a78f5130..a4bc11844 100644
--- a/media-libs/libjxl/libjxl-.ebuild
+++ b/media-libs/libjxl/libjxl-.ebuild
@@ -56,6 +56,7 @@ src_configure() {
-DJPEGXL_FORCE_SYSTEM_HWY=ON
-DJPEGXL_FORCE_SYSTEM_GTEST=ON
-DJPEGXL_FORCE_SYSTEM_LCMS2=ON
+ -DJPEGXL_ENABLE_MANPAGES=OFF
)
cmake_src_configure
[gentoo-commits] repo/proj/guru:dev commit in: media-libs/libjxl/
commit: 6a39cfd4586ee3b6a3feb79c3b4d496525f80d21
Author: Daniel Novomesky gmail com>
AuthorDate: Mon Jan 24 13:35:00 2022 +
Commit: Daniel Novomesky gmail com>
CommitDate: Mon Jan 24 13:35:00 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6a39cfd4
media-libs/libjxl: new use flags for live ebuild
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Daniel Novomesky gmail.com>
media-libs/libjxl/libjxl-.ebuild | 29 -
media-libs/libjxl/metadata.xml | 2 ++
2 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/media-libs/libjxl/libjxl-.ebuild
b/media-libs/libjxl/libjxl-.ebuild
index 1745e4ba0..2a78f5130 100644
--- a/media-libs/libjxl/libjxl-.ebuild
+++ b/media-libs/libjxl/libjxl-.ebuild
@@ -1,9 +1,9 @@
# Copyright 2021-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="7"
+EAPI=8
-inherit xdg cmake git-r3
+inherit cmake git-r3 xdg
DESCRIPTION="JPEG XL image format reference implementation"
HOMEPAGE="https://github.com/libjxl/libjxl;
@@ -12,22 +12,24 @@ EGIT_REPO_URI="https://github.com/libjxl/libjxl.git;
LICENSE="BSD"
SLOT="0"
-IUSE="examples"
+IUSE="examples gdk-pixbuf gimp210"
DEPEND="app-arch/brotli
- sys-libs/zlib
- media-libs/libpng
- virtual/jpeg
- virtual/opengl
- media-libs/freeglut
- media-libs/giflib
- media-libs/openexr:=
- dev-util/google-perftools
- x11-misc/shared-mime-info
dev-cpp/gflags
dev-cpp/gtest
dev-cpp/highway
+ dev-util/google-perftools
+ media-libs/freeglut
+ media-libs/giflib
media-libs/lcms
+ media-libs/libpng
+ media-libs/openexr:=
+ sys-libs/zlib
+ virtual/jpeg
+ virtual/opengl
+ x11-misc/shared-mime-info
+ gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 )
+ gimp210? ( >=media-gfx/gimp-2.10.28:0/2 )
"
BDEPEND=""
@@ -38,7 +40,6 @@ src_configure() {
local mycmakeargs=(
-DCMAKE_SKIP_RPATH=ON
-DBUILD_TESTING=OFF
- -DBUILD_SHARED_LIBS=ON
-DJPEGXL_ENABLE_BENCHMARK=OFF
-DJPEGXL_ENABLE_COVERAGE=OFF
-DJPEGXL_ENABLE_FUZZERS=OFF
@@ -49,6 +50,8 @@ src_configure() {
-DJPEGXL_ENABLE_EXAMPLES=$(usex examples)
-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_FORCE_SYSTEM_GTEST=ON
diff --git a/media-libs/libjxl/metadata.xml b/media-libs/libjxl/metadata.xml
index 5c6f84710..40fe4cbfc 100644
--- a/media-libs/libjxl/metadata.xml
+++ b/media-libs/libjxl/metadata.xml
@@ -9,6 +9,8 @@
Build JPEGXL benchmark tools
Build JPEGXL developer tools
+ Build a gdk-pixbuf loader
+ Enable plugin for GIMP 2.10.x series
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
[gentoo-commits] repo/proj/guru:dev commit in: media-libs/libjxl/
commit: f613f7b211f1d46a7611bfc33b0045f8932f3aaf Author: Daniel Novomesky gmail com> AuthorDate: Sat Jan 1 17:22:45 2022 + Commit: Daniel Novomesky gmail com> CommitDate: Sat Jan 1 17:23:24 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f613f7b2 media-libs/libjxl: depend on dev-cpp/gflags Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Daniel Novomesky gmail.com> media-libs/libjxl/libjxl-.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/media-libs/libjxl/libjxl-.ebuild b/media-libs/libjxl/libjxl-.ebuild index 2fafeb9c7..1745e4ba0 100644 --- a/media-libs/libjxl/libjxl-.ebuild +++ b/media-libs/libjxl/libjxl-.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021 Gentoo Authors +# Copyright 2021-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -24,6 +24,7 @@ DEPEND="app-arch/brotli media-libs/openexr:= dev-util/google-perftools x11-misc/shared-mime-info + dev-cpp/gflags dev-cpp/gtest dev-cpp/highway media-libs/lcms
[gentoo-commits] repo/proj/guru:dev commit in: media-libs/libjxl/
commit: 2b8d9f8d717d47fe54e648763ba7aa47ec1e2721
Author: Daniel Novomesky gmail com>
AuthorDate: Mon Nov 22 16:04:19 2021 +
Commit: Daniel Novomesky gmail com>
CommitDate: Mon Nov 22 16:04:19 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2b8d9f8d
media-libs/libjxl: use system lcms2
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Daniel Novomesky gmail.com>
media-libs/libjxl/libjxl-.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/media-libs/libjxl/libjxl-.ebuild
b/media-libs/libjxl/libjxl-.ebuild
index 233044401..2fafeb9c7 100644
--- a/media-libs/libjxl/libjxl-.ebuild
+++ b/media-libs/libjxl/libjxl-.ebuild
@@ -51,6 +51,7 @@ src_configure() {
-DJPEGXL_FORCE_SYSTEM_BROTLI=ON
-DJPEGXL_FORCE_SYSTEM_HWY=ON
-DJPEGXL_FORCE_SYSTEM_GTEST=ON
+ -DJPEGXL_FORCE_SYSTEM_LCMS2=ON
)
cmake_src_configure
[gentoo-commits] repo/proj/guru:dev commit in: media-libs/libjxl/
commit: 19a763dc21309f7cea4cf09f3784563b197417d7
Author: Daniel Novomesky gmail com>
AuthorDate: Tue Nov 9 10:20:29 2021 +
Commit: Daniel Novomesky gmail com>
CommitDate: Tue Nov 9 10:20:29 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=19a763dc
media-libs/libjxl: don't build tests
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Daniel Novomesky gmail.com>
media-libs/libjxl/libjxl-0.6.1.ebuild | 1 +
media-libs/libjxl/libjxl-.ebuild | 1 +
2 files changed, 2 insertions(+)
diff --git a/media-libs/libjxl/libjxl-0.6.1.ebuild
b/media-libs/libjxl/libjxl-0.6.1.ebuild
index 4ca7f7ae5..44927f1b2 100644
--- a/media-libs/libjxl/libjxl-0.6.1.ebuild
+++ b/media-libs/libjxl/libjxl-0.6.1.ebuild
@@ -96,6 +96,7 @@ src_configure() {
-DBUILD_SHARED_LIBS=ON
-DCMAKE_SKIP_RPATH=ON
+ -DBUILD_TESTING=OFF
-DJPEGXL_BUNDLE_SKCMS=OFF
-DJPEGXL_ENABLE_COVERAGE=OFF
-DJPEGXL_ENABLE_FUZZERS=OFF
diff --git a/media-libs/libjxl/libjxl-.ebuild
b/media-libs/libjxl/libjxl-.ebuild
index 9fbcd8bee..233044401 100644
--- a/media-libs/libjxl/libjxl-.ebuild
+++ b/media-libs/libjxl/libjxl-.ebuild
@@ -36,6 +36,7 @@ RDEPEND="${DEPEND}"
src_configure() {
local mycmakeargs=(
-DCMAKE_SKIP_RPATH=ON
+ -DBUILD_TESTING=OFF
-DBUILD_SHARED_LIBS=ON
-DJPEGXL_ENABLE_BENCHMARK=OFF
-DJPEGXL_ENABLE_COVERAGE=OFF
[gentoo-commits] repo/proj/guru:dev commit in: media-libs/libjxl/
commit: a1e6d327b496762cdd58faa0aeba52354bba3c2d
Author: Daniel Novomesky gmail com>
AuthorDate: Mon Nov 8 09:03:57 2021 +
Commit: Daniel Novomesky gmail com>
CommitDate: Mon Nov 8 09:03:57 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a1e6d327
media-libs/libjxl: update live ebuild
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Daniel Novomesky gmail.com>
media-libs/libjxl/libjxl-.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/media-libs/libjxl/libjxl-.ebuild
b/media-libs/libjxl/libjxl-.ebuild
index 138b32865..9fbcd8bee 100644
--- a/media-libs/libjxl/libjxl-.ebuild
+++ b/media-libs/libjxl/libjxl-.ebuild
@@ -36,6 +36,7 @@ RDEPEND="${DEPEND}"
src_configure() {
local mycmakeargs=(
-DCMAKE_SKIP_RPATH=ON
+ -DBUILD_SHARED_LIBS=ON
-DJPEGXL_ENABLE_BENCHMARK=OFF
-DJPEGXL_ENABLE_COVERAGE=OFF
-DJPEGXL_ENABLE_FUZZERS=OFF
[gentoo-commits] repo/proj/guru:dev commit in: media-libs/libjxl/
commit: f0851b795852c7801efc34358df67ce501987b18
Author: Alessandro Barbieri gmail com>
AuthorDate: Sat Nov 6 13:12:34 2021 +
Commit: Alessandro Barbieri gmail com>
CommitDate: Sat Nov 6 13:12:34 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f0851b79
media-libs/libjxl: drop 0.6-r2
Signed-off-by: Alessandro Barbieri gmail.com>
media-libs/libjxl/Manifest | 1 -
media-libs/libjxl/libjxl-0.6-r2.ebuild | 156 -
2 files changed, 157 deletions(-)
diff --git a/media-libs/libjxl/Manifest b/media-libs/libjxl/Manifest
index fc7f70713..4d30078bf 100644
--- a/media-libs/libjxl/Manifest
+++ b/media-libs/libjxl/Manifest
@@ -1,2 +1 @@
DIST libjxl-0.6.1.tar.gz 16953185 BLAKE2B
d1e906480e80458635a65bd89ce79f13d463e8cf4fb0dfccf6c473e7649fdc5593669effdf85afbb176920c89e61c65c4907834225f7c9e6da4c611996b201e3
SHA512
302935d722160b0b288ac63301f9e95caf82eccf6ad76c4f4da6316a0314ee3562115932b1ceacb0d02708de0a07788992d3478cae73af0b90193f5769f9fb52
-DIST libjxl-0.6.tar.gz 16953410 BLAKE2B
8941987f6d31096a7286f9d98cdcc16e5fe338e6b3d966343f97fc5b5b932ec92c994fab5781448aa7d96324e5c9ce5c83754b01cf6e752d0702ce9fc0a2087f
SHA512
934c86d079c7a1f5382fad158efac225b9d1b27e551ea85ea7ec43e7ffd5cba85ddbfa35658b242a9f9c9589decf245568349abfa8a4fe12898af78d51608852
diff --git a/media-libs/libjxl/libjxl-0.6-r2.ebuild
b/media-libs/libjxl/libjxl-0.6-r2.ebuild
deleted file mode 100644
index e2918d5b2..0
--- a/media-libs/libjxl/libjxl-0.6-r2.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg cmake java-pkg-opt-2
-
-DESCRIPTION="JPEG XL image format reference implementation"
-HOMEPAGE="https://github.com/libjxl/libjxl;
-SRC_URI="https://github.com/libjxl/libjxl/archive/refs/tags/v${PV}.tar.gz ->
${P}.tar.gz"
-
-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
fuzzers
-
-CDEPEND="
- app-arch/brotli
- dev-cpp/highway:=
- media-libs/libpng
- media-libs/lodepng:=
- media-libs/giflib
- sys-libs/zlib
-
- benchmark? (
- media-libs/libavif
- media-libs/libwebp
- virtual/jpeg
- )
- openexr? ( media-libs/openexr:= )
- plugins? (
- dev-libs/glib:2
- media-gfx/gimp
- media-libs/babl
- media-libs/gegl
- media-libs/skcms:=
- x11-libs/gdk-pixbuf
- x11-misc/shared-mime-info
- )
- sjpeg? ( media-libs/sjpeg:= )
- !skcms? ( media-libs/lcms )
- skcms? ( media-libs/skcms:= )
- tcmalloc? ( dev-util/google-perftools )
- viewers? (
- dev-qt/qtconcurrent
- dev-qt/qtwidgets
- dev-qt/qtx11extras
- media-libs/lcms
- x11-libs/libxcb
- )
-"
-RDEPEND="
- ${CDEPEND}
- java? ( virtual/jre:1.8 )
-"
-DEPEND="
- ${CDEPEND}
- dev-cpp/gtest
- kde-frameworks/extra-cmake-modules
- java? ( virtual/jdk:1.8 )
- plugins? ( x11-misc/xdg-utils )
-"
-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 )
-
-CMAKE_IN_SOURCE_BUILD=1
-
-src_prepare() {
- # remove bundled libs cmake
- rm third_party/*.cmake || die
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -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)
- -DJPEGXL_ENABLE_PROFILER=$(usex profile)
- -DJPEGXL_ENABLE_SJPEG=$(usex sjpeg)
- -DJPEGXL_ENABLE_SKCMS=$(usex skcms)
- -DJPEGXL_ENABLE_TCMALLOC=$(usex tcmalloc)
- -DJPEGXL_ENABLE_TOOLS=$(usex tools)
- -DJPEGXL_ENABLE_VIEWERS=$(usex viewers)
- -DJPEGXL_FORCE_NEON=$(usex cpu_flags_arm_neon)
-
- -DBUILD_SHARED_LIBS=ON
- -DJPEGXL_BUNDLE_SKCMS=OFF
- -DJPEGXL_ENABLE_COVERAGE=OFF
- -DJPEGXL_ENABLE_FUZZERS=OFF
- -DJPEGXL_ENABLE_TRANSCODE_JPEG=ON
- -DJPEGXL_FORCE_SYSTEM_BROTLI=ON
- -DJPEGXL_FORCE_SYSTEM_GTEST=ON
- -DJPEGXL_FORCE_SYSTEM_HWY=ON
- -DJPEGXL_STATIC=OFF
-
[gentoo-commits] repo/proj/guru:dev commit in: media-libs/libjxl/
commit: 7cbfbce6fd49ed807e3b8d690c2e6be22cdfcda3
Author: Alessandro Barbieri gmail com>
AuthorDate: Sat Nov 6 13:11:38 2021 +
Commit: Alessandro Barbieri gmail com>
CommitDate: Sat Nov 6 13:12:11 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=7cbfbce6
media-libs/libjxl: install missing lib, no runpaths
Signed-off-by: Alessandro Barbieri gmail.com>
media-libs/libjxl/libjxl-0.6.1.ebuild | 2 ++
1 file changed, 2 insertions(+)
diff --git a/media-libs/libjxl/libjxl-0.6.1.ebuild
b/media-libs/libjxl/libjxl-0.6.1.ebuild
index 2ac499ef3..4ca7f7ae5 100644
--- a/media-libs/libjxl/libjxl-0.6.1.ebuild
+++ b/media-libs/libjxl/libjxl-0.6.1.ebuild
@@ -95,6 +95,7 @@ src_configure() {
-DJPEGXL_FORCE_NEON=$(usex cpu_flags_arm_neon)
-DBUILD_SHARED_LIBS=ON
+ -DCMAKE_SKIP_RPATH=ON
-DJPEGXL_BUNDLE_SKCMS=OFF
-DJPEGXL_ENABLE_COVERAGE=OFF
-DJPEGXL_ENABLE_FUZZERS=OFF
@@ -111,6 +112,7 @@ src_configure() {
src_install() {
cmake_src_install
+ dolib.so libjxl_dec.so*
einstalldocs
#TODO: install documentation
exeinto "/usr/libexec/${PN}"
[gentoo-commits] repo/proj/guru:dev commit in: media-libs/libjxl/
commit: fd7b9099b103ed4b880d41491a5559ab9f709ecb
Author: Alessandro Barbieri gmail com>
AuthorDate: Fri Nov 5 08:29:16 2021 +
Commit: Alessandro Barbieri gmail com>
CommitDate: Fri Nov 5 08:29:59 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fd7b9099
media-libs/libjxl: add 0.6.1
Signed-off-by: Alessandro Barbieri gmail.com>
media-libs/libjxl/Manifest| 1 +
media-libs/libjxl/libjxl-0.6.1.ebuild | 156 ++
2 files changed, 157 insertions(+)
diff --git a/media-libs/libjxl/Manifest b/media-libs/libjxl/Manifest
index 63de49120..fc7f70713 100644
--- a/media-libs/libjxl/Manifest
+++ b/media-libs/libjxl/Manifest
@@ -1 +1,2 @@
+DIST libjxl-0.6.1.tar.gz 16953185 BLAKE2B
d1e906480e80458635a65bd89ce79f13d463e8cf4fb0dfccf6c473e7649fdc5593669effdf85afbb176920c89e61c65c4907834225f7c9e6da4c611996b201e3
SHA512
302935d722160b0b288ac63301f9e95caf82eccf6ad76c4f4da6316a0314ee3562115932b1ceacb0d02708de0a07788992d3478cae73af0b90193f5769f9fb52
DIST libjxl-0.6.tar.gz 16953410 BLAKE2B
8941987f6d31096a7286f9d98cdcc16e5fe338e6b3d966343f97fc5b5b932ec92c994fab5781448aa7d96324e5c9ce5c83754b01cf6e752d0702ce9fc0a2087f
SHA512
934c86d079c7a1f5382fad158efac225b9d1b27e551ea85ea7ec43e7ffd5cba85ddbfa35658b242a9f9c9589decf245568349abfa8a4fe12898af78d51608852
diff --git a/media-libs/libjxl/libjxl-0.6.1.ebuild
b/media-libs/libjxl/libjxl-0.6.1.ebuild
new file mode 100644
index 0..2ac499ef3
--- /dev/null
+++ b/media-libs/libjxl/libjxl-0.6.1.ebuild
@@ -0,0 +1,156 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg cmake java-pkg-opt-2
+
+DESCRIPTION="JPEG XL image format reference implementation"
+HOMEPAGE="https://github.com/libjxl/libjxl;
+SRC_URI="https://github.com/libjxl/libjxl/archive/refs/tags/v${PV}.tar.gz ->
${P}.tar.gz"
+
+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
fuzzers
+
+CDEPEND="
+ app-arch/brotli
+ dev-cpp/highway:=
+ media-libs/libpng
+ media-libs/lodepng:=
+ media-libs/giflib
+ sys-libs/zlib
+
+ benchmark? (
+ media-libs/libavif
+ media-libs/libwebp
+ virtual/jpeg
+ )
+ openexr? ( media-libs/openexr:= )
+ plugins? (
+ dev-libs/glib:2
+ media-gfx/gimp
+ media-libs/babl
+ media-libs/gegl
+ media-libs/skcms:=
+ x11-libs/gdk-pixbuf
+ x11-misc/shared-mime-info
+ )
+ sjpeg? ( media-libs/sjpeg:= )
+ !skcms? ( media-libs/lcms )
+ skcms? ( media-libs/skcms:= )
+ tcmalloc? ( dev-util/google-perftools )
+ viewers? (
+ dev-qt/qtconcurrent
+ dev-qt/qtwidgets
+ dev-qt/qtx11extras
+ media-libs/lcms
+ x11-libs/libxcb
+ )
+"
+RDEPEND="
+ ${CDEPEND}
+ java? ( virtual/jre:1.8 )
+"
+DEPEND="
+ ${CDEPEND}
+ dev-cpp/gtest
+ kde-frameworks/extra-cmake-modules
+ java? ( virtual/jdk:1.8 )
+ plugins? ( x11-misc/xdg-utils )
+"
+BDEPEND="
+ virtual/pkgconfig
+ man? ( app-text/asciidoc )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-0.6-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
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -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)
+ -DJPEGXL_ENABLE_PROFILER=$(usex profile)
+ -DJPEGXL_ENABLE_SJPEG=$(usex sjpeg)
+ -DJPEGXL_ENABLE_SKCMS=$(usex skcms)
+ -DJPEGXL_ENABLE_TCMALLOC=$(usex tcmalloc)
+ -DJPEGXL_ENABLE_TOOLS=$(usex tools)
+ -DJPEGXL_ENABLE_VIEWERS=$(usex viewers)
+ -DJPEGXL_FORCE_NEON=$(usex cpu_flags_arm_neon)
+
+ -DBUILD_SHARED_LIBS=ON
+ -DJPEGXL_BUNDLE_SKCMS=OFF
+ -DJPEGXL_ENABLE_COVERAGE=OFF
+ -DJPEGXL_ENABLE_FUZZERS=OFF
+ -DJPEGXL_ENABLE_TRANSCODE_JPEG=ON
+ -DJPEGXL_FORCE_SYSTEM_BROTLI=ON
+ -DJPEGXL_FORCE_SYSTEM_GTEST=ON
+ -DJPEGXL_FORCE_SYSTEM_HWY=ON
+ -DJPEGXL_STATIC=OFF
+
[gentoo-commits] repo/proj/guru:dev commit in: media-libs/libjxl/
commit: 35c8a0995fde74ddfd92a2d312b85b97ed156cc2
Author: Daniel Novomesky gmail com>
AuthorDate: Thu Nov 4 16:45:56 2021 +
Commit: Daniel Novomesky gmail com>
CommitDate: Thu Nov 4 16:45:56 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=35c8a099
media-libs/libjxl: install jxlinfo in live ebuild
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Daniel Novomesky gmail.com>
media-libs/libjxl/libjxl-.ebuild | 18 --
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/media-libs/libjxl/libjxl-.ebuild
b/media-libs/libjxl/libjxl-.ebuild
index 2ad6c4626..138b32865 100644
--- a/media-libs/libjxl/libjxl-.ebuild
+++ b/media-libs/libjxl/libjxl-.ebuild
@@ -10,9 +10,9 @@ HOMEPAGE="https://github.com/libjxl/libjxl;
EGIT_REPO_URI="https://github.com/libjxl/libjxl.git;
-LICENSE="Apache-2.0"
+LICENSE="BSD"
SLOT="0"
-IUSE=""
+IUSE="examples"
DEPEND="app-arch/brotli
sys-libs/zlib
@@ -24,8 +24,6 @@ DEPEND="app-arch/brotli
media-libs/openexr:=
dev-util/google-perftools
x11-misc/shared-mime-info
- dev-qt/qtwidgets
- dev-qt/qtx11extras
dev-cpp/gtest
dev-cpp/highway
media-libs/lcms
@@ -37,6 +35,7 @@ RDEPEND="${DEPEND}"
src_configure() {
local mycmakeargs=(
+ -DCMAKE_SKIP_RPATH=ON
-DJPEGXL_ENABLE_BENCHMARK=OFF
-DJPEGXL_ENABLE_COVERAGE=OFF
-DJPEGXL_ENABLE_FUZZERS=OFF
@@ -44,8 +43,8 @@ src_configure() {
-DJPEGXL_WARNINGS_AS_ERRORS=OFF
-DJPEGXL_ENABLE_SKCMS=ON
- -DJPEGXL_ENABLE_EXAMPLES=ON
- -DJPEGXL_ENABLE_VIEWERS=ON
+ -DJPEGXL_ENABLE_EXAMPLES=$(usex examples)
+ -DJPEGXL_ENABLE_VIEWERS=OFF
-DJPEGXL_ENABLE_PLUGINS=ON
-DJPEGXL_FORCE_SYSTEM_BROTLI=ON
-DJPEGXL_FORCE_SYSTEM_HWY=ON
@@ -54,3 +53,10 @@ src_configure() {
cmake_src_configure
}
+
+src_install() {
+ cmake_src_install
+ if use examples; then
+ dobin "${BUILD_DIR}/jxlinfo"
+ fi
+}
[gentoo-commits] repo/proj/guru:dev commit in: media-libs/libjxl/
commit: 1e36af049f567042d7b64f5b9f7c429cdc9e988f
Author: Alessandro Barbieri gmail com>
AuthorDate: Thu Oct 28 15:21:06 2021 +
Commit: Alessandro Barbieri gmail com>
CommitDate: Thu Oct 28 15:21:06 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1e36af04
media-libs/libjxl: fix path
Signed-off-by: Alessandro Barbieri gmail.com>
media-libs/libjxl/libjxl-0.6-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/libjxl/libjxl-0.6-r2.ebuild
b/media-libs/libjxl/libjxl-0.6-r2.ebuild
index 0637e43b0..e2918d5b2 100644
--- a/media-libs/libjxl/libjxl-0.6-r2.ebuild
+++ b/media-libs/libjxl/libjxl-0.6-r2.ebuild
@@ -142,7 +142,7 @@ src_install() {
# 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
+ rm -f
"${ED}"/usr/bin/{fuzzer_corpus,*_main,decode_and_encode,*_hlg,tone_map,xyb_range}
|| die
find "${D}" -name '*.a' -delete || die
}
[gentoo-commits] repo/proj/guru:dev commit in: media-libs/libjxl/files/
commit: 400f0eff377b6e277dfa241da87f256dfdb8c5fd
Author: Alessandro Barbieri gmail com>
AuthorDate: Thu Oct 28 15:17:40 2021 +
Commit: Alessandro Barbieri gmail com>
CommitDate: Thu Oct 28 15:17:40 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=400f0eff
media-libs/libjxl: scrub patch
Signed-off-by: Alessandro Barbieri gmail.com>
.../libjxl/files/libjxl-0.6-system-libs.patch | 24 +++---
1 file changed, 12 insertions(+), 12 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 3a7aa9194..8b8d0a269 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 @@
/var/tmp/portage/media-libs/libjxl-0.6/work/libjxl-0.6/lib/jxl.cmake
-+++ libjxl-0.6/lib/jxl.cmake
+--- a/lib/jxl.cmake
b/lib/jxl.cmake
@@ -387,17 +387,6 @@
target_link_libraries(jxl_enc-obj PUBLIC jxl_profiler)
endif()
@@ -18,8 +18,8 @@
# Headers for exporting/importing public headers
include(GenerateExportHeader)
set_target_properties(jxl_dec-obj PROPERTIES
/var/tmp/portage/media-libs/libjxl-0.6/work/libjxl-0.6/lib/jxl_extras.cmake
-+++ libjxl-0.6/lib/jxl_extras.cmake
+--- a/lib/jxl_extras.cmake
b/lib/jxl_extras.cmake
@@ -92,7 +92,7 @@
endif ()
@@ -34,8 +34,8 @@
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
+--- a/plugins/gdk-pixbuf/CMakeLists.txt
b/plugins/gdk-pixbuf/CMakeLists.txt
@@ -23,7 +23,7 @@
# Note: This only needs the decoder library, but we don't install the decoder
@@ -45,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}")
/var/tmp/portage/media-libs/libjxl-0.6/work/libjxl-0.6/third_party/CMakeLists.txt
-+++ libjxl-0.6/third_party/CMakeLists.txt
+--- a/third_party/CMakeLists.txt
b/third_party/CMakeLists.txt
@@ -113,15 +113,6 @@
endif() # JPEGXL_DEP_LICENSE_DIR
endif()
@@ -98,8 +98,8 @@
- ${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
+--- a/tools/comparison_viewer/CMakeLists.txt
b/tools/comparison_viewer/CMakeLists.txt
@@ -24,9 +24,6 @@
image_loading.cc
image_loading.h
@@ -110,8 +110,8 @@
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
+--- a/tools/viewer/CMakeLists.txt
b/tools/viewer/CMakeLists.txt
@@ -26,10 +26,6 @@
viewer_window.h
viewer_window.ui
[gentoo-commits] repo/proj/guru:dev commit in: media-libs/libjxl/
commit: b9e2f79ecb5fd0e323c8a03f084fb703d617cc9a
Author: Alessandro Barbieri gmail com>
AuthorDate: Thu Oct 28 14:32:29 2021 +
Commit: Alessandro Barbieri gmail com>
CommitDate: Thu Oct 28 14:32:29 2021 +
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
[gentoo-commits] repo/proj/guru:dev commit in: media-libs/libjxl/, media-libs/libjxl/files/
commit: 8bf10763574482ee29614a2b4c40c74e87cbcbf6
Author: Alessandro Barbieri gmail com>
AuthorDate: Wed Oct 27 10:50:16 2021 +
Commit: Alessandro Barbieri gmail com>
CommitDate: Wed Oct 27 10:51:07 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8bf10763
media-libs/libjxl: install more stuff
Signed-off-by: Alessandro Barbieri 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_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
+- $
+- "${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? (
[gentoo-commits] repo/proj/guru:dev commit in: media-libs/libjxl/
commit: cf9492e82b413e84024dc0d03cb22c2c22acb0a5
Author: Alessandro Barbieri gmail com>
AuthorDate: Tue Oct 26 16:45:16 2021 +
Commit: Alessandro Barbieri gmail com>
CommitDate: Tue Oct 26 16:45:16 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=cf9492e8
media-libs/libjxl: remove static lib, add todo
Signed-off-by: Alessandro Barbieri gmail.com>
media-libs/libjxl/libjxl-0.6.ebuild | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/media-libs/libjxl/libjxl-0.6.ebuild
b/media-libs/libjxl/libjxl-0.6.ebuild
index 52c54ec86..afd6ae0c0 100644
--- a/media-libs/libjxl/libjxl-0.6.ebuild
+++ b/media-libs/libjxl/libjxl-0.6.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 man +openexr
plugins profile +sjpeg +skcms tcmalloc tools viewers"
+IUSE="abi_x86_64 cpu_flags_arm_neon benchmark devtools examples man +openexr
plugins profile +sjpeg +skcms tcmalloc tools viewers" #java
RDEPEND="
app-arch/brotli
@@ -23,7 +23,6 @@ RDEPEND="
sys-libs/zlib
virtual/jpeg
- !skcms? ( media-libs/lcms )
openexr? ( media-libs/openexr:= )
plugins? (
dev-libs/glib:2
@@ -35,6 +34,7 @@ RDEPEND="
x11-misc/shared-mime-info
)
sjpeg? ( media-libs/sjpeg:= )
+ !skcms? ( media-libs/lcms )
skcms? ( media-libs/skcms:= )
tcmalloc? ( dev-util/google-perftools )
viewers? ( media-libs/lcms )
@@ -85,3 +85,9 @@ src_configure() {
cmake_src_configure
}
+
+src_install() {
+ cmake_src_install
+ find "${D}" -name '*.a' -delete || die
+ #TODO: install documentation
+}
[gentoo-commits] repo/proj/guru:dev commit in: media-libs/libjxl/files/
commit: 8bc9e05a060428324fcb989f28b9712144d0e9d6
Author: Alessandro Barbieri gmail com>
AuthorDate: Tue Oct 26 16:37:37 2021 +
Commit: Alessandro Barbieri gmail com>
CommitDate: Tue Oct 26 16:37:37 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8bc9e05a
media-libs/libjxl: scrub patch
Signed-off-by: Alessandro Barbieri gmail.com>
media-libs/libjxl/files/libjxl-0.6-system-libs.patch | 15 ++-
1 file changed, 6 insertions(+), 9 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 6aa776078..8ca51d6f8 100644
--- a/media-libs/libjxl/files/libjxl-0.6-system-libs.patch
+++ b/media-libs/libjxl/files/libjxl-0.6-system-libs.patch
@@ -1,6 +1,5 @@
-diff '--color=auto' -ru
/var/tmp/portage/media-libs/libjxl-0.6/work/libjxl-0.6/lib/jxl.cmake
libjxl-0.6/lib/jxl.cmake
/var/tmp/portage/media-libs/libjxl-0.6/work/libjxl-0.6/lib/jxl.cmake
2021-10-04 20:02:44.0 +0200
-+++ libjxl-0.6/lib/jxl.cmake 2021-10-26 16:20:37.332839340 +0200
+--- a/lib/jxl.cmake
b/lib/jxl.cmake
@@ -387,17 +387,6 @@
target_link_libraries(jxl_enc-obj PUBLIC jxl_profiler)
endif()
@@ -19,9 +18,8 @@ diff '--color=auto' -ru
/var/tmp/portage/media-libs/libjxl-0.6/work/libjxl-0.6/l
# Headers for exporting/importing public headers
include(GenerateExportHeader)
set_target_properties(jxl_dec-obj PROPERTIES
-diff '--color=auto' -ru
/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
/var/tmp/portage/media-libs/libjxl-0.6/work/libjxl-0.6/plugins/gdk-pixbuf/CMakeLists.txt
2021-10-26 15:59:28.124828026 +0200
-+++ libjxl-0.6/plugins/gdk-pixbuf/CMakeLists.txt 2021-10-26
16:24:08.540453940 +0200
+--- a/plugins/gdk-pixbuf/CMakeLists.txt
b/plugins/gdk-pixbuf/CMakeLists.txt
@@ -23,7 +23,7 @@
# Note: This only needs the decoder library, but we don't install the decoder
@@ -31,9 +29,8 @@ diff '--color=auto' -ru
/var/tmp/portage/media-libs/libjxl-0.6/work/libjxl-0.6/p
pkg_get_variable(GDK_PIXBUF_MODULEDIR gdk-pixbuf-2.0 gdk_pixbuf_moduledir)
install(TARGETS pixbufloader-jxl LIBRARY DESTINATION
"${GDK_PIXBUF_MODULEDIR}")
-diff '--color=auto' -ru
/var/tmp/portage/media-libs/libjxl-0.6/work/libjxl-0.6/third_party/CMakeLists.txt
libjxl-0.6/third_party/CMakeLists.txt
/var/tmp/portage/media-libs/libjxl-0.6/work/libjxl-0.6/third_party/CMakeLists.txt
2021-10-26 15:59:28.123828010 +0200
-+++ libjxl-0.6/third_party/CMakeLists.txt 2021-10-26 16:13:51.758212796
+0200
+--- a/third_party/CMakeLists.txt
b/third_party/CMakeLists.txt
@@ -113,15 +113,6 @@
endif() # JPEGXL_DEP_LICENSE_DIR
endif()
[gentoo-commits] repo/proj/guru:dev commit in: media-libs/libjxl/, media-libs/libjxl/files/
commit: 0518c6760f02e240b61d02cea7188585a8c7f6cc
Author: Alessandro Barbieri gmail com>
AuthorDate: Tue Oct 26 16:34:38 2021 +
Commit: Alessandro Barbieri gmail com>
CommitDate: Tue Oct 26 16:35:07 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0518c676
media-libs/libjxl: add 0.6
Signed-off-by: Alessandro Barbieri gmail.com>
media-libs/libjxl/Manifest | 1 +
.../libjxl/files/libjxl-0.6-system-libs.patch | 87 ++
media-libs/libjxl/libjxl-0.6.ebuild| 87 ++
media-libs/libjxl/metadata.xml | 11 +++
4 files changed, 186 insertions(+)
diff --git a/media-libs/libjxl/Manifest b/media-libs/libjxl/Manifest
new file mode 100644
index 0..63de49120
--- /dev/null
+++ b/media-libs/libjxl/Manifest
@@ -0,0 +1 @@
+DIST libjxl-0.6.tar.gz 16953410 BLAKE2B
8941987f6d31096a7286f9d98cdcc16e5fe338e6b3d966343f97fc5b5b932ec92c994fab5781448aa7d96324e5c9ce5c83754b01cf6e752d0702ce9fc0a2087f
SHA512
934c86d079c7a1f5382fad158efac225b9d1b27e551ea85ea7ec43e7ffd5cba85ddbfa35658b242a9f9c9589decf245568349abfa8a4fe12898af78d51608852
diff --git a/media-libs/libjxl/files/libjxl-0.6-system-libs.patch
b/media-libs/libjxl/files/libjxl-0.6-system-libs.patch
new file mode 100644
index 0..6aa776078
--- /dev/null
+++ b/media-libs/libjxl/files/libjxl-0.6-system-libs.patch
@@ -0,0 +1,87 @@
+diff '--color=auto' -ru
/var/tmp/portage/media-libs/libjxl-0.6/work/libjxl-0.6/lib/jxl.cmake
libjxl-0.6/lib/jxl.cmake
+--- /var/tmp/portage/media-libs/libjxl-0.6/work/libjxl-0.6/lib/jxl.cmake
2021-10-04 20:02:44.0 +0200
libjxl-0.6/lib/jxl.cmake 2021-10-26 16:20:37.332839340 +0200
+@@ -387,17 +387,6 @@
+ target_link_libraries(jxl_enc-obj PUBLIC jxl_profiler)
+ endif()
+
+-#TODO(lode): don't depend on CMS for the core library
+-if (JPEGXL_ENABLE_SKCMS)
+- target_include_directories(jxl_enc-obj PRIVATE
+-$
+- )
+-else ()
+- target_include_directories(jxl_enc-obj PRIVATE
+-$
+- )
+-endif ()
+-
+ # Headers for exporting/importing public headers
+ include(GenerateExportHeader)
+ set_target_properties(jxl_dec-obj PROPERTIES
+diff '--color=auto' -ru
/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
+---
/var/tmp/portage/media-libs/libjxl-0.6/work/libjxl-0.6/plugins/gdk-pixbuf/CMakeLists.txt
2021-10-26 15:59:28.124828026 +0200
libjxl-0.6/plugins/gdk-pixbuf/CMakeLists.txt 2021-10-26
16:24:08.540453940 +0200
+@@ -23,7 +23,7 @@
+
+ # Note: This only needs the decoder library, but we don't install the decoder
+ # shared library.
+-target_link_libraries(pixbufloader-jxl jxl jxl_threads skcms-interface
PkgConfig::Gdk-Pixbuf)
++target_link_libraries(pixbufloader-jxl jxl jxl_threads skcms
PkgConfig::Gdk-Pixbuf)
+
+ pkg_get_variable(GDK_PIXBUF_MODULEDIR gdk-pixbuf-2.0 gdk_pixbuf_moduledir)
+ install(TARGETS pixbufloader-jxl LIBRARY DESTINATION
"${GDK_PIXBUF_MODULEDIR}")
+diff '--color=auto' -ru
/var/tmp/portage/media-libs/libjxl-0.6/work/libjxl-0.6/third_party/CMakeLists.txt
libjxl-0.6/third_party/CMakeLists.txt
+---
/var/tmp/portage/media-libs/libjxl-0.6/work/libjxl-0.6/third_party/CMakeLists.txt
2021-10-26 15:59:28.123828010 +0200
libjxl-0.6/third_party/CMakeLists.txt 2021-10-26 16:13:51.758212796
+0200
+@@ -113,15 +113,6 @@
+ endif() # JPEGXL_DEP_LICENSE_DIR
+ endif()
+
+-# lodepng
+-if( NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/lodepng/lodepng.h" )
+- message(FATAL_ERROR "Please run ${PROJECT_SOURCE_DIR}/deps.sh to fetch the "
+- "build dependencies.")
+-endif()
+-include(lodepng.cmake)
+-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/lodepng/LICENSE"
+- ${PROJECT_BINARY_DIR}/LICENSE.lodepng COPYONLY)
+-
+ # brotli
+ if (NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/brotli/c/include/brotli/decode.h"
OR
+ JPEGXL_FORCE_SYSTEM_BROTLI)
+@@ -190,34 +181,3 @@
+ endforeach()
+ endif() # BROTLI_EMSCRIPTEN
+ endif()
+-
+-# *cms
+-if (JPEGXL_ENABLE_SKCMS OR JPEGXL_ENABLE_PLUGINS)
+- if( NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/skcms/skcms.h" )
+-message(FATAL_ERROR "Please run ${PROJECT_SOURCE_DIR}/deps.sh to fetch
the "
+-"build dependencies.")
+- endif()
+- include(skcms.cmake)
+- configure_file("${CMAKE_CURRENT_SOURCE_DIR}/skcms/LICENSE"
+- ${PROJECT_BINARY_DIR}/LICENSE.skcms COPYONLY)
+-endif ()
+-if (JPEGXL_ENABLE_VIEWERS OR NOT JPEGXL_ENABLE_SKCMS)
+- if( NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/lcms/.git" )
+-message(SEND_ERROR "Please run git submodule update --init")
+- endif()
+- include(lcms2.cmake)
+- configure_file("${CMAKE_CURRENT_SOURCE_DIR}/lcms/COPYING"
+- ${PROJECT_BINARY_DIR}/LICENSE.lcms COPYONLY)
+-endif()
+-
+-# sjpeg
+-if (JPEGXL_ENABLE_SJPEG)
+- if (NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/sjpeg/CMakeLists.txt")
+-message(FATAL_ERROR
[gentoo-commits] repo/proj/guru:dev commit in: media-libs/libjxl/
commit: 782b6adc08d93ba1f48ced6ac35d7945d262a756
Author: Daniel Novomesky gmail com>
AuthorDate: Sun Sep 12 11:58:01 2021 +
Commit: Daniel Novomesky gmail com>
CommitDate: Sun Sep 12 11:58:01 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=782b6adc
media-libs/libjxl: use system-wide dev-cpp/highway
instead of the bundled dependency.
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Daniel Novomesky gmail.com>
media-libs/libjxl/libjxl-.ebuild | 6 ++
1 file changed, 6 insertions(+)
diff --git a/media-libs/libjxl/libjxl-.ebuild
b/media-libs/libjxl/libjxl-.ebuild
index 21dbcb9ab..2ad6c4626 100644
--- a/media-libs/libjxl/libjxl-.ebuild
+++ b/media-libs/libjxl/libjxl-.ebuild
@@ -26,6 +26,9 @@ DEPEND="app-arch/brotli
x11-misc/shared-mime-info
dev-qt/qtwidgets
dev-qt/qtx11extras
+ dev-cpp/gtest
+ dev-cpp/highway
+ media-libs/lcms
"
BDEPEND=""
@@ -40,10 +43,13 @@ src_configure() {
-DJPEGXL_ENABLE_SJPEG=OFF
-DJPEGXL_WARNINGS_AS_ERRORS=OFF
+ -DJPEGXL_ENABLE_SKCMS=ON
-DJPEGXL_ENABLE_EXAMPLES=ON
-DJPEGXL_ENABLE_VIEWERS=ON
-DJPEGXL_ENABLE_PLUGINS=ON
-DJPEGXL_FORCE_SYSTEM_BROTLI=ON
+ -DJPEGXL_FORCE_SYSTEM_HWY=ON
+ -DJPEGXL_FORCE_SYSTEM_GTEST=ON
)
cmake_src_configure
[gentoo-commits] repo/proj/guru:dev commit in: media-libs/libjxl/
commit: 154f03b592b7468e39b1cf24ced044cd66613036 Author: Andrew Ammerlaan gentoo org> AuthorDate: Sat Jul 24 15:54:54 2021 + Commit: Andrew Ammerlaan gentoo org> CommitDate: Sat Jul 24 15:54:54 2021 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=154f03b5 media-libs/libjxl: add missing slot operator Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Andrew Ammerlaan gentoo.org> media-libs/libjxl/libjxl-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/libjxl/libjxl-.ebuild b/media-libs/libjxl/libjxl-.ebuild index cfb733563..21dbcb9ab 100644 --- a/media-libs/libjxl/libjxl-.ebuild +++ b/media-libs/libjxl/libjxl-.ebuild @@ -21,7 +21,7 @@ DEPEND="app-arch/brotli virtual/opengl media-libs/freeglut media-libs/giflib - media-libs/openexr + media-libs/openexr:= dev-util/google-perftools x11-misc/shared-mime-info dev-qt/qtwidgets
[gentoo-commits] repo/proj/guru:dev commit in: media-libs/libjxl/
commit: a20176cd61568a0a0569990e9ddac86f218afec5
Author: Daniel Novomesky gmail com>
AuthorDate: Thu Jun 3 11:25:54 2021 +
Commit: Daniel Novomesky gmail com>
CommitDate: Thu Jun 3 11:25:54 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a20176cd
media-libs/libjxl: renamed package
Old name was media-libs/jpeg-xl
New github repo is used now, instead of gitlab
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Daniel Novomesky gmail.com>
media-libs/libjxl/libjxl-.ebuild | 50
media-libs/libjxl/metadata.xml | 8 ++
2 files changed, 58 insertions(+)
diff --git a/media-libs/libjxl/libjxl-.ebuild
b/media-libs/libjxl/libjxl-.ebuild
new file mode 100644
index 0..cfb733563
--- /dev/null
+++ b/media-libs/libjxl/libjxl-.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit xdg cmake git-r3
+
+DESCRIPTION="JPEG XL image format reference implementation"
+HOMEPAGE="https://github.com/libjxl/libjxl;
+
+EGIT_REPO_URI="https://github.com/libjxl/libjxl.git;
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND="app-arch/brotli
+ sys-libs/zlib
+ media-libs/libpng
+ virtual/jpeg
+ virtual/opengl
+ media-libs/freeglut
+ media-libs/giflib
+ media-libs/openexr
+ dev-util/google-perftools
+ x11-misc/shared-mime-info
+ dev-qt/qtwidgets
+ dev-qt/qtx11extras
+"
+
+BDEPEND=""
+
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ local mycmakeargs=(
+ -DJPEGXL_ENABLE_BENCHMARK=OFF
+ -DJPEGXL_ENABLE_COVERAGE=OFF
+ -DJPEGXL_ENABLE_FUZZERS=OFF
+ -DJPEGXL_ENABLE_SJPEG=OFF
+ -DJPEGXL_WARNINGS_AS_ERRORS=OFF
+
+ -DJPEGXL_ENABLE_EXAMPLES=ON
+ -DJPEGXL_ENABLE_VIEWERS=ON
+ -DJPEGXL_ENABLE_PLUGINS=ON
+ -DJPEGXL_FORCE_SYSTEM_BROTLI=ON
+ )
+
+ cmake_src_configure
+}
diff --git a/media-libs/libjxl/metadata.xml b/media-libs/libjxl/metadata.xml
new file mode 100644
index 0..d9a1e3c6e
--- /dev/null
+++ b/media-libs/libjxl/metadata.xml
@@ -0,0 +1,8 @@
+
+http://www.gentoo.org/dtd/metadata.dtd'>
+
+
+ dnovome...@gmail.com
+ Daniel Novomesky
+
+
