From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BB1E815802F for ; Sun, 2 Apr 2023 14:35:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 095CAE07FA; Sun, 2 Apr 2023 14:35:27 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D8340E07FA for ; Sun, 2 Apr 2023 14:35:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F1F9933C84E for ; Sun, 2 Apr 2023 14:35:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 481DF8E4 for ; Sun, 2 Apr 2023 14:35:24 +0000 (UTC) From: "Andreas K. Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas K. Hüttel" Message-ID: <1680446109.b1f7723c027598678be4300bf613b523ff7bdb9f.dilfridge@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/imagemagick/imagemagick-7.1.0.62-r1.ebuild media-gfx/imagemagick/imagemagick-9999.ebuild media-gfx/imagemagick/metadata.xml X-VCS-Directories: media-gfx/imagemagick/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Hüttel X-VCS-Revision: b1f7723c027598678be4300bf613b523ff7bdb9f X-VCS-Branch: master Date: Sun, 2 Apr 2023 14:35:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9cea0540-8fa8-4872-a67a-994365bf759c X-Archives-Hash: 80d7d913a7725d72e8d65a857ce3ac4e commit: b1f7723c027598678be4300bf613b523ff7bdb9f Author: Andreas K. Hüttel gentoo org> AuthorDate: Sun Apr 2 14:18:58 2023 +0000 Commit: Andreas K. Hüttel gentoo 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 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 @@ Use media-fonts/corefonts which is required by some commands Enable media-libs/libfpx support Enable High Dynamic Range Images formats + Enable support for JPEG XL image format Enable experimental liquid rescale support using media-libs/liblqr Enable OpenCL support Enable Pango support using x11-libs/pango