From nobody Fri Oct 04 21:03:34 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 4XL1HC0P8zz5YLj8; Fri, 04 Oct 2024 21:03:35 +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 4XL1HB6svnz4WvK; Fri, 4 Oct 2024 21:03:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728075815; 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=JW4I//4+5IoxLDEKZMICmC8kSp6yKaxOobDXF8ASkWw=; b=Yxx6CbsI/j0+oIudZo9BJNKdcwfULcBKTjC0WRd8i1tjNRg84zeQPdC+nh38CXXK1+ufCB kWBarjoOCiYnT2Ac2Vhxx5oti04qJYNPQ7biGDku71d2940gWgMHDTklv9NJuuzsaKHp68 qZGoTZ6KTi007ZZtgBjZZ8drGxzNasWNkNu7WL5cNpR3TcXdHpYI+BvIY3at0Ck5XvhCBB dQKsfNEq4fMu5dohcPBHQ2xWsUr54beSYgwI09lT0KtkUkM9R1wW1sl+rmrUhVk7271zWu LBEA/hYEh1sAMj708+In5LJasVmzV3/lBDlNz5at73dlSLclAX1RKG2xRY8YsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728075815; 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=JW4I//4+5IoxLDEKZMICmC8kSp6yKaxOobDXF8ASkWw=; b=iF3Zpa4oyNIHaRvh9NrclYsBy+lrTcJQEB9Z2z1g7FHgsmayY9KX92P2odPUu3VQcndf6h 4X5LEWpoul68Y9gcM4ddMV9NsNzI2FtSunwx9WXmiOoQvCONZ2/ysLCKm7/zfnoqx9NzX5 vJbhgyK1qW9kda/k3V3kqD2aW3KGdr2UHintiCYdDcW8EQmpW9m8TsIGyrsEXSqZYzX7rO xbHYMNi5B4ICDXadQrcvFDr/QMtOMkn9RIj6nN21Wb1Kc7Lu6IsmAYnKmbN/JRoxTuM7oW 6R765iQCStELmRfiWTQOhPG3iEAeKSofDDXVD5hBs8P2c1eemzGpjBR5yG/LVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728075815; a=rsa-sha256; cv=none; b=mWpXyaojzsFqwXkB4IBKwfkik/3t07wBZUdB/h9DUmZrvknNc52EwFbhYGs5SXWaReDkjN FpHX3M55OwsAkFvbfaMZYEsiUEB4scv0Ud9PGgNpiFNzG45PgvxvtvwJ2CKJ6KWA+QRiXl CUhkNDgnW0m3usinyqjzqEDQeSfjTIgXI/9JI246nxsJODN6fmlSHcSupoH0d92e4QIRuj dqLrxIgef+a9SeJP5HXSCC+KZiys4YhYV13FO9/zxgxEEe3xfVgcakFzsZEGQlUMhqbF24 AvBryKBkkgi+Yp9ehmeSDAlvaBoQ+rR5IJXmvJhH6QTzkHBQuwpO0cm2mVtnOA== 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 4XL1HB6TBQzqys; Fri, 4 Oct 2024 21:03:34 +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 494L3Y5D074186; Fri, 4 Oct 2024 21:03:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 494L3Y7w074183; Fri, 4 Oct 2024 21:03:34 GMT (envelope-from git) Date: Fri, 4 Oct 2024 21:03:34 GMT Message-Id: <202410042103.494L3Y7w074183@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jose Alonso Cardenas Marquez Subject: git: 7a3215f73258 - main - x11-wm/picom: fix compilation on 32-bit systems 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: acm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7a3215f732589cafae2c92735de60c7c98aace68 Auto-Submitted: auto-generated The branch main has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=7a3215f732589cafae2c92735de60c7c98aace68 commit 7a3215f732589cafae2c92735de60c7c98aace68 Author: José Maldonado AuthorDate: 2024-10-04 21:02:12 +0000 Commit: Jose Alonso Cardenas Marquez CommitDate: 2024-10-04 21:02:12 +0000 x11-wm/picom: fix compilation on 32-bit systems - Bump PORTREVISION PR: 281830 Reported by: maintainer --- x11-wm/picom/Makefile | 1 + 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 ++++++++++++ 4 files changed, 37 insertions(+) diff --git a/x11-wm/picom/Makefile b/x11-wm/picom/Makefile index 7fb80301e60f..ddea986b420c 100644 --- a/x11-wm/picom/Makefile +++ b/x11-wm/picom/Makefile @@ -1,6 +1,7 @@ PORTNAME= picom DISTVERSIONPREFIX= v DISTVERSION= 12.1 +PORTREVISION= 1 CATEGORIES= x11-wm MAINTAINER= yukiteruamano@volfread.xyz diff --git a/x11-wm/picom/files/patch-src_transition_script.h b/x11-wm/picom/files/patch-src_transition_script.h new file mode 100644 index 000000000000..0c74aa74a935 --- /dev/null +++ b/x11-wm/picom/files/patch-src_transition_script.h @@ -0,0 +1,12 @@ +# 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 new file mode 100644 index 000000000000..b6f42d3023ef --- /dev/null +++ b/x11-wm/picom/files/patch-src_vblank.c @@ -0,0 +1,12 @@ +# 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 new file mode 100644 index 000000000000..7e84979d2cb8 --- /dev/null +++ b/x11-wm/picom/files/patch-src_wm_wm.h @@ -0,0 +1,12 @@ +# 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; +