From owner-svn-ports-all@freebsd.org Wed Oct 30 13:29:56 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9CD241A5A62; Wed, 30 Oct 2019 13:29:56 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4738T03dwDz3QwN; Wed, 30 Oct 2019 13:29:56 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 60D35AE96; Wed, 30 Oct 2019 13:29:56 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x9UDTuIH020548; Wed, 30 Oct 2019 13:29:56 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x9UDTtwU020539; Wed, 30 Oct 2019 13:29:55 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201910301329.x9UDTtwU020539@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 30 Oct 2019 13:29:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r516059 - in head/x11-wm: . compton compton-yshui compton-yshui/files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head/x11-wm: . compton compton-yshui compton-yshui/files X-SVN-Commit-Revision: 516059 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Oct 2019 13:29:56 -0000 Author: jbeich Date: Wed Oct 30 13:29:54 2019 New Revision: 516059 URL: https://svnweb.freebsd.org/changeset/ports/516059 Log: x11-wm/compton-yshui: add new port Actively maintained fork of Compton (X11 compositor). Will be renamed to Picom during the next update. PR: 241216 Tested by: jsm, q5sys Reviewed by: danfe (previous version) Added: head/x11-wm/compton-yshui/ - copied from r516053, head/x11-wm/compton/ head/x11-wm/compton-yshui/files/patch-src_log.c (contents, props changed) Deleted: head/x11-wm/compton-yshui/files/patch-Makefile head/x11-wm/compton-yshui/files/patch-src_c2.h Modified: head/x11-wm/Makefile head/x11-wm/compton-yshui/Makefile head/x11-wm/compton-yshui/distinfo head/x11-wm/compton-yshui/pkg-descr head/x11-wm/compton-yshui/pkg-plist head/x11-wm/compton/Makefile Modified: head/x11-wm/Makefile ============================================================================== --- head/x11-wm/Makefile Wed Oct 30 13:24:55 2019 (r516058) +++ head/x11-wm/Makefile Wed Oct 30 13:29:54 2019 (r516059) @@ -26,6 +26,7 @@ SUBDIR += compizconfig-backend-gconf SUBDIR += compizconfig-python SUBDIR += compton + SUBDIR += compton-yshui SUBDIR += ctwm SUBDIR += cwm SUBDIR += devilspie Modified: head/x11-wm/compton-yshui/Makefile ============================================================================== --- head/x11-wm/compton/Makefile Wed Oct 30 11:38:19 2019 (r516053) +++ head/x11-wm/compton-yshui/Makefile Wed Oct 30 13:29:54 2019 (r516059) @@ -1,68 +1,77 @@ # $FreeBSD$ PORTNAME= compton -PORTVERSION= 20160907 -PORTREVISION= 4 +DISTVERSIONPREFIX= v +DISTVERSION= 7.4 CATEGORIES= x11-wm +PKGNAMESUFFIX= -yshui -MAINTAINER= femc7488@gmail.com -COMMENT= Feature-rich compositing window manager for X11 +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= bd5a5fb56812.patch:-p1 065f9ffd4d35.patch:-p1 -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/LICENSE +MAINTAINER= jbeich@FreeBSD.org +COMMENT= Lightweight X11 compositor +LICENSE= MIT MPL20 +LICENSE_COMB= multi +LICENSE_FILE_MIT= ${WRKSRC}/LICENSES/MIT + +BUILD_DEPENDS= ${LOCALBASE}/include/uthash.h:devel/uthash +LIB_DEPENDS= libev.so:devel/libev \ + libxcb-image.so:x11/xcb-util-image \ + libxcb-render-util.so:x11/xcb-util-renderutil RUN_DEPENDS= xprop:x11/xprop \ xwininfo:x11/xwininfo +CONFLICTS_INSTALL= compton # bin/compton + +USES= compiler:c11 meson localbase pkgconfig python:3.4+,run shebangfix USE_GITHUB= yes -GH_ACCOUNT= chjj -GH_TAGNAME= b7f43ee +USE_XORG= x11 xcb xext pixman +GH_ACCOUNT= yshui +SHEBANG_FILES= bin/compton-convgen.py +MESON_ARGS= -Dunittest=true +TEST_TARGET= test -USES= gmake pkgconfig -USE_XORG= x11 xcomposite xdamage xext xfixes xrandr xrender +OPTIONS_DEFINE= CONFIG DBUS DOCS DRM OPENGL PCRE +OPTIONS_DEFAULT=CONFIG DBUS OPENGL PCRE -MAKE_ARGS= COMPTON_VERSION=git-${PORTVERSION}-${GH_TAGNAME} \ - XDGDIR=${LOCALBASE}/etc/xdg -ALL_TARGET= ${PORTNAME} +CONFIG_DESC= Configuration file parsing support +CONFIG_LIB_DEPENDS= libconfig.so:devel/libconfig \ + libxdg-basedir.so:x11/libxdg-basedir +CONFIG_MESON_TRUE= config_file -OPTIONS_DEFINE= CONFIG PCRE DRM OPENGL DBUS XINERAMA DOCS -OPTIONS_DEFAULT= CONFIG PCRE DRM OPENGL DBUS XINERAMA - -CONFIG_DESC= Configuration file parsing support -PCRE_DESC= Blacklist support (via libpcre) -DRM_DESC= DRM VSync method support -OPENGL_DESC= GLX backend, OpenGL VSync method, etc. -DOCS_DESC= Build manpages (requires AsciiDoc/DocBook) - -CONFIG_LIB_DEPENDS= libconfig.so:devel/libconfig -CONFIG_MAKE_ARGS_OFF= NO_LIBCONFIG=yes - PCRE_LIB_DEPENDS= libpcre.so:devel/pcre -PCRE_MAKE_ARGS_OFF= NO_REGEX_PCRE=yes +PCRE_MESON_TRUE= regex +DRM_DESC= DRM VSync fallback (deprecated) DRM_LIB_DEPENDS= libdrm.so:graphics/libdrm -DRM_MAKE_ARGS_OFF= NO_VSYNC_DRM=yes +DRM_MESON_TRUE= vsync_drm OPENGL_USE= GL=gl -OPENGL_MAKE_ARGS_OFF= NO_VSYNC_OPENGL=yes +OPENGL_MESON_TRUE= opengl DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus -DBUS_MAKE_ARGS_OFF= NO_DBUS=yes +DBUS_MESON_TRUE= dbus -XINERAMA_USE= XORG=xinerama -XINERAMA_MAKE_ARGS_OFF= NO_XINERAMA=yes +DOCS_BUILD_DEPENDS= a2x:textproc/asciidoc +DOCS_MESON_TRUE= build_docs +DOCS_PLIST_FILES= man/man1/${PORTNAME}.1.gz \ + man/man1/${PORTNAME}-trans.1.gz -DOCS_BUILD_DEPENDS= a2x:textproc/asciidoc \ - xsltproc:textproc/libxslt \ - docbook-xml>0:textproc/docbook-xml \ - ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl -DOCS_MAKE_ARGS= DOCDIR=${DOCSDIR} MANDIR=${MANPREFIX}/man/man1 -DOCS_ALL_TARGET= docs -DOCS_PLIST_FILES= man/man1/compton.1.gz man/man1/compton-trans.1.gz -DOCS_PORTDOCS= README.md cdbus-driver.sh - post-patch: - @${REINPLACE_CMD} -e '/config_system_dir/s|/etc|${LOCALBASE}&|' \ - ${WRKSRC}/src/compton.c + @${REINPLACE_CMD} -e '/install_dir/s,share/man,man,' \ + ${WRKSRC}/man/meson.build + @${REINPLACE_CMD} -e '/config_system_dir/s,/etc,${PREFIX}&,' \ + ${WRKSRC}/src/config_libconfig.c +# Extract (snapshot) version from the port instead of meson.build + @${REINPLACE_CMD} -i .nogit -e 's/git.found()/false/' \ + -e "/project_version/s/=.*/= '${DISTVERSIONFULL}'/" \ + ${WRKSRC}/meson.build + +post-install: + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/xdg + ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.sample.conf \ + ${STAGEDIR}${PREFIX}/etc/xdg/${PORTNAME}.conf.sample .include Modified: head/x11-wm/compton-yshui/distinfo ============================================================================== --- head/x11-wm/compton/distinfo Wed Oct 30 11:38:19 2019 (r516053) +++ head/x11-wm/compton-yshui/distinfo Wed Oct 30 13:29:54 2019 (r516059) @@ -1,3 +1,7 @@ -TIMESTAMP = 1473236624 -SHA256 (chjj-compton-20160907-b7f43ee_GH0.tar.gz) = b03a26effb26763a9a3cb48b2bef849719ab5597493e4d599053c93c33f7c358 -SIZE (chjj-compton-20160907-b7f43ee_GH0.tar.gz) = 163233 +TIMESTAMP = 1569024480 +SHA256 (yshui-compton-v7.4_GH0.tar.gz) = 1911aebb49f765586f655933ee016828e126bc7b2bb016b13c9a34a4865a8fd3 +SIZE (yshui-compton-v7.4_GH0.tar.gz) = 218899 +SHA256 (bd5a5fb56812.patch) = a7e29d526517f05fb90f3a6415ef08108ba45865175a676f50376ef8d0e10a7f +SIZE (bd5a5fb56812.patch) = 680 +SHA256 (065f9ffd4d35.patch) = 5d6d687c9ee1eb6ab7a9d39636bb85c4aac7d36ad13433ac66885914ff2e2944 +SIZE (065f9ffd4d35.patch) = 10209 Added: head/x11-wm/compton-yshui/files/patch-src_log.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-wm/compton-yshui/files/patch-src_log.c Wed Oct 30 13:29:54 2019 (r516059) @@ -0,0 +1,21 @@ +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); Modified: head/x11-wm/compton-yshui/pkg-descr ============================================================================== --- head/x11-wm/compton/pkg-descr Wed Oct 30 11:38:19 2019 (r516053) +++ head/x11-wm/compton-yshui/pkg-descr Wed Oct 30 13:29:54 2019 (r516059) @@ -1,14 +1,15 @@ -Compton is a compositor for X11, which was forked from Dana Jansens' fork -of xcompmgr, and heavily refactored. +Compton is a standalone compositor for X11 for window managers without +built-in compositing. This is an actively maintained fork of Compton. -Most prominent changes from the original xcompmgr: +Features: +- Rendering with optional VSync via OpenGL or XRender +- Transparent windows, menus, titlebars, borders +- Shadows and colored shadows +- Fading effects +- Bluring of background +- GLSL fragment shader for window contents +- Conditional settings +- Config, log and PID file support +- Remote control via DBus - - OpenGL/GLX backend in addition to the old XRender backend - - Inactive window transparency and dimming - - Titlebar/frame and menu transparency - - Shadows for ARGB windows, e.g. terminals with transparency - - Colored shadows; new fade system - - Blur of background of transparent windows, window color inversion - - Configuration file support with blacklisting - -WWW: https://github.com/chjj/compton +WWW: https://github.com/yshui/compton Modified: head/x11-wm/compton-yshui/pkg-plist ============================================================================== --- head/x11-wm/compton/pkg-plist Wed Oct 30 11:38:19 2019 (r516053) +++ head/x11-wm/compton-yshui/pkg-plist Wed Oct 30 13:29:54 2019 (r516059) @@ -1,4 +1,5 @@ bin/compton +bin/compton-convgen.py bin/compton-trans @sample etc/xdg/compton.conf.sample share/applications/compton.desktop Modified: head/x11-wm/compton/Makefile ============================================================================== --- head/x11-wm/compton/Makefile Wed Oct 30 13:24:55 2019 (r516058) +++ head/x11-wm/compton/Makefile Wed Oct 30 13:29:54 2019 (r516059) @@ -14,6 +14,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= xprop:x11/xprop \ xwininfo:x11/xwininfo +CONFLICTS_INSTALL= compton-yshui # bin/compton + USE_GITHUB= yes GH_ACCOUNT= chjj GH_TAGNAME= b7f43ee