Index: MOVED =================================================================== --- MOVED +++ MOVED @@ -13433,3 +13433,4 @@ www/nuvolaplayer-yandex-music||2019-10-21|Useless without audio/nuvolaplayer www/nuvolaplayer-youtube||2019-10-21|Useless without audio/nuvolaplayer japanese/yasou-fpw||2019-10-23|Has expired: the only remaining mastersite times out +x11-wm/compton|x11-wm/picom|2019-??-??|Project renamed Index: x11-wm/Makefile =================================================================== --- x11-wm/Makefile +++ x11-wm/Makefile @@ -26,7 +26,6 @@ SUBDIR += compiz-plugins-unsupported SUBDIR += compizconfig-backend-gconf SUBDIR += compizconfig-python - SUBDIR += compton SUBDIR += ctwm SUBDIR += cwm SUBDIR += devilspie @@ -97,6 +96,7 @@ SUBDIR += peksystray SUBDIR += pekwm SUBDIR += phluid + SUBDIR += picom SUBDIR += piewm SUBDIR += plasma5-kdecoration SUBDIR += plasma5-kwin Index: x11-wm/compton/distinfo =================================================================== --- x11-wm/compton/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1569024480 -SHA256 (yshui-compton-v7.4_GH0.tar.gz) = 1911aebb49f765586f655933ee016828e126bc7b2bb016b13c9a34a4865a8fd3 -SIZE (yshui-compton-v7.4_GH0.tar.gz) = 218899 Index: x11-wm/compton/files/patch-src_log.c =================================================================== --- /dev/null +++ x11-wm/compton/files/patch-src_log.c @@ -1,21 +0,0 @@ -Drop after FreeBSD 11 EOL, other systems had timespec_get() for years. - -../src/log.c:162:20: error: use of undeclared identifier 'TIME_UTC' - timespec_get(&ts, TIME_UTC); - ^ -log.c:(.text+0x1db): undefined reference to `timespec_get' - ---- src/log.c.orig 2019-09-21 00:08:00 UTC -+++ src/log.c -@@ -159,7 +159,11 @@ attr_printf(4, 5) void log_printf(struct log *l, int l - } - - struct timespec ts; -+#ifdef TIME_UTC - timespec_get(&ts, TIME_UTC); -+#else -+ clock_gettime(CLOCK_REALTIME, &ts); -+#endif - auto tm = localtime(&ts.tv_sec); - char time_buf[100]; - strftime(time_buf, sizeof time_buf, "%x %T", tm); Index: x11-wm/compton/files/patch-src_x.c =================================================================== --- x11-wm/compton/files/patch-src_x.c +++ /dev/null @@ -1,14 +0,0 @@ -https://github.com/yshui/compton/pull/250 - ---- src/x.c.orig 2019-09-21 00:08:00 UTC -+++ src/x.c -@@ -14,7 +14,9 @@ - #include - - #include "atom.h" -+#ifdef CONFIG_OPENGL - #include "backend/gl/glx.h" -+#endif - #include "common.h" - #include "compiler.h" - #include "kernel.h" Index: x11-wm/compton/files/patch-subprojects_test.h_test.h =================================================================== --- x11-wm/compton/files/patch-subprojects_test.h_test.h +++ /dev/null @@ -1,50 +0,0 @@ -https://github.com/yshui/test.h/pull/1 - ---- subprojects/test.h/test.h.orig 2019-09-21 00:08:00 UTC -+++ subprojects/test.h/test.h -@@ -8,6 +8,13 @@ - #include - #include - -+#if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || \ -+ defined(__NetBSD__) || defined(__OpenBSD__) -+#define USE_SYSCTL_FOR_ARGS 1 -+#include -+#include // getpid -+#endif -+ - struct test_file_metadata; - - struct test_failure { -@@ -91,11 +98,31 @@ extern void __attribute__((weak)) (*test_h_unittest_se - /// @param[out] tests_run if not NULL, set to whether tests were run - static inline void __attribute__((constructor(102))) run_tests(void) { - bool should_run = false; -+#ifdef USE_SYSCTL_FOR_ARGS -+ int mib[] = { -+ CTL_KERN, -+#if defined(__NetBSD__) || defined(__OpenBSD__) -+ KERN_PROC_ARGS, -+ getpid(), -+ KERN_PROC_ARGV, -+#else -+ KERN_PROC, -+ KERN_PROC_ARGS, -+ getpid(), -+#endif -+ }; -+ char *arg = NULL; -+ size_t arglen; -+ sysctl(mib, sizeof(mib)/sizeof(mib[0]), NULL, &arglen, NULL, 0); -+ arg = malloc(arglen); -+ sysctl(mib, sizeof(mib)/sizeof(mib[0]), arg, &arglen, NULL, 0); -+#else - FILE *cmdlinef = fopen("/proc/self/cmdline", "r"); - char *arg = NULL; - int arglen; - fscanf(cmdlinef, "%ms%n", &arg, &arglen); - fclose(cmdlinef); -+#endif - for (char *pos = arg; pos < arg + arglen; pos += strlen(pos) + 1) { - if (strcmp(pos, "--unittest") == 0) { - should_run = true; Index: x11-wm/picom/Makefile =================================================================== --- x11-wm/picom/Makefile +++ x11-wm/picom/Makefile @@ -1,9 +1,9 @@ # $FreeBSD$ -PORTNAME= compton +PORTNAME= picom DISTVERSIONPREFIX= v -DISTVERSION= 7.4 -PORTEPOCH= 1 +DISTVERSION= Next-114 +DISTVERSIONSUFFIX= -g43b2173 CATEGORIES= x11-wm MAINTAINER= jbeich@FreeBSD.org @@ -20,11 +20,11 @@ RUN_DEPENDS= xprop:x11/xprop \ xwininfo:x11/xwininfo -USES= compiler:c11 meson localbase pkgconfig python:3.4+,run shebangfix +USES= compiler:c11 meson localbase pkgconfig USE_GITHUB= yes USE_XORG= x11 xcb xext pixman GH_ACCOUNT= yshui -SHEBANG_FILES= bin/compton-convgen.py +GH_PROJECT= compton # XXX To be renamed soon MESON_ARGS= -Dunittest=true TEST_TARGET= test @@ -50,7 +50,7 @@ DBUS_MESON_TRUE= dbus DOCS_BUILD_DEPENDS= a2x:textproc/asciidoc -DOCS_MESON_TRUE= build_docs +DOCS_MESON_TRUE= with_docs DOCS_PLIST_FILES= man/man1/${PORTNAME}.1.gz \ man/man1/${PORTNAME}-trans.1.gz Index: x11-wm/picom/distinfo =================================================================== --- /dev/null +++ x11-wm/picom/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1570888619 +SHA256 (yshui-compton-vNext-114-g43b2173_GH0.tar.gz) = d18a7299a4d752aae8175767f5ca2052a852fd581e0df6ae683ed63269ba79b0 +SIZE (yshui-compton-vNext-114-g43b2173_GH0.tar.gz) = 226316 Index: x11-wm/picom/pkg-descr =================================================================== --- x11-wm/picom/pkg-descr +++ x11-wm/picom/pkg-descr @@ -1,4 +1,4 @@ -Compton is a compositor for X11, which was forked from Dana Jansens' fork +Picom is a compositor for X11, which was forked from Dana Jansens' fork of xcompmgr, and heavily refactored. Most prominent changes from the original xcompmgr: @@ -11,4 +11,4 @@ - Blur of background of transparent windows, window color inversion - Configuration file support with blacklisting -WWW: https://github.com/yshui/compton +WWW: https://github.com/yshui/picom Index: x11-wm/picom/pkg-plist =================================================================== --- x11-wm/picom/pkg-plist +++ x11-wm/picom/pkg-plist @@ -1,7 +1,9 @@ bin/compton -bin/compton-convgen.py bin/compton-trans -@sample etc/xdg/compton.conf.sample +bin/picom +bin/picom-trans +@sample etc/xdg/picom.conf.sample share/applications/compton.desktop +share/applications/picom.desktop share/icons/hicolor/48x48/apps/compton.png share/icons/hicolor/scalable/apps/compton.svg Index: x11/compton-conf/Makefile =================================================================== --- x11/compton-conf/Makefile +++ x11/compton-conf/Makefile @@ -12,7 +12,7 @@ LICENSE= LGPL21+ LIB_DEPENDS= libconfig.so:devel/libconfig -RUN_DEPENDS= compton:x11-wm/compton +RUN_DEPENDS= compton:x11-wm/picom USES= cmake compiler:c++14-lang localbase:ldflags lxqt qt:5 \ pkgconfig tar:xz Index: x11/lumina-core/Makefile =================================================================== --- x11/lumina-core/Makefile +++ x11/lumina-core/Makefile @@ -15,7 +15,7 @@ RUN_DEPENDS= fluxbox>=0:x11-wm/fluxbox \ xscreensaver>=0:x11/xscreensaver \ xbrightness>=0:x11/xbrightness \ - compton>=0:x11-wm/compton \ + compton:x11-wm/picom \ xrandr>=0:x11/xrandr \ numlockx>=0:x11/numlockx LIB_DEPENDS+= libxcb-ewmh.so:x11/xcb-util-wm \