From nobody Fri Oct 11 19:14:28 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 4XQGX452Xsz5ZHZd; Fri, 11 Oct 2024 19:14:28 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XQGX44b9Hz46RM; Fri, 11 Oct 2024 19:14:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728674068; 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=2qx+srRwpxP3D7wEE2vNtFtl+wB1JtQOAF31jVOF7xc=; b=f5KKAlYqZHAc2ngjWDiOhnR25f/4M/AHyX4byIgZZG06rWlG6nAei08l+w4TEvcO7fajkb hzzqXWaNSqRLSyZnMUneCVSiV4GfTyNLkE0+dJGVNlRDpzuFu1k4/S+CVBI953bCl4PU8l Psgdd8hS+ajkq9P4s/csGhLZ39lv9xPrv0BCECvsm7ciSFOWxmvyAlpnc3TaHwsAyiJJhy IgtzG62vcvHeWgoaRSMsFFJMI8h1ejsG4AKaS7NjimmOwq4iCD/oSK1PMs4dXk4Ufvy3mj 3W98jeHMTm65W16jWsff5lQKJGF21+VFBuqkFM9a50Kfcwo/lHpq6Ny8nZN+UQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728674068; 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=2qx+srRwpxP3D7wEE2vNtFtl+wB1JtQOAF31jVOF7xc=; b=aJu7ep097trB6ReLy56mGxvX0hhIiQTJZsxIAZuPldkJDb1021kluwh5CD/X5kK//NUgFz d8rSv9j6btkH7TWbYGBXQV8a89jy7NGKGhmZ/NYJQrgUH9o3Y7Ezxx4QdShL0MK6dlziC5 g/Y9QPFe2ZlKOD1eagJFHVOZXGbZDtl2tmhjo8PsdtBTQUr6i/qgZKBOfRAQnYv95QB7GQ iQYWnsv3GHhhlzPscLQ/zi6r2+32aW1Kj2we3Habl4gAkXs82j9BDzPJ0xSILvFiSGz4/L AnUAMtupPVaQxm/46MYBW8wf3x6ZL+K7QdXsTJo6hMy2VlhFcFMGD4Q5EUWekQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728674068; a=rsa-sha256; cv=none; b=FAqQPSVnXfGVwe8I2l6dhRQKZ3lH6KbaLxJT5yuSHDbTJEpkqT620yVqM7QT3MeSBJv5kZ kKM8ytEFWOyNF5HO9W80+5+KjsV+0Bc+or9zp8Z7HWDSCKfj6d5pN7JG3mM09aQ6eyi18W S0HJxtubkRVr0+NKpZe1WHPolnyGx/OY+o/gzeSH2jrDPQz7FdpoZGY0gAkG+PPM/P1T8v Unzjmpp+KYUyhJHLS+HHFEYgObcOTdPbmuM9KpiyKXW5/dqyXN6Lbr+CZcRg55jI2QhjnF AY5HJdu7rkpgTC/RFtZ5kvhPcMDh5XpV9nrrn/VFoJF27N7X8TeK3CUvm+AGdQ== 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 4XQGX44BgLzv4v; Fri, 11 Oct 2024 19:14:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49BJESeK029822; Fri, 11 Oct 2024 19:14:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49BJESVU029819; Fri, 11 Oct 2024 19:14:28 GMT (envelope-from git) Date: Fri, 11 Oct 2024 19:14:28 GMT Message-Id: <202410111914.49BJESVU029819@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: 11c31a3bd07d - main - x11-wm/picom: Update 12.1 =?utf-8?Q?=E2=86=92?= 12.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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 11c31a3bd07d6d3a887b0c2cc04aae04f9dee9c9 Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=11c31a3bd07d6d3a887b0c2cc04aae04f9dee9c9 commit 11c31a3bd07d6d3a887b0c2cc04aae04f9dee9c9 Author: José Maldonado AuthorDate: 2024-10-11 19:13:11 +0000 Commit: Vladimir Druzenko CommitDate: 2024-10-11 19:13:11 +0000 x11-wm/picom: Update 12.1 → 12.2 Changelog: https://github.com/yshui/picom/releases/tag/v12.2 Upstream fixed build and work on 32-bit systems - remove local patches. PR: 282014 MFH: 2024Q4 --- x11-wm/picom/Makefile | 3 +-- x11-wm/picom/distinfo | 6 +++--- x11-wm/picom/files/patch-meson.build | 6 +++--- x11-wm/picom/files/patch-src_transition_script.h | 12 ------------ x11-wm/picom/files/patch-src_vblank.c | 12 ------------ x11-wm/picom/files/patch-src_wm_wm.h | 12 ------------ 6 files changed, 7 insertions(+), 44 deletions(-) diff --git a/x11-wm/picom/Makefile b/x11-wm/picom/Makefile index ddea986b420c..f503a145e964 100644 --- a/x11-wm/picom/Makefile +++ b/x11-wm/picom/Makefile @@ -1,7 +1,6 @@ PORTNAME= picom DISTVERSIONPREFIX= v -DISTVERSION= 12.1 -PORTREVISION= 1 +DISTVERSION= 12.2 CATEGORIES= x11-wm MAINTAINER= yukiteruamano@volfread.xyz diff --git a/x11-wm/picom/distinfo b/x11-wm/picom/distinfo index 73806133d558..627588ab94aa 100644 --- a/x11-wm/picom/distinfo +++ b/x11-wm/picom/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1727632550 -SHA256 (yshui-picom-v12.1_GH0.tar.gz) = d1aab4277e3a123c41621fa57c1ed66cc4a6553174a69e259d3027cf984c452c -SIZE (yshui-picom-v12.1_GH0.tar.gz) = 672958 +TIMESTAMP = 1728619456 +SHA256 (yshui-picom-v12.2_GH0.tar.gz) = c9c24e10ea57d740fc781b47bf5e423ab08216c3056c270a83de35a7f8317a28 +SIZE (yshui-picom-v12.2_GH0.tar.gz) = 673913 diff --git a/x11-wm/picom/files/patch-meson.build b/x11-wm/picom/files/patch-meson.build index ad737789a858..786ada675d26 100644 --- a/x11-wm/picom/files/patch-meson.build +++ b/x11-wm/picom/files/patch-meson.build @@ -1,5 +1,5 @@ # Configure PICOM_VERSION and PICOM_FULL_VERSION ---- meson.build.orig 2024-09-28 23:22:13 UTC +--- meson.build.orig 2024-10-10 12:00:52 UTC +++ meson.build @@ -3,33 +3,8 @@ cc = meson.get_compiler('c') @@ -32,8 +32,8 @@ -else - add_global_arguments('-DPICOM_FULL_VERSION="v'+meson.project_version()+'"', language: 'c') -endif -+add_global_arguments('-DPICOM_VERSION="v12.1"', language: 'c') -+add_global_arguments('-DPICOM_FULL_VERSION="v12.1"', language: 'c') ++add_global_arguments('-DPICOM_VERSION="v12.2"', language: 'c') ++add_global_arguments('-DPICOM_FULL_VERSION="v12.2"', language: 'c') if get_option('buildtype') == 'release' add_global_arguments('-DNDEBUG', language: 'c') diff --git a/x11-wm/picom/files/patch-src_transition_script.h b/x11-wm/picom/files/patch-src_transition_script.h deleted file mode 100644 index 0c74aa74a935..000000000000 --- a/x11-wm/picom/files/patch-src_transition_script.h +++ /dev/null @@ -1,12 +0,0 @@ -# Official fixes for 32-bit compilation ---- src/transition/script.h.orig 2024-09-28 23:22:13 UTC -+++ src/transition/script.h -@@ -45,8 +45,6 @@ typedef struct config_setting_t config_setting_t; - SCRIPT_EVAL_OK, - }; - typedef struct config_setting_t config_setting_t; --static_assert(alignof(double) > alignof(unsigned), "double/unsigned has unexpected " -- "alignment"); - - #define SCRIPT_CTX_PLACEHOLDER_BASE (0x40000000) - diff --git a/x11-wm/picom/files/patch-src_vblank.c b/x11-wm/picom/files/patch-src_vblank.c deleted file mode 100644 index b6f42d3023ef..000000000000 --- a/x11-wm/picom/files/patch-src_vblank.c +++ /dev/null @@ -1,12 +0,0 @@ -# Official fixes for 32-bit compilation ---- src/vblank.c.orig 2024-09-28 23:22:13 UTC -+++ src/vblank.c -@@ -409,7 +409,7 @@ static void handle_present_complete_notify(struct pres - - struct timespec now; - clock_gettime(CLOCK_MONOTONIC, &now); -- auto now_us = (unsigned long)(now.tv_sec * 1000000L + now.tv_nsec / 1000); -+ auto now_us = (uint64_t)now.tv_sec * 1000000UL + (uint64_t)now.tv_nsec / 1000; - - // X sometimes sends duplicate/bogus MSC events, when screen has just been turned - // off. Don't use the msc value in these events. We treat this as not receiving a diff --git a/x11-wm/picom/files/patch-src_wm_wm.h b/x11-wm/picom/files/patch-src_wm_wm.h deleted file mode 100644 index 7e84979d2cb8..000000000000 --- a/x11-wm/picom/files/patch-src_wm_wm.h +++ /dev/null @@ -1,12 +0,0 @@ -# Official fixes for 32-bit compilation ---- src/wm/wm.h.orig 2024-09-28 23:22:13 UTC -+++ src/wm/wm.h -@@ -63,7 +63,7 @@ typedef struct wm_treeid { - typedef struct wm_treeid { - /// The generation of the window ID. This is used to detect if the window ID is - /// reused. Inherited from the wm_tree at cr -- uint64_t gen; -+ alignas(8) uint64_t gen; - /// The X window ID. - xcb_window_t x; -