diff options
| author |   Andrew Ammerlaan <andrewammerlaan@gentoo.org> | 2024-01-23 14:46:29 +0100 |
|---|---|---|
| committer | Andrew Ammerlaan <andrewammerlaan@gentoo.org> | 2024-01-23 14:47:20 +0100 |
| commit | 6552f78effce628accd6eb59582f367b39b97f70 (patch) | |
| tree | d83c027c33daf205889d502a4c99057df2a22bce /app-misc | |
| parent | www-apps/gitea: drop 1.21.2 (diff) | |
| download | gentoo-6552f78effce628accd6eb59582f367b39b97f70.tar.gz gentoo-6552f78effce628accd6eb59582f367b39b97f70.tar.bz2 gentoo-6552f78effce628accd6eb59582f367b39b97f70.zip | |
app-misc/ddcutil: fix build with USE=-usb-monitor (again)
Closes: https://bugs.gentoo.org/922715
Signed-off-by: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
Diffstat (limited to 'app-misc')
| -rw-r--r-- | app-misc/ddcutil/ddcutil-2.1.0-r1.ebuild (renamed from app-misc/ddcutil/ddcutil-2.1.0.ebuild) | 1 | ||||
| -rw-r--r-- | app-misc/ddcutil/files/ddcutil-2.1.0-fix-build-with-usb-monitor-disabled.patch | 34 |
2 files changed, 35 insertions, 0 deletions
diff --git a/app-misc/ddcutil/ddcutil-2.1.0.ebuild b/app-misc/ddcutil/ddcutil-2.1.0-r1.ebuild index 746ceafd18ca..933c0987e2ff 100644 --- a/app-misc/ddcutil/ddcutil-2.1.0.ebuild +++ b/app-misc/ddcutil/ddcutil-2.1.0-r1.ebuild @@ -43,6 +43,7 @@ BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${PN}-1.4.1-no-werror.patch + "${FILESDIR}"/${PN}-2.1.0-fix-build-with-usb-monitor-disabled.patch ) pkg_pretend() { 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 new file mode 100644 index 000000000000..199bf1b1563b --- /dev/null +++ b/app-misc/ddcutil/files/ddcutil-2.1.0-fix-build-with-usb-monitor-disabled.patch @@ -0,0 +1,34 @@ +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); |