From nobody Tue Feb 13 16:08:16 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TZ5pS2bRrz598B1; Tue, 13 Feb 2024 16:08:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TZ5pS24r1z4j7R; Tue, 13 Feb 2024 16:08:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707840496; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=66O8oAED6f4C+2rau98y5vMiAQm7z4qPpYF6jQBwRcg=; b=lQqW5HPlCHJq8RV7owQ8wo5L4Nw4UahqRUGbRoNodUX4gbO66nmJ5nLJCsL2Pew4L1vPIB lnBWRD3YEPOYljVMDoNPl2/tV/S6t5JblP0NQ9mU4YfIi6A0PquCl6ZOI8VhkiD7wWpr4E 4RhQjH9Hzw15tE44KIWsfvnEEjp1nJaUZUnYYIfe+1V8oNqk5H0fvV+gAAqIBdgEqrN0Bw xKeUL5aB7wJGO+o/PpkWBzH8Fwf+zLPFZRVY2QSUH38wcDFPLObirV+L/lYJo3J4O1U8Ez RDU89xfDqAIJbx6sixneCsyuP7Jt1gDhl8fPJowTpWH+6sCd+SeL8nlUvVgHQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707840496; a=rsa-sha256; cv=none; b=hewQrlGmWifpRauaH6MHayoPXwuaidk+p5/+DHXjvMJNZn1WyRgXBHD07ZLiDKuTskEZAq 31bYO+zOLNsTEJ1BEJy7mHE746nUvIFEBQ4hHUB8EQ3KhGxSHRlfeKThKVA1H+LNYn5Naz Op/AoH20YMHk2ry8UhI49Zv7AizjExO2InPWXCf4Cqtd7iw5ePutGEen+LsVb5Vmz3bU3q Qg+0ptIkEWWxMabNC/Lx5VQrdZipk9uwTKQ7QH45JraGSJ7+iED9ZPvRyPgZcwJaZUWFON 0EFazUC6TJIV7mzp6VYkVOIBWDNNvkcjVWNSolBeizDGOabA6X7+K679f49Obg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707840496; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=66O8oAED6f4C+2rau98y5vMiAQm7z4qPpYF6jQBwRcg=; b=BGmunvdXvQNodboXxXCw0rnQJKyAW9B/N3AVVC09nYe7eq9HuL2vdOAFCjRPTbsjmqx7Go MjmmDwI4RwhZew2+/Bw0rKvwclLINIGwbFO+eO2FW0hQbO2fUzp3059KhHmdOqc3XA4WBG wjQxoo3v/cZoBnk+FwEY9nTulM7eEdtQHmpU396w5twmjY0IbiTAQmJca8QIdOdqbEDRxl o1BZcBK9uj55gjkFvjS8R0UC02R4rXnr4McFQTHsYrdMhFeg17vL0k/qdFuBGWFMj7MrDg O4ukLPd+NiHkIJb2zmNVU2/zqCfpqzVM4NTppDrtrzUvVaZZl7+Lcs0yRGhx4A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TZ5pS17f9zM2Z; Tue, 13 Feb 2024 16:08:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41DG8GRS070395; Tue, 13 Feb 2024 16:08:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41DG8GBm070392; Tue, 13 Feb 2024 16:08:16 GMT (envelope-from git) Date: Tue, 13 Feb 2024 16:08:16 GMT Message-Id: <202402131608.41DG8GBm070392@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 52e26b406ae2 - main - x11-wm/picom: update to 11.2 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 52e26b406ae207aaf0cad205e003563fbb5e3728 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=52e26b406ae207aaf0cad205e003563fbb5e3728 commit 52e26b406ae207aaf0cad205e003563fbb5e3728 Author: Jan Beich AuthorDate: 2024-02-13 10:36:02 +0000 Commit: Jan Beich CommitDate: 2024-02-13 16:08:02 +0000 x11-wm/picom: update to 11.2 Changes: https://github.com/yshui/picom/releases/v11.2 Reported by: GitHub (watch releases) --- x11-wm/picom/Makefile | 6 ++--- x11-wm/picom/distinfo | 6 ++--- x11-wm/picom/files/patch-rtprio | 57 ++++++++++++++++++++++++++++++++--------- 3 files changed, 50 insertions(+), 19 deletions(-) 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,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 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,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 @@ -32,23 +42,46 @@ https://github.com/yshui/picom/commit/dff77aae27cf #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); + } +