git: 44ac26649b41 - main - x11/wallutils: update to 5.10.0

From: Jan Beich <jbeich_at_FreeBSD.org>
Date: Fri, 12 Nov 2021 18:21:19 UTC
The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=44ac26649b41fc7826813b8bb0a2abd755aae8a5

commit 44ac26649b41fc7826813b8bb0a2abd755aae8a5
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2021-11-12 12:53:21 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2021-11-12 18:16:58 +0000

    x11/wallutils: update to 5.10.0
    
    Changes:        https://github.com/xyproto/wallutils/compare/5.9.0...5.10.0
    Reported by:    Repology
---
 x11/wallutils/Makefile                 | 44 ++++++++++++++++++++----------
 x11/wallutils/distinfo                 | 50 ++++++++++++++++++++--------------
 x11/wallutils/files/patch-libheif-1.10 | 16 +++++++++++
 3 files changed, 75 insertions(+), 35 deletions(-)

diff --git a/x11/wallutils/Makefile b/x11/wallutils/Makefile
index cca2b434d68c..a2cf1bedd47e 100644
--- a/x11/wallutils/Makefile
+++ b/x11/wallutils/Makefile
@@ -1,11 +1,11 @@
 PORTNAME=	wallutils
-DISTVERSION=	5.9.0
+DISTVERSION=	5.10.0
 CATEGORIES=	x11
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Utilities for handling monitors, resolutions, wallpapers and timed wallpapers
 
-LICENSE=	MIT
+LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libwayland-client.so:graphics/wayland \
@@ -14,20 +14,24 @@ LIB_DEPENDS=	libwayland-client.so:graphics/wayland \
 USES=		go:modules
 USE_GITHUB=	yes
 GH_ACCOUNT=	xyproto
-GH_TUPLE=	anthonynsimon:bild:v0.11.1:anthonynsimon_bild/vendor/github.com/anthonynsimon/bild \
-		cpuguy83:go-md2man:v2.0.0:cpuguy83_go_md2man/vendor/github.com/cpuguy83/go-md2man/v2 \
-		fatih:color:v1.9.0:fatih_color/vendor/github.com/fatih/color \
-		golang:image:58c23975cae1:golang_image/vendor/golang.org/x/image \
-		golang:sys:d5e6a3e2c0ae:golang_sys/vendor/golang.org/x/sys \
-		mattn:go-colorable:v0.1.6:mattn_go_colorable/vendor/github.com/mattn/go-colorable \
-		mattn:go-isatty:v0.0.12:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
-		russross:blackfriday:v2.0.1:russross_blackfriday/vendor/github.com/russross/blackfriday/v2 \
+GH_TUPLE=	antchfx:xmlquery:v1.3.8:antchfx_xmlquery/vendor/github.com/antchfx/xmlquery \
+		antchfx:xpath:v1.2.0:antchfx_xpath/vendor/github.com/antchfx/xpath \
+		anthonynsimon:bild:v0.13.0:anthonynsimon_bild/vendor/github.com/anthonynsimon/bild \
+		cpuguy83:go-md2man:v2.0.0:cpuguy83_go_md2man_v2/vendor/github.com/cpuguy83/go-md2man/v2 \
+		fatih:color:v1.13.0:fatih_color/vendor/github.com/fatih/color \
+		golang:groupcache:41bb18bfe9da:golang_groupcache/vendor/github.com/golang/groupcache \
+		golang:image:6944b10bf410:golang_image/vendor/golang.org/x/image \
+		golang:net:58aab5ef257a:golang_net/vendor/golang.org/x/net \
+		golang:sys:99a53858aa08:golang_sys/vendor/golang.org/x/sys \
+		golang:text:v0.3.7:golang_text/vendor/golang.org/x/text \
+		mattn:go-colorable:v0.1.11:mattn_go_colorable/vendor/github.com/mattn/go-colorable \
+		mattn:go-isatty:v0.0.14:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
+		russross:blackfriday:v2.0.1:russross_blackfriday_v2/vendor/github.com/russross/blackfriday/v2 \
 		shurcooL:sanitized_anchor_name:v1.0.0:shurcool_sanitized_anchor_name/vendor/github.com/shurcooL/sanitized_anchor_name \
 		stretchr:powerwalk:bceb9d014549:stretchr_powerwalk/vendor/github.com/stretchr/powerwalk \
 		urfave:cli:v1.22.1:urfave_cli/vendor/github.com/urfave/cli \
-		xyproto:event:a3d8ddca97ef:xyproto_event/vendor/github.com/xyproto/event \
-		xyproto:gnometimed:745a6701ce92:xyproto_gnometimed/vendor/github.com/xyproto/gnometimed \
-		xyproto:simpletimed:17a9b15a6cbc:xyproto_simpletimed/vendor/github.com/xyproto/simpletimed
+		xyproto:env:v1.7.0:xyproto_env/vendor/github.com/xyproto/env \
+		xyproto:heic:v1.0.0:xyproto_heic/vendor/github.com/xyproto/heic
 GO_TARGET=	./cmd/getdpi \
 		./cmd/lscollection \
 		./cmd/lsmon \
@@ -44,7 +48,19 @@ GO_TARGET=	./cmd/getdpi \
 		${NULL}
 PLIST_FILES=	${GO_TARGET:S,./cmd,bin,}
 
+OPTIONS_DEFINE=		HEIF
+OPTIONS_DEFAULT=	HEIF
+
+HEIF_DESC=		Extract timing metadata from macOS dynamic wallpaper
+HEIF_LIB_DEPENDS=	libheif.so:graphics/libheif
+HEIF_USES=		pkgconfig
+HEIF_MESON_ENABLED=	libheif
+HEIF_VARS=		GO_TARGET+=./cmd/heic2stw
+
 post-patch:
-	@${REINPLACE_CMD} 's,/usr/local,${PREFIX},g' ${WRKSRC}/collections.go
+# Respect PREFIX for wallpapers
+	@${REINPLACE_CMD} 's,/usr/share,${DATADIR:H},' \
+		${WRKSRC}/cmd/heic2stw/main.go \
+		${WRKSRC}/collections.go
 
 .include <bsd.port.mk>
diff --git a/x11/wallutils/distinfo b/x11/wallutils/distinfo
index 540d9c4357ee..311ca976afae 100644
--- a/x11/wallutils/distinfo
+++ b/x11/wallutils/distinfo
@@ -1,20 +1,30 @@
-TIMESTAMP = 1582890075
-SHA256 (xyproto-wallutils-5.9.0_GH0.tar.gz) = 2333141c8b879d884bad83f7645ad9295b5f7bea9dd4d48805e136ec6e28e9bd
-SIZE (xyproto-wallutils-5.9.0_GH0.tar.gz) = 1587797
-SHA256 (anthonynsimon-bild-v0.11.1_GH0.tar.gz) = ff9d374785509ace0ea1c36a200d46583e3a1395c6d2b32b85ba9d897159aee5
-SIZE (anthonynsimon-bild-v0.11.1_GH0.tar.gz) = 51206
+TIMESTAMP = 1636721601
+SHA256 (xyproto-wallutils-5.10.0_GH0.tar.gz) = db2408625c04e4e24bbc7d203074c5e1b3fbf1156d5af2237e6b9e468cdc72f6
+SIZE (xyproto-wallutils-5.10.0_GH0.tar.gz) = 2204265
+SHA256 (antchfx-xmlquery-v1.3.8_GH0.tar.gz) = aff0d2224b7f997200f09d4b245ca84623e9ccaa7d8c427ee3f4b0657cf04c8e
+SIZE (antchfx-xmlquery-v1.3.8_GH0.tar.gz) = 20748
+SHA256 (antchfx-xpath-v1.2.0_GH0.tar.gz) = 507f7f3dee7b833506d9fa0d90aad43a78d92c632eb7c39d8bb8cfa752ee289c
+SIZE (antchfx-xpath-v1.2.0_GH0.tar.gz) = 28749
+SHA256 (anthonynsimon-bild-v0.13.0_GH0.tar.gz) = 0ad6a39bc4981d323968f301c23e52016699895273fd8bc7e33640a1ee18d9e0
+SIZE (anthonynsimon-bild-v0.13.0_GH0.tar.gz) = 3999622
 SHA256 (cpuguy83-go-md2man-v2.0.0_GH0.tar.gz) = 50537880d42fc28b9c2e9aaa36b137349d43cc73d46436a499f8c928cd2fc576
 SIZE (cpuguy83-go-md2man-v2.0.0_GH0.tar.gz) = 52021
-SHA256 (fatih-color-v1.9.0_GH0.tar.gz) = f5a6372ff7c87d22baaa2089e5cdd8a218fb3a9be047195c0ab421d5340f6f3f
-SIZE (fatih-color-v1.9.0_GH0.tar.gz) = 1230941
-SHA256 (golang-image-58c23975cae1_GH0.tar.gz) = 07bed75a05c6ecd45b4c2f42536ef06d59e11a7d29b9387bba37a91cafcd741f
-SIZE (golang-image-58c23975cae1_GH0.tar.gz) = 4896648
-SHA256 (golang-sys-d5e6a3e2c0ae_GH0.tar.gz) = 6cd44aa33cb0fc4caedadde44b3a943bece0aa67d803c00bfb09b03222845f19
-SIZE (golang-sys-d5e6a3e2c0ae_GH0.tar.gz) = 1539001
-SHA256 (mattn-go-colorable-v0.1.6_GH0.tar.gz) = e313129503025c383b5e69082fb1144e83a864d12ec45bb7a224d3fc4a635fbc
-SIZE (mattn-go-colorable-v0.1.6_GH0.tar.gz) = 9472
-SHA256 (mattn-go-isatty-v0.0.12_GH0.tar.gz) = addbdc341d7685ed4cc8d2d8a8fd2bd9b784bde00d0ea99fb251039fc10c611c
-SIZE (mattn-go-isatty-v0.0.12_GH0.tar.gz) = 4548
+SHA256 (fatih-color-v1.13.0_GH0.tar.gz) = 326ff785bc0cb5171c17be2a65959e83ee7889ba39412ba4c53c062e2df3ffec
+SIZE (fatih-color-v1.13.0_GH0.tar.gz) = 10826
+SHA256 (golang-groupcache-41bb18bfe9da_GH0.tar.gz) = 1e89795970d6593affdafe1d09dcf947681ca1ea82528e8e4fb9974a77f2e394
+SIZE (golang-groupcache-41bb18bfe9da_GH0.tar.gz) = 26101
+SHA256 (golang-image-6944b10bf410_GH0.tar.gz) = 3082fefd781ef527e363362ff5be1de06650f924cdae95220121f08ac116b0e8
+SIZE (golang-image-6944b10bf410_GH0.tar.gz) = 4903151
+SHA256 (golang-net-58aab5ef257a_GH0.tar.gz) = 18f73cc040d821c9a715338c0d446481a6d9df1b3e0437302d09a5b96119ce4d
+SIZE (golang-net-58aab5ef257a_GH0.tar.gz) = 1263704
+SHA256 (golang-sys-99a53858aa08_GH0.tar.gz) = 94e4c7582aad81bb361e33ddf92b83fab05b7ac8d3a97cb544fe21c6be4e4fcf
+SIZE (golang-sys-99a53858aa08_GH0.tar.gz) = 1223415
+SHA256 (golang-text-v0.3.7_GH0.tar.gz) = 7cab2f6c3133ac1d422edd952b0dd2082fa55a73c2663fb2defd9bf83d649b26
+SIZE (golang-text-v0.3.7_GH0.tar.gz) = 8354718
+SHA256 (mattn-go-colorable-v0.1.11_GH0.tar.gz) = b88eae3c846d3c9bee375bfb72b535b726755a06d8e972c937820aba45d2f5e0
+SIZE (mattn-go-colorable-v0.1.11_GH0.tar.gz) = 9800
+SHA256 (mattn-go-isatty-v0.0.14_GH0.tar.gz) = e6460325edf600297cf2ef68834938fb1c5b8d5f234b3b24ec7c0a29a2d70b39
+SIZE (mattn-go-isatty-v0.0.14_GH0.tar.gz) = 4710
 SHA256 (russross-blackfriday-v2.0.1_GH0.tar.gz) = 5a0f38a36b6f3b2d59b72d713451a895a4d3a4406b3533882483782e37797cff
 SIZE (russross-blackfriday-v2.0.1_GH0.tar.gz) = 79613
 SHA256 (shurcooL-sanitized_anchor_name-v1.0.0_GH0.tar.gz) = 7e11964980f9b8595c17bc8970f0174621afe464920e38df7f8d77e45058388f
@@ -23,9 +33,7 @@ SHA256 (stretchr-powerwalk-bceb9d014549_GH0.tar.gz) = 01289e544b8d9147fc67796083
 SIZE (stretchr-powerwalk-bceb9d014549_GH0.tar.gz) = 4041
 SHA256 (urfave-cli-v1.22.1_GH0.tar.gz) = 6872bda8fc6e2e5046984b09633605153cf996ef57872bdd801a47e0e55e1c69
 SIZE (urfave-cli-v1.22.1_GH0.tar.gz) = 73623
-SHA256 (xyproto-event-a3d8ddca97ef_GH0.tar.gz) = 78a06d50d6d50cf3da9a19fbb48cc90c08e2c9209abd53e63beb83df36a4a787
-SIZE (xyproto-event-a3d8ddca97ef_GH0.tar.gz) = 5638
-SHA256 (xyproto-gnometimed-745a6701ce92_GH0.tar.gz) = 7053c8e55dcb2ac86a873de5fb896c7a47354b544e79560d5c6c104b5fb6fd8d
-SIZE (xyproto-gnometimed-745a6701ce92_GH0.tar.gz) = 200757
-SHA256 (xyproto-simpletimed-17a9b15a6cbc_GH0.tar.gz) = c7606f8032bb1b3f1776be54ce478fd57b4f37391b5994051ac6e94df87d27fa
-SIZE (xyproto-simpletimed-17a9b15a6cbc_GH0.tar.gz) = 189208
+SHA256 (xyproto-env-v1.7.0_GH0.tar.gz) = 978e88e9a08b1d1eb22c0285b5efbf2f63ccc57bc09008854c5c32f723c44cea
+SIZE (xyproto-env-v1.7.0_GH0.tar.gz) = 4634
+SHA256 (xyproto-heic-v1.0.0_GH0.tar.gz) = c66194f27e4a4dd837bc7caae357a817fea6b0743c5822c37fad777f4bda3a5b
+SIZE (xyproto-heic-v1.0.0_GH0.tar.gz) = 67422236
diff --git a/x11/wallutils/files/patch-libheif-1.10 b/x11/wallutils/files/patch-libheif-1.10
new file mode 100644
index 000000000000..49335b84e64b
--- /dev/null
+++ b/x11/wallutils/files/patch-libheif-1.10
@@ -0,0 +1,16 @@
+Drop after graphics/libheif is updated to 1.12 or later.
+https://github.com/strukturag/libheif/commit/115c96a96a58
+
+vendor/github.com/xyproto/heic/heic.go:269:37: could not determine kind of name for C.heif_suberror_Wrong_tile_image_pixel_depth
+
+--- vendor/github.com/xyproto/heic/heic.go.orig	2021-11-12 12:53:21 UTC
++++ vendor/github.com/xyproto/heic/heic.go
+@@ -266,8 +266,6 @@ const (
+ 
+ 	SuberrorInvalidPixiBox = C.heif_suberror_Invalid_pixi_box
+ 
+-	SuberrorWrongTileImagePixelDepth = C.heif_suberror_Wrong_tile_image_pixel_depth
+-
+ 	// --- Unsupported_feature ---
+ 
+ 	// Image was coded with an unsupported compression method.