picom: update to 9.1

Notable changes:
  New blur method for the experimental backends: dual-kawase
  Support for rounding the corners of windows
  Usability of picom-trans is improved
  It's now possible to match against all values of a window property
  Fix darkening of window edges when using blur
  Some long deprecated options are removed

7 files changed, 6 insertions, 190 deletions

diff --git a/x11/picom/Makefile b/x11/picom/Makefile
index d1cd170e980..3b0c6de8be5 100644
--- a/x11/picom/Makefile
+++ b/x11/picom/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2022/07/29 21:16:32 tnn Exp $
+# $NetBSD: Makefile,v 1.8 2022/09/04 12:12:01 tnn Exp $
 
-DISTNAME=	picom-8.2
-PKGREVISION=	1
+DISTNAME=	picom-9.1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GITHUB:=yshui/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
@@ -23,11 +22,6 @@ REPLACE_SH+=		bin/picom-trans
 PYTHON_FOR_BUILD_ONLY=	tool
 INSTALLATION_DIRS+=	share/examples/picom
 
-SUBST_CLASSES+=		mandir
-SUBST_STAGE.mandir=	pre-configure
-SUBST_FILES.mandir=	man/meson.build
-SUBST_VARS.mandir=	PKGMANDIR
-
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/picom.sample.conf ${DESTDIR}${PREFIX}/share/examples/picom/picom.sample.conf
 
diff --git a/x11/picom/distinfo b/x11/picom/distinfo
index a5a823ff119..d579602d594 100644
--- a/x11/picom/distinfo
+++ b/x11/picom/distinfo
@@ -1,10 +1,5 @@
-$NetBSD: distinfo,v 1.8 2022/07/29 21:16:32 tnn Exp $
+$NetBSD: distinfo,v 1.9 2022/09/04 12:12:01 tnn Exp $
 
-BLAKE2s (picom-8.2.tar.gz) = 7875bdc50acd5a81e0eb2871b3c42ac1962f8d23d3c72428c9735717bd0da2c4
-SHA512 (picom-8.2.tar.gz) = bdc6675e73a211075ee0df2b056342cabb19ad27fd73586f5216886f503cd994536845eb866f371e07a8dc0404346c67b899a14830e9b7cbc9c01cbd782f36b1
-Size (picom-8.2.tar.gz) = 242653 bytes
-SHA1 (patch-man_meson.build) = 987bf5451443f0a6d7cd50319052d1f48a0557fe
-SHA1 (patch-src_c2.c) = ef49d0b02691b495b625423c832c603852045a73
-SHA1 (patch-src_config.c) = ffffb13adcf2e6767813fdaade83793d074f4cf5
-SHA1 (patch-src_dbus.c) = 191ff5f507b882bac219174a89d887fd6aaf231a
-SHA1 (patch-src_string__utils.h) = 90f8fefb9ce4cc14049e494b49041e48bd9d82d6
+BLAKE2s (picom-9.1.tar.gz) = 0b5ca67e4a107726a71b690825608d3d29305bd7bcd927aea8bb3e572223ca0f
+SHA512 (picom-9.1.tar.gz) = 375dc245be1c0f277bc0ddfc6e6480255efba06ce49f953c5314b7ba9795d1f50c5de907762208becc13c5210f24ac5b2241e2eb5e0e10dc5e5b96081cc821df
+Size (picom-9.1.tar.gz) = 263924 bytes
diff --git a/x11/picom/patches/patch-man_meson.build b/x11/picom/patches/patch-man_meson.build
deleted file mode 100644
index c475f182e81..00000000000
--- a/x11/picom/patches/patch-man_meson.build
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-man_meson.build,v 1.1 2022/07/29 21:16:32 tnn Exp $
-
-Honour PKGMANDIR.
-
---- man/meson.build.orig	2020-10-24 08:44:12.000000000 +0000
-+++ man/meson.build
-@@ -7,6 +7,6 @@ if get_option('with_docs')
- 		                        'picom-version='+version,
- 		                        '--format', 'manpage', '@INPUT@', '-D',
- 		                        meson.current_build_dir()],
--		              install: true, install_dir: 'share/man/man1/')
-+		              install: true, install_dir: '@PKGMANDIR@/man1/')
- 	endforeach
- endif
diff --git a/x11/picom/patches/patch-src_c2.c b/x11/picom/patches/patch-src_c2.c
deleted file mode 100644
index 4981915494c..00000000000
--- a/x11/picom/patches/patch-src_c2.c
+++ /dev/null
@@ -1,69 +0,0 @@
-$NetBSD: patch-src_c2.c,v 1.1 2020/11/19 11:03:04 nia Exp $
-
-Arguments to ctype functions must be unsigned char.
-
---- src/c2.c.orig	2020-10-24 08:44:12.000000000 +0000
-+++ src/c2.c
-@@ -240,7 +240,7 @@ static inline int strcmp_wd(const char *
- 		return ret;
- 
- 	char c = src[strlen(needle)];
--	if (isalnum(c) || '_' == c)
-+	if (isalnum((unsigned char)c) || '_' == c)
- 		return 1;
- 	else
- 		return 0;
-@@ -386,7 +386,7 @@ c2_lptr_t *c2_parse(c2_lptr_t **pcondlst
- // TODO Not a very good macro
- #define C2H_SKIP_SPACES()                                                                \
- 	{                                                                                \
--		while (isspace(pattern[offset]))                                         \
-+		while (isspace((unsigned char)pattern[offset]))                          \
- 			++offset;                                                        \
- 	}
- 
-@@ -430,7 +430,7 @@ static int c2_parse_grp(const char *patt
- 		assert(elei <= 2);
- 
- 		// Jump over spaces
--		if (isspace(pattern[offset]))
-+		if (isspace((unsigned char)pattern[offset]))
- 			continue;
- 
- 		// Handle end of group
-@@ -578,7 +578,7 @@ static int c2_parse_target(const char *p
- 
- 	// Copy target name out
- 	int tgtlen = 0;
--	for (; pattern[offset] && (isalnum(pattern[offset]) || '_' == pattern[offset]);
-+	for (; pattern[offset] && (isalnum((unsigned char)pattern[offset]) || '_' == pattern[offset]);
- 	     ++offset) {
- 		++tgtlen;
- 	}
-@@ -825,7 +825,7 @@ static int c2_parse_pattern(const char *
- 		pleaf->ptntype = C2_L_PTINT;
- 		offset = to_int_checked(endptr - pattern);
- 		// Make sure we are stopping at the end of a word
--		if (isalnum(pattern[offset])) {
-+		if (isalnum((unsigned char)pattern[offset])) {
- 			c2_error("Trailing characters after a numeric pattern.");
- 		}
- 	} else {
-@@ -834,7 +834,7 @@ static int c2_parse_pattern(const char *
- 		char delim = '\0';
- 
- 		// String flags
--		if (tolower(pattern[offset]) == 'r') {
-+		if (tolower((unsigned char)pattern[offset]) == 'r') {
- 			raw = true;
- 			++offset;
- 			C2H_SKIP_SPACES();
-@@ -1033,7 +1033,7 @@ static bool c2_l_postprocess(session_t *
- 	// Warn about lower case characters in target name
- 	if (pleaf->predef == C2_L_PUNDEFINED) {
- 		for (const char *pc = pleaf->tgt; *pc; ++pc) {
--			if (islower(*pc)) {
-+			if (islower((unsigned char)*pc)) {
- 				log_warn("Lowercase character in target name \"%s\".",
- 				         pleaf->tgt);
- 				break;
diff --git a/x11/picom/patches/patch-src_config.c b/x11/picom/patches/patch-src_config.c
deleted file mode 100644
index 714417bf321..00000000000
--- a/x11/picom/patches/patch-src_config.c
+++ /dev/null
@@ -1,51 +0,0 @@
-$NetBSD: patch-src_config.c,v 1.1 2020/11/19 11:03:04 nia Exp $
-
-Arguments to ctype functions must be unsigned char.
-
---- src/config.c.orig	2020-10-24 08:44:12.000000000 +0000
-+++ src/config.c
-@@ -33,7 +33,7 @@ bool parse_long(const char *s, long *des
- 		log_error("Invalid number: %s", s);
- 		return false;
- 	}
--	while (isspace(*endptr))
-+	while (isspace((unsigned char)*endptr))
- 		++endptr;
- 	if (*endptr) {
- 		log_error("Trailing characters: %s", s);
-@@ -74,7 +74,7 @@ const char *parse_readnum(const char *sr
- 		log_error("No number found: %s", src);
- 		return src;
- 	}
--	while (*pc && (isspace(*pc) || *pc == ',')) {
-+	while (*pc && (isspace((unsigned char)*pc) || *pc == ',')) {
- 		++pc;
- 	}
- 	*dest = val;
-@@ -154,7 +154,7 @@ conv *parse_blur_kern(const char *src, c
- 
- 	// Detect trailing characters
- 	for (; *pc && *pc != ';'; pc++) {
--		if (!isspace(*pc) && *pc != ',') {
-+		if (!isspace((unsigned char)*pc) && *pc != ',') {
- 			// TODO isspace is locale aware, be careful
- 			log_error("Trailing characters in blur kernel string.");
- 			goto err2;
-@@ -164,7 +164,7 @@ conv *parse_blur_kern(const char *src, c
- 	// Jump over spaces after ';'
- 	if (*pc == ';') {
- 		pc++;
--		while (*pc && isspace(*pc)) {
-+		while (*pc && isspace((unsigned char)*pc)) {
- 			++pc;
- 		}
- 	}
-@@ -418,7 +418,7 @@ bool parse_rule_opacity(c2_lptr_t **res,
- 	}
- 
- 	// Skip over spaces
--	while (*endptr && isspace(*endptr))
-+	while (*endptr && isspace((unsigned char)*endptr))
- 		++endptr;
- 	if (':' != *endptr) {
- 		log_error("Opacity terminator not found: %s", src);
diff --git a/x11/picom/patches/patch-src_dbus.c b/x11/picom/patches/patch-src_dbus.c
deleted file mode 100644
index 4e19308b40f..00000000000
--- a/x11/picom/patches/patch-src_dbus.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_dbus.c,v 1.1 2020/11/19 11:03:04 nia Exp $
-
-Arguments to ctype functions must be unsigned char.
-
---- src/dbus.c.orig	2020-10-24 08:44:12.000000000 +0000
-+++ src/dbus.c
-@@ -129,7 +129,7 @@ bool cdbus_init(session_t *ps, const cha
- 		// underscore
- 		char *tmp = service + strlen(CDBUS_SERVICE_NAME) + 1;
- 		while (*tmp) {
--			if (!isalnum(*tmp)) {
-+			if (!isalnum((unsigned char)*tmp)) {
- 				*tmp = '_';
- 			}
- 			tmp++;
diff --git a/x11/picom/patches/patch-src_string__utils.h b/x11/picom/patches/patch-src_string__utils.h
deleted file mode 100644
index 8a41445c07a..00000000000
--- a/x11/picom/patches/patch-src_string__utils.h
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-src_string__utils.h,v 1.1 2020/11/19 11:03:04 nia Exp $
-
-Arguments to ctype functions must be unsigned char.
-
---- src/string_utils.h.orig	2020-10-24 08:44:12.000000000 +0000
-+++ src/string_utils.h
-@@ -37,7 +37,7 @@ static inline int uitostr(unsigned int n
- static inline const char *skip_space_const(const char *src) {
- 	if (!src)
- 		return NULL;
--	while (*src && isspace(*src))
-+	while (*src && isspace((unsigned char)*src))
- 		src++;
- 	return src;
- }
-@@ -45,7 +45,7 @@ static inline const char *skip_space_con
- static inline char *skip_space_mut(char *src) {
- 	if (!src)
- 		return NULL;
--	while (*src && isspace(*src))
-+	while (*src && isspace((unsigned char)*src))
- 		src++;
- 	return src;
- }