[gentoo-commits] repo/gentoo:master commit in: dev-embedded/libftdi/, dev-embedded/libftdi/files/

[gentoo-commits] repo/gentoo:master commit in: dev-embedded/libftdi/, dev-embedded/libftdi/files/

[Sven Wegener]

commit:     d8344da95467382d33df0c3aa727162f46b6e75b
Author:     Sven Wegener <swegener <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 19 15:49:03 2015 +0000
Commit:     Sven Wegener <swegener <AT> gentoo <DOT> org>
CommitDate: Sat Dec 19 15:59:04 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8344da9

dev-embedded/libftdi: Fix cmake build issue with USE=examples, bug #566856

Signed-off-by: Sven Wegener <swegener <AT> gentoo.org>

 .../libftdi/files/libftdi-0.20-cmake-include.patch | 22 ++++++++++++++++++++++
 dev-embedded/libftdi/libftdi-0.20.ebuild           |  4 +++-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/dev-embedded/libftdi/files/libftdi-0.20-cmake-include.patch b/dev-embedded/libftdi/files/libftdi-0.20-cmake-include.patch
new file mode 100644
index 0000000..4faf7c6
--- /dev/null
+++ b/dev-embedded/libftdi/files/libftdi-0.20-cmake-include.patch
@@ -0,0 +1,22 @@
+From ccbd6cf1934056386772debba8583bc9b3721072 Mon Sep 17 00:00:00 2001
+From: Uffe Jakobsen <uffe@uffe.org>
+Date: Mon, 22 Oct 2012 12:03:22 +0200
+Subject: [PATCH] Fix build on FreeBSD (cmake file typo)
+
+---
+ examples/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
+index 6793d89..1263c62 100644
+--- a/examples/CMakeLists.txt
++++ b/examples/CMakeLists.txt
+@@ -2,7 +2,7 @@ option(EXAMPLES "Build example programs" ON)
+ 
+ if (EXAMPLES)
+     # Includes
+-    include( ${CMAKE_CURRENT_SOURCE_DIR}
++    include_directories( ${CMAKE_CURRENT_SOURCE_DIR}
+             ${CMAKE_CURRENT_BINARY_DIR}
+             )
+ 

diff --git a/dev-embedded/libftdi/libftdi-0.20.ebuild b/dev-embedded/libftdi/libftdi-0.20.ebuild
index a5804f3..acc14c0 100644
--- a/dev-embedded/libftdi/libftdi-0.20.ebuild
+++ b/dev-embedded/libftdi/libftdi-0.20.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="2"
 
-inherit cmake-utils python
+inherit cmake-utils python eutils
 
 if [[ ${PV} == 9999* ]] ; then
 	EGIT_REPO_URI="git://developer.intra2net.com/${PN}"
@@ -34,6 +34,8 @@ src_prepare() {
 	sed -i \
 		-e '/SET(LIB_SUFFIX /d' \
 		CMakeLists.txt || die
+
+	epatch "${FILESDIR}"/${P}-cmake-include.patch
 }
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: dev-embedded/libftdi/, dev-embedded/libftdi/files/

[Sam James]

commit:     438dbc8c314630574457430a3e0e3aa44273a9b7
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 14 03:55:12 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 14 03:55:12 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=438dbc8c

dev-embedded/libftdi: patch out distutils use

Closes: https://bugs.gentoo.org/934224
Bug: https://bugs.gentoo.org/929394
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-embedded/libftdi/files/libftdi-1.5-py312.patch | 25 ++++++++++++++++++++++
 dev-embedded/libftdi/libftdi-1.5-r6.ebuild         |  4 ++++
 2 files changed, 29 insertions(+)

diff --git a/dev-embedded/libftdi/files/libftdi-1.5-py312.patch b/dev-embedded/libftdi/files/libftdi-1.5-py312.patch
new file mode 100644
index 000000000000..51fdd10efd81
--- /dev/null
+++ b/dev-embedded/libftdi/files/libftdi-1.5-py312.patch
@@ -0,0 +1,25 @@
+https://bugs.gentoo.org/934224
+http://developer.intra2net.com/git/?p=libftdi;a=commit;h=abd19b721f7e9b4d514ed319ece173ebc7b1ea72
+
+From abd19b721f7e9b4d514ed319ece173ebc7b1ea72 Mon Sep 17 00:00:00 2001
+From: =?utf8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
+Date: Mon, 19 Dec 2022 17:40:43 +0100
+Subject: [PATCH] python: move from distutils to sysconfig
+
+The distutils module was deprecated in Python 3.10, and will be removed
+in 3.12 [1], thus switch to the sysconfig module instead.
+
+[1] https://peps.python.org/pep-0632/
+--- a/python/CMakeLists.txt
++++ b/python/CMakeLists.txt
+@@ -42,7 +42,7 @@ endif ()
+ 
+ set_target_properties ( ${SWIG_MODULE_ftdi1_REAL_NAME} PROPERTIES NO_SONAME ON )
+ 
+-execute_process ( COMMAND ${PYTHON_EXECUTABLE} -c "from distutils import sysconfig; print( sysconfig.get_python_lib( plat_specific=True, prefix='${CMAKE_INSTALL_PREFIX}' ) )"
++execute_process ( COMMAND ${PYTHON_EXECUTABLE} -c "import sysconfig; print( sysconfig.get_path( 'platlib', vars={'platbase': '${CMAKE_INSTALL_PREFIX}'} ) )"
+                   OUTPUT_VARIABLE _ABS_PYTHON_MODULE_PATH
+                   OUTPUT_STRIP_TRAILING_WHITESPACE )
+ 
+-- 
+1.7.1

diff --git a/dev-embedded/libftdi/libftdi-1.5-r6.ebuild b/dev-embedded/libftdi/libftdi-1.5-r6.ebuild
index c8a0cc141846..d176c11a73f3 100644
--- a/dev-embedded/libftdi/libftdi-1.5-r6.ebuild
+++ b/dev-embedded/libftdi/libftdi-1.5-r6.ebuild
@@ -46,6 +46,10 @@ BDEPEND="
 	python? ( >=dev-lang/swig-4.2.0 )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-py312.patch
+)
+
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }