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 B40EE158099 for ; Mon, 27 Nov 2023 20:09:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E0D832BC034; Mon, 27 Nov 2023 20:09:18 +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 C594F2BC034 for ; Mon, 27 Nov 2023 20:09:18 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D81B8340C7F for ; Mon, 27 Nov 2023 20:09:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2346E1298 for ; Mon, 27 Nov 2023 20:09:16 +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: <1701115665.79d92dece993d8d1d1a9d45a8f4f84c5d895009a.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.0.0-r1.ebuild app-misc/ddcutil/ddcutil-2.0.0.ebuild app-misc/ddcutil/files/ddcutil-2.0.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: 79d92dece993d8d1d1a9d45a8f4f84c5d895009a X-VCS-Branch: master Date: Mon, 27 Nov 2023 20:09:16 +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: 7cdebb34-5c20-43b2-88ed-caf1307110a9 X-Archives-Hash: d0849efe4ee2d90c5d7f331352ebb486 commit: 79d92dece993d8d1d1a9d45a8f4f84c5d895009a Author: Andrew Ammerlaan gentoo org> AuthorDate: Mon Nov 27 20:07:45 2023 +0000 Commit: Andrew Ammerlaan gentoo org> CommitDate: Mon Nov 27 20:07:45 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79d92dec app-misc/ddcutil: fix build USE=-usb-monitor, add missing dep Closes: https://bugs.gentoo.org/918124 Closes: https://bugs.gentoo.org/918408 Signed-off-by: Andrew Ammerlaan gentoo.org> ...dcutil-2.0.0.ebuild => ddcutil-2.0.0-r1.ebuild} | 2 ++ ...2.0.0-fix-build-with-usb-monitor-disabled.patch | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/app-misc/ddcutil/ddcutil-2.0.0.ebuild b/app-misc/ddcutil/ddcutil-2.0.0-r1.ebuild similarity index 97% rename from app-misc/ddcutil/ddcutil-2.0.0.ebuild rename to app-misc/ddcutil/ddcutil-2.0.0-r1.ebuild index 708539105ec7..0c8b195f90ae 100644 --- a/app-misc/ddcutil/ddcutil-2.0.0.ebuild +++ b/app-misc/ddcutil/ddcutil-2.0.0-r1.ebuild @@ -19,6 +19,7 @@ REQUIRED_USE="drm? ( X )" RDEPEND=" dev-libs/glib:2 + >=dev-libs/jansson-2 sys-apps/i2c-tools virtual/udev drm? ( x11-libs/libdrm ) @@ -42,6 +43,7 @@ BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${PN}-1.4.1-no-werror.patch + "${FILESDIR}"/${PN}-2.0.0-fix-build-with-usb-monitor-disabled.patch ) pkg_pretend() { 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 new file mode 100644 index 000000000000..3fc988eac350 --- /dev/null +++ b/app-misc/ddcutil/files/ddcutil-2.0.0-fix-build-with-usb-monitor-disabled.patch @@ -0,0 +1,22 @@ +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;