summaryrefslogtreecommitdiff
path: root/app-misc
diff options
context:
space:
mode:
Diffstat (limited to 'app-misc')
-rw-r--r--app-misc/Manifest.gzbin50216 -> 50208 bytes
-rw-r--r--app-misc/ddcutil/Manifest7
-rw-r--r--app-misc/ddcutil/ddcutil-2.1.4.ebuild10
-rw-r--r--app-misc/ddcutil/ddcutil-2.2.0.ebuild121
-rw-r--r--app-misc/ddcutil/files/ddcutil-1.4.1-no-werror.patch2
-rw-r--r--app-misc/ddcutil/files/ddcutil-2.1.4-fix-clang.patch57
6 files changed, 191 insertions, 6 deletions
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 80593e4eff91..570b2d02a0d3 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
Binary files differ
diff --git a/app-misc/ddcutil/Manifest b/app-misc/ddcutil/Manifest
index 36295ba6a2d0..e0fc40b66cdb 100644
--- a/app-misc/ddcutil/Manifest
+++ b/app-misc/ddcutil/Manifest
@@ -1,9 +1,12 @@
AUX ddcutil-1.3.0-no-werror.patch 1835 BLAKE2B 1edbfb8c00db14f5e33dd229b83e5145b8a659f8ea4c2c2626b79abbdafb8b7872fe55e1dccd7cb6ec5f390c8a91591d61fad08d08b952457e6ad8df54075ae6 SHA512 a8664bafa314c3664c32b3a7c7a22bf7a3a9163dd57888e91726f0d82371b65f873342b0daba598ac02020cef5742bbecd6b2434c2392c46642951f9bba4d2f2
-AUX ddcutil-1.4.1-no-werror.patch 767 BLAKE2B 0769e02893eb5f2c1b6f6713a140696412eb910a4f65e6ef9dc85d4c500c0a892f80a6954e7c41a9b96393aa45cc2fa23997be810d80804592a8a589eacd0c30 SHA512 d63aff2fc41849b53454dfe3a7f3a378febf4454be2647d89feeb3028256c5ff61b5173fce9ac5c94de348e6c2f735464e8647ce0449f376d3e556aa763fcfb8
+AUX ddcutil-1.4.1-no-werror.patch 773 BLAKE2B 8b1c37926e300db238c6be8340a1a0c41cd47ed2183cf50d57001af6f2d23b71643abedebf98496db720ee5d9e5d95a4d31c6def77a57c056b87e82b1f39d288 SHA512 510d094c6cc24ed0d1134e6b62acb77341c07b87ec4d78516f02d5742ebc4933df946625645f404e6b9fc2e918a14de4f748487aeee821bc5cb2f12c6fd90b39
+AUX ddcutil-2.1.4-fix-clang.patch 2236 BLAKE2B c636641e59d398911b64c5d1b462af1c55849ac0fd4a4f42610d0580616e95fa318ae6cbe68416229f5b5a59cae2f6ce2fe2b33e789143eaf3adc6981e9a25c7 SHA512 337ed0af7455318c26b62cc9a16a1a09db5bd7380a1dce4ee36dd05d98bcbc712a3e4f52ad782c698f759c557839427945cf59dee740753562e5d0a7081c95af
DIST ddcutil-1.3.0.tar.gz 816789 BLAKE2B 1cb3b64961503416b85b792e1002ec67788f8cf7d622be1c4930808f99e16974ff57ed582d1d02a67580e3f4d92bef54b3669fd7378462bf4c98a3643d6786be SHA512 93d69958b2e1dcb66ad700712742536179383c93f2ec1f746b6a6c78adfd6daa861275208850cc807e0c16a11ea84904cb13ceef512ca76e1daa910410303d41
DIST ddcutil-1.4.5.tar.gz 817492 BLAKE2B b6442d9f7ec3687a3e75d9784dc9f62563f42c72c82a8a2ea24a392c3c4f186578c2c2f6592ba12c324568a20b7b25082acce9e7b753c41c1ac925d9d6de62dd SHA512 c355f104b60dbc3c893dea473d841181cfcaacd0cb2e97bc41ea829185c7ccdcff19ab19189ee572e7f2f6b41cbb2bd6c569ad3c09f6d645f9e342b7d1a5310f
DIST ddcutil-2.1.4.tar.gz 924298 BLAKE2B d11c4daa6a6b4c5c694cf45fa3a76709bcacc8a63bbe7ea331bcf2dd45a7e99dcdf890d97a9515dda909e6a54ca90c30d966e0dd5437fdd0972232878c4de581 SHA512 8c352bfacc2a5cdd22b8d84f2facd58de6d425d0d3f98de543cf36a3e6b15aa10fc86e87780c82f872f0bf0db984e1cc800aaff914bafe4dbf17602e2a7caeb0
+DIST ddcutil-2.2.0.tar.gz 1016240 BLAKE2B cc2c7cd1b5bcdd4a457b2b5547236a44e831893d6f39a7fb16af7de4524c900cd267c07ef027aa7481dff06701ff0538a244a6c5cabe8bc8afef73ca05c41f9a SHA512 e650f1743e1d807b4a7030389729f0aac4e2558bc5374ea9a27a16c97818ba9ede87ddfe38aebffbb9e182c8efbfab913ba729f8cc5b8ccffe44a62280e2037c
EBUILD ddcutil-1.3.0.ebuild 2933 BLAKE2B 3a32592eb97a2df63a18c82e473d4ba13ab556307960a0b727fc753ba6979a23098b36c8ed36721a6798612d6a5ecc83bff17b62900737f828fafb88321639ab SHA512 f4b220503b91620611bfbb0b90fde47906eab3471ac704f47c090567f0090269a6e823970c30722652cec69971fc13d4ee87edbc10a41f5a85d8675809e6485a
EBUILD ddcutil-1.4.5.ebuild 2945 BLAKE2B 014ff0e0a740916303ce6af069f2066ff7fbea4c5d714cc13e45b288ef784484a9e7f2a94da04bef5c2f5e9bb57595b935a62d3dbb7e4c9db7535169b5ed7419 SHA512 b60685531a199a33891a8073197b813d4d56bb9e8a9888ed19e00b4b3635525ba4305899c7d50c87061a567808dcc96d6920e5480050f46e491bc92bf0476492
-EBUILD ddcutil-2.1.4.ebuild 2982 BLAKE2B 9e15a22f121e245df6df476343659e285db428c8d1bf21356cdf41516f785feefacb89ec11de0af25a1746ad0f9261a2d7cf517ab428b99e42f7679e8d655502 SHA512 f0031252183128fb3951c0a88b1f89f4a6b575a720fec69aea68a1ef95f803e835fd13f8f70a3520f544581dcdc72eaa7d6029264fefdb7b1dddc95b724e5664
+EBUILD ddcutil-2.1.4.ebuild 3168 BLAKE2B 48b8fdcc7243b84cf5ce269f232315670d4fb70396aca446ae7b2e8db21e595d31c47c6db9e2ac556ef77db19ba6d048ca2b780b90e366801b6e8a67738ea7bd SHA512 27fe451ab2dd14ea4bd28b8a513f4346f4922fac02ad327e2f3bd589a522909996b0fb47b95f14d92a1d22746445046985602190bdf006f0252a9b7844e524fb
+EBUILD ddcutil-2.2.0.ebuild 3057 BLAKE2B 4a8a52e60212e083225038242b736d3cf609fa7c403c74ed5b069ec2bdb98f01f5a7fabee6272dcbfcfa0a6b20d4a4b5db32ceaddcd40a84a412632a3a034cbf SHA512 8b402c473546b63d879d55b66530854fd1a435eff60d9c01313c1ea314f9d151dd62754a8f1fe9fbc1355c5d8633eef3795be422ad06de64c5d9877a6cb6cce8
MISC metadata.xml 1293 BLAKE2B c7fc827c0bcf7914b2c0b3f9ecec9dee145824c33a516ef3d9cd43fcd368977d9f17a76b6b8775fa773f8ce8b109d16b1e5c8b14dee5d0e9e56aa7a4024a190d SHA512 a795c9fb1479ae198446160e9a020ce911b02ffd0d51af9cd634504aca1ded4c38d3295eca0cbc6ad33506684f55cf96676c868ec349229d0dfdaa17f8afa806
diff --git a/app-misc/ddcutil/ddcutil-2.1.4.ebuild b/app-misc/ddcutil/ddcutil-2.1.4.ebuild
index 80f986094745..b8c9ae48701c 100644
--- a/app-misc/ddcutil/ddcutil-2.1.4.ebuild
+++ b/app-misc/ddcutil/ddcutil-2.1.4.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
# Check for bumps & cleanup with app-misc/ddcui
-inherit autotools linux-info udev
+inherit autotools flag-o-matic linux-info udev
DESCRIPTION="Program for querying and changing monitor settings"
HOMEPAGE="https://www.ddcutil.com/"
SRC_URI="https://github.com/rockowitz/ddcutil/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SLOT="0/5"
LICENSE="GPL-2"
+SLOT="0/5"
KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
IUSE="drm usb-monitor user-permissions video_cards_nvidia X"
REQUIRED_USE="drm? ( X )"
@@ -43,6 +43,7 @@ BDEPEND="virtual/pkgconfig"
PATCHES=(
"${FILESDIR}"/${PN}-1.4.1-no-werror.patch
+ "${FILESDIR}"/${PN}-2.1.4-fix-clang.patch
)
pkg_pretend() {
@@ -65,6 +66,9 @@ src_prepare() {
}
src_configure() {
+ # too many error on -Wcompound-token-split-by-macro by clang
+ append-cflags $(test-flags-CC -Wno-compound-token-split-by-macro)
+
local myeconfargs=(
# FAILS: doxyfile: No such file or directory
# $(use_enable doc doxygen)
diff --git a/app-misc/ddcutil/ddcutil-2.2.0.ebuild b/app-misc/ddcutil/ddcutil-2.2.0.ebuild
new file mode 100644
index 000000000000..48b460d56661
--- /dev/null
+++ b/app-misc/ddcutil/ddcutil-2.2.0.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Check for bumps & cleanup with app-misc/ddcui
+
+inherit autotools linux-info udev
+
+DESCRIPTION="Program for querying and changing monitor settings"
+HOMEPAGE="https://www.ddcutil.com/"
+SRC_URI="https://github.com/rockowitz/ddcutil/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0/5"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="usb-monitor user-permissions video_cards_nvidia X"
+
+# In 2.2.0, DRM seems fairly embedded and non-optional even if the
+# build system option exists. Fails to build.
+RDEPEND="
+ dev-libs/glib:2
+ >=dev-libs/jansson-2
+ sys-apps/i2c-tools
+ virtual/udev
+ x11-libs/libdrm
+ usb-monitor? (
+ dev-libs/hidapi
+ virtual/libusb:1
+ sys-apps/usbutils
+ )
+ user-permissions? (
+ acct-group/i2c
+ usb-monitor? ( acct-group/video )
+ )
+ X? (
+ x11-libs/libXrandr
+ x11-libs/libX11
+ )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+# doc? ( app-text/doxygen[dot] )
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.4.1-no-werror.patch
+)
+
+pkg_pretend() {
+ # This program needs /dev/ic2-* devices to communicate with the monitor.
+ CONFIG_CHECK="~I2C_CHARDEV"
+ ERROR_I2C_CHARDEV="You must enable I2C_CHARDEV in your kernel to continue"
+ if use usb-monitor; then
+ CONFIG_CHECK+=" ~HIDRAW ~USB_HIDDEV"
+ ERROR_HIDRAW="HIDRAW is needed to support USB monitors"
+ ERROR_I2C_CHARDEV="USB_HIDDEV is needed to support USB monitors"
+ fi
+
+ # Now do the actual checks setup above
+ check_extra_config
+}
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ # FAILS: doxyfile: No such file or directory
+ # $(use_enable doc doxygen)
+ --enable-drm
+ --enable-udev
+ $(use_enable usb-monitor usb)
+ --enable-lib
+ $(use_enable X x11)
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+ if use user-permissions; then
+ udev_dorules data/usr/lib/udev/rules.d/60-ddcutil-i2c.rules
+ if use usb-monitor; then
+ udev_dorules data/usr/lib/udev/rules.d/60-ddcutil-usb.rules
+ fi
+ fi
+}
+
+pkg_postinst() {
+ if use user-permissions; then
+ einfo "To allow non-root users access to the /dev/i2c-* devices, add those"
+ einfo "users to the i2c group: usermod -aG i2c user"
+ einfo "Restart the computer or reload the i2c-dev module to activate"
+ einfo "the new udev rule."
+ einfo "For more information read: http://www.ddcutil.com/i2c_permissions/"
+
+ if use usb-monitor; then
+ einfo "To allow non-root users access to USB monitors, add those users"
+ einfo "to the video group: usermod -aG video user"
+ einfo "Restart the computer, reload the hiddev and hidraw modules, or replug"
+ einfo "the monitor to activate the new udev rule."
+ einfo "For more information read: http://www.ddcutil.com/usb/"
+ fi
+
+ udev_reload
+ fi
+
+ if use video_cards_nvidia; then
+ ewarn "Please read the following webpage on proper usage with the nVidia "
+ ewarn "binary drivers, or it may not work: http://www.ddcutil.com/nvidia/"
+ fi
+}
+
+pkg_postrm() {
+ if use user-permissions; then
+ udev_reload
+ fi
+}
diff --git a/app-misc/ddcutil/files/ddcutil-1.4.1-no-werror.patch b/app-misc/ddcutil/files/ddcutil-1.4.1-no-werror.patch
index deabd2bfedbc..bf03bf5ce336 100644
--- a/app-misc/ddcutil/files/ddcutil-1.4.1-no-werror.patch
+++ b/app-misc/ddcutil/files/ddcutil-1.4.1-no-werror.patch
@@ -19,7 +19,7 @@ index c12f15c..27d2124 100644
dnl AC_MSG_NOTICE([DBG = |$DBG|])
-AM_CONDITIONAL(WARNINGS_ARE_ERRORS_COND, [test "x$ddcutil_version_suffix" != "x"] )
-+AM_CONDITIONAL(WARNINGS_ARE_ERRORS_COND, [test 0])
++AM_CONDITIONAL(WARNINGS_ARE_ERRORS_COND, [test 1 -eq 0])
AS_IF( [test 0$DBG -ne 0],
AC_MSG_NOTICE([debug messages enabled]),
diff --git a/app-misc/ddcutil/files/ddcutil-2.1.4-fix-clang.patch b/app-misc/ddcutil/files/ddcutil-2.1.4-fix-clang.patch
new file mode 100644
index 000000000000..2a830337e177
--- /dev/null
+++ b/app-misc/ddcutil/files/ddcutil-2.1.4-fix-clang.patch
@@ -0,0 +1,57 @@
+https://github.com/rockowitz/ddcutil/pull/502
+
+From d6eeb92f0e537aba415b6abc28fe157626a7bef7 Mon Sep 17 00:00:00 2001
+From: "Z. Liu" <zhixu.liu@gmail.com>
+Date: Tue, 25 Feb 2025 22:24:23 +0800
+Subject: [PATCH] fix error reported by clang 19
+
+1. query_sysenv_i2c.c: error: variable 'busct' set but not used [-Werror,-Wunused-but-set-variable]
+2. i2c_strategy_dispatcher.c: error: expression which evaluates to zero treated as a null pointer
+
+Signed-off-by: Z. Liu <zhixu.liu@gmail.com>
+---
+ src/app_sysenv/query_sysenv_i2c.c | 3 ---
+ src/i2c/i2c_strategy_dispatcher.c | 4 ++--
+ 2 files changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/src/app_sysenv/query_sysenv_i2c.c b/src/app_sysenv/query_sysenv_i2c.c
+index 55f3424a..290b704b 100644
+--- a/src/app_sysenv/query_sysenv_i2c.c
++++ b/src/app_sysenv/query_sysenv_i2c.c
+@@ -275,11 +275,8 @@ void test_edid_read_variants(Env_Accumulator * accum) {
+ rpt_title("Testing EDID read alternatives...",depth);
+ sysenv_rpt_current_time(NULL, d1);
+
+- int busct = 0;
+-
+ for (int busno=0; busno < I2C_BUS_MAX; busno++) {
+ if (i2c_device_exists(busno)) {
+- busct++;
+ rpt_nl();
+ rpt_vstring(d1, "Examining device /dev/i2c-%d...", busno);
+
+diff --git a/src/i2c/i2c_strategy_dispatcher.c b/src/i2c/i2c_strategy_dispatcher.c
+index ee435e6d..d6026526 100644
+--- a/src/i2c/i2c_strategy_dispatcher.c
++++ b/src/i2c/i2c_strategy_dispatcher.c
+@@ -188,7 +188,7 @@ Status_Errno_DDC invoke_i2c_writer(
+ hexstring_t(bytes_to_write, bytect));
+
+ // n. prior to gcc 11, declaration cannot immediately follow label
+- I2C_IO_Strategy * strategy = I2C_IO_STRATEGY_NOT_SET;
++ I2C_IO_Strategy * strategy = NULL;
+ retry:
+ strategy = i2c_get_io_strategy();
+ DBGTRC_NOPREFIX(debug, TRACE_GROUP, "strategy = %s", strategy->strategy_name);
+@@ -235,7 +235,7 @@ Status_Errno_DDC invoke_i2c_reader(
+ readbuf);
+
+ // n. prior to gcc 11, declaration cannot immediately follow label
+- I2C_IO_Strategy * strategy = I2C_IO_STRATEGY_NOT_SET;
++ I2C_IO_Strategy * strategy = NULL;
+ retry:
+ strategy = i2c_get_io_strategy();
+ DBGTRC_NOPREFIX(debug, TRACE_GROUP, "strategy = %s", strategy->strategy_name);
+--
+2.45.2
+
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-04 19:27:35 +0000