From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C8CE115838C for ; Tue, 23 Jan 2024 13:47:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E945DE2A21; Tue, 23 Jan 2024 13:47:39 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D1430E2A21 for ; Tue, 23 Jan 2024 13:47:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 056FE34330F for ; Tue, 23 Jan 2024 13:47:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 73A1113AA for ; Tue, 23 Jan 2024 13:47:37 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1706017640.6552f78effce628accd6eb59582f367b39b97f70.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/ddcutil/, app-misc/ddcutil/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-misc/ddcutil/ddcutil-2.1.0-r1.ebuild app-misc/ddcutil/ddcutil-2.1.0.ebuild app-misc/ddcutil/files/ddcutil-2.1.0-fix-build-with-usb-monitor-disabled.patch X-VCS-Directories: app-misc/ddcutil/ app-misc/ddcutil/files/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 6552f78effce628accd6eb59582f367b39b97f70 X-VCS-Branch: master Date: Tue, 23 Jan 2024 13:47:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1f4f7a0a-f874-4d5b-9a30-6cb4b615db26 X-Archives-Hash: 382deacf28c87d583f05e764eb8ea05c commit: 6552f78effce628accd6eb59582f367b39b97f70 Author: Andrew Ammerlaan gentoo org> AuthorDate: Tue Jan 23 13:46:29 2024 +0000 Commit: Andrew Ammerlaan gentoo org> CommitDate: Tue Jan 23 13:47:20 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6552f78e app-misc/ddcutil: fix build with USE=-usb-monitor (again) Closes: https://bugs.gentoo.org/922715 Signed-off-by: Andrew Ammerlaan gentoo.org> ...dcutil-2.1.0.ebuild => ddcutil-2.1.0-r1.ebuild} | 1 + ...2.1.0-fix-build-with-usb-monitor-disabled.patch | 34 ++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/app-misc/ddcutil/ddcutil-2.1.0.ebuild b/app-misc/ddcutil/ddcutil-2.1.0-r1.ebuild similarity index 97% rename from app-misc/ddcutil/ddcutil-2.1.0.ebuild rename to 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 +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);