Cleanup and python 3.13
This commit is contained in:
Mario Fetka
@@ -1,7 +1,11 @@
|
||||
AUX libftdi-0.20-cmake-include.patch 687 BLAKE2B 8817db6e200adcb3d76da91565fe25f694445a46325a6435d6d0545d6741b0d15b199f96aabf01ca664eeb3355008acc6ec309f5fa87f975584935ecd74558f7 SHA512 b7b2d3a8cd84f3bbc86aa43bc9d090359375c6ea6b52a32107cd46751d386768b3d196c0bca7235453c596ef19c5ee4e1a39739db90e3e0c06adc62609e7fb90
|
||||
AUX libftdi-0.20-cmake-version.patch 1010 BLAKE2B cd88bc50cebb22a5e982d8f7985014549bdae23e35fefb0d2f6cf14c4610d79ebfbbb11e94174b6c1ff260d83713c4c4db395c725bbe836142e0e80092324a3f SHA512 9ea6d07324c6cb89856f8a9411b0564fb344f2624162f5435b9cbaeddb97361d79dd9b71d0c64988106ec162cd5a93b43f2c5257f0f0207ce8151de37712cd91
|
||||
AUX libftdi-1.5-cmake-cxx.patch 1448 BLAKE2B f43c592cc17481e21dc1b0fe4a4cf583c3b2f192197133443f90dc1f9bd134fe903598dc9d12f92a8376bcd58f4cb698b9bd34ff4c06cf2df180260d2456126c SHA512 9881153611aa75dcc53f739bd510898f55d9fc56a07cec41e09fed37768c462663160d8491f7eaaa5dd7bc8935d36f33379d3529cfe355a3391507415a9e7cae
|
||||
AUX libftdi-1.5-cmake4.patch 2596 BLAKE2B 3bdcd9886451b0f0f14905109ec755d80bade06572c5c40ddc29115a6294c280f3ba13f9c7387100cde6d6cd1898e8f8d8fd891f2ffa2d91e04e44208f8d4a26 SHA512 7fa0ef24934e07a6f6e1cecb1e1246c2d96c42b97a7943a3ac532da041c1eb5d69bc2764613a6b0fd7baf9f91f8b82a9c23adde31c3d7f6663bca3c0222c2b07
|
||||
AUX libftdi-1.5-py312.patch 1144 BLAKE2B cf2263322b71ac06ac23f94fff8b2b68763fda8eb9d59d5811ed02e178a8c866f0f045b9acaced3b8cb01924504f3e00fd5f10c16642e9e2089a18f56e2e2c6c SHA512 8f0bdf45028d586a3d5d28aac135e6ad04f4e28d44e5a16953db78253a37374c87bf085eb1969a716e906a22f0b6affa874f3bc8e39c1b4ffaf8a84cdd5f800a
|
||||
AUX libftdi-1.5-swig-4.3.patch 4135 BLAKE2B 88da729f7ce3f02400f5ff1a7c9f94242625225b7e3193169725acf0f6acf8c3bcf29a85fa6dae9f632ac1cf05bcb6a7e9086256a9c687df3b1250d9b808f4a5 SHA512 6102992dfeca5c8ade821deff1d76d7ed579a1951287beede7cbd96cd09b39061b8742cdb7c073dd06af759d8fe476c66f9ba81c5b78f755658d02ae4014cf77
|
||||
AUX libftdi-1.5-tests-no-cxx.patch 1017 BLAKE2B ff3e05ae2cc48a023c74142f986159f68b6a3e49ccf9684c94b4de2fd03c8d5c53e600810d1e8933e09ed7aa167fab15101344a6bdc8b9e00647f2c86801f694 SHA512 6d0fa3923f8f1e92b22538448368016db24d194b886c4702731eb5038b65c8a03773cfe0a02459cf040574845ab482fb676f01a97f26d5c48065fd9427a11eeb
|
||||
DIST libftdi1-1.5.tar.bz2 116297 BLAKE2B 460ab93026e14a452e31fcc6930d305638fdc0ed06cb44fb9d50ad8f80199b17057d2f48a27b8295b43b956934289c872a2ef1ddb7f93fa93c6816511ef7607d SHA512 c525b2ab6aff9ef9254971ae7d57f3549a36a36875765c48f947d52532814a2a004de1232389d4fe824a8c8ab84277b08427308573476e1da9b7db83db802f6f
|
||||
EBUILD libftdi-1.5-r4.ebuild 1917 BLAKE2B 1e3a1b651d560dd752a8a8f61ba179423b6bc33f8b5b5d43f5daa0d51af84e5210dae0d6b69937629105a85516d845626f12f09f185260bc52ea8b6ea7c770f9 SHA512 f6b528fd3efe328ba9787537ae7983e68e9aedd62d64acb61a6e155010210496e95dabfa769380132f19a2f7acb9ab3f20561b593ec9e92fb68175cf29db46d6
|
||||
EBUILD libftdi-1.5-r4.ebuild 1917 BLAKE2B cf81642728b47ff66a177003e00eb1d4ff29dfec745df5bb977e43841cbc80da19a5c3231fb6242c4b947a25e3af3b51d6aa74997b8c8cfbd0a5728b06be3a03 SHA512 4cfdb32d72019f6c982f59d9c3a8bdc49ffc6b8ae762fa270409eb1096de1fe0f8ca6b89cd1e71ccf8010d5cd18462d7727e799da8e09678651e8d85145ae3eb
|
||||
EBUILD libftdi-1.5-r7.ebuild 2049 BLAKE2B 5d046361cb7967ebc606d20e94ca1825c11737336be521aec35242f00faab0ce7af26eecf2e9c439b83d8d1c209828121f6eb5e489e766a719aee221000ec992 SHA512 f76fce65bb6b574bc93f19ec99a3f7e9a44815d57e38f7388491d3c137b3b21af4e64d597bfd5d2bd8795a00f4bdf7cb87852c412bd21642eb15629f55b2d99b
|
||||
MISC metadata.xml 318 BLAKE2B c2c9ab83d57a082ed6608367f53f0f9420056c909d4ee50641da5b8f12b6a6ca996740fbdcadb0fa08460cb0cbef36dbedfaaf98acaea3eeeeee6afcf7724f54 SHA512 313b5c5dfcf5feb7dc8e41c1cb74939619451cb0747c1a281c9a0e763d26e0850a43e05d8fd2a836389bd75c2a4f153b80986e11be8171e9d93ca234f9df05f2
|
||||
|
||||
87
dev-embedded/libftdi/files/libftdi-1.5-cmake4.patch
Normal file
87
dev-embedded/libftdi/files/libftdi-1.5-cmake4.patch
Normal file
@@ -0,0 +1,87 @@
|
||||
From 503c8789db7cb99e4e53cae3c220f80aef07c785 Mon Sep 17 00:00:00 2001
|
||||
From: Yegor Yefremov <yegorslists@googlemail.com>
|
||||
Date: Wed, 2 Apr 2025 10:12:34 +0200
|
||||
Subject: [PATCH] CMakeLists.txt: bump CMake version to 3.15
|
||||
|
||||
Older CMake versions are treated as deprecated.
|
||||
|
||||
merged with cherry-picks of preceding changes:
|
||||
3861e7dc9e83f2f6ff4e1579cf3bbf63a6827105
|
||||
de9f01ece34d2fe6e842e0250a38f4b16eda2429
|
||||
3f314ed78111473b7cbf1b9d1854c9f6322eea7a
|
||||
|
||||
diff -u a/CMakeLists.txt b/CMakeLists.txt
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -1,3 +1,5 @@
|
||||
+cmake_minimum_required(VERSION 3.15 FATAL_ERROR)
|
||||
+
|
||||
# Project
|
||||
project(libftdi1 C)
|
||||
set(MAJOR_VERSION 1)
|
||||
@@ -12,7 +14,6 @@
|
||||
set(CMAKE_BUILD_TYPE RelWithDebInfo)
|
||||
endif("${CMAKE_BUILD_TYPE}" STREQUAL "")
|
||||
set(CMAKE_COLOR_MAKEFILE ON)
|
||||
-cmake_minimum_required(VERSION 2.6 FATAL_ERROR)
|
||||
|
||||
add_definitions(-Wall)
|
||||
|
||||
@@ -211,30 +212,25 @@
|
||||
|
||||
set ( LIBFTDI_USE_FILE ${CMAKE_INSTALL_PREFIX}/${LIBFTDI_CMAKE_CONFIG_DIR}/UseLibFTDI1.cmake )
|
||||
|
||||
-if(CMAKE_VERSION VERSION_LESS 2.8.8)
|
||||
- configure_file ( cmake/LibFTDI1Config.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/LibFTDI1Config.cmake @ONLY )
|
||||
- configure_file ( cmake/LibFTDI1ConfigVersion.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/LibFTDI1ConfigVersion.cmake @ONLY )
|
||||
-else ()
|
||||
- include(CMakePackageConfigHelpers)
|
||||
-
|
||||
- configure_package_config_file (
|
||||
- cmake/LibFTDI1Config.cmake.in
|
||||
- ${CMAKE_CURRENT_BINARY_DIR}/LibFTDI1Config.cmake
|
||||
- INSTALL_DESTINATION ${LIBFTDI_CMAKE_CONFIG_DIR}
|
||||
- PATH_VARS
|
||||
- LIBFTDI_USE_FILE
|
||||
- LIBFTDI_ROOT_DIR
|
||||
- LIBFTDI_INCLUDE_DIR
|
||||
- LIBFTDI_INCLUDE_DIRS
|
||||
- LIBFTDI_LIBRARY_DIRS
|
||||
- NO_CHECK_REQUIRED_COMPONENTS_MACRO
|
||||
- )
|
||||
- write_basic_package_version_file (
|
||||
- LibFTDI1ConfigVersion.cmake
|
||||
- VERSION ${LIBFTDI_VERSION_STRING}
|
||||
- COMPATIBILITY AnyNewerVersion
|
||||
- )
|
||||
-endif ()
|
||||
+include(CMakePackageConfigHelpers)
|
||||
+
|
||||
+configure_package_config_file (
|
||||
+ cmake/LibFTDI1Config.cmake.in
|
||||
+ ${CMAKE_CURRENT_BINARY_DIR}/LibFTDI1Config.cmake
|
||||
+ INSTALL_DESTINATION ${LIBFTDI_CMAKE_CONFIG_DIR}
|
||||
+ PATH_VARS
|
||||
+ LIBFTDI_USE_FILE
|
||||
+ LIBFTDI_ROOT_DIR
|
||||
+ LIBFTDI_INCLUDE_DIR
|
||||
+ LIBFTDI_INCLUDE_DIRS
|
||||
+ LIBFTDI_LIBRARY_DIRS
|
||||
+ NO_CHECK_REQUIRED_COMPONENTS_MACRO
|
||||
+)
|
||||
+write_basic_package_version_file (
|
||||
+ LibFTDI1ConfigVersion.cmake
|
||||
+ VERSION ${LIBFTDI_VERSION_STRING}
|
||||
+ COMPATIBILITY AnyNewerVersion
|
||||
+)
|
||||
|
||||
|
||||
install ( FILES
|
||||
--- a/examples/cmake_example/CMakeLists.txt
|
||||
+++ b/examples/cmake_example/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required ( VERSION 2.8 )
|
||||
+cmake_minimum_required(VERSION 3.15 FATAL_ERROR)
|
||||
|
||||
project ( example C )
|
||||
|
||||
25
dev-embedded/libftdi/files/libftdi-1.5-py312.patch
Normal file
25
dev-embedded/libftdi/files/libftdi-1.5-py312.patch
Normal file
@@ -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
|
||||
82
dev-embedded/libftdi/files/libftdi-1.5-swig-4.3.patch
Normal file
82
dev-embedded/libftdi/files/libftdi-1.5-swig-4.3.patch
Normal file
@@ -0,0 +1,82 @@
|
||||
https://bugs.gentoo.org/953348
|
||||
http://developer.intra2net.com/git/?p=libftdi;a=commit;h=ff7707e3ffadc09af420b26370b9e097a5b2bc8b
|
||||
|
||||
From ff7707e3ffadc09af420b26370b9e097a5b2bc8b Mon Sep 17 00:00:00 2001
|
||||
From: William S Fulton <wsf@fultondesigns.co.uk>
|
||||
Date: Fri, 18 Oct 2024 09:38:20 +0200
|
||||
Subject: [PATCH] python: update for SWIG 4.3
|
||||
|
||||
SWIG 4.3 comes with an API change to the SWIG_Python_AppendOutput()
|
||||
function, so switch to the recommended SWIG_AppendOutput() instead.
|
||||
Because the new function is a macro in fact also switch to the {..}
|
||||
delimiters as the code needs to be preprocessed. The change is
|
||||
compatible with the previous SWIG releases 4.2 and 4.1 at least.
|
||||
|
||||
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2319133
|
||||
Related: https://github.com/swig/swig/pull/2907
|
||||
---
|
||||
python/ftdi1.i | 18 +++++++++---------
|
||||
1 files changed, 9 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/python/ftdi1.i b/python/ftdi1.i
|
||||
index 8b179f9..fac4d16 100644
|
||||
--- a/python/ftdi1.i
|
||||
+++ b/python/ftdi1.i
|
||||
@@ -52,7 +52,7 @@ char * str2charp_size(PyObject* pyObj, int * size)
|
||||
%enddef
|
||||
%feature("autodoc", ftdi_usb_find_all_docstring) ftdi_usb_find_all;
|
||||
%typemap(in,numinputs=0) SWIGTYPE** OUTPUT ($*ltype temp) %{ $1 = &temp; %}
|
||||
-%typemap(argout) SWIGTYPE** OUTPUT %{ $result = SWIG_Python_AppendOutput($result, SWIG_NewPointerObj((void*)*$1,$*descriptor,0)); %}
|
||||
+%typemap(argout,noblock=1) SWIGTYPE** OUTPUT { $result = SWIG_AppendOutput($result, SWIG_NewPointerObj((void*)*$1,$*descriptor,0)); }
|
||||
%apply SWIGTYPE** OUTPUT { struct ftdi_device_list **devlist };
|
||||
int ftdi_usb_find_all(struct ftdi_context *ftdi, struct ftdi_device_list **devlist,
|
||||
int vendor, int product);
|
||||
@@ -92,12 +92,12 @@ char * str2charp_size(PyObject* pyObj, int * size)
|
||||
%enddef
|
||||
%feature("autodoc", ftdi_read_data_docstring) ftdi_read_data;
|
||||
%typemap(in,numinputs=1) (unsigned char *buf, int size) %{ $2 = PyInt_AsLong($input);$1 = (unsigned char*)malloc($2*sizeof(char)); %}
|
||||
-%typemap(argout) (unsigned char *buf, int size) %{
|
||||
+%typemap(argout,noblock=1) (unsigned char *buf, int size) {
|
||||
if(result<0)
|
||||
$2=0;
|
||||
- $result = SWIG_Python_AppendOutput($result, charp2str((char*)$1, $2));
|
||||
+ $result = SWIG_AppendOutput($result, charp2str((char*)$1, $2));
|
||||
free($1);
|
||||
-%}
|
||||
+}
|
||||
int ftdi_read_data(struct ftdi_context *ftdi, unsigned char *buf, int size);
|
||||
%clear (unsigned char *buf, int size);
|
||||
|
||||
@@ -119,12 +119,12 @@ char * str2charp_size(PyObject* pyObj, int * size)
|
||||
%enddef
|
||||
%feature("autodoc", ftdi_read_pins_docstring) ftdi_read_pins;
|
||||
%typemap(in,numinputs=0) unsigned char *pins ($*ltype temp) %{ $1 = &temp; %}
|
||||
-%typemap(argout) (unsigned char *pins) %{ $result = SWIG_Python_AppendOutput($result, charp2str((char*)$1, 1)); %}
|
||||
+%typemap(argout,noblock=1) (unsigned char *pins) { $result = SWIG_AppendOutput($result, charp2str((char*)$1, 1)); }
|
||||
int ftdi_read_pins(struct ftdi_context *ftdi, unsigned char *pins);
|
||||
%clear unsigned char *pins;
|
||||
|
||||
%typemap(in,numinputs=0) unsigned char *latency ($*ltype temp) %{ $1 = &temp; %}
|
||||
-%typemap(argout) (unsigned char *latency) %{ $result = SWIG_Python_AppendOutput($result, charp2str((char*)$1, 1)); %}
|
||||
+%typemap(argout,noblock=1) (unsigned char *latency) { $result = SWIG_AppendOutput($result, charp2str((char*)$1, 1)); }
|
||||
int ftdi_get_latency_timer(struct ftdi_context *ftdi, unsigned char *latency);
|
||||
%clear unsigned char *latency;
|
||||
|
||||
@@ -137,12 +137,12 @@ char * str2charp_size(PyObject* pyObj, int * size)
|
||||
%clear int* value;
|
||||
|
||||
%typemap(in,numinputs=1) (unsigned char *buf, int size) %{ $2 = PyInt_AsLong($input);$1 = (unsigned char*)malloc($2*sizeof(char)); %}
|
||||
-%typemap(argout) (unsigned char *buf, int size) %{
|
||||
+%typemap(argout,noblock=1) (unsigned char *buf, int size) {
|
||||
if(result<0)
|
||||
$2=0;
|
||||
- $result = SWIG_Python_AppendOutput($result, charp2str((char*)$1, $2));
|
||||
+ $result = SWIG_AppendOutput($result, charp2str((char*)$1, $2));
|
||||
free($1);
|
||||
-%}
|
||||
+}
|
||||
int ftdi_get_eeprom_buf(struct ftdi_context *ftdi, unsigned char * buf, int size);
|
||||
%clear (unsigned char *buf, int size);
|
||||
|
||||
--
|
||||
1.7.1
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
EAPI=8
|
||||
|
||||
PYTHON_COMPAT=( python3_{9..12} )
|
||||
PYTHON_COMPAT=( python3_{9..13} )
|
||||
inherit cmake python-single-r1
|
||||
|
||||
MY_P="${PN}1-${PV}"
|
||||
|
||||
92
dev-embedded/libftdi/libftdi-1.5-r7.ebuild
Normal file
92
dev-embedded/libftdi/libftdi-1.5-r7.ebuild
Normal file
@@ -0,0 +1,92 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
MY_P="${PN}1-${PV}"
|
||||
PYTHON_COMPAT=( python3_{10..13} )
|
||||
inherit cmake python-single-r1
|
||||
|
||||
if [[ ${PV} == 9999* ]] ; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="git://developer.intra2net.com/${PN}"
|
||||
else
|
||||
SRC_URI="https://www.intra2net.com/en/developer/${PN}/download/${MY_P}.tar.bz2"
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Userspace access to FTDI USB interface chips"
|
||||
HOMEPAGE="https://www.intra2net.com/en/developer/libftdi/"
|
||||
|
||||
LICENSE="LGPL-2"
|
||||
SLOT="1"
|
||||
IUSE="cxx doc examples python test tools"
|
||||
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
RDEPEND="
|
||||
virtual/libusb:1
|
||||
cxx? ( dev-libs/boost )
|
||||
doc? ( !dev-embedded/libftdi:0[doc] )
|
||||
python? ( ${PYTHON_DEPS} )
|
||||
tools? ( dev-libs/confuse:= )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
test? ( dev-libs/boost )
|
||||
"
|
||||
BDEPEND="
|
||||
doc? ( app-text/doxygen )
|
||||
python? ( >=dev-lang/swig-4.2.0 )
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${P}-tests-no-cxx.patch
|
||||
"${FILESDIR}"/${P}-cmake-cxx.patch
|
||||
"${FILESDIR}"/${P}-py312.patch
|
||||
"${FILESDIR}"/${P}-cmake4.patch
|
||||
"${FILESDIR}"/${P}-swig-4.3.patch
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
use python && python-single-r1_pkg_setup
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DFTDIPP=$(usex cxx)
|
||||
-DDOCUMENTATION=$(usex doc)
|
||||
-DEXAMPLES=$(usex examples)
|
||||
-DPYTHON_BINDINGS=$(usex python)
|
||||
-DBUILD_TESTS=$(usex test)
|
||||
-DFTDI_EEPROM=$(usex tools)
|
||||
-DCMAKE_SKIP_BUILD_RPATH=ON
|
||||
-DSTATICLIBS=OFF
|
||||
)
|
||||
cmake_src_configure
|
||||
}
|
||||
|
||||
src_test() {
|
||||
cd "${BUILD_DIR}/test" || die
|
||||
LD_LIBRARY_PATH="${BUILD_DIR}/src" ./test_libftdi1 -l all || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake_src_install
|
||||
|
||||
use python && python_optimize
|
||||
dodoc AUTHORS ChangeLog README TODO
|
||||
|
||||
if use doc ; then
|
||||
# Clean up man pages with too generic names. #356369
|
||||
rm -vf "${BUILD_DIR}"/doc/man/man3/_* || die
|
||||
|
||||
doman "${BUILD_DIR}"/doc/man/man3/*
|
||||
dodoc -r "${BUILD_DIR}"/doc/html
|
||||
fi
|
||||
|
||||
if use examples ; then
|
||||
docinto examples
|
||||
dodoc examples/*.c
|
||||
fi
|
||||
}
|
||||
Reference in New Issue
Block a user