From 637874b91a93d6eaca80813a60d4ad95f0f0a682 Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Mon, 11 Dec 2023 08:31:07 +0100 Subject: app-misc/ddcutil: install correct udev rules Closes: https://bugs.gentoo.org/919691 Signed-off-by: Andrew Ammerlaan --- app-misc/ddcutil/ddcutil-2.0.0-r1.ebuild | 121 ------------------------------- app-misc/ddcutil/ddcutil-2.0.0-r2.ebuild | 121 +++++++++++++++++++++++++++++++ 2 files changed, 121 insertions(+), 121 deletions(-) delete mode 100644 app-misc/ddcutil/ddcutil-2.0.0-r1.ebuild create mode 100644 app-misc/ddcutil/ddcutil-2.0.0-r2.ebuild (limited to 'app-misc') diff --git a/app-misc/ddcutil/ddcutil-2.0.0-r1.ebuild b/app-misc/ddcutil/ddcutil-2.0.0-r1.ebuild deleted file mode 100644 index 404d40c2fb75..000000000000 --- a/app-misc/ddcutil/ddcutil-2.0.0-r1.ebuild +++ /dev/null @@ -1,121 +0,0 @@ -# Copyright 1999-2023 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" - -SLOT="0/5" -LICENSE="GPL-2" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" -IUSE="drm usb-monitor user-permissions video_cards_nvidia X" -REQUIRED_USE="drm? ( X )" - -RDEPEND=" - dev-libs/glib:2 - >=dev-libs/jansson-2 - sys-apps/i2c-tools - virtual/udev - drm? ( 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-doc/doxygen[dot] ) - -PATCHES=( - "${FILESDIR}"/${PN}-1.4.1-no-werror.patch - "${FILESDIR}"/${PN}-2.0.0-fix-build-with-usb-monitor-disabled.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) - $(use_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/etc/udev/rules.d/60-ddcutil-i2c.rules - if use usb-monitor; then - udev_dorules data/etc/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/ddcutil-2.0.0-r2.ebuild b/app-misc/ddcutil/ddcutil-2.0.0-r2.ebuild new file mode 100644 index 000000000000..6eea72eebf9a --- /dev/null +++ b/app-misc/ddcutil/ddcutil-2.0.0-r2.ebuild @@ -0,0 +1,121 @@ +# Copyright 1999-2023 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" + +SLOT="0/5" +LICENSE="GPL-2" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" +IUSE="drm usb-monitor user-permissions video_cards_nvidia X" +REQUIRED_USE="drm? ( X )" + +RDEPEND=" + dev-libs/glib:2 + >=dev-libs/jansson-2 + sys-apps/i2c-tools + virtual/udev + drm? ( 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-doc/doxygen[dot] ) + +PATCHES=( + "${FILESDIR}"/${PN}-1.4.1-no-werror.patch + "${FILESDIR}"/${PN}-2.0.0-fix-build-with-usb-monitor-disabled.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) + $(use_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 +} -- cgit v1.2.3-65-gdbad