1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-16 07:58:04 +00:00

x11-wm/picom: update to 11.2

Changes:	https://github.com/yshui/picom/releases/v11.2
Reported by:	GitHub (watch releases)
This commit is contained in:
Jan Beich 2024-02-13 11:36:02 +01:00
parent ae3d385524
commit 52e26b406a
3 changed files with 50 additions and 19 deletions

View File

@ -1,7 +1,6 @@
PORTNAME= picom
DISTVERSIONPREFIX= v
DISTVERSION= 11.1
PORTREVISION= 1
DISTVERSION= 11.2
CATEGORIES= x11-wm
MAINTAINER= jbeich@FreeBSD.org
@ -45,8 +44,7 @@ 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

View File

@ -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

View File

@ -1,8 +1,7 @@
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).
@ -16,13 +15,24 @@ https://github.com/yshui/picom/commit/dff77aae27cf
@@ -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 <fcntl.h>
@ -32,23 +42,46 @@ https://github.com/yshui/picom/commit/dff77aae27cf
#include <sched.h>
#include <stddef.h>
#include <stdio.h>
@@ -2557,15 +2558,16 @@ void set_rr_scheduling(void) {
@@ -33,9 +34,6 @@
#include <xcb/render.h>
#include <xcb/sync.h>
#include <xcb/xfixes.h>
-#ifdef __OpenBSD__
-#include <pthread.h>
-#endif
#include <ev.h>
#include <test.h>
@@ -2606,14 +2604,8 @@ void set_rr_scheduling(void) {
int ret;
struct sched_param param;
-
-#ifndef __OpenBSD__
- ret = sched_getparam(0, &param);
+ int old_policy;
+ ret = pthread_getschedparam(pthread_self(), &old_policy, &param);
-#else
int old_policy;
ret = pthread_getschedparam(pthread_self(), &old_policy, &param);
-#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, &param);
+
+ ret = pthread_setschedparam(pthread_self(), SCHED_RR, &param);
-#else
ret = pthread_setschedparam(pthread_self(), SCHED_RR, &param);
-#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);
}