On Wed, Nov 16, 2022 at 10:34:41PM +0100, Omar Polo wrote:
> On 2022/11/16 19:29:17 +0000, Klemens Nanni <k...@openbsd.org> wrote:
> > On Mon, Nov 14, 2022 at 07:41:01PM +0100, Omar Polo wrote:
> > > Hello ports,
> > >
> > > this updates picom to the latest release. I've tested brieflily the
> > > previous RCs too, seems to work fine here with the default config.
> > >
> > > I had to disable the opengl backend because it fails to build due to
> > > an undefined symbol glEGLImageTargetTexStorageEXT, no idea about it.
> > >
> > > this updates also install an autostart. i only use xenodm and cwm,
> > > don't know how that works with DEs
> >
> > ===> Building package for picom-10
> > ...
> > Error:
> > /usr/ports/pobj/picom-10/fake-amd64/usr/local/share/examples/picom/picom.desktop
> > does not exist
> > pkg_create: can't continue
> >
> > $ find `make show=WRKINST` -name \*.desktop
> > /usr/ports/pobj/picom-10/fake-amd64/etc/xdg/autostart/picom.desktop
> >
> > /usr/ports/pobj/picom-10/fake-amd64/usr/local/share/applications/picom.desktop
> >
> > Looks like the port installed it to the fake /etc itself.
>
> yes, with this update it tries to install picom.desktop into
> /etc/xdg/autostart. I forgot to 'cvs add' a patch (that also neuters
> some pointless git checking) before sending the email, sorry.
>
> I haven't found another way other than patching.
> MODMESON_CONFIGURE_ARGS already has --sysconfdir=${SYSCONFDIR} and
> meson doesn't like this flag to be provided more than once.
I see now.
meson tries to install the same picom.desktop twice, so we might as well
drop the second attempt and use the first file for @sample in PLIST.
git detection can also be neutered a tad simpler.
Here's your diff with a slightly simpler meson.build patch.
So I have the following in my ~/.xsession
picom --daemon --config /dev/null --vsync --backend glx
Updating with your patch now gives me
$ picom --config /dev/null --vsync --backend glx
[ 11/17/22 19:33:29.791 get_cfg ERROR ] Backend "glx" is only available
as part of the legacy backends.
[ 11/17/22 19:33:29.792 session_init FATAL ERROR ] Failed to get
configuration, usually mean you have specified invalid options.
[ 11/17/22 19:33:29.792 main FATAL ERROR ] Failed to create new session.
https://github.com/yshui/picom/releases/tag/v10-rc1 says we can use
the `legacy-backends' option or switch to the "egl" one, but neither
works for me:
$ picom --config /dev/null --vsync --backend glx --legacy-backends
[ 11/17/22 19:38:21.287 init_render ERROR ] GLX backend support not
compiled in.
[ 11/17/22 19:38:21.287 session_init FATAL ERROR ] Failed to initialize
the backend
$ picom --config /dev/null --vsync --backend egl
[ 11/17/22 19:35:26.762 get_cfg WARN ] The egl backend is still
experimental, use with care.
[ 11/17/22 19:35:26.762 get_cfg ERROR ] Backend "egl" is only available
as part of the legacy backends.
[ 11/17/22 19:35:26.762 session_init FATAL ERROR ] Failed to get
configuration, usually mean you have specified invalid options.
[ 11/17/22 19:35:26.762 main FATAL ERROR ] Failed to create new session.
So is this expected?
I can just drop the --backend option which makes picom run again, but
I don't know which backend it is using.
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/picom/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile 11 Mar 2022 20:16:55 -0000 1.7
+++ Makefile 17 Nov 2022 15:19:20 -0000
@@ -2,14 +2,14 @@ COMMENT = lightweight compositor for X11
GH_ACCOUNT = yshui
GH_PROJECT = picom
-GH_TAGNAME = v9.1
+GH_TAGNAME = v10
CATEGORIES = x11
# MPL 2.0
PERMIT_PACKAGE = Yes
-WANTLIB += GL X11 X11-xcb c config dbus-1 ev m pcre pixman-1
+WANTLIB += X11 X11-xcb c config dbus-1 ev m pcre pixman-1
WANTLIB += xcb-composite xcb-damage xcb-glx xcb-image xcb-present
WANTLIB += xcb-randr xcb-render-util xcb-render xcb-shape xcb-sync
WANTLIB += xcb-xfixes xcb-xinerama xcb
@@ -34,6 +34,13 @@ LIB_DEPENDS = devel/libconfig \
CONFIGURE_ARGS += -Dwith_docs=true \
-Dunittest=true \
-Dcompton=false
+
+# fails to build with:
+# ld: error: undefined symbol: glEGLImageTargetTexStorageEXT
+# >>> referenced by egl.c
+# >>> src/picom.p/backend_gl_egl.c.o:(egl_bind_pixmap)
+CONFIGURE_ARGS += -Dopengl=false
+
CONFIGURE_ENV += CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/picom/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo 14 Feb 2022 13:04:05 -0000 1.4
+++ distinfo 17 Nov 2022 15:00:49 -0000
@@ -1,2 +1,2 @@
-SHA256 (picom-9.1.tar.gz) = hwCscb1JbJEmLIV24pyzrs8rTvSMBDlKkpUJ08s3uH0=
-SIZE (picom-9.1.tar.gz) = 263924
+SHA256 (picom-10.tar.gz) = 6EAwTDKfB5cgWWMwKJTFXhHXfPUaIsCnIINEzm/Qojg=
+SIZE (picom-10.tar.gz) = 286728
Index: patches/patch-meson_build
===================================================================
RCS file: patches/patch-meson_build
diff -N patches/patch-meson_build
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-meson_build 17 Nov 2022 15:20:09 -0000
@@ -0,0 +1,24 @@
+- ignore git
+- autostart file in /etc/ needs PLIST @sample
+
+Index: meson.build
+--- meson.build.orig
++++ meson.build
+@@ -7,8 +7,7 @@ cc = meson.get_compiler('c')
+ version = 'v'+meson.project_version()
+
+ # use git describe if that's available
+-git = find_program('git', required: false)
+-if git.found()
++if false
+ gitv = run_command('git', 'rev-parse', '--short=5', 'HEAD', check:
false)
+ if gitv.returncode() == 0
+ version = 'vgit-'+gitv.stdout().strip()
+@@ -73,7 +72,6 @@ subdir('man')
+
+ install_data('bin/picom-trans', install_dir: get_option('bindir'))
+ install_data('picom.desktop', install_dir: 'share/applications')
+-install_data('picom.desktop', install_dir: get_option('sysconfdir') / 'xdg' /
'autostart')
+
+ if get_option('compton')
+ install_data('compton.desktop', install_dir: 'share/applications')
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/picom/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 11 Mar 2022 20:16:55 -0000 1.3
+++ pkg/PLIST 17 Nov 2022 15:06:27 -0000
@@ -3,6 +3,7 @@ bin/picom-trans
@man man/man1/picom-trans.1
@man man/man1/picom.1
share/applications/picom.desktop
+@sample ${SYSCONFDIR}/xdg/autostart/picom.desktop
share/examples/picom/
share/examples/picom/picom.sample.conf
share/icons/hicolor/48x48/apps/picom.png
