pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/x11
Module Name: pkgsrc
Committed By: nia
Date: Sun Dec 15 14:05:47 UTC 2019
Modified Files:
pkgsrc/x11: Makefile
Added Files:
pkgsrc/x11/picom: DESCR Makefile PLIST distinfo options.mk
pkgsrc/x11/picom/patches: patch-src_backend_gl_gl__common.c
patch-src_utils.h
Removed Files:
pkgsrc/x11/compton: DESCR Makefile PLIST distinfo options.mk
pkgsrc/x11/compton/patches: patch-man_meson.build patch-meson.build
patch-src_backend_gl_gl__common.c patch-src_compiler.h
patch-src_utils.h
Log Message:
x11: Add picom. Replaces compton.
A lightweight compositor for X11 (previously a compton fork)
To generate a diff of this commit:
cvs rdiff -u -r1.867 -r1.868 pkgsrc/x11/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/x11/compton/DESCR
cvs rdiff -u -r1.11 -r0 pkgsrc/x11/compton/Makefile
cvs rdiff -u -r1.3 -r0 pkgsrc/x11/compton/PLIST
cvs rdiff -u -r1.8 -r0 pkgsrc/x11/compton/distinfo
cvs rdiff -u -r1.2 -r0 pkgsrc/x11/compton/options.mk
cvs rdiff -u -r1.1 -r0 pkgsrc/x11/compton/patches/patch-man_meson.build \
pkgsrc/x11/compton/patches/patch-meson.build \
pkgsrc/x11/compton/patches/patch-src_backend_gl_gl__common.c \
pkgsrc/x11/compton/patches/patch-src_utils.h
cvs rdiff -u -r1.2 -r0 pkgsrc/x11/compton/patches/patch-src_compiler.h
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/picom/DESCR pkgsrc/x11/picom/Makefile \
pkgsrc/x11/picom/PLIST pkgsrc/x11/picom/distinfo \
pkgsrc/x11/picom/options.mk
cvs rdiff -u -r0 -r1.1 \
pkgsrc/x11/picom/patches/patch-src_backend_gl_gl__common.c \
pkgsrc/x11/picom/patches/patch-src_utils.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/Makefile
diff -u pkgsrc/x11/Makefile:1.867 pkgsrc/x11/Makefile:1.868
--- pkgsrc/x11/Makefile:1.867 Tue Nov 26 09:07:16 2019
+++ pkgsrc/x11/Makefile Sun Dec 15 14:05:47 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.867 2019/11/26 09:07:16 wiz Exp $
+# $NetBSD: Makefile,v 1.868 2019/12/15 14:05:47 nia Exp $
#
COMMENT= Packages to support the X window system
@@ -28,7 +28,6 @@ SUBDIR+= clipit
SUBDIR+= clisp-gtk2
SUBDIR+= clisp-mit-clx
SUBDIR+= clisp-new-clx
-SUBDIR+= compton
SUBDIR+= deforaos-integration
SUBDIR+= deforaos-keyboard
SUBDIR+= deforaos-libdesktop
@@ -306,6 +305,7 @@ SUBDIR+= p5-Wx
SUBDIR+= p5-Wx-Perl-ProcessStream
SUBDIR+= p5-X11-Protocol
SUBDIR+= p5-gtk2
+SUBDIR+= picom
SUBDIR+= pixman
SUBDIR+= plasma-framework
SUBDIR+= py-Pmw
Added files:
Index: pkgsrc/x11/picom/DESCR
diff -u /dev/null pkgsrc/x11/picom/DESCR:1.1
--- /dev/null Sun Dec 15 14:05:47 2019
+++ pkgsrc/x11/picom/DESCR Sun Dec 15 14:05:47 2019
@@ -0,0 +1 @@
+A lightweight compositor for X11 (previously a compton fork)
Index: pkgsrc/x11/picom/Makefile
diff -u /dev/null pkgsrc/x11/picom/Makefile:1.1
--- /dev/null Sun Dec 15 14:05:47 2019
+++ pkgsrc/x11/picom/Makefile Sun Dec 15 14:05:47 2019
@@ -0,0 +1,45 @@
+# $NetBSD: Makefile,v 1.1 2019/12/15 14:05:47 nia Exp $
+
+DISTNAME= picom-7.5
+CATEGORIES= x11
+MASTER_SITES= ${MASTER_SITE_GITHUB:=yshui/}
+GITHUB_TAG= v${PKGVERSION_NOREV}
+
+MAINTAINER= pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE= https://github.com/yshui/picom
+COMMENT= Lightweight compositor for X11 (fork of Compton)
+LICENSE= mpl-2.0 AND mit
+
+USE_TOOLS+= pkg-config
+USE_LANGUAGES= c c++
+
+CONFLICTS+= compton-[0-9]*
+SUPERSEDES+= compton-[0-9]*
+
+TOOL_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc
+
+MESON_ARGS+= -Dbuild_docs=true
+
+REPLACE_PYTHON+= bin/compton-convgen.py
+REPLACE_SH+= bin/picom-trans
+
+post-install:
+ ${MV} ${DESTDIR}${PREFIX}/share/man ${DESTDIR}${PREFIX}/${PKGMANDIR} || ${TRUE}
+
+.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/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/libxdg-basedir/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/pixman/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 /dev/null pkgsrc/x11/picom/PLIST:1.1
--- /dev/null Sun Dec 15 14:05:47 2019
+++ pkgsrc/x11/picom/PLIST Sun Dec 15 14:05:47 2019
@@ -0,0 +1,12 @@
+@comment $NetBSD: PLIST,v 1.1 2019/12/15 14:05:47 nia Exp $
+bin/compton
+bin/compton-convgen.py
+bin/compton-trans
+bin/picom
+bin/picom-trans
+man/man1/picom-trans.1
+man/man1/picom.1
+share/applications/compton.desktop
+share/applications/picom.desktop
+share/icons/hicolor/48x48/apps/compton.png
+share/icons/hicolor/scalable/apps/compton.svg
Index: pkgsrc/x11/picom/distinfo
diff -u /dev/null pkgsrc/x11/picom/distinfo:1.1
--- /dev/null Sun Dec 15 14:05:47 2019
+++ pkgsrc/x11/picom/distinfo Sun Dec 15 14:05:47 2019
@@ -0,0 +1,8 @@
+$NetBSD: distinfo,v 1.1 2019/12/15 14:05:47 nia 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 (patch-src_utils.h) = 31f422592b5f9d232d26f437808b64dc2fb4c0f2
Index: pkgsrc/x11/picom/options.mk
diff -u /dev/null pkgsrc/x11/picom/options.mk:1.1
--- /dev/null Sun Dec 15 14:05:47 2019
+++ pkgsrc/x11/picom/options.mk Sun Dec 15 14:05:47 2019
@@ -0,0 +1,21 @@
+# $NetBSD: options.mk,v 1.1 2019/12/15 14:05:47 nia Exp $
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.picom
+PKG_SUPPORTED_OPTIONS= dbus opengl
+PKG_SUGGESTED_OPTIONS= dbus opengl
+#PKG_SUGGESTED_OPTIONS= dbus
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mdbus)
+MESON_ARGS+= -Ddbus=true
+. include "../../sysutils/dbus/buildlink3.mk"
+.else
+MESON_ARGS+= -Ddbus=false
+.endif
+
+.if !empty(PKG_OPTIONS:Mopengl)
+MESON_ARGS+= -Dopengl=true
+.else
+MESON_ARGS+= -Dopengl=false
+.endif
Index: pkgsrc/x11/picom/patches/patch-src_backend_gl_gl__common.c
diff -u /dev/null pkgsrc/x11/picom/patches/patch-src_backend_gl_gl__common.c:1.1
--- /dev/null Sun Dec 15 14:05:47 2019
+++ pkgsrc/x11/picom/patches/patch-src_backend_gl_gl__common.c Sun Dec 15 14:05:47 2019
@@ -0,0 +1,58 @@
+$NetBSD: patch-src_backend_gl_gl__common.c,v 1.1 2019/12/15 14:05:47 nia Exp $
+
+error: macro "memcpy" passed 19 arguments, but takes just 3
+
+--- src/backend/gl/gl_common.c.orig 2019-11-18 21:59:30.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",
+ // ri, rx, ry, rxe, rye, rdx, rdy, rdxe, rdye);
+
+- 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},
+- },
+- 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);
+
+ 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);
+ }
+ }
+
+@@ -672,10 +673,9 @@ _gl_fill(backend_t *base, struct color c
+ for (int i = 0; i < nrects; i++) {
+ 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],
+- (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);
+ indices[i * 6 + 0] = (GLuint)i * 4 + 0;
+ indices[i * 6 + 1] = (GLuint)i * 4 + 1;
+ indices[i * 6 + 2] = (GLuint)i * 4 + 2;
Index: pkgsrc/x11/picom/patches/patch-src_utils.h
diff -u /dev/null pkgsrc/x11/picom/patches/patch-src_utils.h:1.1
--- /dev/null Sun Dec 15 14:05:47 2019
+++ pkgsrc/x11/picom/patches/patch-src_utils.h Sun Dec 15 14:05:47 2019
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_utils.h,v 1.1 2019/12/15 14:05:47 nia Exp $
+
+Conflicting type definition with libc popcountl
+
+--- src/utils.h.orig 2019-11-18 21:59:30.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 __NetBSD__
+ static inline int attr_const popcountl(unsigned long a) {
+ return __builtin_popcountl(a);
+ }
++#endif
+
+ /**
+ * Normalize a double value to a specific range.
Home |
Main Index |
Thread Index |
Old Index