git: 7ea47cecaa27 - main - graphics/jpeg-xl: update to 0.7.r

From: Jan Beich <jbeich_at_FreeBSD.org>
Date: Tue, 09 Aug 2022 16:19:45 UTC
The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=7ea47cecaa27a9e3f25e7a5f23d2059ab6b21e13

commit 7ea47cecaa27a9e3f25e7a5f23d2059ab6b21e13
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2022-08-05 14:09:58 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2022-08-09 16:05:50 +0000

    graphics/jpeg-xl: update to 0.7.r
    
    Changes:        https://github.com/libjxl/libjxl/releases/tag/v0.7rc
    Reported by:    GitHub (watch releases)
---
 graphics/ImageMagick7/Makefile      |  2 +-
 graphics/geeqie/Makefile            |  2 +-
 graphics/gimp-app/Makefile          |  2 +-
 graphics/gimp-jxl-plugin/Makefile   |  2 +-
 graphics/gimp-jxl-plugin/distinfo   |  6 +++---
 graphics/imlib2-jxl/Makefile        |  1 +
 graphics/kf5-kimageformats/Makefile |  1 +
 graphics/libjxl/Makefile            | 24 +++++-------------------
 graphics/libjxl/distinfo            | 26 +++++---------------------
 graphics/libjxl/pkg-plist           | 11 +++++++----
 graphics/vips/Makefile              |  2 +-
 multimedia/aom/Makefile             |  1 +
 x11/swayimg/Makefile                |  1 +
 13 files changed, 29 insertions(+), 52 deletions(-)

diff --git a/graphics/ImageMagick7/Makefile b/graphics/ImageMagick7/Makefile
index 03bb4aa15e94..0f90d7a71fa5 100644
--- a/graphics/ImageMagick7/Makefile
+++ b/graphics/ImageMagick7/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	ImageMagick
 DISTVERSION=	7.1.0-43
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics perl5
 MASTER_SITES=	https://ftp.acc.umu.se/mirror/imagemagick.org/ftp/releases/ \
 		https://mirror.dogado.de/imagemagick/releases/ \
diff --git a/graphics/geeqie/Makefile b/graphics/geeqie/Makefile
index f232fb9db745..7cc15f49bdd6 100644
--- a/graphics/geeqie/Makefile
+++ b/graphics/geeqie/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	geeqie
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.7.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics
 
 MAINTAINER=	amdmi3@FreeBSD.org
diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index 4bc3c243efb9..0068546f29c8 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -1,6 +1,6 @@
 PORTNAME?=	gimp
 PORTVERSION=	2.10.32
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH?=	1
 CATEGORIES?=	graphics gnome
 MASTER_SITES=	GIMP/gimp/v${PORTVERSION:R}
diff --git a/graphics/gimp-jxl-plugin/Makefile b/graphics/gimp-jxl-plugin/Makefile
index 5a2d98ea31ff..7440a026bef3 100644
--- a/graphics/gimp-jxl-plugin/Makefile
+++ b/graphics/gimp-jxl-plugin/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	gimp-jxl-plugin
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.6.1
+DISTVERSION=	0.7rc
 CATEGORIES=	graphics
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/graphics/gimp-jxl-plugin/distinfo b/graphics/gimp-jxl-plugin/distinfo
index adc343eb2152..528d2cabbfad 100644
--- a/graphics/gimp-jxl-plugin/distinfo
+++ b/graphics/gimp-jxl-plugin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1635545136
-SHA256 (libjxl-libjxl-v0.6.1_GH0.tar.gz) = ccbd5a729d730152303be399f033b905e608309d5802d77a61a95faa092592c5
-SIZE (libjxl-libjxl-v0.6.1_GH0.tar.gz) = 16953185
+TIMESTAMP = 1659708598
+SHA256 (libjxl-libjxl-v0.7rc_GH0.tar.gz) = 17148629624e328cd015439b37bf07fc49245afefa1abaa50ef9e7a56028dcef
+SIZE (libjxl-libjxl-v0.7rc_GH0.tar.gz) = 1505052
diff --git a/graphics/imlib2-jxl/Makefile b/graphics/imlib2-jxl/Makefile
index f3a054521aca..2f513247a906 100644
--- a/graphics/imlib2-jxl/Makefile
+++ b/graphics/imlib2-jxl/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	imlib2-jxl
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.1.1
+PORTREVISION=	1
 CATEGORIES=	graphics
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/graphics/kf5-kimageformats/Makefile b/graphics/kf5-kimageformats/Makefile
index 819a78abfbda..9946f7000950 100644
--- a/graphics/kf5-kimageformats/Makefile
+++ b/graphics/kf5-kimageformats/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	kimageformats
 DISTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	graphics kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/graphics/libjxl/Makefile b/graphics/libjxl/Makefile
index b1b7795c8b1f..0968109876ce 100644
--- a/graphics/libjxl/Makefile
+++ b/graphics/libjxl/Makefile
@@ -1,26 +1,13 @@
 PORTNAME=	libjxl
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.6.1
-PORTREVISION=	6
+DISTVERSION=	0.7rc
 CATEGORIES=	graphics
 
-PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES+=	adb32f3f8f37.patch:-p1 # https://github.com/libjxl/libjxl/pull/193
-PATCHFILES+=	c31dca74e68f.patch:-p1 # https://github.com/libjxl/libjxl/pull/678
-PATCHFILES+=	0b70567432ab.patch:-p1 # https://github.com/libjxl/libjxl/pull/797
-PATCHFILES+=	e0107a6ca637.patch:-p1 # https://github.com/libjxl/libjxl/pull/847
-PATCHFILES+=	e903d53a58b4.patch:-p1 # https://github.com/libjxl/libjxl/pull/1071
-PATCHFILES+=	600b59153882.patch:-p1 # https://github.com/libjxl/libjxl/pull/1156
-PATCHFILES+=	98d25826edc1.patch:-p1 # https://github.com/libjxl/libjxl/pull/1343
-PATCHFILES+=	1f849bd28145.patch:-p1 # https://github.com/libjxl/libjxl/pull/1369
-
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	JPEG XL reference encoder/decoder
 
-LICENSE=	BSD3CLAUSE ZLIB
-LICENSE_COMB=	multi
-LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/LICENSE
-LICENSE_FILE_ZLIB=	${WRKSRC}/third_party/lodepng/LICENSE
+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libbrotlienc.so:archivers/brotli \
 		libhwy.so:devel/highway
@@ -31,7 +18,7 @@ CPE_VENDOR=	${PORTNAME}_project
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 GH_TUPLE=	jbeich:skcms:6437475:skcms/third_party/skcms \
-		lvandeve:lodepng:48e5364:lodepng/third_party/lodepng \
+		libjxl:testdata:d81acac:testdata/third_party/testdata \
 		webmproject:sjpeg:868ab55:sjpeg/third_party/sjpeg \
 		${NULL}
 CMAKE_ON=	JPEGXL_ENABLE_PLUGINS
@@ -60,8 +47,7 @@ MANPAGES_BUILD_DEPENDS=	a2x:textproc/asciidoc
 MANPAGES_USES=		python:build
 MANPAGES_CMAKE_BOOL=	JPEGXL_ENABLE_MANPAGES
 
-OPENEXR_LIB_DEPENDS=	libImath.so:math/Imath \
-			libOpenEXR.so:graphics/openexr
+OPENEXR_LIB_DEPENDS=	libOpenEXR.so:graphics/openexr
 OPENEXR_CMAKE_BOOL=	JPEGXL_ENABLE_OPENEXR
 
 PIXBUF_USES=		gnome
diff --git a/graphics/libjxl/distinfo b/graphics/libjxl/distinfo
index f55542f9a3b0..dc58a9ad9fa1 100644
--- a/graphics/libjxl/distinfo
+++ b/graphics/libjxl/distinfo
@@ -1,25 +1,9 @@
-TIMESTAMP = 1635545136
-SHA256 (libjxl-libjxl-v0.6.1_GH0.tar.gz) = ccbd5a729d730152303be399f033b905e608309d5802d77a61a95faa092592c5
-SIZE (libjxl-libjxl-v0.6.1_GH0.tar.gz) = 16953185
+TIMESTAMP = 1659708598
+SHA256 (libjxl-libjxl-v0.7rc_GH0.tar.gz) = 17148629624e328cd015439b37bf07fc49245afefa1abaa50ef9e7a56028dcef
+SIZE (libjxl-libjxl-v0.7rc_GH0.tar.gz) = 1505052
 SHA256 (jbeich-skcms-6437475_GH0.tar.gz) = 6818ea7aa053a964d1795d6d1d3c5e2aad5d30dff9817c8e604e324ef643ec01
 SIZE (jbeich-skcms-6437475_GH0.tar.gz) = 9200034
-SHA256 (lvandeve-lodepng-48e5364_GH0.tar.gz) = 41e0bcc686e31ee2d51a6c87c0089045f4805e4053d39026ad02e8aa90c782c1
-SIZE (lvandeve-lodepng-48e5364_GH0.tar.gz) = 239988
+SHA256 (libjxl-testdata-d81acac_GH0.tar.gz) = ae76a2bf3cbbeb927ad2570f08da6cfb0157ac8d3284ba5003848d1514489909
+SIZE (libjxl-testdata-d81acac_GH0.tar.gz) = 26789139
 SHA256 (webmproject-sjpeg-868ab55_GH0.tar.gz) = ffe757b376fed2fd94473f8625c25f82a3a23aa317fb1bbf1ac8159b6e0a7726
 SIZE (webmproject-sjpeg-868ab55_GH0.tar.gz) = 2472084
-SHA256 (adb32f3f8f37.patch) = 52e4fd7e1bce238731a9a1a0b1c9124624c6f85766d3debaf2d2e0f017471692
-SIZE (adb32f3f8f37.patch) = 5664
-SHA256 (c31dca74e68f.patch) = c6a1412d73f1ee156d4cc978fde7e5ec91e62bae9946ebb38a5e78be7f93a253
-SIZE (c31dca74e68f.patch) = 767
-SHA256 (0b70567432ab.patch) = 3141d2f814e196c89b254692ab5eb911164c906ac58d78b009331f5ac01f4d6b
-SIZE (0b70567432ab.patch) = 5886
-SHA256 (e0107a6ca637.patch) = c1c130d786503c9e1ee479c3d2736320b5c52866d9acf9d5ab46bdb8ef39bd90
-SIZE (e0107a6ca637.patch) = 15581
-SHA256 (e903d53a58b4.patch) = 32a04b4f9f88e2dcbbdef2ca3b03a52b38d22ccda806fd98df67ed46cb2b3cb9
-SIZE (e903d53a58b4.patch) = 4937
-SHA256 (600b59153882.patch) = d432c690ae59e2ce2b43fd45eb2d6c849178aad782b839f824bfb133d84b8d3a
-SIZE (600b59153882.patch) = 1697
-SHA256 (98d25826edc1.patch) = 24031f56b6cf7f55f463e566d788c22b7adf17da939dafc73947f919350b2120
-SIZE (98d25826edc1.patch) = 1387
-SHA256 (1f849bd28145.patch) = 834bc7c9a260c47cff25ad27ddf8f6a79a2ce71a62bd541a1d22cb6027dcec4f
-SIZE (1f849bd28145.patch) = 987
diff --git a/graphics/libjxl/pkg-plist b/graphics/libjxl/pkg-plist
index 91051800f600..e19126abd3ff 100644
--- a/graphics/libjxl/pkg-plist
+++ b/graphics/libjxl/pkg-plist
@@ -1,7 +1,10 @@
+bin/cjpeg_hdr
 bin/cjxl
 bin/djxl
+bin/jxlinfo
 include/jxl/butteraugli.h
 include/jxl/butteraugli_cxx.h
+include/jxl/cms_interface.h
 include/jxl/codestream_header.h
 include/jxl/color_encoding.h
 include/jxl/decode.h
@@ -20,13 +23,13 @@ include/jxl/types.h
 %%PIXBUF%%lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-jxl.so
 lib/libjxl.a
 lib/libjxl.so
-lib/libjxl.so.0.6
-lib/libjxl.so.0.6.1
+lib/libjxl.so.0.7
+lib/libjxl.so.0.7.0
 lib/libjxl_dec.a
 lib/libjxl_threads.a
 lib/libjxl_threads.so
-lib/libjxl_threads.so.0.6
-lib/libjxl_threads.so.0.6.1
+lib/libjxl_threads.so.0.7
+lib/libjxl_threads.so.0.7.0
 libdata/pkgconfig/libjxl.pc
 libdata/pkgconfig/libjxl_threads.pc
 %%MANPAGES%%share/man/man1/cjxl.1.gz
diff --git a/graphics/vips/Makefile b/graphics/vips/Makefile
index 80e019262beb..6e8f87753aca 100644
--- a/graphics/vips/Makefile
+++ b/graphics/vips/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	vips
 PORTVERSION=	8.12.2
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	graphics
 MASTER_SITES=	https://github.com/libvips/libvips/releases/download/v${PORTVERSION}/
 
diff --git a/multimedia/aom/Makefile b/multimedia/aom/Makefile
index a10fbc96cb14..2b15c6a5b82f 100644
--- a/multimedia/aom/Makefile
+++ b/multimedia/aom/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	aom
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.4.0
+PORTREVISION=	1
 CATEGORIES=	multimedia
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/x11/swayimg/Makefile b/x11/swayimg/Makefile
index 707c1e28560a..61ed15eeeaab 100644
--- a/x11/swayimg/Makefile
+++ b/x11/swayimg/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	swayimg
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.8
+PORTREVISION=	1
 CATEGORIES=	x11 wayland
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/