gentoo auto-resync : 27:11:2023 - 22:51:09

3 files changed, 26 insertions, 1 deletions

diff --git a/app-misc/ddcutil/Manifest b/app-misc/ddcutil/Manifest
index 5e31f88306e0..7be2f4308a80 100644
--- a/app-misc/ddcutil/Manifest
+++ b/app-misc/ddcutil/Manifest
@@ -1,6 +1,7 @@
 AUX ddcutil-1.2.2-no-werror.patch 858 BLAKE2B 83dbd07d70237f0cf7c823fa1c412c8ce6aa3fcfc39ae203586ba6d0acb5f5628136a702799ba6151a5359b99f574534064803a5512652a3135960e1ea7f14b6 SHA512 0628149606d927bf624d9f152e21cfc7ccc9fd847b502f0dff487188b529779a35d9fb3ef787bcbc421db1bceb97e210cb835de948a8535809b27c925f21c8c7
 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
 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
@@ -10,5 +11,5 @@ EBUILD ddcutil-1.2.2.ebuild 2858 BLAKE2B bcc3c7806612b87f84e83a42dccec89b554af1b
 EBUILD ddcutil-1.3.0.ebuild 2932 BLAKE2B 3b80f739f488823c18280ede45c2b6289246c7107ee5299db0bf3badf743d01d1f9880b2eaeb848f8d618cae5e6851b61e9a0a272ed218621e2313bb594956a6 SHA512 a2cae54f0374d48ec36f0181e580c3a474969db17012ba2cfbfd0eab772b35afb44e7439850d7e736e2bfb7d570321b7a1447b150627ccae0af3fec4e4fe0b66
 EBUILD ddcutil-1.4.1.ebuild 2937 BLAKE2B b0359cd1e43b2e4b79d63fc879a5f0dfaef228026e58080e8c64f5a2e6e8580204ee44cd04cafc053ec57082f000d060e9f317a733ac434804239fee3faad84b SHA512 cd9b87dfe214a2e8ac496f63aacd8776de47dac0a18248af47923321f2431f58ea0c2229d975d81bb6dfc0e1f731b80ca15ce17766cf05d9d7556710b364f42e
 EBUILD ddcutil-1.4.5.ebuild 2944 BLAKE2B 2519079a5875cc99cbe4037fe7df42973933071d04591f6aede5f9a712f609cf0a085b1135f21b7b7126367c4ca3f19f2d3725f4ee603e95e5e13c60ad761acf SHA512 7aea5603827335c3a7d56840afc837b9fb08c0591d93e0091e6dbc240200f69de1323b6d4b0e998c505352085ee198e9319deef6fad92889d671e68a1c557754
-EBUILD ddcutil-2.0.0.ebuild 2944 BLAKE2B 8649a4a30a4bfde60ab1e00f159a61c8c4e8e58fd8cc5754a239f7a406bcfce0bb16d5175114d3fb95b36563593e3c7e5f0e88ba984c4397daa2272ec4c3a647 SHA512 c3ef31cfbcc38cd51b3184427d79a34e4d230dca7261b5f10c0ce9e882fb912976edddb878caad1c67098f473da6aaf5f95c946799f5575c18f04bb91114830d
+EBUILD ddcutil-2.0.0-r1.ebuild 3035 BLAKE2B 3e2a2ca5a411b0a1701269c2b5591c699b77a385d4a45fa6ac78fb7f762d7cdd8d58240533e62ea3d813d4e2e80cfea16f65cffd12580dc9941db3626c325790 SHA512 c729bbb454f38646857e63e5905e71ecc27fb10a698d63984e266dc7bba312ab9f0adce443b9ccb833880ab71a31e2cf77c3970a7fea9ad9e41725afbf601e10
 MISC metadata.xml 1293 BLAKE2B c7fc827c0bcf7914b2c0b3f9ecec9dee145824c33a516ef3d9cd43fcd368977d9f17a76b6b8775fa773f8ce8b109d16b1e5c8b14dee5d0e9e56aa7a4024a190d SHA512 a795c9fb1479ae198446160e9a020ce911b02ffd0d51af9cd634504aca1ded4c38d3295eca0cbc6ad33506684f55cf96676c868ec349229d0dfdaa17f8afa806
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;