summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Ammerlaan <andrewammerlaan@gentoo.org>2023-11-27 21:07:45 +0100
committerAndrew Ammerlaan <andrewammerlaan@gentoo.org>2023-11-27 21:07:45 +0100
commit79d92dece993d8d1d1a9d45a8f4f84c5d895009a (patch)
treeafa1145eb760d99f303679d4fac38e89c6cb3a54 /app-misc/ddcutil
parentsys-boot/gnu-efi: Stabilize 3.0.17 arm, #918532 (diff)
downloadgentoo-79d92dece993d8d1d1a9d45a8f4f84c5d895009a.tar.gz
gentoo-79d92dece993d8d1d1a9d45a8f4f84c5d895009a.tar.bz2
gentoo-79d92dece993d8d1d1a9d45a8f4f84c5d895009a.zip
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 <andrewammerlaan@gentoo.org>
Diffstat (limited to 'app-misc/ddcutil')
-rw-r--r--app-misc/ddcutil/ddcutil-2.0.0-r1.ebuild (renamed from app-misc/ddcutil/ddcutil-2.0.0.ebuild)2
-rw-r--r--app-misc/ddcutil/files/ddcutil-2.0.0-fix-build-with-usb-monitor-disabled.patch22
2 files changed, 24 insertions, 0 deletions
diff --git a/app-misc/ddcutil/ddcutil-2.0.0.ebuild b/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;