commit: 7c21d79e20bebeb0da273fd4ff0c85ffbeaa8155 Author: Daniel Novomeský <dnovomesky <AT> gmail <DOT> com> AuthorDate: Thu Jan 19 20:25:40 2023 +0000 Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org> CommitDate: Fri Jan 27 11:53:17 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c21d79e
media-libs/libjxl: add 0.8.0 Signed-off-by: Daniel Novomeský <dnovomesky <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/29178 Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org> media-libs/libjxl/Manifest | 1 + .../{libjxl-9999.ebuild => libjxl-0.8.0.ebuild} | 35 +++++++++++----------- media-libs/libjxl/libjxl-9999.ebuild | 6 ++-- media-libs/libjxl/metadata.xml | 3 ++ 4 files changed, 24 insertions(+), 21 deletions(-) diff --git a/media-libs/libjxl/Manifest b/media-libs/libjxl/Manifest index 4c19e2d1152b..a377a56c114b 100644 --- a/media-libs/libjxl/Manifest +++ b/media-libs/libjxl/Manifest @@ -1,2 +1,3 @@ DIST libjxl-0.7.0.tar.gz 1505917 BLAKE2B fd60e8fb1d7082deaaaf413395ac09e6096bb164ac1b2765a836e0bd3b96a8ac604c2e7631dd17d3eb1d9421c9460de13cede63c5786a5b0689cb858d7f5ec59 SHA512 c73039606acf7b2cbc331c6787af5167d711fd1af22bc616e1f478c531b087da82c98f2cb7e88c4d1f8bcfdc4e053ae0dc99cc9a811545b7f9658041489ed04b DIST libjxl-0.7.0_pre20220825.tar.gz 1505499 BLAKE2B 67b1f33112c85c8ccf1187cc44441f1afd6b5f11139f5b066092abe3dd2304e7ff8a8179fb1ef2a08982d2700ac757113019580c99abf37b3d701310f70861bf SHA512 13132dbe93d1b55cf878653803b01547b77152687aedd8ea07c162562f78965f74b5d96b82a434d2982962ad817096253a9447743e620cc72af0f1906a284b1d +DIST libjxl-0.8.0.tar.gz 1611824 BLAKE2B e16fb51c7938be22754cad70ccab1e0e965b218993aa2fe9646b6b8958887b2e868bdc9631a9d3ff5c24ca1b02f9e262c4d531238d78a7d80f23ed5911a95b1e SHA512 ef472ddc5e277f3d41491c2acc03ed0152ec3ea87efb9e3320cfd830ceb383728658318444b06a3e9f8662bc11c0014675966572ce33f49c8e5cb13c5ed48de1 diff --git a/media-libs/libjxl/libjxl-9999.ebuild b/media-libs/libjxl/libjxl-0.8.0.ebuild similarity index 68% copy from media-libs/libjxl/libjxl-9999.ebuild copy to media-libs/libjxl/libjxl-0.8.0.ebuild index f8c37689216e..6c5ced59bf36 100644 --- a/media-libs/libjxl/libjxl-9999.ebuild +++ b/media-libs/libjxl/libjxl-0.8.0.ebuild @@ -1,31 +1,26 @@ -# Copyright 2021-2022 Gentoo Authors +# Copyright 2021-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit cmake-multilib flag-o-matic git-r3 +inherit cmake-multilib flag-o-matic 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) +SRC_URI="https://github.com/libjxl/libjxl/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0" -IUSE="gdk-pixbuf openexr" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="openexr" DEPEND="app-arch/brotli:=[${MULTILIB_USEDEP}] >=dev-cpp/highway-1.0.0[${MULTILIB_USEDEP}] media-libs/giflib:=[${MULTILIB_USEDEP}] - media-libs/libjpeg-turbo[${MULTILIB_USEDEP}] + >=media-libs/lcms-2.13:2[${MULTILIB_USEDEP}] + media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] media-libs/libpng:=[${MULTILIB_USEDEP}] - sys-libs/zlib[${MULTILIB_USEDEP}] >=x11-misc/shared-mime-info-2.2 - gdk-pixbuf? ( - dev-libs/glib:2 - x11-libs/gdk-pixbuf:2 - ) openexr? ( media-libs/openexr:= ) " RDEPEND="${DEPEND}" @@ -41,13 +36,16 @@ multilib_src_configure() { -DJPEGXL_ENABLE_SJPEG=OFF -DJPEGXL_WARNINGS_AS_ERRORS=OFF - -DJPEGXL_ENABLE_SKCMS=ON + -DJPEGXL_ENABLE_SKCMS=OFF -DJPEGXL_ENABLE_VIEWERS=OFF + -DJPEGXL_ENABLE_PLUGINS=OFF -DJPEGXL_FORCE_SYSTEM_BROTLI=ON -DJPEGXL_FORCE_SYSTEM_HWY=ON + -DJPEGXL_FORCE_SYSTEM_LCMS2=ON -DJPEGXL_ENABLE_DOXYGEN=OFF -DJPEGXL_ENABLE_MANPAGES=OFF -DJPEGXL_ENABLE_JNI=OFF + -DJPEGXL_ENABLE_JPEGLI_LIBJPEG=OFF -DJPEGXL_ENABLE_TCMALLOC=OFF -DJPEGXL_ENABLE_EXAMPLES=OFF ) @@ -56,18 +54,19 @@ multilib_src_configure() { mycmakeargs+=( -DJPEGXL_ENABLE_TOOLS=ON -DJPEGXL_ENABLE_OPENEXR=$(usex openexr) - -DJPEGXL_ENABLE_PLUGINS=ON - -DJPEGXL_ENABLE_PLUGIN_GDKPIXBUF=$(usex gdk-pixbuf) - -DJPEGXL_ENABLE_PLUGIN_GIMP210=OFF - -DJPEGXL_ENABLE_PLUGIN_MIME=OFF ) else mycmakeargs+=( -DJPEGXL_ENABLE_TOOLS=OFF -DJPEGXL_ENABLE_OPENEXR=OFF - -DJPEGXL_ENABLE_PLUGINS=OFF ) fi cmake_src_configure } + +multilib_src_install() { + cmake_src_install + + find "${ED}" -name '*.a' -delete || die +} diff --git a/media-libs/libjxl/libjxl-9999.ebuild b/media-libs/libjxl/libjxl-9999.ebuild index f8c37689216e..30362a1f1147 100644 --- a/media-libs/libjxl/libjxl-9999.ebuild +++ b/media-libs/libjxl/libjxl-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2022 Gentoo Authors +# Copyright 2021-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -18,9 +18,8 @@ IUSE="gdk-pixbuf openexr" DEPEND="app-arch/brotli:=[${MULTILIB_USEDEP}] >=dev-cpp/highway-1.0.0[${MULTILIB_USEDEP}] media-libs/giflib:=[${MULTILIB_USEDEP}] - media-libs/libjpeg-turbo[${MULTILIB_USEDEP}] + media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] media-libs/libpng:=[${MULTILIB_USEDEP}] - sys-libs/zlib[${MULTILIB_USEDEP}] >=x11-misc/shared-mime-info-2.2 gdk-pixbuf? ( dev-libs/glib:2 @@ -48,6 +47,7 @@ multilib_src_configure() { -DJPEGXL_ENABLE_DOXYGEN=OFF -DJPEGXL_ENABLE_MANPAGES=OFF -DJPEGXL_ENABLE_JNI=OFF + -DJPEGXL_ENABLE_JPEGLI_LIBJPEG=OFF -DJPEGXL_ENABLE_TCMALLOC=OFF -DJPEGXL_ENABLE_EXAMPLES=OFF ) diff --git a/media-libs/libjxl/metadata.xml b/media-libs/libjxl/metadata.xml index 8ac778195a7c..1e3f2d5931e2 100644 --- a/media-libs/libjxl/metadata.xml +++ b/media-libs/libjxl/metadata.xml @@ -17,4 +17,7 @@ <use> <flag name="gdk-pixbuf">Build a gdk-pixbuf loader</flag> </use> + <upstream> + <remote-id type="github">libjxl/libjxl</remote-id> + </upstream> </pkgmetadata>
