Re: NEW: x11/picom

Stuart Henderson <stu@spacehopper.org> writes:

> On 2020/05/28 20:41, Omar Polo wrote:
>>
>> Bryan Steele <brynet@gmail.com> writes:
>>
>> > On Wed, May 27, 2020 at 09:33:57PM +0200, Omar Polo wrote:
>> > >
>> > > Hi,
>> > >
>> > > This is a port for picom, a compositor for X11. It's an
>> > > actively
>> > > developed fork of compton.
>> > >
>> > > I've been running for a month now, and it has been rock
>> > > stable
>> > > (instead
>> > > of compton which would occasionally crash.)
>> > >
>> > > Build and tested on amd64, passes port-lib-depends-check
>> > > and
>> > > portcheck.
>> > >
>> > > A couple of notes about the patches:
>> > >
>> > > - (AFAIK) the project was recently renamed from "compton"
>> > > to
>> > > "picom",
>> > > that's the reason they install some files that can
>> > > conflict with
>> > > x11/compton (like the bin/compton{,-trans} links to
>> > > bin/picom{,-trans}). I've removed (and/or renamed) them
>> > > to
>> > > avoid the
>> > > conflict, since I wanted to have them both installed
>> > > side-by-side
>> > >
>> > > - moved the manpage from the (port) default share/man/man1
>> > > to
>> > > man/man1
>> > >
>> > > - the patch-src_meson_build is an hack to avoid a meson
>> > > error I
>> > > cannot
>> > > understand
>> > >
>> > > Cheers!
>> > >
>> >
>> > I can't comment on the port itself, but picom looks like it
>> > needs
>> > a similar fix for vsync as compton in ports does to use the
>> > correct
>> > drm(4) device node.
>> >
>> > -Bryan.
>> >
>> > diff --git src/vsync.c src/vsync.c
>> > index 5980155..8273d28 100644
>> > --- src/vsync.c
>> > +++ src/vsync.c
>> > @@ -54,7 +54,7 @@ static int vsync_drm_wait(session_t *ps) {
>> > */
>> > static bool vsync_drm_init(session_t *ps) {
>> > // Should we always open card0?
>> > - if (ps->drm_fd < 0 && (ps->drm_fd = open("/dev/dri/card0",
>> > O_RDWR)) <
>> > 0) {
>> > + if (ps->drm_fd < 0 && (ps->drm_fd = open("/dev/drm0",
>> > O_RDWR)) < 0) {
>> > log_error("Failed to open device.");
>> > return false;
>> > }
>>
>> Thanks for finding this!
>>
>> attaching an updated tarball with this and the patch by Jan
>> Beich.
>>
>
>
>
> Here's a diff on top to avoid some duplication, put GH_* in the
> normal
> place, put CONFIGURE_* variables before the targets as is
> usually done
> in ports, and update the license marker (some of the source code
> files
> are MPL only so I think we should just show the most restrictive
> license).
> I updated DESCR a bit too.

Thank you. It is indeed better now, in particular the DESCR.

> The manpage is a bit of a mess but I suppose we can't expect
> much better
> from asciidoc!
>
> OK sthen@ with that on top (new tar with these changes
> attached).

Cheers!

>
> diff 21bb08e451e5f7126e2ff8ba5827c403e7ceea34 /usr/ports/mystuff
> blob - f4a7636c5438fc26342d756bb0ccdc139ea20786
> file + x11/picom/Makefile
> --- x11/picom/Makefile
> +++ x11/picom/Makefile
> @@ -2,14 +2,13 @@
>
> COMMENT = lightweight compositor for X11
>
> -V = 8
> -PKGNAME = picom-${V}
> +GH_ACCOUNT = yshui
> +GH_PROJECT = picom
> +GH_TAGNAME = v8
>
> CATEGORIES = x11
>
> -HOMEPAGE = https://github.com/yshui/picom
> -
> -# MPL-2.0 AND MIT
> +# MPL 2.0
> PERMIT_PACKAGE = Yes
>
> WANTLIB += GL X11 X11-xcb c config dbus-1 ev m pcre pixman-1
> @@ -17,10 +16,6 @@ WANTLIB += xcb-composite xcb-damage xcb-glx
> xcb-image
> WANTLIB += xcb-randr xcb-render-util xcb-render xcb-shape
> xcb-sync
> WANTLIB += xcb-xfixes xcb-xinerama xcb
>
> -GH_ACCOUNT = yshui
> -GH_PROJECT = picom
> -GH_TAGNAME = v8
> -
> MODULES = devel/meson
>
> BUILD_DEPENDS = devel/uthash \
> @@ -34,12 +29,12 @@ LIB_DEPENDS = devel/libconfig \
> devel/pcre \
> x11/dbus
>
> -pre-patch:
> - cd ${WRKSRC}/media && mv compton.svg picom.svg
> - cd ${WRKSRC}/media/icons/48x48 && mv compton.png picom.png
> -
> CONFIGURE_ARGS += -Dwith_docs=true
> CONFIGURE_ENV += CPPFLAGS="${CPPFLAGS}
> -I${LOCALBASE}/include" \
> LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
> +
> +pre-patch:
> + cd ${WRKSRC}/media && mv compton.svg picom.svg
> + cd ${WRKSRC}/media/icons/48x48 && mv compton.png picom.png
>
> .include <bsd.port.mk>
> blob - 866af67e0f75de1c6b3f447d09d715cc505836b1
> file + x11/picom/pkg/DESCR
> --- x11/picom/pkg/DESCR
> +++ x11/picom/pkg/DESCR
> @@ -1,2 +1,4 @@
> -Picom is a lightweight compositor for X11 (previously a compton
> -fork).
> +Picom is a lightweight, standalone compositor for X11, for use
> with
> +window managers that do not natively provide compositing
> functionality.
> +Features include fading, shadows, transparency/dimming for
> inactive
> +windows, and flexible configuration.