* [gentoo-commits] repo/gentoo:master commit in: app-misc/ddcutil/files/
@ 2023-07-03 5:14 Robin H. Johnson
0 siblings, 0 replies; 5+ messages in thread
From: Robin H. Johnson @ 2023-07-03 5:14 UTC (permalink / raw
To: gentoo-commits
commit: 2675cfc6a2bafffec57e4067215403e56fd42e75
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 3 05:14:01 2023 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Jul 3 05:14:01 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2675cfc6
app-misc/ddcutil: fix -Werror again
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
Closes: https://bugs.gentoo.org/909501
app-misc/ddcutil/files/ddcutil-1.4.1-no-werror.patch | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/app-misc/ddcutil/files/ddcutil-1.4.1-no-werror.patch b/app-misc/ddcutil/files/ddcutil-1.4.1-no-werror.patch
index dc7954960649..07897eb74e80 100644
--- a/app-misc/ddcutil/files/ddcutil-1.4.1-no-werror.patch
+++ b/app-misc/ddcutil/files/ddcutil-1.4.1-no-werror.patch
@@ -12,3 +12,14 @@ index c12f15c..27d2124 100644
CLEANFILES = \
*expand
+--- ddcutil-1.4.1/configure.ac.orig 2023-07-02 22:11:20.601695946 -0700
++++ ddcutil-1.4.1/configure.ac 2023-07-02 22:11:41.306685606 -0700
+@@ -63,7 +63,7 @@
+ AC_ARG_VAR(DBG, [Turn on script debugging messages(0/1)])
+ dnl AC_MSG_NOTICE([DBG = |$DBG|])
+
+-AM_CONDITIONAL(WARNINGS_ARE_ERRORS_COND, [test "x$ddcutil_version_suffix" != "x"] )
++AM_CONDITIONAL(WARNINGS_ARE_ERRORS_COND, 0)
+
+ AS_IF( [test 0$DBG -ne 0],
+ AC_MSG_NOTICE([debug messages enabled]),
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/ddcutil/files/
@ 2024-02-17 14:35 David Seifert
0 siblings, 0 replies; 5+ messages in thread
From: David Seifert @ 2024-02-17 14:35 UTC (permalink / raw
To: gentoo-commits
commit: 458f6c886bf188821f252e53824ff0cd23b0ca33
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Feb 17 14:35:12 2024 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Feb 17 14:35:12 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=458f6c88
app-misc/ddcutil: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
...2.1.0-fix-build-with-usb-monitor-disabled.patch | 34 ----------------------
1 file changed, 34 deletions(-)
diff --git a/app-misc/ddcutil/files/ddcutil-2.1.0-fix-build-with-usb-monitor-disabled.patch b/app-misc/ddcutil/files/ddcutil-2.1.0-fix-build-with-usb-monitor-disabled.patch
deleted file mode 100644
index 199bf1b1563b..000000000000
--- a/app-misc/ddcutil/files/ddcutil-2.1.0-fix-build-with-usb-monitor-disabled.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From a3ad6164977d250cc03d6bb33719814ee34efdfb Mon Sep 17 00:00:00 2001
-From: Sanford Rockowitz <rockowitz@minsoft.com>
-Date: Mon, 22 Jan 2024 18:58:34 -0500
-Subject: [PATCH] missing ifdef around USB only setting (fixes #369)
-
----
- src/cmdline/parsed_cmd.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/cmdline/parsed_cmd.c b/src/cmdline/parsed_cmd.c
-index a4e2c080..f5f6ac85 100644
---- a/src/cmdline/parsed_cmd.c
-+++ b/src/cmdline/parsed_cmd.c
-@@ -135,8 +135,10 @@ Parsed_Cmd * new_parsed_cmd() {
- g_array_set_clear_func(parsed_cmd->setvcp_values, destroy_parsed_setvcp_value);
- if (DEFAULT_ENABLE_UDF)
- parsed_cmd->flags |= CMD_FLAG_ENABLE_UDF;
-+#ifdef ENABLE_USB
- if (DEFAULT_ENABLE_USB)
- parsed_cmd->flags |= CMD_FLAG_ENABLE_USB;
-+#endif
- if (DEFAULT_ENABLE_CACHED_CAPABILITIES)
- parsed_cmd->flags |= CMD_FLAG_ENABLE_CACHED_CAPABILITIES;
- return parsed_cmd;
-@@ -248,7 +250,9 @@ void dbgrpt_parsed_cmd(Parsed_Cmd * parsed_cmd, int depth) {
-
- rpt_nl();
- rpt_label(depth, "Display Selection");
-+#ifdef ENABLE_USB
- rpt_bool("enable usb", NULL, parsed_cmd->flags & CMD_FLAG_ENABLE_USB, d1);
-+#endif
- rpt_structure_loc("pdid", parsed_cmd->pdid, d1);
- if (parsed_cmd->pdid)
- dbgrpt_display_identifier(parsed_cmd->pdid, d2);
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/ddcutil/files/
@ 2024-03-31 16:27 Robin H. Johnson
0 siblings, 0 replies; 5+ messages in thread
From: Robin H. Johnson @ 2024-03-31 16:27 UTC (permalink / raw
To: gentoo-commits
commit: b7e21df46f74f27f04c332e2ae01864b3390d1d0
Author: Matthew White <mehw.is.me <AT> inventati <DOT> org>
AuthorDate: Sun Mar 31 08:29:53 2024 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Mar 31 16:27:02 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7e21df4
app-misc/ddcutil: fix command not found error
Fixes:
* QA Notice: command not found:
*
* ./configure: line 2975: 0: command not found
Closes: https://bugs.gentoo.org/922205
Package-Manager: portage-3.0.63
Signed-off-by: Matthew White <mehw.is.me <AT> inventati.org>
X-cherry-picked: 0eb622b9779318b160ed865c095d3bdd4508d96c)
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/36012
app-misc/ddcutil/files/ddcutil-1.4.1-no-werror.patch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-misc/ddcutil/files/ddcutil-1.4.1-no-werror.patch b/app-misc/ddcutil/files/ddcutil-1.4.1-no-werror.patch
index 07897eb74e80..deabd2bfedbc 100644
--- a/app-misc/ddcutil/files/ddcutil-1.4.1-no-werror.patch
+++ b/app-misc/ddcutil/files/ddcutil-1.4.1-no-werror.patch
@@ -19,7 +19,7 @@ index c12f15c..27d2124 100644
dnl AC_MSG_NOTICE([DBG = |$DBG|])
-AM_CONDITIONAL(WARNINGS_ARE_ERRORS_COND, [test "x$ddcutil_version_suffix" != "x"] )
-+AM_CONDITIONAL(WARNINGS_ARE_ERRORS_COND, 0)
++AM_CONDITIONAL(WARNINGS_ARE_ERRORS_COND, [test 0])
AS_IF( [test 0$DBG -ne 0],
AC_MSG_NOTICE([debug messages enabled]),
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/ddcutil/files/
@ 2025-01-10 21:45 Ionen Wolkens
0 siblings, 0 replies; 5+ messages in thread
From: Ionen Wolkens @ 2025-01-10 21:45 UTC (permalink / raw
To: gentoo-commits
commit: 81cf3a3b8587d21c42466e840e6f82c2f2382c4c
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Fri Jan 10 15:57:06 2025 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Jan 10 21:41:38 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81cf3a3b
app-misc/ddcutil: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
.../ddcutil/files/ddcutil-1.2.2-no-werror.patch | 41 ----------------------
...2.0.0-fix-build-with-usb-monitor-disabled.patch | 22 ------------
2 files changed, 63 deletions(-)
diff --git a/app-misc/ddcutil/files/ddcutil-1.2.2-no-werror.patch b/app-misc/ddcutil/files/ddcutil-1.2.2-no-werror.patch
deleted file mode 100644
index caedb9922d27..000000000000
--- a/app-misc/ddcutil/files/ddcutil-1.2.2-no-werror.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/src/adl/Makefile.am
-+++ b/src/adl/Makefile.am
-@@ -6,7 +6,6 @@ AM_CPPFLAGS = \
- AM_CPPFLAGS += -I@ADL_HEADER_DIR@
-
- AM_CFLAGS = -Wall
--AM_CFLAGS += -Werror
-
- if ENABLE_CALLGRAPH_COND
- AM_CFLAGS += -fdump-rtl-expand
---- a/src/app_sysenv/Makefile.am
-+++ b/src/app_sysenv/Makefile.am
-@@ -12,7 +12,6 @@ endif
-
-
- AM_CFLAGS = -Wall
--AM_CFLAGS += -Werror
- # AM_CFLAGS += -Wpedantic
-
- if ENABLE_CALLGRAPH_COND
---- a/src/i2c/Makefile.am
-+++ b/src/i2c/Makefile.am
-@@ -4,7 +4,6 @@ AM_CPPFLAGS = \
- -I$(top_srcdir)/src/public
-
- AM_CFLAGS = -Wall
--AM_CFLAGS += -Werror
- # AM_CFLAGS += -Wpedantic
-
- if ENABLE_CALLGRAPH_COND
---- a/src/test/Makefile.am
-+++ b/src/test/Makefile.am
-@@ -4,7 +4,7 @@ $(GLIB_CFLAGS) \
- -I$(top_srcdir)/src \
- -I$(top_srcdir)/src/public
-
--AM_CFLAGS = -Wall -Werror
-+AM_CFLAGS = -Wall
-
- CLEANFILES = \
- *expand
diff --git a/app-misc/ddcutil/files/ddcutil-2.0.0-fix-build-with-usb-monitor-disabled.patch b/app-misc/ddcutil/files/ddcutil-2.0.0-fix-build-with-usb-monitor-disabled.patch
deleted file mode 100644
index 3fc988eac350..000000000000
--- a/app-misc/ddcutil/files/ddcutil-2.0.0-fix-build-with-usb-monitor-disabled.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://bugs.gentoo.org/918124
-https://github.com/rockowitz/ddcutil/commit/4e2681a89fc5ba1ab5f909e30baf9eef0c99e5bd
-diff --git a/src/cmdline/cmd_parser_goption.c b/src/cmdline/cmd_parser_goption.c
-index 342d7b03..5168861f 100644
---- a/src/cmdline/cmd_parser_goption.c
-+++ b/src/cmdline/cmd_parser_goption.c
-@@ -1604,6 +1604,7 @@ parse_command(
- FREE(fl2_work);
- }
-
-+#ifdef USE_USB
- if (ignored_vid_pid) {
- int ndx = 0;
- for (char * cur = ignored_vid_pid[ndx]; cur && ndx < 10; cur=ignored_vid_pid[++ndx]) {
-@@ -1630,6 +1631,7 @@ parse_command(
- ntsa_free(ignored_vid_pid,true);
- ignored_vid_pid = NULL;
- }
-+#endif
-
- if (sleep_multiplier_work) {
- float multiplier = 0.0f;
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/ddcutil/files/
@ 2025-03-01 21:36 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2025-03-01 21:36 UTC (permalink / raw
To: gentoo-commits
commit: d0d08b8ad9215bbde888a1d08f3d9ec052667884
Author: Kostadin Shishmanov <kostadinshishmanov <AT> protonmail <DOT> com>
AuthorDate: Sat Mar 1 16:10:49 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 1 21:35:36 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0d08b8a
app-misc/ddcutil: fix patch for USE=-X
Turns out upstream didn't completely solve the issue and ddcutil
still failed to build on systems where X was not installed.
Bug: https://bugs.gentoo.org/950320
Signed-off-by: Kostadin Shishmanov <kostadinshishmanov <AT> protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/40832
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/ddcutil-2.2.0-fix-build-without-X.patch | 145 ++++++++++++++++++---
1 file changed, 129 insertions(+), 16 deletions(-)
diff --git a/app-misc/ddcutil/files/ddcutil-2.2.0-fix-build-without-X.patch b/app-misc/ddcutil/files/ddcutil-2.2.0-fix-build-without-X.patch
index b8e8b2d75c06..172e704c543f 100644
--- a/app-misc/ddcutil/files/ddcutil-2.2.0-fix-build-without-X.patch
+++ b/app-misc/ddcutil/files/ddcutil-2.2.0-fix-build-without-X.patch
@@ -10,15 +10,17 @@ Subject: [PATCH] build with configure option --disable-x11
eliminates watch-mode XEVENT
addresses issue #504
+
---
src/base/parms.h | 6 +++++-
src/cmdline/cmd_parser_goption.c | 12 ++++++++++++
src/dw/Makefile.am | 10 ++++++++--
- src/dw/dw_common.c | 2 ++
- src/dw/dw_main.c | 14 ++++++++++++++
- src/dw/dw_poll.c | 4 ++++
+ src/dw/dw_common.c | 4 ++++
+ src/dw/dw_common.h | 6 +++++-
+ src/dw/dw_main.c | 31 ++++++++++++++++++++++++++++++-
+ src/dw/dw_poll.c | 6 ++++++
src/dw/dw_services.c | 4 ++++
- 7 files changed, 49 insertions(+), 3 deletions(-)
+ 8 files changed, 74 insertions(+), 5 deletions(-)
diff --git a/src/base/parms.h b/src/base/parms.h
index 3a8fbdd5..fcfac321 100644
@@ -125,7 +127,7 @@ index 0327f1af..063beef4 100644
# Rename to "all=local" for development
diff --git a/src/dw/dw_common.c b/src/dw/dw_common.c
-index 62f87226..29c4ff75 100644
+index 62f87226..ddb456e3 100644
--- a/src/dw/dw_common.c
+++ b/src/dw/dw_common.c
@@ -59,7 +59,9 @@
@@ -138,8 +140,45 @@ index 62f87226..29c4ff75 100644
#include "dw_common.h"
+@@ -132,7 +134,9 @@ void dw_free_watch_displays_data(Watch_Displays_Data * wdd) {
+ if (wdd) {
+ assert( memcmp(wdd->marker, WATCH_DISPLAYS_DATA_MARKER, 4) == 0 );
+ wdd->marker[3] = 'x';
++#ifdef USE_X11
+ free(wdd->evdata);
++#endif
+ free(wdd);
+ }
+ }
+diff --git a/src/dw/dw_common.h b/src/dw/dw_common.h
+index bd310923..e12ca63e 100644
+--- a/src/dw/dw_common.h
++++ b/src/dw/dw_common.h
+@@ -14,7 +14,9 @@
+
+ #include "base/displays.h"
+
++#ifdef USE_X11
+ #include "dw_xevent.h"
++#endif
+
+ extern uint16_t initial_stabilization_millisec;
+ extern uint16_t stabilization_poll_millisec;
+@@ -40,9 +42,11 @@ typedef struct {
+ pid_t main_process_id;
+ pid_t main_thread_id;
+ DDCA_Display_Event_Class event_classes;
+- DDC_Watch_Mode watch_mode;
++ DDC_Watch_Mode watch_mode;
+ int watch_loop_millisec;
++#ifdef USE_X11
+ XEvent_Data * evdata;
++#endif
+ } Watch_Displays_Data;
+
+ void dw_free_watch_displays_data(Watch_Displays_Data * wdd);
diff --git a/src/dw/dw_main.c b/src/dw/dw_main.c
-index 996d6f95..d3218c89 100644
+index 996d6f95..c5e098cb 100644
--- a/src/dw/dw_main.c
+++ b/src/dw/dw_main.c
@@ -46,7 +46,9 @@
@@ -152,7 +191,20 @@ index 996d6f95..d3218c89 100644
#include "dw_main.h"
-@@ -79,8 +81,10 @@ resolve_watch_mode(DDC_Watch_Mode initial_mode, XEvent_Data ** xev_data_loc) {
+@@ -65,7 +67,12 @@ static DDCA_Display_Event_Class active_watch_displays_classes = DDCA_EVENT_CLASS
+ static Watch_Displays_Data * global_wdd; // needed to pass to dw_stop_watch_displays()
+
+
++// ***
++// Iftesting out resolve_watch_mode() if X11 is not defined is a quick and dirty hack.
++// It relies on the fact that currently the only mode other than XEVENT is POLL
++// ***
+
++#ifdef USE_X11
+ /** Determines the actual watch mode to be used
+ *
+ * @param initial_mode mode requested
+@@ -79,8 +86,10 @@ resolve_watch_mode(DDC_Watch_Mode initial_mode, XEvent_Data ** xev_data_loc) {
DBGTRC_STARTING(debug, TRACE_GROUP, "initial_mode=%s xev_data_loc=%p", watch_mode_name(initial_mode), xev_data_loc);
DDC_Watch_Mode resolved_watch_mode = Watch_Mode_Poll;
@@ -163,7 +215,7 @@ index 996d6f95..d3218c89 100644
#ifndef ENABLE_UDEV
if (initial_mode == Watch_Mode_Udev)
-@@ -89,6 +93,7 @@ resolve_watch_mode(DDC_Watch_Mode initial_mode, XEvent_Data ** xev_data_loc) {
+@@ -89,6 +98,7 @@ resolve_watch_mode(DDC_Watch_Mode initial_mode, XEvent_Data ** xev_data_loc) {
if (initial_mode == Watch_Mode_Dynamic) {
resolved_watch_mode = Watch_Mode_Poll; // always works, may be slow
@@ -171,7 +223,7 @@ index 996d6f95..d3218c89 100644
char * xdg_session_type = getenv("XDG_SESSION_TYPE");
DBGTRC_NOPREFIX(debug, DDCA_TRC_NONE, "XDG_SESSION_TYPE=|%s|", xdg_session_type);
if (xdg_session_type && // can xdg_session_type ever not be set
-@@ -111,6 +116,7 @@ resolve_watch_mode(DDC_Watch_Mode initial_mode, XEvent_Data ** xev_data_loc) {
+@@ -111,6 +121,7 @@ resolve_watch_mode(DDC_Watch_Mode initial_mode, XEvent_Data ** xev_data_loc) {
// sysfs_fully_reliable = is_sysfs_reliable();
// if (!sysfs_fully_reliable)
// dw_watch_mode = Watch_Mode_Poll;
@@ -179,7 +231,7 @@ index 996d6f95..d3218c89 100644
}
else {
resolved_watch_mode = initial_mode;
-@@ -124,6 +130,7 @@ resolve_watch_mode(DDC_Watch_Mode initial_mode, XEvent_Data ** xev_data_loc) {
+@@ -124,6 +135,7 @@ resolve_watch_mode(DDC_Watch_Mode initial_mode, XEvent_Data ** xev_data_loc) {
}
#endif
@@ -187,7 +239,7 @@ index 996d6f95..d3218c89 100644
if (resolved_watch_mode == Watch_Mode_Xevent) {
xevdata = dw_init_xevent_screen_change_notification();
// *xev_data_loc = ddc_init_xevent_screen_change_notification();
-@@ -132,15 +139,18 @@ resolve_watch_mode(DDC_Watch_Mode initial_mode, XEvent_Data ** xev_data_loc) {
+@@ -132,20 +144,23 @@ resolve_watch_mode(DDC_Watch_Mode initial_mode, XEvent_Data ** xev_data_loc) {
MSG_W_SYSLOG(DDCA_SYSLOG_WARNING, "X11 RANDR api unavailable. Switching to Watch_Mode_Poll");
}
}
@@ -206,7 +258,47 @@ index 996d6f95..d3218c89 100644
DBGTRC_DONE(debug, TRACE_GROUP, "resolved_watch_mode: %s. *xev_data_loc: %p",
watch_mode_name(resolved_watch_mode), *xev_data_loc);
return resolved_watch_mode;
-@@ -278,6 +288,7 @@ dw_stop_watch_displays(bool wait, DDCA_Display_Event_Class* enabled_classes_loc)
+ }
+-
++#endif
+
+ /** Starts thread that watches for changes in display connection status.
+ *
+@@ -162,7 +177,9 @@ dw_start_watch_displays(DDCA_Display_Event_Class event_classes) {
+ watch_mode_name(watch_displays_mode), watch_thread, event_classes, SBOOL(all_video_adapters_implement_drm));
+ DBGTRC_NOPREFIX(debug, TRACE_GROUP, "thread_id = %d, traced_function_stack=%p", TID(), traced_function_stack);
+ Error_Info * err = NULL;
++#ifdef USE_X11
+ XEvent_Data * xev_data = NULL;
++#endif
+
+ if (!all_video_adapters_implement_drm) {
+ err = ERRINFO_NEW(DDCRC_INVALID_OPERATION, "Requires DRM video drivers");
+@@ -174,8 +191,12 @@ dw_start_watch_displays(DDCA_Display_Event_Class event_classes) {
+ goto bye;
+ }
+
++#ifdef USE_X11
+ DDC_Watch_Mode resolved_watch_mode = resolve_watch_mode(watch_displays_mode, &xev_data);
+ ASSERT_IFF(resolved_watch_mode == Watch_Mode_Xevent, xev_data);
++#else
++ DDC_Watch_Mode resolved_watch_mode = Watch_Mode_Poll;
++#endif
+
+ int calculated_watch_loop_millisec = dw_calc_watch_loop_millisec(resolved_watch_mode);
+ // DBGTRC_NOPREFIX(debug, DDCA_TRC_NONE, "calc_watch_loop_millisec() returned %d", calculated_watch_loop_millisec);
+@@ -216,8 +237,10 @@ dw_start_watch_displays(DDCA_Display_Event_Class event_classes) {
+ wdd->event_classes = event_classes;
+ wdd->watch_mode = resolved_watch_mode;
+ wdd->watch_loop_millisec = calculated_watch_loop_millisec;
++#ifdef USE_X11
+ if (xev_data)
+ wdd->evdata = xev_data;
++#endif
+ global_wdd = wdd;
+
+ #ifdef CALLBACK_DISPLAYS_THREAD
+@@ -278,6 +301,7 @@ dw_stop_watch_displays(bool wait, DDCA_Display_Event_Class* enabled_classes_loc)
if (watch_thread) {
DBGTRC_NOPREFIX(debug, DDCA_TRC_NONE, "resolved_watch_mode = %s",
watch_mode_name(global_wdd->watch_mode));
@@ -214,7 +306,7 @@ index 996d6f95..d3218c89 100644
if (global_wdd->watch_mode == Watch_Mode_Xevent) {
if (terminate_using_x11_event) { // for testing, does not currently work
dw_send_x11_termination_message(global_wdd->evdata);
-@@ -290,6 +301,9 @@ dw_stop_watch_displays(bool wait, DDCA_Display_Event_Class* enabled_classes_loc)
+@@ -290,6 +314,9 @@ dw_stop_watch_displays(bool wait, DDCA_Display_Event_Class* enabled_classes_loc)
else {
terminate_watch_thread = true; // signal watch thread to terminate
}
@@ -224,8 +316,18 @@ index 996d6f95..d3218c89 100644
// DBGTRC_NOPREFIX(debug, TRACE_GROUP, "Waiting %d millisec for watch thread to terminate...", 4000);
// usleep(4000*1000); // greater than the sleep in watch_displays_using_poll()
+@@ -433,7 +460,9 @@ void init_dw_main() {
+ RTTI_ADD_FUNC(dw_start_watch_displays);
+ RTTI_ADD_FUNC(dw_stop_watch_displays);
+ RTTI_ADD_FUNC(dw_get_active_watch_classes);
++#ifdef USE_X11
+ RTTI_ADD_FUNC(resolve_watch_mode);
++#endif
+ RTTI_ADD_FUNC(dw_redetect_displays);
+ }
+
diff --git a/src/dw/dw_poll.c b/src/dw/dw_poll.c
-index 677a6ce6..336b5c92 100644
+index 677a6ce6..e1244491 100644
--- a/src/dw/dw_poll.c
+++ b/src/dw/dw_poll.c
@@ -62,7 +62,9 @@
@@ -238,7 +340,18 @@ index 677a6ce6..336b5c92 100644
#include "dw_poll.h"
-@@ -276,6 +278,7 @@ gpointer dw_watch_display_connections(gpointer data) {
+@@ -206,8 +208,10 @@ gpointer dw_watch_display_connections(gpointer data) {
+ Watch_Displays_Data * wdd = data;
+ assert(wdd && memcmp(wdd->marker, WATCH_DISPLAYS_DATA_MARKER, 4) == 0);
+ assert(wdd->watch_mode == Watch_Mode_Xevent || wdd->watch_mode == Watch_Mode_Poll);
++#ifdef USE_X11
+ if (wdd->watch_mode == Watch_Mode_Xevent)
+ assert(wdd->evdata);
++#endif
+ GPtrArray * displays_to_recheck = g_ptr_array_new();
+
+ DBGTRC_STARTING(debug, TRACE_GROUP,
+@@ -276,6 +280,7 @@ gpointer dw_watch_display_connections(gpointer data) {
continue;
dw_terminate_if_invalid_thread_or_process(cur_pid, cur_tid);
@@ -246,7 +359,7 @@ index 677a6ce6..336b5c92 100644
if (wdd->watch_mode == Watch_Mode_Xevent) {
if (terminate_using_x11_event) {
bool event_found = dw_next_X11_event_of_interest(wdd->evdata);
-@@ -295,6 +298,7 @@ gpointer dw_watch_display_connections(gpointer data) {
+@@ -295,6 +300,7 @@ gpointer dw_watch_display_connections(gpointer data) {
continue;
}
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2025-03-01 21:36 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-03-01 21:36 [gentoo-commits] repo/gentoo:master commit in: app-misc/ddcutil/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2025-01-10 21:45 Ionen Wolkens
2024-03-31 16:27 Robin H. Johnson
2024-02-17 14:35 David Seifert
2023-07-03 5:14 Robin H. Johnson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox