Sat May 2 11:23:05 2020 UTC ()
picom: update to version 8.

pkgsrc changes:
- Restore patch-src_backend_gl_gl__common.c from the previous "compton"
  package. It is smaller and better explains why the patch is needed.
- drop dependency on libxdg-basedir, dropped by upstream.

Upstream new feature & improvements
- You can now use the time variable in window shaders to get a timestamp.
- --max-brightness, which allows you to dim windows that are too bright.
- Automatic configuration file reloading after it's changed.
- A lot of the artifacts seen with blur and use-damage enabled are fixed.
- _NET_WM_BYPASS_COMPOSITOR property are now handled.
- Completely transparent windows won't have a blurred background anymore.
- Improved fullscreen window detection.
- Various improvments to the inverter.sh script
- wintype notify has been renamed to notification to match the EWMH names
- (also various bug fixes)


(tnn)
diff -r1.1 -r1.2 pkgsrc/x11/picom/Makefile
diff -r1.1 -r1.2 pkgsrc/x11/picom/PLIST
diff -r1.1 -r1.2 pkgsrc/x11/picom/distinfo
diff -r1.1 -r1.2 pkgsrc/x11/picom/patches/patch-src_backend_gl_gl__common.c
diff -r0 -r1.1 pkgsrc/x11/picom/patches/patch-src_compiler.h
cvs diff -r1.1 -r1.2 pkgsrc/x11/picom/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/picom/Makefile 2019/12/15 14:05:47 1.1
+++ pkgsrc/x11/picom/Makefile 2020/05/02 11:23:04 1.2
@@ -1,45 +1,44 @@ @@ -1,45 +1,44 @@
1# $NetBSD: Makefile,v 1.1 2019/12/15 14:05:47 nia Exp $ 1# $NetBSD: Makefile,v 1.2 2020/05/02 11:23:04 tnn Exp $
2 2
3DISTNAME= picom-7.5 3DISTNAME= picom-8
4CATEGORIES= x11 4CATEGORIES= x11
5MASTER_SITES= ${MASTER_SITE_GITHUB:=yshui/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=yshui/}
6GITHUB_TAG= v${PKGVERSION_NOREV} 6GITHUB_TAG= v${PKGVERSION_NOREV}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://github.com/yshui/picom 9HOMEPAGE= https://github.com/yshui/picom
10COMMENT= Lightweight compositor for X11 (fork of Compton) 10COMMENT= Lightweight compositor for X11 (fork of Compton)
11LICENSE= mpl-2.0 AND mit 11LICENSE= mpl-2.0 AND mit
12 12
13USE_TOOLS+= pkg-config 13USE_TOOLS+= pkg-config
14USE_LANGUAGES= c c++ 14USE_LANGUAGES= c c++
15 15
16CONFLICTS+= compton-[0-9]* 16CONFLICTS+= compton-[0-9]*
17SUPERSEDES+= compton-[0-9]* 17SUPERSEDES+= compton-[0-9]*
18 18
19TOOL_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc 19TOOL_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc
20 20
21MESON_ARGS+= -Dbuild_docs=true 21MESON_ARGS+= -Dwith_docs=true
22 22
23REPLACE_PYTHON+= bin/compton-convgen.py 23REPLACE_PYTHON+= bin/compton-convgen.py
24REPLACE_SH+= bin/picom-trans 24REPLACE_SH+= bin/picom-trans
25 25
26post-install: 26post-install:
27 ${MV} ${DESTDIR}${PREFIX}/share/man ${DESTDIR}${PREFIX}/${PKGMANDIR} || ${TRUE} 27 ${MV} ${DESTDIR}${PREFIX}/share/man ${DESTDIR}${PREFIX}/${PKGMANDIR} || ${TRUE}
28 28
29.include "options.mk" 29.include "options.mk"
30.include "../../devel/meson/build.mk" 30.include "../../devel/meson/build.mk"
31.include "../../devel/libconfig/buildlink3.mk" 31.include "../../devel/libconfig/buildlink3.mk"
32.include "../../devel/libev/buildlink3.mk" 32.include "../../devel/libev/buildlink3.mk"
33.include "../../devel/pcre/buildlink3.mk" 33.include "../../devel/pcre/buildlink3.mk"
34.include "../../devel/uthash/buildlink3.mk" 34.include "../../devel/uthash/buildlink3.mk"
35.include "../../graphics/MesaLib/buildlink3.mk" 35.include "../../graphics/MesaLib/buildlink3.mk"
36.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 36.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
37.include "../../sysutils/desktop-file-utils/desktopdb.mk" 37.include "../../sysutils/desktop-file-utils/desktopdb.mk"
38.include "../../x11/libxcb/buildlink3.mk" 38.include "../../x11/libxcb/buildlink3.mk"
39.include "../../x11/libxdg-basedir/buildlink3.mk" 
40.include "../../x11/libX11/buildlink3.mk" 39.include "../../x11/libX11/buildlink3.mk"
41.include "../../x11/libXext/buildlink3.mk" 40.include "../../x11/libXext/buildlink3.mk"
42.include "../../x11/pixman/buildlink3.mk" 41.include "../../x11/pixman/buildlink3.mk"
43.include "../../x11/xcb-util-image/buildlink3.mk" 42.include "../../x11/xcb-util-image/buildlink3.mk"
44.include "../../x11/xcb-util-renderutil/buildlink3.mk" 43.include "../../x11/xcb-util-renderutil/buildlink3.mk"
45.include "../../mk/bsd.pkg.mk" 44.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/x11/picom/PLIST (expand / switch to unified diff)

--- pkgsrc/x11/picom/PLIST 2019/12/15 14:05:47 1.1
+++ pkgsrc/x11/picom/PLIST 2020/05/02 11:23:04 1.2
@@ -1,12 +1,11 @@ @@ -1,12 +1,11 @@
1@comment $NetBSD: PLIST,v 1.1 2019/12/15 14:05:47 nia Exp $ 1@comment $NetBSD: PLIST,v 1.2 2020/05/02 11:23:04 tnn Exp $
2bin/compton 2bin/compton
3bin/compton-convgen.py 
4bin/compton-trans 3bin/compton-trans
5bin/picom 4bin/picom
6bin/picom-trans 5bin/picom-trans
7man/man1/picom-trans.1 6man/man1/picom-trans.1
8man/man1/picom.1 7man/man1/picom.1
9share/applications/compton.desktop 8share/applications/compton.desktop
10share/applications/picom.desktop 9share/applications/picom.desktop
11share/icons/hicolor/48x48/apps/compton.png 10share/icons/hicolor/48x48/apps/compton.png
12share/icons/hicolor/scalable/apps/compton.svg 11share/icons/hicolor/scalable/apps/compton.svg
cvs diff -r1.1 -r1.2 pkgsrc/x11/picom/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/picom/distinfo 2019/12/15 14:05:47 1.1
+++ pkgsrc/x11/picom/distinfo 2020/05/02 11:23:04 1.2
@@ -1,8 +1,9 @@ @@ -1,8 +1,9 @@
1$NetBSD: distinfo,v 1.1 2019/12/15 14:05:47 nia Exp $ 1$NetBSD: distinfo,v 1.2 2020/05/02 11:23:04 tnn Exp $
2 2
3SHA1 (picom-7.5.tar.gz) = 60f3700cb4c728e801caf6981a7bcdfcee0fa45e 3SHA1 (picom-8.tar.gz) = 9dacc23864ec52a859522e9ac3c66cc171c89dec
4RMD160 (picom-7.5.tar.gz) = e1c889539b6d414c5a7f45b48abc7bd8a6a4ddef 4RMD160 (picom-8.tar.gz) = 8a788bbadc0c21585e56fd1e433f4b4425b0dce8
5SHA512 (picom-7.5.tar.gz) = 6535e5eab1a243bbee62448bc48830b7ea3566f94b2c45d9ca76fd8b8056e1f00e55f0e4b58110364d2c4f56652cc005622d644c1db1db41d2811ecc19e6d44a 5SHA512 (picom-8.tar.gz) = 154dd42dea16aca463e7d7f9913a8f10740df892bfdda2fee210a94b13c8eaf6201b35e505daf45075fdb1980bb9b85adf170b649702c1b1e2fcdc1d88406b4a
6Size (picom-7.5.tar.gz) = 219456 bytes 6Size (picom-8.tar.gz) = 242059 bytes
7SHA1 (patch-src_backend_gl_gl__common.c) = 6b42dc1a4dd061046d23d123ccc4df4dea2ab48f 7SHA1 (patch-src_backend_gl_gl__common.c) = e702435b89018fd59d5a48f336c6cfdae644dca6
 8SHA1 (patch-src_compiler.h) = 6d659359b70528bd5e6bdd98479502ebd4881976
8SHA1 (patch-src_utils.h) = 31f422592b5f9d232d26f437808b64dc2fb4c0f2 9SHA1 (patch-src_utils.h) = 31f422592b5f9d232d26f437808b64dc2fb4c0f2
cvs diff -r1.1 -r1.2 pkgsrc/x11/picom/patches/Attic/patch-src_backend_gl_gl__common.c (expand / switch to unified diff)

--- pkgsrc/x11/picom/patches/Attic/patch-src_backend_gl_gl__common.c 2019/12/15 14:05:47 1.1
+++ pkgsrc/x11/picom/patches/Attic/patch-src_backend_gl_gl__common.c 2020/05/02 11:23:05 1.2
@@ -1,58 +1,42 @@ @@ -1,58 +1,42 @@
1$NetBSD: patch-src_backend_gl_gl__common.c,v 1.1 2019/12/15 14:05:47 nia Exp $ 1$NetBSD: patch-src_backend_gl_gl__common.c,v 1.2 2020/05/02 11:23:05 tnn Exp $
2 2
3error: macro "memcpy" passed 19 arguments, but takes just 3 3Parentheses are required around macro argument containing braced initializer
 4list.
 5memcpy(3) is a macro when using e.g. -D_FORTIFY_SOURCE=2.
4 6
5--- src/backend/gl/gl_common.c.orig 2019-11-18 21:59:30.000000000 +0000 7--- src/backend/gl/gl_common.c.orig 2019-08-18 21:40:33.000000000 +0000
6+++ src/backend/gl/gl_common.c 8+++ src/backend/gl/gl_common.c
7@@ -315,22 +315,23 @@ static void x_rect_to_coords(int nrects, 9@@ -316,7 +316,7 @@ static void x_rect_to_coords(int nrects,
8 // log_trace("Rect %d: %f, %f, %f, %f -> %d, %d, %d, %d", 
9 // ri, rx, ry, rxe, rye, rdx, rdy, rdxe, rdye); 10 // ri, rx, ry, rxe, rye, rdx, rdy, rdxe, rdye);
10  11
11- memcpy(&coord[i * 16], 12 memcpy(&coord[i * 16],
12- (GLint[][2]){ 13- (GLint[][2]){
13- {vx1, vy1}, 14+ ((GLint[][2]){
14- {texture_x1, texture_y1}, 15 {vx1, vy1},
15- {vx2, vy1}, 16 {texture_x1, texture_y1},
16- {texture_x2, texture_y1}, 17 {vx2, vy1},
17- {vx2, vy2}, 18@@ -325,11 +325,11 @@ static void x_rect_to_coords(int nrects,
18- {texture_x2, texture_y2}, 19 {texture_x2, texture_y2},
19- {vx1, vy2}, 20 {vx1, vy2},
20- {texture_x1, texture_y2}, 21 {texture_x1, texture_y2},
21- }, 22- },
22- sizeof(GLint[2]) * 8); 23+ }),
23+ GLint temp1[8][2] = { 24 sizeof(GLint[2]) * 8);
24+ {vx1, vy1}, 
25+ {texture_x1, texture_y1}, 
26+ {vx2, vy1}, 
27+ {texture_x2, texture_y1}, 
28+ {vx2, vy2}, 
29+ {texture_x2, texture_y2}, 
30+ {vx1, vy2}, 
31+ {texture_x1, texture_y2}, 
32+ }; 
33+ 
34+ memcpy(&coord[i * 16], temp1, sizeof(GLint[2]) * 8); 
35  25
36 GLuint u = (GLuint)(i * 4); 26 GLuint u = (GLuint)(i * 4);
37- memcpy(&indices[i * 6], (GLuint[]){u + 0, u + 1, u + 2, u + 2, u + 3, u + 0}, 27- memcpy(&indices[i * 6], (GLuint[]){u + 0, u + 1, u + 2, u + 2, u + 3, u + 0},
38- sizeof(GLuint) * 6); 28+ memcpy(&indices[i * 6], ((GLuint[]){u + 0, u + 1, u + 2, u + 2, u + 3, u + 0}),
39+ GLuint temp2[] = {u + 0, u + 1, u + 2, u + 2, u + 3, u + 0}; 29 sizeof(GLuint) * 6);
40+ 
41+ memcpy(&indices[i * 6], temp2, sizeof(GLuint) * 6); 
42 } 30 }
43 } 31 }
44  32@@ -673,8 +673,8 @@ _gl_fill(backend_t *base, struct color c
45@@ -672,10 +673,9 @@ _gl_fill(backend_t *base, struct color c 
46 for (int i = 0; i < nrects; i++) { 
47 GLint y1 = y_inverted ? height - rect[i].y2 : rect[i].y1, 33 GLint y1 = y_inverted ? height - rect[i].y2 : rect[i].y1,
48 y2 = y_inverted ? height - rect[i].y1 : rect[i].y2; 34 y2 = y_inverted ? height - rect[i].y1 : rect[i].y2;
49- memcpy(&coord[i * 8], 35 memcpy(&coord[i * 8],
50- (GLint[][2]){ 36- (GLint[][2]){
51- {rect[i].x1, y1}, {rect[i].x2, y1}, {rect[i].x2, y2}, {rect[i].x1, y2}}, 37- {rect[i].x1, y1}, {rect[i].x2, y1}, {rect[i].x2, y2}, {rect[i].x1, y2}},
52- sizeof(GLint[2]) * 4); 38+ ((GLint[][2]){
53+ GLint temp1[4][2] = { 39+ {rect[i].x1, y1}, {rect[i].x2, y1}, {rect[i].x2, y2}, {rect[i].x1, y2}}),
54+ {rect[i].x1, y1}, {rect[i].x2, y1}, {rect[i].x2, y2}, {rect[i].x1, y2}}; 40 sizeof(GLint[2]) * 4);
55+ memcpy(&coord[i * 8], temp1, sizeof(GLint[2]) * 4); 
56 indices[i * 6 + 0] = (GLuint)i * 4 + 0; 41 indices[i * 6 + 0] = (GLuint)i * 4 + 0;
57 indices[i * 6 + 1] = (GLuint)i * 4 + 1; 42 indices[i * 6 + 1] = (GLuint)i * 4 + 1;
58 indices[i * 6 + 2] = (GLuint)i * 4 + 2; 
File Added: pkgsrc/x11/picom/patches/Attic/patch-src_compiler.h
$NetBSD: patch-src_compiler.h,v 1.1 2020/05/02 11:23:05 tnn Exp $

Conflicting type definition with libc popcount.

--- src/compiler.h.orig	2020-04-21 18:33:17.000000000 +0000
+++ src/compiler.h
@@ -111,6 +111,8 @@
 typedef unsigned long ulong;
 typedef unsigned int uint;
 
+#ifndef __NetBSD__
 static inline int popcount(uint x) {
 	return __builtin_popcount(x);
 }
+#endif