* [gentoo-commits] repo/gentoo:master commit in: app-misc/ddcutil/, app-misc/ddcutil/files/
@ 2018-01-30 21:28 Jonathan Scruggs
0 siblings, 0 replies; 4+ messages in thread
From: Jonathan Scruggs @ 2018-01-30 21:28 UTC (permalink / raw
To: gentoo-commits
commit: 1c133a7cccdf1f1aff10ec0a00766cb073d72f8b
Author: Jonathan Scruggs <j.scruggs <AT> gmail <DOT> com>
AuthorDate: Tue Jan 30 21:07:42 2018 +0000
Commit: Jonathan Scruggs <dracwyrm <AT> gentoo <DOT> org>
CommitDate: Tue Jan 30 21:27:58 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c133a7c
app-misc/ddcutil: remove pedantic compiler flag
Closes: https://bugs.gentoo.org/645830
Closes: https://github.com/gentoo/gentoo/pull/7003
app-misc/ddcutil/ddcutil-0.8.6-r1.ebuild | 108 ++++++++++++++++++
.../ddcutil-0.8.6-remove-pedantic-cflag.patch | 126 +++++++++++++++++++++
2 files changed, 234 insertions(+)
diff --git a/app-misc/ddcutil/ddcutil-0.8.6-r1.ebuild b/app-misc/ddcutil/ddcutil-0.8.6-r1.ebuild
new file mode 100644
index 00000000000..a1402f71b64
--- /dev/null
+++ b/app-misc/ddcutil/ddcutil-0.8.6-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic linux-info udev user
+
+DESCRIPTION="Program for querying and changing monitor settings"
+HOMEPAGE="http://www.ddcutil.com/"
+SRC_URI="https://github.com/rockowitz/ddcutil/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="drm usb-monitor user-permissions video_cards_nvidia X"
+REQUIRED_USE="drm? ( X )"
+
+RDEPEND="dev-libs/glib:2
+ sys-apps/i2c-tools
+ virtual/udev
+ drm? ( x11-libs/libdrm )
+ usb-monitor? (
+ dev-libs/hidapi
+ virtual/libusb:1
+ sys-apps/usbutils
+ )
+ X? (
+ x11-libs/libXrandr
+ x11-libs/libX11
+ )"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+PATCHES=( ${FILESDIR}/${P}-remove-pedantic-cflag.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() {
+ # Bug 607818.
+ replace-flags -O3 -O2
+
+ local myeconfargs=(
+ $(use_enable drm)
+ $(use_enable usb-monitor usb)
+ $(use_enable X x11)
+ --enable-lib
+ --disable-cffi
+ --disable-cython
+ --disable-swig
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+ if use user-permissions; then
+ udev_dorules data/etc/udev/rules.d/45-ddcutil-i2c.rules
+ if use usb-monitor; then
+ udev_dorules data/etc/udev/rules.d/45-ddcutil-usb.rules
+ fi
+ fi
+}
+
+pkg_postinst() {
+ if use user-permissions; then
+ enewgroup i2c
+ 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
+ enewgroup video
+ 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
+}
diff --git a/app-misc/ddcutil/files/ddcutil-0.8.6-remove-pedantic-cflag.patch b/app-misc/ddcutil/files/ddcutil-0.8.6-remove-pedantic-cflag.patch
new file mode 100644
index 00000000000..e20cc36459e
--- /dev/null
+++ b/app-misc/ddcutil/files/ddcutil-0.8.6-remove-pedantic-cflag.patch
@@ -0,0 +1,126 @@
+diff -urN a/src/app_sysenv/Makefile.am b/src/app_sysenv/Makefile.am
+--- a/src/app_sysenv/Makefile.am 2018-01-20 06:40:55.000000000 +0000
++++ b/src/app_sysenv/Makefile.am 2018-01-28 20:16:44.143484825 +0000
+@@ -15,8 +15,8 @@
+
+
+ AM_CFLAGS = -Wall
+-AM_CFLAGS += -Werror
+-AM_CFLAGS += -Wpedantic
++#AM_CFLAGS += -Werror
++#AM_CFLAGS += -Wpedantic
+
+ if ENABLE_CALLGRAPH_COND
+ AM_CFLAGS += -fdump-rtl-expand
+diff -urN a/src/base/Makefile.am b/src/base/Makefile.am
+--- a/src/base/Makefile.am 2018-01-20 06:40:55.000000000 +0000
++++ b/src/base/Makefile.am 2018-01-28 20:21:31.124936834 +0000
+@@ -4,7 +4,7 @@
+ -I$(top_srcdir)/src/public
+
+ AM_CFLAGS = -Wall
+-AM_CFLAGS += -Werror
++#AM_CFLAGS += -Werror
+ # AM_CFLAGS += -Wpedantic
+
+ if ENABLE_CALLGRAPH_COND
+diff -urN a/src/cmdline/Makefile.am b/src/cmdline/Makefile.am
+--- a/src/cmdline/Makefile.am 2018-01-20 06:40:55.000000000 +0000
++++ b/src/cmdline/Makefile.am 2018-01-28 20:20:32.178848976 +0000
+@@ -4,7 +4,7 @@
+ -I$(top_srcdir)/src/public
+
+ AM_CFLAGS = -Wall
+-AM_CFLAGS += -Werror
++#AM_CFLAGS += -Werror
+ # flags g_option parser structs in cmd_parser_goption.c
+ # AM_CFLAGS += -Wpedantic
+
+diff -urN a/src/ddc/Makefile.am b/src/ddc/Makefile.am
+--- a/src/ddc/Makefile.am 2018-01-20 06:40:55.000000000 +0000
++++ b/src/ddc/Makefile.am 2018-01-28 20:18:09.643626498 +0000
+@@ -11,8 +11,8 @@
+
+
+ AM_CFLAGS = -Wall
+-AM_CFLAGS += -Werror
+-AM_CFLAGS += -Wpedantic
++#AM_CFLAGS += -Werror
++#AM_CFLAGS += -Wpedantic
+
+ if ENABLE_CALLGRAPH_COND
+ AM_CFLAGS += -fdump-rtl-expand
+diff -urN a/src/i2c/Makefile.am b/src/i2c/Makefile.am
+--- a/src/i2c/Makefile.am 2018-01-20 06:40:55.000000000 +0000
++++ b/src/i2c/Makefile.am 2018-01-28 20:17:30.271562118 +0000
+@@ -4,8 +4,8 @@
+ -I$(top_srcdir)/src/public
+
+ AM_CFLAGS = -Wall
+-AM_CFLAGS += -Werror
+-AM_CFLAGS += -Wpedantic
++#AM_CFLAGS += -Werror
++#AM_CFLAGS += -Wpedantic
+
+ if ENABLE_CALLGRAPH_COND
+ AM_CFLAGS += -fdump-rtl-expand
+diff -urN a/src/sample_clients/Makefile.am b/src/sample_clients/Makefile.am
+--- a/src/sample_clients/Makefile.am 2018-01-20 06:40:55.000000000 +0000
++++ b/src/sample_clients/Makefile.am 2018-01-28 20:19:57.230795822 +0000
+@@ -7,7 +7,7 @@
+ -I$(top_srcdir)/src
+
+ AM_CFLAGS = -Wall -fPIC
+-AM_CFLAGS += -Werror
++#AM_CFLAGS += -Werror
+
+ check_PROGRAMS =
+ if ENABLE_SHARED_LIB_COND
+diff -urN a/src/test/Makefile.am b/src/test/Makefile.am
+--- a/src/test/Makefile.am 2018-01-20 06:40:55.000000000 +0000
++++ b/src/test/Makefile.am 2018-01-28 20:19:03.509712410 +0000
+@@ -12,7 +12,7 @@
+
+
+
+-AM_CFLAGS = -Wall -Werror
++AM_CFLAGS = -Wall
+
+ if ENABLE_CALLGRAPH_COND
+ AM_CFLAGS += -fdump-rtl-expand
+diff -urN a/src/usb/Makefile.am b/src/usb/Makefile.am
+--- a/src/usb/Makefile.am 2018-01-20 06:40:55.000000000 +0000
++++ b/src/usb/Makefile.am 2018-01-28 20:18:26.146653076 +0000
+@@ -5,7 +5,7 @@
+ -I$(top_srcdir)/src/public
+
+ AM_CFLAGS = -Wall
+-AM_CFLAGS += -Wpedantic
++#AM_CFLAGS += -Wpedantic
+
+ if ENABLE_CALLGRAPH_COND
+ AM_CFLAGS += -fdump-rtl-expand
+diff -urN a/src/util/Makefile.am b/src/util/Makefile.am
+--- a/src/util/Makefile.am 2018-01-20 06:40:55.000000000 +0000
++++ b/src/util/Makefile.am 2018-01-28 20:21:07.245901502 +0000
+@@ -3,7 +3,7 @@
+ $(LIBDRM_CFLAGS)
+
+ AM_CFLAGS = -Wall
+-AM_CFLAGS += -Werror
++#AM_CFLAGS += -Werror
+ # -pedantic issues warnings re code that doesn't conform to ISO C
+ # Alas, -m modifier on sscanf is a POSIX extension, not ISO C
+ # In combination with -Werror, causes device_util.c to fail compilation
+diff -urN a/src/vcp/Makefile.am b/src/vcp/Makefile.am
+--- a/src/vcp/Makefile.am 2018-01-20 06:40:55.000000000 +0000
++++ b/src/vcp/Makefile.am 2018-01-28 20:19:28.024750741 +0000
+@@ -4,7 +4,7 @@
+ -I$(top_srcdir)/src/public
+
+ AM_CFLAGS = -Wall
+-AM_CFLAGS += -Werror
++#AM_CFLAGS += -Werror
+ # vcp_feature_codes.c requires extensive changes if -Wpedantic
+ # AM_CFLAGS += -Wpedantic
+
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/ddcutil/, app-misc/ddcutil/files/
@ 2022-08-29 11:46 Andrew Ammerlaan
0 siblings, 0 replies; 4+ messages in thread
From: Andrew Ammerlaan @ 2022-08-29 11:46 UTC (permalink / raw
To: gentoo-commits
commit: 905d6d61b858289154539583df1fe6821a9ae1e6
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 29 11:37:27 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon Aug 29 11:45:55 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=905d6d61
app-misc/ddcutil: add 1.3.0
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
app-misc/ddcutil/Manifest | 1 +
app-misc/ddcutil/ddcutil-1.3.0.ebuild | 119 +++++++++++++++++++++
.../ddcutil/files/ddcutil-1.3.0-no-werror.patch | 73 +++++++++++++
3 files changed, 193 insertions(+)
diff --git a/app-misc/ddcutil/Manifest b/app-misc/ddcutil/Manifest
index 6237ee274ea6..b8e49ee087d8 100644
--- a/app-misc/ddcutil/Manifest
+++ b/app-misc/ddcutil/Manifest
@@ -1 +1,2 @@
DIST ddcutil-1.2.2.tar.gz 803943 BLAKE2B 65cc5dc0d1ee85d1e2b6670f7c24508ab817c6eebdb596b5f6f70c7ff7b9257f12f70abfea2d735e23755e508d4829d4be6574ac16564d4d828e0b1153cf8afe SHA512 0329711e536cbcaee2efe6cf981a17181ab318846e9c6a82f2ceacc42691ba49c06df44a52d1f079568e9ccec588cc85d4de4adf19b6db83bebe4bb90ae29207
+DIST ddcutil-1.3.0.tar.gz 816789 BLAKE2B 1cb3b64961503416b85b792e1002ec67788f8cf7d622be1c4930808f99e16974ff57ed582d1d02a67580e3f4d92bef54b3669fd7378462bf4c98a3643d6786be SHA512 93d69958b2e1dcb66ad700712742536179383c93f2ec1f746b6a6c78adfd6daa861275208850cc807e0c16a11ea84904cb13ceef512ca76e1daa910410303d41
diff --git a/app-misc/ddcutil/ddcutil-1.3.0.ebuild b/app-misc/ddcutil/ddcutil-1.3.0.ebuild
new file mode 100644
index 000000000000..35f885477ff1
--- /dev/null
+++ b/app-misc/ddcutil/ddcutil-1.3.0.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2022 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/4"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="drm usb-monitor user-permissions video_cards_nvidia X"
+REQUIRED_USE="drm? ( X )"
+
+RDEPEND="
+ dev-libs/glib: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}"/${P}-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)
+ $(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/45-ddcutil-i2c.rules
+ if use usb-monitor; then
+ udev_dorules data/etc/udev/rules.d/45-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.3.0-no-werror.patch b/app-misc/ddcutil/files/ddcutil-1.3.0-no-werror.patch
new file mode 100644
index 000000000000..4df9c892c12b
--- /dev/null
+++ b/app-misc/ddcutil/files/ddcutil-1.3.0-no-werror.patch
@@ -0,0 +1,73 @@
+diff --git a/src/app_ddcutil/Makefile.am b/src/app_ddcutil/Makefile.am
+index 068e419..f21e9fd 100644
+--- a/src/app_ddcutil/Makefile.am
++++ b/src/app_ddcutil/Makefile.am
+@@ -5,7 +5,6 @@ AM_CPPFLAGS = \
+
+
+ AM_CFLAGS = -Wall
+-AM_CFLAGS += -Werror
+ # AM_CFLAGS += -Wpedantic
+
+ if ENABLE_CALLGRAPH_COND
+diff --git a/src/app_sysenv/Makefile.am b/src/app_sysenv/Makefile.am
+index a182ff9..753f187 100644
+--- a/src/app_sysenv/Makefile.am
++++ b/src/app_sysenv/Makefile.am
+@@ -12,7 +12,6 @@ endif
+
+
+ AM_CFLAGS = -Wall
+-AM_CFLAGS += -Werror
+ # AM_CFLAGS += -Wpedantic
+
+ if ENABLE_CALLGRAPH_COND
+diff --git a/src/i2c/Makefile.am b/src/i2c/Makefile.am
+index 52a4efa..5c671e1 100644
+--- a/src/i2c/Makefile.am
++++ b/src/i2c/Makefile.am
+@@ -5,7 +5,6 @@ AM_CPPFLAGS = \
+ -I$(top_srcdir)/src/public
+
+ AM_CFLAGS = -Wall
+-AM_CFLAGS += -Werror
+ # AM_CFLAGS += -Wpedantic
+
+ if ENABLE_CALLGRAPH_COND
+diff --git a/src/libmain/Makefile.am b/src/libmain/Makefile.am
+index ace200a..46cc9f4 100644
+--- a/src/libmain/Makefile.am
++++ b/src/libmain/Makefile.am
+@@ -5,7 +5,6 @@ AM_CPPFLAGS = \
+
+
+ AM_CFLAGS = -Wall
+-AM_CFLAGS += -Werror
+ # AM_CFLAGS += -Wpedantic
+
+ if ENABLE_CALLGRAPH_COND
+diff --git a/src/sample_clients/Makefile.am b/src/sample_clients/Makefile.am
+index 1593521..63d2307 100644
+--- a/src/sample_clients/Makefile.am
++++ b/src/sample_clients/Makefile.am
+@@ -7,7 +7,6 @@ AM_CPPFLAGS= \
+ -I$(top_srcdir)/src
+
+ AM_CFLAGS = -Wall -fPIC
+-# AM_CFLAGS += -Werror
+
+ check_PROGRAMS =
+ if ENABLE_SHARED_LIB_COND
+diff --git a/src/test/Makefile.am b/src/test/Makefile.am
+index c12f15c..27d2124 100644
+--- a/src/test/Makefile.am
++++ b/src/test/Makefile.am
+@@ -4,7 +4,7 @@ $(GLIB_CFLAGS) \
+ -I$(top_srcdir)/src \
+ -I$(top_srcdir)/src/public
+
+-AM_CFLAGS = -Wall -Werror
++AM_CFLAGS = -Wall
+
+ CLEANFILES = \
+ *expand
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/ddcutil/, app-misc/ddcutil/files/
@ 2023-11-27 20:09 Andrew Ammerlaan
0 siblings, 0 replies; 4+ messages in thread
From: Andrew Ammerlaan @ 2023-11-27 20:09 UTC (permalink / raw
To: gentoo-commits
commit: 79d92dece993d8d1d1a9d45a8f4f84c5d895009a
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 27 20:07:45 2023 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon Nov 27 20:07:45 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79d92dec
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 <AT> gentoo.org>
...dcutil-2.0.0.ebuild => ddcutil-2.0.0-r1.ebuild} | 2 ++
...2.0.0-fix-build-with-usb-monitor-disabled.patch | 22 ++++++++++++++++++++++
2 files changed, 24 insertions(+)
diff --git a/app-misc/ddcutil/ddcutil-2.0.0.ebuild b/app-misc/ddcutil/ddcutil-2.0.0-r1.ebuild
similarity index 97%
rename from app-misc/ddcutil/ddcutil-2.0.0.ebuild
rename to 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;
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-misc/ddcutil/, app-misc/ddcutil/files/
@ 2024-01-23 13:47 Andrew Ammerlaan
0 siblings, 0 replies; 4+ messages in thread
From: Andrew Ammerlaan @ 2024-01-23 13:47 UTC (permalink / raw
To: gentoo-commits
commit: 6552f78effce628accd6eb59582f367b39b97f70
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 23 13:46:29 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Jan 23 13:47:20 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6552f78e
app-misc/ddcutil: fix build with USE=-usb-monitor (again)
Closes: https://bugs.gentoo.org/922715
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
...dcutil-2.1.0.ebuild => ddcutil-2.1.0-r1.ebuild} | 1 +
...2.1.0-fix-build-with-usb-monitor-disabled.patch | 34 ++++++++++++++++++++++
2 files changed, 35 insertions(+)
diff --git a/app-misc/ddcutil/ddcutil-2.1.0.ebuild b/app-misc/ddcutil/ddcutil-2.1.0-r1.ebuild
similarity index 97%
rename from app-misc/ddcutil/ddcutil-2.1.0.ebuild
rename to 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);
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-01-23 13:47 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-01-30 21:28 [gentoo-commits] repo/gentoo:master commit in: app-misc/ddcutil/, app-misc/ddcutil/files/ Jonathan Scruggs
-- strict thread matches above, loose matches on Subject: below --
2022-08-29 11:46 Andrew Ammerlaan
2023-11-27 20:09 Andrew Ammerlaan
2024-01-23 13:47 Andrew Ammerlaan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox