commit: b1f7723c027598678be4300bf613b523ff7bdb9f Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> AuthorDate: Sun Apr 2 14:18:58 2023 +0000 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> CommitDate: Sun Apr 2 14:35:09 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1f7723c
media-gfx/imagemagick: add jpeg-xl support Closes: https://bugs.gentoo.org/853226 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> .../{imagemagick-9999.ebuild => imagemagick-7.1.0.62-r1.ebuild} | 7 ++++--- media-gfx/imagemagick/imagemagick-9999.ebuild | 5 +++-- media-gfx/imagemagick/metadata.xml | 1 + 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild b/media-gfx/imagemagick/imagemagick-7.1.0.62-r1.ebuild similarity index 95% copy from media-gfx/imagemagick/imagemagick-9999.ebuild copy to media-gfx/imagemagick/imagemagick-7.1.0.62-r1.ebuild index 516ae1cca24a..ffa25e8a06ac 100644 --- a/media-gfx/imagemagick/imagemagick-9999.ebuild +++ b/media-gfx/imagemagick/imagemagick-7.1.0.62-r1.ebuild @@ -14,7 +14,7 @@ else MY_PV="$(ver_rs 3 '-')" MY_P="ImageMagick-${MY_PV}" SRC_URI="mirror://imagemagick/${MY_P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" fi S="${WORKDIR}/${MY_P}" @@ -26,7 +26,7 @@ LICENSE="imagemagick" # Please check this on bumps, SONAME is often not updated! Use abidiff on old/new. # If ABI is broken, change the bit after the '-'. SLOT="0/$(ver_cut 1-3)-43" -IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zip zlib" +IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k jpegxl lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zip zlib" REQUIRED_USE="corefonts? ( truetype ) svg? ( xml ) @@ -48,6 +48,7 @@ RDEPEND=" jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( media-libs/libjpeg-turbo:= ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) + jpegxl? ( >=media-libs/libjxl-0.6 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) @@ -172,7 +173,7 @@ src_configure() { $(use_with jbig) $(use_with jpeg) $(use_with jpeg2k openjp2) - --without-jxl + $(use_with jpegxl jxl) $(use_with lcms) $(use_with lqr) $(use_with lzma) diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild b/media-gfx/imagemagick/imagemagick-9999.ebuild index 516ae1cca24a..085bd89a9b6a 100644 --- a/media-gfx/imagemagick/imagemagick-9999.ebuild +++ b/media-gfx/imagemagick/imagemagick-9999.ebuild @@ -26,7 +26,7 @@ LICENSE="imagemagick" # Please check this on bumps, SONAME is often not updated! Use abidiff on old/new. # If ABI is broken, change the bit after the '-'. SLOT="0/$(ver_cut 1-3)-43" -IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zip zlib" +IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k jpegxl lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zip zlib" REQUIRED_USE="corefonts? ( truetype ) svg? ( xml ) @@ -48,6 +48,7 @@ RDEPEND=" jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( media-libs/libjpeg-turbo:= ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) + jpegxl? ( >=media-libs/libjxl-0.6 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) @@ -172,7 +173,7 @@ src_configure() { $(use_with jbig) $(use_with jpeg) $(use_with jpeg2k openjp2) - --without-jxl + $(use_with jpegxl jxl) $(use_with lcms) $(use_with lqr) $(use_with lzma) diff --git a/media-gfx/imagemagick/metadata.xml b/media-gfx/imagemagick/metadata.xml index 591c4245c3f7..b1fc8d65f222 100644 --- a/media-gfx/imagemagick/metadata.xml +++ b/media-gfx/imagemagick/metadata.xml @@ -13,6 +13,7 @@ <flag name="corefonts">Use <pkg>media-fonts/corefonts</pkg> which is required by some commands</flag> <flag name="fpx">Enable <pkg>media-libs/libfpx</pkg> support</flag> <flag name="hdri">Enable High Dynamic Range Images formats</flag> + <flag name="jpegxl">Enable support for JPEG XL image format</flag> <flag name="lqr">Enable experimental liquid rescale support using <pkg>media-libs/liblqr</pkg></flag> <flag name="opencl">Enable OpenCL support</flag> <flag name="pango">Enable Pango support using <pkg>x11-libs/pango</pkg></flag>
