gentoo auto-resync : 23:01:2024 - 16:46:30

3 files changed, 37 insertions, 1 deletions

diff --git a/app-misc/ddcutil/Manifest b/app-misc/ddcutil/Manifest
index 76e18573b1cd..6289cb82c379 100644
--- a/app-misc/ddcutil/Manifest
+++ b/app-misc/ddcutil/Manifest
@@ -2,6 +2,7 @@ AUX ddcutil-1.2.2-no-werror.patch 858 BLAKE2B 83dbd07d70237f0cf7c823fa1c412c8ce6
 AUX ddcutil-1.3.0-no-werror.patch 1835 BLAKE2B 1edbfb8c00db14f5e33dd229b83e5145b8a659f8ea4c2c2626b79abbdafb8b7872fe55e1dccd7cb6ec5f390c8a91591d61fad08d08b952457e6ad8df54075ae6 SHA512 a8664bafa314c3664c32b3a7c7a22bf7a3a9163dd57888e91726f0d82371b65f873342b0daba598ac02020cef5742bbecd6b2434c2392c46642951f9bba4d2f2
 AUX ddcutil-1.4.1-no-werror.patch 760 BLAKE2B 160756abf6ed5eb83152cff7cfc756ca91bbc52054c49d7fccf859e28d85f6668fb0ff2cdf3dcccf80e1f1414b5327ecc255e29b92d457dd535e62b2a0a0a0d5 SHA512 7581e0097b5b20146effca3d415e51aae0e5248572fc10182a046cbe1071f0c770856584ecdd966e6c992a05f1d2349cdba80220fe81e63d1a7521fffe02ebc4
 AUX ddcutil-2.0.0-fix-build-with-usb-monitor-disabled.patch 721 BLAKE2B c5514b7bc6406017a1dbdc831743da975881102ee7290eb04a6b52a83ae291e2330efd5b3c71623b014263cf1682cfb8a175d5e691538e153bf6dead88d5800e SHA512 013fe7ff51992a1e69f05184f97d4026f4d10b42b45934925754199029bf3e16f8403f61a4b7caaa6306eed3083e735ef355d794b5b066400a3d146f455ad43b
+AUX ddcutil-2.1.0-fix-build-with-usb-monitor-disabled.patch 1372 BLAKE2B 6c3d8dc6d3b02942577ee61263f18e8e3c05363237d7836e90119757477061181b1d3afe9464b69483829f86ca3251c3416b728774bf245299a1a5f7bc0ba3a2 SHA512 3ae25e440ccc653430782faf8d056aa51e399c04d71dfee16f009701fc9fc0e5a0e781dd8110b4daa22dd4c14e7c964e4f1221388f7232cc1a5deacc3bd7479e
 DIST ddcutil-1.2.2.tar.gz 803943 BLAKE2B 65cc5dc0d1ee85d1e2b6670f7c24508ab817c6eebdb596b5f6f70c7ff7b9257f12f70abfea2d735e23755e508d4829d4be6574ac16564d4d828e0b1153cf8afe SHA512 0329711e536cbcaee2efe6cf981a17181ab318846e9c6a82f2ceacc42691ba49c06df44a52d1f079568e9ccec588cc85d4de4adf19b6db83bebe4bb90ae29207
 DIST ddcutil-1.3.0.tar.gz 816789 BLAKE2B 1cb3b64961503416b85b792e1002ec67788f8cf7d622be1c4930808f99e16974ff57ed582d1d02a67580e3f4d92bef54b3669fd7378462bf4c98a3643d6786be SHA512 93d69958b2e1dcb66ad700712742536179383c93f2ec1f746b6a6c78adfd6daa861275208850cc807e0c16a11ea84904cb13ceef512ca76e1daa910410303d41
 DIST ddcutil-1.4.1.tar.gz 816782 BLAKE2B ebc8b8893fda9a1e5b278b198594619f7c26a309e15aab90d5f8c61da352c54173076c86ce4e9d9bdcad8857e8ee45500de0c28d5de073038c841caf12080e5f SHA512 e53820662c12cd3a91b1182e02ad74841238117c129e88c8bcdede42d4e0dec22a9c1ec37a7b1e1dd512f2cf7ef410e737d9fdba62d95ea48e5912e43e6d3857
@@ -13,5 +14,5 @@ EBUILD ddcutil-1.3.0.ebuild 2933 BLAKE2B 3a32592eb97a2df63a18c82e473d4ba13ab5563
 EBUILD ddcutil-1.4.1.ebuild 2938 BLAKE2B 0b104b941b0fde07f1539dab57b3201917f11c2c564c7e911bfa5e14d73a8a291d4b7822beb4e79e0bade89aff1da4d534bb5b2c722831c29f942fd7cb093577 SHA512 c10403a5a83747c9058a1851dd1abe22abb8015ab04e761d87f92e7ea537051c9b6928afe2c771fc529a685b5047e2551e1697afe650177f4854a1ad4c5435d3
 EBUILD ddcutil-1.4.5.ebuild 2945 BLAKE2B 014ff0e0a740916303ce6af069f2066ff7fbea4c5d714cc13e45b288ef784484a9e7f2a94da04bef5c2f5e9bb57595b935a62d3dbb7e4c9db7535169b5ed7419 SHA512 b60685531a199a33891a8073197b813d4d56bb9e8a9888ed19e00b4b3635525ba4305899c7d50c87061a567808dcc96d6920e5480050f46e491bc92bf0476492
 EBUILD ddcutil-2.0.0-r2.ebuild 3049 BLAKE2B 6c23467ee06a7dcfb89e4d9ee0a1a7ae1fffe2fcdf86e972fdf5005708234b320ef03e50a6ecb160df85b7a42026fe9cb2e3afe144949022c798956f1b01213e SHA512 354af8e35c242a39c6497b89a36c897a6e826bd7d330ac6f062509467f402899b7c56fdaa0fee90ccd83019c11b5d9336b4a0bdaaa01007d63df7d5d63743549
-EBUILD ddcutil-2.1.0.ebuild 2980 BLAKE2B e04240b002df3f16e804e8b0c3d886a30eb8a99d9c1f1d4b208980f0fffc0a08f8eede8145ad7b241fac0af90fa276a7e685ce1b041dcc97e7f65c5996b116ef SHA512 f9162a5ecb6797f33eafc92440f5c49cf81cad281445130a2616ffd3b22339a634fee78dd5e9e3b639c6d4f85cf6ba92f325ade7b754b2640a974357249a6118
+EBUILD ddcutil-2.1.0-r1.ebuild 3049 BLAKE2B 0835dbb2fe72e5a51acf13de69f12fbc0d75f39eeefb3c405fc12910517d6f7754b9d0279045915e1f91a9514204fadc9aa1755595eb73c858a138e3b35fe510 SHA512 10f0b51f98d3951fc0cc3cbdef3fb11ed7484999323301053518d104ba10d602ad3e979c39a720ca93c32d17fd75b44c3dfaef72a372b28e1c03cdf0763cd53e
 MISC metadata.xml 1293 BLAKE2B c7fc827c0bcf7914b2c0b3f9ecec9dee145824c33a516ef3d9cd43fcd368977d9f17a76b6b8775fa773f8ce8b109d16b1e5c8b14dee5d0e9e56aa7a4024a190d SHA512 a795c9fb1479ae198446160e9a020ce911b02ffd0d51af9cd634504aca1ded4c38d3295eca0cbc6ad33506684f55cf96676c868ec349229d0dfdaa17f8afa806
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);