commit: 83eb9ebf7f46b652e03175976a18b81b4cedb03a Author: Daniel Novomesky <dnovomesky <AT> gmail <DOT> com> AuthorDate: Tue Mar 29 19:13:03 2022 +0000 Commit: Yixun Lan <dlan <AT> gentoo <DOT> org> CommitDate: Sun Apr 3 23:15:17 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83eb9ebf
media-libs/libjxl: version bump to 20220329 snapshot Closes: https://github.com/gentoo/gentoo/pull/24807 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Daniel Novomesky <dnovomesky <AT> gmail.com> Signed-off-by: Yixun Lan <dlan <AT> gentoo.org> media-libs/libjxl/Manifest | 1 + ...9999.ebuild => libjxl-0.7.0_pre20220329.ebuild} | 31 ++++++++++------------ media-libs/libjxl/libjxl-9999.ebuild | 7 +++-- 3 files changed, 18 insertions(+), 21 deletions(-) diff --git a/media-libs/libjxl/Manifest b/media-libs/libjxl/Manifest index dff7d80ef035..2614d99687a0 100644 --- a/media-libs/libjxl/Manifest +++ b/media-libs/libjxl/Manifest @@ -1 +1,2 @@ DIST libjxl-0.7.0_pre20220311.tar.gz 17322724 BLAKE2B a3cf970ea3db67e0890e94a5c74ea66610d4fed608fa3d079e6934a1d5f2bdc3ef4264c1df85e4b4efcd22c060087c712009f6c4a6b69a41f6e96ff3674c6de5 SHA512 f3e46ddea462b31de6df3c615c3cd628adc58c7ff41588e2ec4cc8929590c9272603a66ed4620b9ba550d85b3d1a6da3f51b1c4f8650ef8901347fea8af5d474 +DIST libjxl-0.7.0_pre20220329.tar.gz 21282311 BLAKE2B 8ced9811adba47e5ccac4d55cb7133a863bedceebeb51e649fa79ecb17b785e747532f1f36fd39e3627d0a29406f5f403dee8fa42a9958c713c1296c2f83260a SHA512 deb17dd2eb3e2c39d624d97c6959940aee5beafcb009f6cb2ac14dd83c73d2601df8c81f6cec5d8032d9e66d1fdabfe620dcbf9bfa5e90eb9978265896816242 diff --git a/media-libs/libjxl/libjxl-9999.ebuild b/media-libs/libjxl/libjxl-0.7.0_pre20220329.ebuild similarity index 74% copy from media-libs/libjxl/libjxl-9999.ebuild copy to media-libs/libjxl/libjxl-0.7.0_pre20220329.ebuild index 1a2abbce5e64..5407dd894d8b 100644 --- a/media-libs/libjxl/libjxl-9999.ebuild +++ b/media-libs/libjxl/libjxl-0.7.0_pre20220329.ebuild @@ -3,37 +3,33 @@ EAPI=8 -CMAKE_ECLASS=cmake -inherit cmake-multilib git-r3 xdg +inherit cmake-multilib 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://api.github.com/repos/libjxl/libjxl/tarball/fde214c5f4dc5ffd0360401a68df33182edf9226 -> ${P}.tar.gz" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86" LICENSE="BSD" SLOT="0" -IUSE="examples gdk-pixbuf gimp210 openexr" +IUSE="examples openexr" 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/lcms-2.13:=[${MULTILIB_USEDEP}] media-libs/libpng:=[${MULTILIB_USEDEP}] sys-libs/zlib[${MULTILIB_USEDEP}] virtual/jpeg[${MULTILIB_USEDEP}] - x11-misc/shared-mime-info - gdk-pixbuf? ( - dev-libs/glib:2 - x11-libs/gdk-pixbuf:2 - ) - gimp210? ( >=media-gfx/gimp-2.10.28:0/2 ) + >=x11-misc/shared-mime-info-2.2 openexr? ( media-libs/openexr:= ) " - RDEPEND="${DEPEND}" +S="${WORKDIR}/libjxl-libjxl-fde214c" + multilib_src_configure() { local mycmakeargs=( -DCMAKE_SKIP_RPATH=ON @@ -44,10 +40,12 @@ 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 @@ -59,16 +57,12 @@ multilib_src_configure() { -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 @@ -77,7 +71,10 @@ multilib_src_configure() { multilib_src_install() { cmake_src_install + if use examples && multilib_is_native_abi; then dobin "${BUILD_DIR}/jxlinfo" fi + + find "${D}" -name '*.a' -delete || die } diff --git a/media-libs/libjxl/libjxl-9999.ebuild b/media-libs/libjxl/libjxl-9999.ebuild index 1a2abbce5e64..0dcf64fe11d8 100644 --- a/media-libs/libjxl/libjxl-9999.ebuild +++ b/media-libs/libjxl/libjxl-9999.ebuild @@ -3,8 +3,7 @@ EAPI=8 -CMAKE_ECLASS=cmake -inherit cmake-multilib git-r3 xdg +inherit cmake-multilib git-r3 DESCRIPTION="JPEG XL image format reference implementation" HOMEPAGE="https://github.com/libjxl/libjxl"; @@ -23,7 +22,7 @@ DEPEND="app-arch/brotli:=[${MULTILIB_USEDEP}] media-libs/libpng:=[${MULTILIB_USEDEP}] sys-libs/zlib[${MULTILIB_USEDEP}] virtual/jpeg[${MULTILIB_USEDEP}] - x11-misc/shared-mime-info + >=x11-misc/shared-mime-info-2.2 gdk-pixbuf? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 @@ -31,7 +30,6 @@ DEPEND="app-arch/brotli:=[${MULTILIB_USEDEP}] gimp210? ( >=media-gfx/gimp-2.10.28:0/2 ) openexr? ( media-libs/openexr:= ) " - RDEPEND="${DEPEND}" multilib_src_configure() { @@ -62,6 +60,7 @@ multilib_src_configure() { -DJPEGXL_ENABLE_PLUGINS=ON -DJPEGXL_ENABLE_PLUGIN_GDKPIXBUF=$(usex gdk-pixbuf) -DJPEGXL_ENABLE_PLUGIN_GIMP210=$(usex gimp210) + -DJPEGXL_ENABLE_PLUGIN_MIME=OFF ) else mycmakeargs+=(
