mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-12 07:27:57 +00:00
Code Issues Releases Activity

x11-wm/picom: Update 12.1 → 12.2

Browse Source 
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
This commit is contained in:
José Maldonado 2024-10-11 22:13:11 +03:00 committed by Vladimir Druzenko
parent fbf656754e
commit 11c31a3bd0
6 changed files with 7 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
x11-wm/picom/Makefile
View File

@ -1,7 +1,6 @@
PORTNAME= picom
DISTVERSIONPREFIX= v
DISTVERSION= 12.1
PORTREVISION= 1
DISTVERSION= 12.2
CATEGORIES= x11-wm
MAINTAINER= yukiteruamano@volfread.xyz

6
x11-wm/picom/distinfo
View File

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

6
x11-wm/picom/files/patch-meson.build
View File

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

12
x11-wm/picom/files/patch-src_transition_script.h
View File

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

12
x11-wm/picom/files/patch-src_vblank.c
View File

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

12
x11-wm/picom/files/patch-src_wm_wm.h
View File

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