commit: 26fc3c9a722a0d9847b6127fffaeb6ecacedbfa3 Author: Daniel Novomeský <dnovomesky <AT> gmail <DOT> com> AuthorDate: Mon Oct 17 15:07:49 2022 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Oct 25 16:13:00 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26fc3c9a
media-libs/libjxl: add 0.7.0 Closes: https://bugs.gentoo.org/876727 Signed-off-by: Daniel Novomeský <dnovomesky <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/27820 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-libs/libjxl/Manifest | 1 + .../{libjxl-9999.ebuild => libjxl-0.7.0.ebuild} | 35 +++++++++++----------- media-libs/libjxl/libjxl-9999.ebuild | 12 ++++---- media-libs/libjxl/metadata.xml | 1 - 4 files changed, 24 insertions(+), 25 deletions(-) diff --git a/media-libs/libjxl/Manifest b/media-libs/libjxl/Manifest index d76aa43488c5..0fac8236bf38 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_pre20220329.tar.gz 21282311 BLAKE2B 8ced9811adba47e5ccac4d55cb7133a863bedceebeb51e649fa79ecb17b785e747532f1f36fd39e3627d0a29406f5f403dee8fa42a9958c713c1296c2f83260a SHA512 deb17dd2eb3e2c39d624d97c6959940aee5beafcb009f6cb2ac14dd83c73d2601df8c81f6cec5d8032d9e66d1fdabfe620dcbf9bfa5e90eb9978265896816242 DIST libjxl-0.7.0_pre20220825.tar.gz 1505499 BLAKE2B 67b1f33112c85c8ccf1187cc44441f1afd6b5f11139f5b066092abe3dd2304e7ff8a8179fb1ef2a08982d2700ac757113019580c99abf37b3d701310f70861bf SHA512 13132dbe93d1b55cf878653803b01547b77152687aedd8ea07c162562f78965f74b5d96b82a434d2982962ad817096253a9447743e620cc72af0f1906a284b1d diff --git a/media-libs/libjxl/libjxl-9999.ebuild b/media-libs/libjxl/libjxl-0.7.0.ebuild similarity index 71% copy from media-libs/libjxl/libjxl-9999.ebuild copy to media-libs/libjxl/libjxl-0.7.0.ebuild index a2269bfc62ec..c35258044ff6 100644 --- a/media-libs/libjxl/libjxl-9999.ebuild +++ b/media-libs/libjxl/libjxl-0.7.0.ebuild @@ -3,36 +3,32 @@ EAPI=8 -inherit cmake-multilib 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 gimp210 openexr" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="openexr" DEPEND="app-arch/brotli:=[${MULTILIB_USEDEP}] - dev-cpp/gflags:=[${MULTILIB_USEDEP}] >=dev-cpp/highway-1.0.0[${MULTILIB_USEDEP}] media-libs/giflib:=[${MULTILIB_USEDEP}] + >=media-libs/lcms-2.13:=[${MULTILIB_USEDEP}] + media-libs/libjpeg-turbo[${MULTILIB_USEDEP}] media-libs/libpng:=[${MULTILIB_USEDEP}] sys-libs/zlib[${MULTILIB_USEDEP}] - media-libs/libjpeg-turbo[${MULTILIB_USEDEP}] >=x11-misc/shared-mime-info-2.2 - gdk-pixbuf? ( - dev-libs/glib:2 - x11-libs/gdk-pixbuf:2 - ) - gimp210? ( >=media-gfx/gimp-2.10.28:0/2 ) openexr? ( media-libs/openexr:= ) " RDEPEND="${DEPEND}" multilib_src_configure() { + filter-lto + local mycmakeargs=( -DBUILD_TESTING=OFF -DJPEGXL_ENABLE_BENCHMARK=OFF @@ -41,10 +37,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 @@ -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=$(usex gimp210) - -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 "${D}" -name '*.a' -delete || die +} diff --git a/media-libs/libjxl/libjxl-9999.ebuild b/media-libs/libjxl/libjxl-9999.ebuild index a2269bfc62ec..f8c37689216e 100644 --- a/media-libs/libjxl/libjxl-9999.ebuild +++ b/media-libs/libjxl/libjxl-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit cmake-multilib git-r3 +inherit cmake-multilib flag-o-matic git-r3 DESCRIPTION="JPEG XL image format reference implementation" HOMEPAGE="https://github.com/libjxl/libjxl"; @@ -13,26 +13,26 @@ EGIT_SUBMODULES=(third_party/skcms) LICENSE="BSD" SLOT="0" -IUSE="gdk-pixbuf gimp210 openexr" +IUSE="gdk-pixbuf openexr" DEPEND="app-arch/brotli:=[${MULTILIB_USEDEP}] - dev-cpp/gflags:=[${MULTILIB_USEDEP}] >=dev-cpp/highway-1.0.0[${MULTILIB_USEDEP}] media-libs/giflib:=[${MULTILIB_USEDEP}] + media-libs/libjpeg-turbo[${MULTILIB_USEDEP}] media-libs/libpng:=[${MULTILIB_USEDEP}] sys-libs/zlib[${MULTILIB_USEDEP}] - media-libs/libjpeg-turbo[${MULTILIB_USEDEP}] >=x11-misc/shared-mime-info-2.2 gdk-pixbuf? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 ) - gimp210? ( >=media-gfx/gimp-2.10.28:0/2 ) openexr? ( media-libs/openexr:= ) " RDEPEND="${DEPEND}" multilib_src_configure() { + filter-lto + local mycmakeargs=( -DBUILD_TESTING=OFF -DJPEGXL_ENABLE_BENCHMARK=OFF @@ -58,7 +58,7 @@ multilib_src_configure() { -DJPEGXL_ENABLE_OPENEXR=$(usex openexr) -DJPEGXL_ENABLE_PLUGINS=ON -DJPEGXL_ENABLE_PLUGIN_GDKPIXBUF=$(usex gdk-pixbuf) - -DJPEGXL_ENABLE_PLUGIN_GIMP210=$(usex gimp210) + -DJPEGXL_ENABLE_PLUGIN_GIMP210=OFF -DJPEGXL_ENABLE_PLUGIN_MIME=OFF ) else diff --git a/media-libs/libjxl/metadata.xml b/media-libs/libjxl/metadata.xml index f39fa860738c..8ac778195a7c 100644 --- a/media-libs/libjxl/metadata.xml +++ b/media-libs/libjxl/metadata.xml @@ -16,6 +16,5 @@ </longdescription> <use> <flag name="gdk-pixbuf">Build a gdk-pixbuf loader</flag> - <flag name="gimp210">Enable plugin for GIMP 2.10.x series</flag> </use> </pkgmetadata>
