commit: 5ae7867e94b749fcb1d709269602fcc482664e43 Author: Holger Hoffstätte <holger <AT> applied-asynchrony <DOT> com> AuthorDate: Sun May 19 12:16:30 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun May 19 17:01:34 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ae7867e
media-gfx/graphicsmagick: reinstate JPEG-2000 support Closes: https://bugs.gentoo.org/913069 Signed-off-by: Holger Hoffstätte <holger <AT> applied-asynchrony.com> Signed-off-by: Sam James <sam <AT> gentoo.org> ...{graphicsmagick-9999.ebuild => graphicsmagick-1.3.43-r1.ebuild} | 7 ++++--- media-gfx/graphicsmagick/graphicsmagick-9999.ebuild | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.43-r1.ebuild similarity index 96% copy from media-gfx/graphicsmagick/graphicsmagick-9999.ebuild copy to media-gfx/graphicsmagick/graphicsmagick-1.3.43-r1.ebuild index de2acbced7ba..89f44bc5c1e2 100644 --- a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild +++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.43-r1.ebuild @@ -27,7 +27,7 @@ fi LICENSE="MIT" SLOT="0/${PV%.*}" -IUSE="bzip2 +cxx debug dynamic-loading fpx heif imagemagick jbig jpeg jpegxl lcms lzma" +IUSE="bzip2 +cxx debug dynamic-loading fpx heif imagemagick jbig jpeg jpeg2k jpegxl lcms lzma" IUSE+=" openmp perl png postscript q16 q32 static-libs svg tcmalloc tiff truetype" IUSE+=" webp wmf X zlib zstd" @@ -39,6 +39,7 @@ RDEPEND=" imagemagick? ( !media-gfx/imagemagick ) jbig? ( media-libs/jbigkit ) jpeg? ( media-libs/libjpeg-turbo:= ) + jpeg2k? ( media-libs/jasper:= ) jpegxl? ( media-libs/libjxl:= ) lcms? ( media-libs/lcms:2 ) lzma? ( app-arch/xz-utils ) @@ -68,6 +69,7 @@ BDEPEND+=" virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${PN}-1.3.41-flags.patch "${FILESDIR}"/${PN}-1.3.41-perl.patch + "${FILESDIR}"/${PN}-1.3.43-bashism.patch ) pkg_pretend() { @@ -113,8 +115,7 @@ src_configure() { $(use_with jbig) $(use_with webp) $(use_with jpeg) - # Needs last-rited/unpackaged jasper - --without-jp2 + $(use_with jpeg2k jp2) $(use_with lcms lcms2) $(use_with lzma) $(use_with png) diff --git a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild b/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild index de2acbced7ba..7bac94809556 100644 --- a/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild +++ b/media-gfx/graphicsmagick/graphicsmagick-9999.ebuild @@ -27,7 +27,7 @@ fi LICENSE="MIT" SLOT="0/${PV%.*}" -IUSE="bzip2 +cxx debug dynamic-loading fpx heif imagemagick jbig jpeg jpegxl lcms lzma" +IUSE="bzip2 +cxx debug dynamic-loading fpx heif imagemagick jbig jpeg jpeg2k jpegxl lcms lzma" IUSE+=" openmp perl png postscript q16 q32 static-libs svg tcmalloc tiff truetype" IUSE+=" webp wmf X zlib zstd" @@ -39,6 +39,7 @@ RDEPEND=" imagemagick? ( !media-gfx/imagemagick ) jbig? ( media-libs/jbigkit ) jpeg? ( media-libs/libjpeg-turbo:= ) + jpeg2k? ( media-libs/jasper:= ) jpegxl? ( media-libs/libjxl:= ) lcms? ( media-libs/lcms:2 ) lzma? ( app-arch/xz-utils ) @@ -113,8 +114,7 @@ src_configure() { $(use_with jbig) $(use_with webp) $(use_with jpeg) - # Needs last-rited/unpackaged jasper - --without-jp2 + $(use_with jpeg2k jp2) $(use_with lcms lcms2) $(use_with lzma) $(use_with png)
