CVS commit: pkgsrc/x11/picom

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sat May  2 11:23:05 UTC 2020

Modified Files:
        pkgsrc/x11/picom: Makefile PLIST distinfo
        pkgsrc/x11/picom/patches: patch-src_backend_gl_gl__common.c
Added Files:
        pkgsrc/x11/picom/patches: patch-src_compiler.h

Log Message:
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)


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/picom/Makefile pkgsrc/x11/picom/PLIST \
    pkgsrc/x11/picom/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/x11/picom/patches/patch-src_backend_gl_gl__common.c
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/picom/patches/patch-src_compiler.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/picom/Makefile
diff -u pkgsrc/x11/picom/Makefile:1.1 pkgsrc/x11/picom/Makefile:1.2
--- pkgsrc/x11/picom/Makefile:1.1       Sun Dec 15 14:05:47 2019
+++ pkgsrc/x11/picom/Makefile   Sat May  2 11:23:04 2020
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2019/12/15 14:05:47 nia Exp $
+# $NetBSD: Makefile,v 1.2 2020/05/02 11:23:04 tnn Exp $
 
-DISTNAME=      picom-7.5
+DISTNAME=      picom-8
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=yshui/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -18,7 +18,7 @@ SUPERSEDES+=  compton-[0-9]*
 
 TOOL_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc
 
-MESON_ARGS+=   -Dbuild_docs=true
+MESON_ARGS+=   -Dwith_docs=true
 
 REPLACE_PYTHON+=       bin/compton-convgen.py
 REPLACE_SH+=           bin/picom-trans
@@ -36,7 +36,6 @@ post-install:
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/libxcb/buildlink3.mk"
-.include "../../x11/libxdg-basedir/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/pixman/buildlink3.mk"
Index: pkgsrc/x11/picom/PLIST
diff -u pkgsrc/x11/picom/PLIST:1.1 pkgsrc/x11/picom/PLIST:1.2
--- pkgsrc/x11/picom/PLIST:1.1  Sun Dec 15 14:05:47 2019
+++ pkgsrc/x11/picom/PLIST      Sat May  2 11:23:04 2020
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2019/12/15 14:05:47 nia Exp $
+@comment $NetBSD: PLIST,v 1.2 2020/05/02 11:23:04 tnn Exp $
 bin/compton
-bin/compton-convgen.py
 bin/compton-trans
 bin/picom
 bin/picom-trans
Index: pkgsrc/x11/picom/distinfo
diff -u pkgsrc/x11/picom/distinfo:1.1 pkgsrc/x11/picom/distinfo:1.2
--- pkgsrc/x11/picom/distinfo:1.1       Sun Dec 15 14:05:47 2019
+++ pkgsrc/x11/picom/distinfo   Sat May  2 11:23:04 2020
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.1 2019/12/15 14:05:47 nia Exp $
+$NetBSD: distinfo,v 1.2 2020/05/02 11:23:04 tnn Exp $
 
-SHA1 (picom-7.5.tar.gz) = 60f3700cb4c728e801caf6981a7bcdfcee0fa45e
-RMD160 (picom-7.5.tar.gz) = e1c889539b6d414c5a7f45b48abc7bd8a6a4ddef
-SHA512 (picom-7.5.tar.gz) = 6535e5eab1a243bbee62448bc48830b7ea3566f94b2c45d9ca76fd8b8056e1f00e55f0e4b58110364d2c4f56652cc005622d644c1db1db41d2811ecc19e6d44a
-Size (picom-7.5.tar.gz) = 219456 bytes
-SHA1 (patch-src_backend_gl_gl__common.c) = 6b42dc1a4dd061046d23d123ccc4df4dea2ab48f
+SHA1 (picom-8.tar.gz) = 9dacc23864ec52a859522e9ac3c66cc171c89dec
+RMD160 (picom-8.tar.gz) = 8a788bbadc0c21585e56fd1e433f4b4425b0dce8
+SHA512 (picom-8.tar.gz) = 154dd42dea16aca463e7d7f9913a8f10740df892bfdda2fee210a94b13c8eaf6201b35e505daf45075fdb1980bb9b85adf170b649702c1b1e2fcdc1d88406b4a
+Size (picom-8.tar.gz) = 242059 bytes
+SHA1 (patch-src_backend_gl_gl__common.c) = e702435b89018fd59d5a48f336c6cfdae644dca6
+SHA1 (patch-src_compiler.h) = 6d659359b70528bd5e6bdd98479502ebd4881976
 SHA1 (patch-src_utils.h) = 31f422592b5f9d232d26f437808b64dc2fb4c0f2

Index: pkgsrc/x11/picom/patches/patch-src_backend_gl_gl__common.c
diff -u pkgsrc/x11/picom/patches/patch-src_backend_gl_gl__common.c:1.1 pkgsrc/x11/picom/patches/patch-src_backend_gl_gl__common.c:1.2
--- pkgsrc/x11/picom/patches/patch-src_backend_gl_gl__common.c:1.1      Sun Dec 15 14:05:47 2019
+++ pkgsrc/x11/picom/patches/patch-src_backend_gl_gl__common.c  Sat May  2 11:23:05 2020
@@ -1,58 +1,42 @@
-$NetBSD: patch-src_backend_gl_gl__common.c,v 1.1 2019/12/15 14:05:47 nia Exp $
+$NetBSD: patch-src_backend_gl_gl__common.c,v 1.2 2020/05/02 11:23:05 tnn Exp $
 
-error: macro "memcpy" passed 19 arguments, but takes just 3
+Parentheses are required around macro argument containing braced initializer
+list.
+memcpy(3) is a macro when using e.g. -D_FORTIFY_SOURCE=2.
 
---- src/backend/gl/gl_common.c.orig    2019-11-18 21:59:30.000000000 +0000
+--- src/backend/gl/gl_common.c.orig    2019-08-18 21:40:33.000000000 +0000
 +++ src/backend/gl/gl_common.c
-@@ -315,22 +315,23 @@ static void x_rect_to_coords(int nrects,
-               // log_trace("Rect %d: %f, %f, %f, %f -> %d, %d, %d, %d",
+@@ -316,7 +316,7 @@ static void x_rect_to_coords(int nrects,
                //          ri, rx, ry, rxe, rye, rdx, rdy, rdxe, rdye);
  
--              memcpy(&coord[i * 16],
+               memcpy(&coord[i * 16],
 -                     (GLint[][2]){
--                         {vx1, vy1},
--                         {texture_x1, texture_y1},
--                         {vx2, vy1},
--                         {texture_x2, texture_y1},
--                         {vx2, vy2},
--                         {texture_x2, texture_y2},
--                         {vx1, vy2},
--                         {texture_x1, texture_y2},
++                     ((GLint[][2]){
+                          {vx1, vy1},
+                          {texture_x1, texture_y1},
+                          {vx2, vy1},
+@@ -325,11 +325,11 @@ static void x_rect_to_coords(int nrects,
+                          {texture_x2, texture_y2},
+                          {vx1, vy2},
+                          {texture_x1, texture_y2},
 -                     },
--                     sizeof(GLint[2]) * 8);
-+              GLint temp1[8][2] = {
-+                 {vx1, vy1},
-+                 {texture_x1, texture_y1},
-+                 {vx2, vy1},
-+                 {texture_x2, texture_y1},
-+                 {vx2, vy2},
-+                 {texture_x2, texture_y2},
-+                 {vx1, vy2},
-+                 {texture_x1, texture_y2},
-+              };
-+
-+              memcpy(&coord[i * 16], temp1, sizeof(GLint[2]) * 8);
++                     }),
+                      sizeof(GLint[2]) * 8);
  
                GLuint u = (GLuint)(i * 4);
 -              memcpy(&indices[i * 6], (GLuint[]){u + 0, u + 1, u + 2, u + 2, u + 3, u + 0},
--                     sizeof(GLuint) * 6);
-+              GLuint temp2[] = {u + 0, u + 1, u + 2, u + 2, u + 3, u + 0};
-+
-+              memcpy(&indices[i * 6], temp2, sizeof(GLuint) * 6);
++              memcpy(&indices[i * 6], ((GLuint[]){u + 0, u + 1, u + 2, u + 2, u + 3, u + 0}),
+                      sizeof(GLuint) * 6);
        }
  }
- 
-@@ -672,10 +673,9 @@ _gl_fill(backend_t *base, struct color c
-       for (int i = 0; i < nrects; i++) {
+@@ -673,8 +673,8 @@ _gl_fill(backend_t *base, struct color c
                GLint y1 = y_inverted ? height - rect[i].y2 : rect[i].y1,
                      y2 = y_inverted ? height - rect[i].y1 : rect[i].y2;
--              memcpy(&coord[i * 8],
+               memcpy(&coord[i * 8],
 -                     (GLint[][2]){
 -                         {rect[i].x1, y1}, {rect[i].x2, y1}, {rect[i].x2, y2}, {rect[i].x1, y2}},
--                     sizeof(GLint[2]) * 4);
-+              GLint temp1[4][2] = {
-+              {rect[i].x1, y1}, {rect[i].x2, y1}, {rect[i].x2, y2}, {rect[i].x1, y2}};
-+              memcpy(&coord[i * 8], temp1, sizeof(GLint[2]) * 4);
++                     ((GLint[][2]){
++                         {rect[i].x1, y1}, {rect[i].x2, y1}, {rect[i].x2, y2}, {rect[i].x1, y2}}),
+                      sizeof(GLint[2]) * 4);
                indices[i * 6 + 0] = (GLuint)i * 4 + 0;
                indices[i * 6 + 1] = (GLuint)i * 4 + 1;
-               indices[i * 6 + 2] = (GLuint)i * 4 + 2;

Added files:

Index: pkgsrc/x11/picom/patches/patch-src_compiler.h
diff -u /dev/null pkgsrc/x11/picom/patches/patch-src_compiler.h:1.1
--- /dev/null   Sat May  2 11:23:05 2020
+++ pkgsrc/x11/picom/patches/patch-src_compiler.h       Sat May  2 11:23:05 2020
@@ -0,0 +1,15 @@
+$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