Attachment #253974 for bug #281830

View | Details | Raw Unified | Return to bug 281830
Collapse All | Expand All

Lines 1-6 Link Here

(-)b/x11-wm/picom/Makefile (+1 lines)
1	PORTNAME= picom	1	PORTNAME= picom
2	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
3	DISTVERSION= 12.1	3	DISTVERSION= 12.1
		4	PORTREVISION= 1
4	CATEGORIES= x11-wm	5	CATEGORIES= x11-wm
5		6
6	MAINTAINER= yukiteruamano@volfread.xyz	7	MAINTAINER= yukiteruamano@volfread.xyz




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




# 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




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

Return to bug 281830

Added Link Here

(-)b/x11-wm/picom/files/patch-src_transition_script.h (+12 lines)
1	# Official fixes for 32-bit compilation
2	--- src/transition/script.h.orig 2024-09-28 23:22:13 UTC
3	+++ src/transition/script.h
4	@@ -45,8 +45,6 @@ typedef struct config_setting_t config_setting_t;
5	SCRIPT_EVAL_OK,
6	};
7	typedef struct config_setting_t config_setting_t;
8	-static_assert(alignof(double) > alignof(unsigned), "double/unsigned has unexpected "
9	- "alignment");
10
11	#define SCRIPT_CTX_PLACEHOLDER_BASE (0x40000000)
12

Added Link Here

(-)b/x11-wm/picom/files/patch-src_vblank.c (+12 lines)
1	# Official fixes for 32-bit compilation
2	--- src/vblank.c.orig 2024-09-28 23:22:13 UTC
3	+++ src/vblank.c
4	@@ -409,7 +409,7 @@ static void handle_present_complete_notify(struct pres
5
6	struct timespec now;
7	clock_gettime(CLOCK_MONOTONIC, &now);
8	- auto now_us = (unsigned long)(now.tv_sec * 1000000L + now.tv_nsec / 1000);
9	+ auto now_us = (uint64_t)now.tv_sec * 1000000UL + (uint64_t)now.tv_nsec / 1000;
10
11	// X sometimes sends duplicate/bogus MSC events, when screen has just been turned
12	// off. Don't use the msc value in these events. We treat this as not receiving a

Added Link Here

(-)b/x11-wm/picom/files/patch-src_wm_wm.h (-1 / +12 lines)
0	-	1	# Official fixes for 32-bit compilation
		2	--- src/wm/wm.h.orig 2024-09-28 23:22:13 UTC
		3	+++ src/wm/wm.h
		4	@@ -63,7 +63,7 @@ typedef struct wm_treeid {
		5	typedef struct wm_treeid {
		6	/// The generation of the window ID. This is used to detect if the window ID is
		7	/// reused. Inherited from the wm_tree at cr
		8	- uint64_t gen;
		9	+ alignas(8) uint64_t gen;
		10	/// The X window ID.
		11	xcb_window_t x;
		12