diff --git a/x11-wm/picom/Makefile b/x11-wm/picom/Makefile index ed8eae9867b1..5586185cfc07 100644 --- a/x11-wm/picom/Makefile +++ b/x11-wm/picom/Makefile @@ -1,74 +1,72 @@ PORTNAME= picom DISTVERSIONPREFIX= v -DISTVERSION= 11.1 -PORTREVISION= 1 +DISTVERSION= 11.2 CATEGORIES= x11-wm MAINTAINER= jbeich@FreeBSD.org COMMENT= Lightweight X11 compositor WWW= https://github.com/yshui/picom 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 USES= compiler:c11 meson localbase pkgconfig xorg USE_GITHUB= yes USE_XORG= x11 xcb xext pixman GH_ACCOUNT= yshui MESON_ARGS= -Dcompton=false -Dunittest=true TEST_TARGET= test PLIST_FILES= bin/${PORTNAME} \ bin/${PORTNAME}-trans \ etc/xdg/autostart/${PORTNAME}.desktop \ "@sample etc/xdg/${PORTNAME}.conf.sample" \ share/applications/${PORTNAME}.desktop OPTIONS_DEFINE= CONFIG DBUS DOCS DRM OPENGL PCRE OPTIONS_DEFAULT=CONFIG DBUS OPENGL PCRE CONFIG_DESC= Configuration file parsing support CONFIG_LIB_DEPENDS= libconfig.so:devel/libconfig CONFIG_MESON_TRUE= config_file PCRE_LIB_DEPENDS= libpcre2-8.so:devel/pcre2 PCRE_MESON_TRUE= regex DRM_DESC= DRM VSync fallback (deprecated) DRM_LIB_DEPENDS= libdrm.so:graphics/libdrm DRM_MESON_TRUE= vsync_drm -OPENGL_USES= gl -OPENGL_USE= GL=egl,gl +OPENGL_LIB_DEPENDS= libepoxy.so:graphics/libepoxy OPENGL_MESON_TRUE= opengl DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus DBUS_MESON_TRUE= dbus DOCS_BUILD_DEPENDS= a2x:textproc/asciidoc DOCS_MESON_TRUE= with_docs DOCS_PLIST_FILES= share/man/man1/${PORTNAME}.1.gz \ share/man/man1/${PORTNAME}-trans.1.gz post-patch: @${REINPLACE_CMD} -e 's,/etc,${PREFIX}&,' \ ${WRKSRC}/man/${PORTNAME}.1.asciidoc \ ${WRKSRC}/src/config.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 diff --git a/x11-wm/picom/distinfo b/x11-wm/picom/distinfo index b3e7e7838e92..9339fad45321 100644 --- a/x11-wm/picom/distinfo +++ b/x11-wm/picom/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1706465839 -SHA256 (yshui-picom-v11.1_GH0.tar.gz) = 96f2a33a93064a74b557942d0300a2ac77ac853f50efbbf6466849fcc7542ec8 -SIZE (yshui-picom-v11.1_GH0.tar.gz) = 308617 +TIMESTAMP = 1707820562 +SHA256 (yshui-picom-v11.2_GH0.tar.gz) = 1c1063936faf09ed9bba726e7737a562564b7a5f8cdef79d48fcdaf3669a4df4 +SIZE (yshui-picom-v11.2_GH0.tar.gz) = 308679 diff --git a/x11-wm/picom/files/patch-rtprio b/x11-wm/picom/files/patch-rtprio index e4d20a12c732..4cf46a51d618 100644 --- a/x11-wm/picom/files/patch-rtprio +++ b/x11-wm/picom/files/patch-rtprio @@ -1,54 +1,87 @@ https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=276962 -https://github.com/yshui/picom/commit/023103c62074 https://github.com/yshui/picom/commit/dff77aae27cf ---- src/meson.build.orig 2024-01-28 18:17:19 UTC +--- src/meson.build.orig 2024-02-13 10:36:02 UTC +++ src/meson.build @@ -23,7 +23,7 @@ required_packages = [ # Some XCB packages are here because their versioning differs (see check below). required_packages = [ 'pixman-1', 'x11', 'x11-xcb', 'xcb-image', 'xcb-renderutil', 'xcb-util', - 'xext' + 'xext', 'threads', ] foreach i : required_packages @@ -59,7 +59,7 @@ if get_option('opengl') if get_option('opengl') - cflags += ['-DCONFIG_OPENGL', '-DGL_GLEXT_PROTOTYPES'] -- deps += [dependency('gl', required: true), dependency('egl', required: true), dependency('threads', required:true)] -+ deps += [dependency('gl', required: true), dependency('egl', required: true)] + cflags += ['-DCONFIG_OPENGL'] +- deps += [dependency('epoxy', required: true), dependency('threads', required:true)] ++ deps += [dependency('epoxy', required: true)] srcs += [ 'opengl.c' ] endif ---- src/picom.c.orig 2024-01-28 18:17:19 UTC +@@ -84,10 +84,6 @@ elif (host_system == 'freebsd' or host_system == 'netb + elif (host_system == 'freebsd' or host_system == 'netbsd' or + host_system == 'dragonfly' or host_system == 'openbsd') + cflags += ['-DHAS_KQUEUE'] +-endif +- +-if host_system == 'openbsd' +- deps += [dependency('threads', required: true)] + endif + + subdir('backend') +--- src/picom.c.orig 2024-02-13 10:36:02 UTC +++ src/picom.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include -@@ -2557,15 +2558,16 @@ void set_rr_scheduling(void) { +@@ -33,9 +34,6 @@ + #include + #include + #include +-#ifdef __OpenBSD__ +-#include +-#endif + + #include + #include +@@ -2606,14 +2604,8 @@ void set_rr_scheduling(void) { int ret; struct sched_param param; - +-#ifndef __OpenBSD__ - ret = sched_getparam(0, ¶m); -+ int old_policy; -+ ret = pthread_getschedparam(pthread_self(), &old_policy, ¶m); +-#else + int old_policy; + ret = pthread_getschedparam(pthread_self(), &old_policy, ¶m); +-#endif +- if (ret != 0) { log_debug("Failed to get old scheduling priority"); return; - } +@@ -2621,16 +2613,12 @@ void set_rr_scheduling(void) { param.sched_priority = priority; + +-#ifndef __OpenBSD__ - ret = sched_setscheduler(0, SCHED_RR, ¶m); -+ -+ ret = pthread_setschedparam(pthread_self(), SCHED_RR, ¶m); +-#else + ret = pthread_setschedparam(pthread_self(), SCHED_RR, ¶m); +-#endif +- if (ret != 0) { log_info("Failed to set real-time scheduling priority to %d.", priority); return; + } ++ + log_info("Set real-time scheduling priority to %d", priority); + } +