[gentoo-commits] repo/gentoo:master commit in: dev-embedded/openocd/

["Yixun Lan" <dlan@gentoo.org>]

commit:     9ec1edb1acb503243d4f3ea1474298b0b39f7d51
Author:     Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 17 02:09:57 2024 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Sat Feb 17 02:12:12 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ec1edb1

dev-embedded/openocd: make libgpiod optional

Closes: https://bugs.gentoo.org/917547
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>

 dev-embedded/openocd/metadata.xml                             |  1 +
 .../openocd/{openocd-9999.ebuild => openocd-0.12.0-r2.ebuild} | 11 ++++++++---
 dev-embedded/openocd/openocd-9999.ebuild                      |  7 ++++---
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/dev-embedded/openocd/metadata.xml b/dev-embedded/openocd/metadata.xml
index b9dbe67059b7..358a9c0a93c5 100644
--- a/dev-embedded/openocd/metadata.xml
+++ b/dev-embedded/openocd/metadata.xml
@@ -17,6 +17,7 @@
 		<flag name="capstone">Use <pkg>dev-libs/capstone</pkg> for disassembly support</flag>
 		<flag name="cmsis-dap">Support for CMSIS-DAP compliant adapters</flag>
 		<flag name="dummy">Build the dummy port driver</flag>
+		<flag name="gpiod">Enable Linux GPIO bitbang support via libgpiod</flag>
 		<flag name="jlink"> Build the SEGGER J-Link driver</flag>
 		<flag name="ftdi">Enable support for USB FTDI chips via <pkg>dev-embedded/libftdi</pkg></flag>
 		<flag name="parport">Enable support for parport JTAG devices</flag>

diff --git a/dev-embedded/openocd/openocd-9999.ebuild b/dev-embedded/openocd/openocd-0.12.0-r2.ebuild
similarity index 90%
copy from dev-embedded/openocd/openocd-9999.ebuild
copy to dev-embedded/openocd/openocd-0.12.0-r2.ebuild
index 669feebd09f8..698978b49848 100644
--- a/dev-embedded/openocd/openocd-9999.ebuild
+++ b/dev-embedded/openocd/openocd-0.12.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,13 +21,13 @@ HOMEPAGE="https://openocd.sourceforge.io"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE="capstone +cmsis-dap dummy +ftdi +jlink parport +usb verbose-io"
+IUSE="capstone +cmsis-dap dummy +ftdi gpiod +jlink parport +usb verbose-io"
 RESTRICT="strip" # includes non-native binaries
 
 RDEPEND="
 	acct-group/plugdev
 	>=dev-lang/jimtcl-0.81:=
-	dev-libs/libgpiod:0/2
+	gpiod? ( dev-libs/libgpiod:0/2 )
 	capstone? ( dev-libs/capstone )
 	cmsis-dap? ( dev-libs/hidapi )
 	jlink? ( >=dev-embedded/libjaylink-0.2.0 )
@@ -37,6 +37,10 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-0.12.0-capstone-includedir.patch"
+)
+
 src_prepare() {
 	default
 
@@ -66,6 +70,7 @@ src_configure() {
 		$(use_enable ftdi openjtag)
 		$(use_enable ftdi presto)
 		$(use_enable ftdi usb-blaster)
+		$(use_enable gpiod linuxgpiod)
 		$(use_enable jlink)
 		$(use_enable parport)
 		$(use_enable parport parport_ppdev)

diff --git a/dev-embedded/openocd/openocd-9999.ebuild b/dev-embedded/openocd/openocd-9999.ebuild
index 669feebd09f8..bf5127f94e2c 100644
--- a/dev-embedded/openocd/openocd-9999.ebuild
+++ b/dev-embedded/openocd/openocd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,13 +21,13 @@ HOMEPAGE="https://openocd.sourceforge.io"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE="capstone +cmsis-dap dummy +ftdi +jlink parport +usb verbose-io"
+IUSE="capstone +cmsis-dap dummy +ftdi gpiod +jlink parport +usb verbose-io"
 RESTRICT="strip" # includes non-native binaries
 
 RDEPEND="
 	acct-group/plugdev
 	>=dev-lang/jimtcl-0.81:=
-	dev-libs/libgpiod:0/2
+	gpiod? ( dev-libs/libgpiod:0/2 )
 	capstone? ( dev-libs/capstone )
 	cmsis-dap? ( dev-libs/hidapi )
 	jlink? ( >=dev-embedded/libjaylink-0.2.0 )
@@ -66,6 +66,7 @@ src_configure() {
 		$(use_enable ftdi openjtag)
 		$(use_enable ftdi presto)
 		$(use_enable ftdi usb-blaster)
+		$(use_enable gpiod linuxgpiod)
 		$(use_enable jlink)
 		$(use_enable parport)
 		$(use_enable parport parport_ppdev)