CVS commit: pkgsrc/x11/picom

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Aug  6 13:39:40 UTC 2024

Modified Files:
        pkgsrc/x11/picom: Makefile PLIST distinfo options.mk

Log Message:
picom: Update to 11.2

Various performance improvements and bug fixes.

Note: this disables the OpenGL backend on NetBSD 9 due to
limitations in libGL on that platform.  The default backend
("xrender") is unaffected.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/x11/picom/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/picom/PLIST
cvs rdiff -u -r1.9 -r1.10 pkgsrc/x11/picom/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/picom/options.mk

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.10 pkgsrc/x11/picom/Makefile:1.11
--- pkgsrc/x11/picom/Makefile:1.10      Mon Aug 14 05:25:35 2023
+++ pkgsrc/x11/picom/Makefile   Tue Aug  6 13:39:40 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2023/08/14 05:25:35 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2024/08/06 13:39:40 nia Exp $
 
-DISTNAME=      picom-9.1
-PKGREVISION=   1
+DISTNAME=      picom-11.2
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=yshui/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -21,24 +20,29 @@ USE_LANGUAGES=              c c++
 MESON_ARGS+=           -Dwith_docs=true
 REPLACE_SH+=           bin/picom-trans
 PYTHON_FOR_BUILD_ONLY= tool
-INSTALLATION_DIRS+=    share/examples/picom
+INSTALLATION_DIRS+=    share/examples/picom share/examples/picom/xdg/autostart
+
+CONF_FILES+=   share/examples/picom/xdg/autostart/picom.desktop \
+               ${PKG_SYSCONFDIR}/xdg/autostart/picom.desktop
+MAKE_DIRS+=    ${PKG_SYSCONFDIR}/xdg/autostart
 
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/picom.sample.conf ${DESTDIR}${PREFIX}/share/examples/picom/picom.sample.conf
+       ${MV} ${DESTDIR}${PKG_SYSCONFDIR}/xdg/autostart/picom.desktop ${DESTDIR}${PREFIX}/share/examples/picom/xdg/autostart
 
 .include "options.mk"
 .include "../../devel/meson/build.mk"
 .include "../../devel/libconfig/buildlink3.mk"
 .include "../../devel/libev/buildlink3.mk"
-.include "../../devel/pcre/buildlink3.mk"
+.include "../../devel/pcre2/buildlink3.mk"
 .include "../../devel/uthash/buildlink3.mk"
-.include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/libxcb/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/pixman/buildlink3.mk"
+.include "../../x11/xcb-util/buildlink3.mk"
 .include "../../x11/xcb-util-image/buildlink3.mk"
 .include "../../x11/xcb-util-renderutil/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/x11/picom/PLIST
diff -u pkgsrc/x11/picom/PLIST:1.3 pkgsrc/x11/picom/PLIST:1.4
--- pkgsrc/x11/picom/PLIST:1.3  Fri Jul 29 21:16:32 2022
+++ pkgsrc/x11/picom/PLIST      Tue Aug  6 13:39:40 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2022/07/29 21:16:32 tnn Exp $
+@comment $NetBSD: PLIST,v 1.4 2024/08/06 13:39:40 nia Exp $
 bin/compton
 bin/compton-trans
 bin/picom
@@ -8,5 +8,6 @@ man/man1/picom.1
 share/applications/compton.desktop
 share/applications/picom.desktop
 share/examples/picom/picom.sample.conf
+share/examples/picom/xdg/autostart/picom.desktop
 share/icons/hicolor/48x48/apps/compton.png
 share/icons/hicolor/scalable/apps/compton.svg

Index: pkgsrc/x11/picom/distinfo
diff -u pkgsrc/x11/picom/distinfo:1.9 pkgsrc/x11/picom/distinfo:1.10
--- pkgsrc/x11/picom/distinfo:1.9       Sun Sep  4 12:12:01 2022
+++ pkgsrc/x11/picom/distinfo   Tue Aug  6 13:39:40 2024
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.9 2022/09/04 12:12:01 tnn Exp $
+$NetBSD: distinfo,v 1.10 2024/08/06 13:39:40 nia Exp $
 
-BLAKE2s (picom-9.1.tar.gz) = 0b5ca67e4a107726a71b690825608d3d29305bd7bcd927aea8bb3e572223ca0f
-SHA512 (picom-9.1.tar.gz) = 375dc245be1c0f277bc0ddfc6e6480255efba06ce49f953c5314b7ba9795d1f50c5de907762208becc13c5210f24ac5b2241e2eb5e0e10dc5e5b96081cc821df
-Size (picom-9.1.tar.gz) = 263924 bytes
+BLAKE2s (picom-11.2.tar.gz) = feee788995f73d162b0078db69ae3d4e593a095418940d304b87ab483396c4be
+SHA512 (picom-11.2.tar.gz) = df8fc1a593e108b37be185129ac1f3a23c2ae648a04352c45b9d5888838e5754c68f2eb684f12f1ed4d973eca0aef83a61789f028c63bc2d0f0f38902232aadc
+Size (picom-11.2.tar.gz) = 308679 bytes

Index: pkgsrc/x11/picom/options.mk
diff -u pkgsrc/x11/picom/options.mk:1.1 pkgsrc/x11/picom/options.mk:1.2
--- pkgsrc/x11/picom/options.mk:1.1     Sun Dec 15 14:05:47 2019
+++ pkgsrc/x11/picom/options.mk Tue Aug  6 13:39:40 2024
@@ -1,9 +1,15 @@
-# $NetBSD: options.mk,v 1.1 2019/12/15 14:05:47 nia Exp $
+# $NetBSD: options.mk,v 1.2 2024/08/06 13:39:40 nia Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.picom
 PKG_SUPPORTED_OPTIONS=         dbus opengl
-PKG_SUGGESTED_OPTIONS=         dbus opengl
-#PKG_SUGGESTED_OPTIONS=                dbus
+PKG_SUGGESTED_OPTIONS=         dbus
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${X11_TYPE} == "modular" || \
+    (${OPSYS} == "NetBSD" && ${OPSYS_VERSION} >= 100000)
+PKG_SUGGESTED_OPTIONS+=                opengl
+.endif
 
 .include "../../mk/bsd.options.mk"
 
@@ -16,6 +22,7 @@ MESON_ARGS+=          -Ddbus=false
 
 .if !empty(PKG_OPTIONS:Mopengl)
 MESON_ARGS+=           -Dopengl=true
+.  include "../../graphics/libepoxy/buildlink3.mk"
 .else
 MESON_ARGS+=           -Dopengl=false
 .endif