compton: update to 7.3

v7:
compton now requires uthash to build.
xcb-xinerama is now mandatory.
Improved build experience on FreeBSD.
compton now detects what driver it is using.
glFinish is used automatically when not using NVIDIA driver. This should reduce input lag.
Window shadow parameter is tweaked so it won't get cut off at the edges.
The experimental glx backend now uses OpenGL 3.3 core profile.
New blur configuration syntax

v6:
Experimental new backends are integrated into compton
vsync is now a boolean value, indicates whether vsync should be enabled. #130
xcb-xinerama is mandatory now. Build option xinerama is removed.
New glx backend is feature complete.
New xrender backend is feature complete.
Better handling of X visuals and GLX FBConfigs #104 cf9125c
Failure to parse config file is now a hard error.
Fading, window state tracking is refactored.

Deprecations
--sw-opti is deprecated. Users who want to limit the paint rate should always just use --vsync.
--glx-use-gpushader4 is deprecated
--vsync-aggressive is deprecated
Support for Composite < 0.2 dropped
New glx backend won't support OpenGL < 3.0
--glx-swap-method is deprecated in favor of the easier to understand option --use-damage #131
--glx-copy-from-front and --glx-use-copysubbuffermesa are removed since they are deprecated 3 major releases ago.

5 files changed, 54 insertions, 23 deletions

diff --git a/x11/compton/Makefile b/x11/compton/Makefile
index 8c88ef054cd..f828832164a 100644
--- a/x11/compton/Makefile
+++ b/x11/compton/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2019/03/29 07:27:49 pho Exp $
+# $NetBSD: Makefile,v 1.9 2019/09/17 11:43:29 tnn Exp $
 
-DISTNAME=	compton-5.1
+DISTNAME=	compton-7.3
 CATEGORIES=	x11 wm
 MASTER_SITES=	${MASTER_SITE_GITHUB:=yshui/}
-GITHUB_TAG=	v5.1
+GITHUB_TAG=	v${PKGVERSION_NOREV}
 
 MAINTAINER=	nia@NetBSD.org
 HOMEPAGE=	https://github.com/yshui/compton
@@ -32,6 +32,7 @@ post-install:
 .include "../../devel/py-meson/build.mk"
 .include "../../devel/libconfig/buildlink3.mk"
 .include "../../devel/libev/buildlink3.mk"
+.include "../../devel/uthash/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/libxcb/buildlink3.mk"
diff --git a/x11/compton/distinfo b/x11/compton/distinfo
index f34c4f3434f..caf31dd980c 100644
--- a/x11/compton/distinfo
+++ b/x11/compton/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.5 2019/03/01 17:13:32 youri Exp $
+$NetBSD: distinfo,v 1.6 2019/09/17 11:43:29 tnn Exp $
 
-SHA1 (compton-5.1.tar.gz) = 323904b6305dbf32c1bb7355d75ba4f8f50e9fd1
-RMD160 (compton-5.1.tar.gz) = b1d05080aaa7db33d3500620c77ea41377ee2816
-SHA512 (compton-5.1.tar.gz) = 61f88019b2b4ef06e5c6a155f913b0b1c0ab7d077be5af14104596cebe0428ba6d0d98399e3c450c494945a1d4727446b2f3631989dc766439112527a9d0a888
-Size (compton-5.1.tar.gz) = 199770 bytes
-SHA1 (patch-src_compiler.h) = 7072c1d176ab624241043dd8cedd4690fdc6834d
+SHA1 (compton-7.3.tar.gz) = c899bb76dd5e2eecce3e99ea5386e07f52448491
+RMD160 (compton-7.3.tar.gz) = c8c0a608e2327f2fda773ee18f1e629150fb1555
+SHA512 (compton-7.3.tar.gz) = 5a8fd294a8f39fd926029e872f0c8c998ccc105cb408b058539659f74446ea94862fb6b8d88b370576c73d8b18d846a12d9c0240348c6b758eec4e8550945aac
+Size (compton-7.3.tar.gz) = 218892 bytes
+SHA1 (patch-meson.build) = c39a4e0da8b7e6e5d3af38ea005e7915cd5e10ab
+SHA1 (patch-src_compiler.h) = 0b853c6d864a3e5ad78e1b494725aa5b19d331b8
+SHA1 (patch-src_utils.h) = 386a7fea89e12b966b9ac38df428b689ad2b63f3
diff --git a/x11/compton/patches/patch-meson.build b/x11/compton/patches/patch-meson.build
new file mode 100644
index 00000000000..217cffff8d2
--- /dev/null
+++ b/x11/compton/patches/patch-meson.build
@@ -0,0 +1,17 @@
+$NetBSD: patch-meson.build,v 1.1 2019/09/17 11:43:29 tnn Exp $
+
+Use libc popcountl if present.
+
+--- meson.build.orig	2019-08-18 21:40:33.000000000 +0000
++++ meson.build
+@@ -53,6 +53,10 @@ if cc.has_header('stdc-predef.h')
+ 	add_global_arguments('-DHAS_STDC_PREDEF_H', language: 'c')
+ endif
+ 
++if cc.has_function('popcountl', prefix : '#include <strings.h>')
++	add_global_arguments('-DHAS_POPCOUNTL', language: 'c')
++endif
++
+ warns = [ 'all', 'extra', 'no-unused-parameter', 'nonnull', 'shadow', 'no-type-limits',
+           'implicit-fallthrough', 'no-unknown-warning-option', 'no-missing-braces', 'conversion' ]
+ foreach w : warns
diff --git a/x11/compton/patches/patch-src_compiler.h b/x11/compton/patches/patch-src_compiler.h
index 5df46f3a3e6..1b77cfd4234 100644
--- a/x11/compton/patches/patch-src_compiler.h
+++ b/x11/compton/patches/patch-src_compiler.h
@@ -1,20 +1,10 @@
-$NetBSD: patch-src_compiler.h,v 1.1 2019/03/01 17:13:32 youri Exp $
+$NetBSD: patch-src_compiler.h,v 1.2 2019/09/17 11:43:29 tnn Exp $
 
 Fix build for NetBSD
 
---- src/compiler.h.orig	2019-02-06 21:29:32.000000000 +0000
+--- src/compiler.h.orig	2019-08-18 21:40:33.000000000 +0000
 +++ src/compiler.h
-@@ -2,7 +2,9 @@
- // Copyright (c) 2018 Yuxuan Shui <yshuiv7@gmail.com>
- #pragma once
- 
-+#ifndef __NetBSD__
- #include <stdc-predef.h>
-+#endif
- 
- #define auto         __auto_type
- #define likely(x)    __builtin_expect(!!(x), 1)
-@@ -82,6 +84,7 @@
+@@ -94,6 +94,7 @@
  # define unreachable do {} while(0)
  #endif
  
@@ -22,10 +12,13 @@ Fix build for NetBSD
  #ifndef __STDC_NO_THREADS__
  # include <threads.h>
  #elif __STDC_VERSION__ >= 201112L
-@@ -91,3 +94,6 @@
+@@ -103,6 +104,9 @@
  #else
  # define thread_local _Pragma("GCC error \"No thread local storage support\"") __error__
  #endif
 +#else
 +# define thread_local __thread
 +#endif
+ 
+ typedef unsigned long ulong;
+ typedef unsigned int uint;
diff --git a/x11/compton/patches/patch-src_utils.h b/x11/compton/patches/patch-src_utils.h
new file mode 100644
index 00000000000..0230bee88e0
--- /dev/null
+++ b/x11/compton/patches/patch-src_utils.h
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_utils.h,v 1.1 2019/09/17 11:43:29 tnn Exp $
+
+Use libc popcountl if present.
+
+--- src/utils.h.orig	2019-08-18 21:40:33.000000000 +0000
++++ src/utils.h
+@@ -114,9 +114,11 @@ static inline int attr_const normalize_i
+ /// clamp `val` into interval [min, max]
+ #define clamp(val, min, max) max2(min2(val, max), min)
+ 
++#ifndef HAS_POPCOUNTL
+ static inline int attr_const popcountl(unsigned long a) {
+ 	return __builtin_popcountl(a);
+ }
++#endif
+ 
+ /**
+  * Normalize a double value to a specific range.