* [gentoo-commits] repo/gentoo:master commit in: dev-embedded/libftdi/files/, dev-embedded/libftdi/
@ 2015-12-19 16:01 Sven Wegener
0 siblings, 0 replies; 4+ messages in thread
From: Sven Wegener @ 2015-12-19 16:01 UTC (permalink / raw
To: gentoo-commits
commit: 62e0925ef3d5cd8072258cbfac969c1bef054982
Author: Sven Wegener <swegener <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 19 15:49:33 2015 +0000
Commit: Sven Wegener <swegener <AT> gentoo <DOT> org>
CommitDate: Sat Dec 19 15:59:32 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62e0925e
dev-embedded/libftdi: Fix version in pkg-config file with USE=-doc
Signed-off-by: Sven Wegener <swegener <AT> gentoo.org>
.../libftdi/files/libftdi-0.20-cmake-version.patch | 38 ++++++++++++++++++++++
dev-embedded/libftdi/libftdi-0.20.ebuild | 2 +-
2 files changed, 39 insertions(+), 1 deletion(-)
diff --git a/dev-embedded/libftdi/files/libftdi-0.20-cmake-version.patch b/dev-embedded/libftdi/files/libftdi-0.20-cmake-version.patch
new file mode 100644
index 0000000..1be51da
--- /dev/null
+++ b/dev-embedded/libftdi/files/libftdi-0.20-cmake-version.patch
@@ -0,0 +1,38 @@
+From e18b700743217e8c505e97762e0f66a4f6a90425 Mon Sep 17 00:00:00 2001
+From: Maciej Grela <maciej.grela@gmail.com>
+Date: Wed, 20 Jun 2012 23:08:50 +0200
+Subject: [PATCH] Fix libftdi.pc file generation when building with
+ -DDOCUMENTATION=OFF
+
+---
+ CMakeLists.txt | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4c43a48..07f8bb9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -2,7 +2,9 @@
+ project(libftdi)
+ set(MAJOR_VERSION 0)
+ set(MINOR_VERSION 20)
++set(PACKAGE libftdi)
+ set(VERSION_STRING ${MAJOR_VERSION}.${MINOR_VERSION})
++set(VERSION ${VERSION_STRING})
+ SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}")
+
+ # CMake
+@@ -116,12 +118,11 @@ add_custom_target(dist
+
+ option(DOCUMENTATION "Generate API documentation with Doxygen" ON)
+
++
+ find_package(Doxygen)
+ if(DOCUMENTATION AND DOXYGEN_FOUND)
+
+ # Set variables
+- set(PACKAGE libftdi)
+- set(VERSION ${VERSION_STRING})
+ set(top_srcdir ${CMAKE_SOURCE_DIR})
+
+ # Find doxy config
diff --git a/dev-embedded/libftdi/libftdi-0.20.ebuild b/dev-embedded/libftdi/libftdi-0.20.ebuild
index acc14c0..fe3eab8 100644
--- a/dev-embedded/libftdi/libftdi-0.20.ebuild
+++ b/dev-embedded/libftdi/libftdi-0.20.ebuild
@@ -35,7 +35,7 @@ src_prepare() {
-e '/SET(LIB_SUFFIX /d' \
CMakeLists.txt || die
- epatch "${FILESDIR}"/${P}-cmake-include.patch
+ epatch "${FILESDIR}"/${P}-cmake-{include,version}.patch
}
src_configure() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-embedded/libftdi/files/, dev-embedded/libftdi/
@ 2017-01-15 10:33 Pacho Ramos
0 siblings, 0 replies; 4+ messages in thread
From: Pacho Ramos @ 2017-01-15 10:33 UTC (permalink / raw
To: gentoo-commits
commit: e0e1e59e81509c54cbfb398bdc495235511ca46c
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 15 10:14:14 2017 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Jan 15 10:31:37 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0e1e59e
dev-embedded/libftdi: Drop old
Package-Manager: Portage-2.3.3, Repoman-2.3.1
dev-embedded/libftdi/Manifest | 1 -
.../libftdi/files/libftdi-1.0-staticlibs.patch | 123 ---------------------
dev-embedded/libftdi/libftdi-1.0.ebuild | 67 -----------
3 files changed, 191 deletions(-)
diff --git a/dev-embedded/libftdi/Manifest b/dev-embedded/libftdi/Manifest
index 57bb77c..ae69859 100644
--- a/dev-embedded/libftdi/Manifest
+++ b/dev-embedded/libftdi/Manifest
@@ -1,4 +1,3 @@
DIST libftdi-0.19.tar.gz 406671 SHA256 567c9d2c42d92fc401c5aba2deed45ffb2433990984e816bcdf31e441aef06be SHA512 c6deefe8c83063343321e8c2c6b6c1c2842a9f1caf4e54f47106c3c4aac638736f19fecf91582c6cc9f4917c4d140157440c360ce3a030dfb7fa027483bab972 WHIRLPOOL b3ee2812697cb8e0e549d580b07b2d67f2bc7bbb5da823e80172748d2d907e67c36314c4524beb2278e131a57c1ae4e25efaaa7b243ab80b30a3f88fa9f6fd7a
DIST libftdi-0.20.tar.gz 423570 SHA256 3176d5b5986438f33f5208e690a8bfe90941be501cc0a72118ce3d338d4b838e SHA512 540e5eb201a65936c3dbabff70c251deba1615874b11ff27c5ca16c39d71c150cf61758a68b541135a444fe32ab403b0fba0daf55c587647aaf9b3f400f1dee7 WHIRLPOOL b1eab592bd6a21a123c7e951d5e4cdafc740c20773b8c5c7c86eef2a05bc8a190a2758a04187d3436de464a49dc329d4e4c9e54792287cc5c39a0ec7d08425d2
-DIST libftdi1-1.0.tar.bz2 97072 SHA256 7290fd38208d8c00d25ed13ce172aaa0403b37148080e4a33a99837022d2b321 SHA512 e733db0bf826415971c64723fe1e56cb1201fa1b9e3a3f04a2a47e1d16c543ae29c634a514f5ff5ca422c2e3b3e1715988c84df1dc66114700209dfb1e6d96ae WHIRLPOOL 82b384b396b12681d88531082e6a5d9d765934877192001106b7bb2ee91da91d0941eb7514b7b091fca403d47b4458a5ae06c5249b0cb0114a0fbe7b7056b7ed
DIST libftdi1-1.2.tar.bz2 100672 SHA256 a6ea795c829219015eb372b03008351cee3fb39f684bff3bf8a4620b558488d6 SHA512 d175e2b39dda880653a2e46db67e49a8921095e69eff6598159c3c31292d4ce76617c2f1617fd6727b08c930fcea335d8ef01857debbb60e7ac384b516d38a05 WHIRLPOOL 7e6646a23b8e8f1c0fec6b1ad3231797653e1788abfb7340cd391c792d2f48e4cada0ca832e325947b49d964919d5b81cddd8b43f3962d185605afbabd743fbf
diff --git a/dev-embedded/libftdi/files/libftdi-1.0-staticlibs.patch b/dev-embedded/libftdi/files/libftdi-1.0-staticlibs.patch
deleted file mode 100644
index a3ce560..00000000
--- a/dev-embedded/libftdi/files/libftdi-1.0-staticlibs.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-make static libs optional. already sent upstream.
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -46,6 +46,8 @@ set(CPACK_COMPONENT_SHAREDLIBS_GROUP "Development")
- "Static library, good if you want to embed libftdi1 in your application.")
- set(CPACK_COMPONENT_HEADERS_DESCRIPTION
- "C/C++ header files.")
-+
-+option ( STATICLIBS "Build static libraries" ON )
-
- set(CPACK_COMPONENT_SHAREDLIBS_GROUP "Development")
- set(CPACK_COMPONENT_STATICLIBS_GROUP "Development")
---- a/ftdipp/CMakeLists.txt
-+++ b/ftdipp/CMakeLists.txt
-@@ -30,12 +30,16 @@ if (FTDIPP)
- set_target_properties(ftdipp1 PROPERTIES VERSION ${VERSION_FIXUP}.${MINOR_VERSION}.0 SOVERSION 2)
-
- # Static library
-- add_library(ftdipp1-static STATIC ${cpp_sources})
-- set_target_properties(ftdipp1-static PROPERTIES OUTPUT_NAME "ftdipp1")
-+ if (STATICLIBS)
-+ add_library(ftdipp1-static STATIC ${cpp_sources})
-+ set_target_properties(ftdipp1-static PROPERTIES OUTPUT_NAME "ftdipp1")
-+ endif (STATICLIBS)
-
- # Prevent clobbering each other during the build
- set_target_properties(ftdipp1 PROPERTIES CLEAN_DIRECT_OUTPUT 1)
-- set_target_properties(ftdipp1-static PROPERTIES CLEAN_DIRECT_OUTPUT 1)
-+ if (STATICLIBS)
-+ set_target_properties(ftdipp1-static PROPERTIES CLEAN_DIRECT_OUTPUT 1)
-+ endif (STATICLIBS)
-
- # Dependencies
- target_link_libraries(ftdipp1 ftdi1 ${LIBUSB_LIBRARIES} ${BOOST_LIBRARIES})
-@@ -46,10 +50,12 @@ if (FTDIPP)
- LIBRARY DESTINATION lib${LIB_SUFFIX}
- COMPONENT sharedlibs
- )
-- install( TARGETS ftdipp1-static
-- ARCHIVE DESTINATION lib${LIB_SUFFIX}
-- COMPONENT staticlibs
-- )
-+ if (STATICLIBS)
-+ install( TARGETS ftdipp1-static
-+ ARCHIVE DESTINATION lib${LIB_SUFFIX}
-+ COMPONENT staticlibs
-+ )
-+ endif (STATICLIBS)
- install( FILES ${cpp_headers}
- DESTINATION include/${PROJECT_NAME}
- COMPONENT headers
-@@ -61,10 +67,12 @@ if (FTDIPP)
- DESTINATION bin
- COMPONENT sharedlibs
- )
-- install( TARGETS ftdipp1-static
-- DESTINATION bin
-- COMPONENT staticlibs
-- )
-+ if (STATICLIBS)
-+ install( TARGETS ftdipp1-static
-+ DESTINATION bin
-+ COMPONENT staticlibs
-+ )
-+ endif (STATICLIBS)
- install( FILES ${cpp_headers}
- DESTINATION include/${PROJECT_NAME}
- COMPONENT headers
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -28,11 +28,15 @@ set_target_properties(ftdi1 PROPERTIES VERSION ${VERSION_FIXUP}.${MINOR_VERSION}
-
- # Static library
- add_library(ftdi1-static STATIC ${c_sources})
--set_target_properties(ftdi1-static PROPERTIES OUTPUT_NAME "ftdi1")
-+if (STATICLIBS)
-+ set_target_properties(ftdi1-static PROPERTIES OUTPUT_NAME "ftdi1")
-+endif (STATICLIBS)
-
- # Prevent clobbering each other during the build
- set_target_properties(ftdi1 PROPERTIES CLEAN_DIRECT_OUTPUT 1)
--set_target_properties(ftdi1-static PROPERTIES CLEAN_DIRECT_OUTPUT 1)
-+if (STATICLIBS)
-+ set_target_properties(ftdi1-static PROPERTIES CLEAN_DIRECT_OUTPUT 1)
-+endif (STATICLIBS)
-
- # Dependencies
- target_link_libraries(ftdi1 ${LIBUSB_LIBRARIES})
-@@ -45,10 +49,12 @@ if(${UNIX})
- COMPONENT sharedlibs
- )
-
-- install( TARGETS ftdi1-static
-- ARCHIVE DESTINATION lib${LIB_SUFFIX}
-- COMPONENT staticlibs
-- )
-+ if (STATICLIBS)
-+ install( TARGETS ftdi1-static
-+ ARCHIVE DESTINATION lib${LIB_SUFFIX}
-+ COMPONENT staticlibs
-+ )
-+ endif (STATICLIBS)
-
- install( FILES ${c_headers}
- DESTINATION include/${PROJECT_NAME}
-@@ -64,10 +70,12 @@ if(${WIN32})
- COMPONENT sharedlibs
- )
-
-- install( TARGETS ftdi1-static
-- DESTINATION bin
-- COMPONENT staticlibs
-- )
-+ if (STATICLIBS)
-+ install( TARGETS ftdi1-static
-+ DESTINATION bin
-+ COMPONENT staticlibs
-+ )
-+ endif (STATICLIBS)
-
- install( FILES ${c_headers}
- DESTINATION include/${PROJECT_NAME}
diff --git a/dev-embedded/libftdi/libftdi-1.0.ebuild b/dev-embedded/libftdi/libftdi-1.0.ebuild
deleted file mode 100644
index 71cd0a5..00000000
--- a/dev-embedded/libftdi/libftdi-1.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit cmake-utils eutils
-
-MY_P="${PN}1-${PV}"
-if [[ ${PV} == 9999* ]] ; then
- EGIT_REPO_URI="git://developer.intra2net.com/${PN}"
- inherit git-2
-else
- SRC_URI="http://www.intra2net.com/en/developer/${PN}/download/${MY_P}.tar.bz2"
- KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-DESCRIPTION="Userspace access to FTDI USB interface chips"
-HOMEPAGE="http://www.intra2net.com/en/developer/libftdi/"
-
-LICENSE="LGPL-2"
-SLOT="1"
-IUSE="cxx doc examples python static-libs tools"
-
-RDEPEND="virtual/libusb:1
- cxx? ( dev-libs/boost )
- python? ( dev-lang/python )
- tools? ( dev-libs/confuse )"
-DEPEND="${RDEPEND}
- python? ( dev-lang/swig )
- doc? ( app-doc/doxygen )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.0-staticlibs.patch
-}
-
-src_configure() {
- mycmakeargs=(
- $(cmake-utils_use cxx FTDIPP)
- $(cmake-utils_use doc DOCUMENTATION)
- $(cmake-utils_use examples EXAMPLES)
- $(cmake-utils_use python PYTHON_BINDINGS)
- $(cmake-utils_use static-libs STATICLIBS)
- $(cmake-utils_use tools FTDI_EEPROM)
- -DCMAKE_SKIP_BUILD_RPATH=ON
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
- dodoc AUTHORS ChangeLog README TODO
-
- if use doc ; then
- # Clean up crap man pages. #356369
- rm -vf "${CMAKE_BUILD_DIR}"/doc/man/man3/{_,usb_,deprecated}*
-
- doman "${CMAKE_BUILD_DIR}"/doc/man/man3/*
- dohtml "${CMAKE_BUILD_DIR}"/doc/html/*
- fi
- if use examples ; then
- docinto examples
- dodoc examples/*.c
- fi
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-embedded/libftdi/files/, dev-embedded/libftdi/
@ 2021-03-10 4:51 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2021-03-10 4:51 UTC (permalink / raw
To: gentoo-commits
commit: a4c858127655bd6543d301f40a24200f2b592b57
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 10 04:51:12 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Mar 10 04:51:12 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4c85812
dev-embedded/libftdi: add upstream CMake patch
Closes: https://bugs.gentoo.org/775116
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../libftdi/files/libftdi-1.5-cmake-cxx.patch | 46 +++++++++++
dev-embedded/libftdi/libftdi-1.5-r3.ebuild | 96 ++++++++++++++++++++++
2 files changed, 142 insertions(+)
diff --git a/dev-embedded/libftdi/files/libftdi-1.5-cmake-cxx.patch b/dev-embedded/libftdi/files/libftdi-1.5-cmake-cxx.patch
new file mode 100644
index 00000000000..a04aee1cf1d
--- /dev/null
+++ b/dev-embedded/libftdi/files/libftdi-1.5-cmake-cxx.patch
@@ -0,0 +1,46 @@
+https://bugs.gentoo.org/766818
+
+From cdb28383402d248dbc6062f4391b038375c52385 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Fri, 17 Jul 2020 21:25:03 +0200
+Subject: [PATCH] CMakeLists.txt: fix paths when FTDIPP is set
+
+Use the same project name (i.e. libftdi1 and not libftdipp1) when FTDIPP
+is enabled as suggested by Aurelien Jarno in
+http://developer.intra2net.com/mailarchive/html/libftdi/2020/msg00044.html
+
+Without this change, the libftdi1.pc config file defines the include
+path as /usr/local/include/libftdipp1 while the ftdi.h file is actually
+installed in /usr/local/include/libftdi1
+
+This is an issue for example for libsigrok which will fail on:
+
+In file included from src/hardware/asix-sigma/protocol.c:27:
+src/hardware/asix-sigma/protocol.h:28:10: fatal error: ftdi.h: No such file or directory
+ 28 | #include <ftdi.h>
+ | ^~~~~~~~
+
+Fixes:
+ - http://autobuild.buildroot.org/results/1427f44e36752c337791597fab47a1889552a2fe
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+---
+ CMakeLists.txt | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5aecafc..3b0b87c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -136,7 +136,7 @@ endif ()
+
+ add_subdirectory(src)
+ if ( FTDIPP )
+- project(libftdipp1 C CXX)
++ project(libftdi1 C CXX)
+ add_subdirectory(ftdipp)
+ endif ()
+ if ( PYTHON_BINDINGS )
+--
+1.7.1
+
diff --git a/dev-embedded/libftdi/libftdi-1.5-r3.ebuild b/dev-embedded/libftdi/libftdi-1.5-r3.ebuild
new file mode 100644
index 00000000000..43542c3f4d8
--- /dev/null
+++ b/dev-embedded/libftdi/libftdi-1.5-r3.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit cmake python-single-r1
+
+MY_P="${PN}1-${PV}"
+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"
+ KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+DESCRIPTION="Userspace access to FTDI USB interface chips"
+HOMEPAGE="https://www.intra2net.com/en/developer/libftdi/"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="LGPL-2"
+SLOT="1"
+IUSE="cxx doc examples python test tools"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+BDEPEND="
+ doc? ( app-doc/doxygen )
+ python? ( dev-lang/swig )"
+RDEPEND="
+ virtual/libusb:1
+ cxx? ( dev-libs/boost )
+ python? ( ${PYTHON_DEPS} )
+ tools? (
+ !<dev-embedded/ftdi_eeprom-1.0
+ dev-libs/confuse:=
+ )"
+DEPEND="${RDEPEND}
+ test? ( dev-libs/boost )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-tests-no-cxx.patch
+ "${FILESDIR}"/${P}-cmake-cxx.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
+
+ # Fix up pkgconfig files
+ # bug #766818
+ if use cxx ; then
+ sed -i -e "s/libftdipp1/libftdi1/" "${ED}"/usr/$(get_libdir)/pkgconfig/libftdi1.pc || die
+ sed -i -e "s/libftdi1/libftdipp1/" "${ED}"/usr/$(get_libdir)/pkgconfig/libftdipp1.pc || die
+ fi
+
+ use python && python_optimize
+ dodoc AUTHORS ChangeLog README TODO
+
+ if use doc ; then
+ # Clean up crap man pages. #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
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-embedded/libftdi/files/, dev-embedded/libftdi/
@ 2025-04-04 20:46 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2025-04-04 20:46 UTC (permalink / raw
To: gentoo-commits
commit: ee3fdd30dd61a1e079996ef39f94203dd25d4665
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 4 20:13:11 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Apr 4 20:41:59 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee3fdd30
dev-embedded/libftdi: Fix build w/ >=cmake-4
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../libftdi/files/libftdi-1.5-cmake4.patch | 87 ++++++++++++++++++++++
dev-embedded/libftdi/libftdi-1.5-r7.ebuild | 8 +-
2 files changed, 91 insertions(+), 4 deletions(-)
diff --git a/dev-embedded/libftdi/files/libftdi-1.5-cmake4.patch b/dev-embedded/libftdi/files/libftdi-1.5-cmake4.patch
new file mode 100644
index 000000000000..21a9fa3ec1cd
--- /dev/null
+++ b/dev-embedded/libftdi/files/libftdi-1.5-cmake4.patch
@@ -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 )
+
diff --git a/dev-embedded/libftdi/libftdi-1.5-r7.ebuild b/dev-embedded/libftdi/libftdi-1.5-r7.ebuild
index 4b8db8a33ade..36bf10ce1a9d 100644
--- a/dev-embedded/libftdi/libftdi-1.5-r7.ebuild
+++ b/dev-embedded/libftdi/libftdi-1.5-r7.ebuild
@@ -1,19 +1,18 @@
-# Copyright 1999-2024 Gentoo Authors
+# 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..12} )
inherit cmake python-single-r1
-MY_P="${PN}1-${PV}"
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
@@ -23,8 +22,8 @@ HOMEPAGE="https://www.intra2net.com/en/developer/libftdi/"
LICENSE="LGPL-2"
SLOT="1"
IUSE="cxx doc examples python test tools"
-RESTRICT="!test? ( test )"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
RDEPEND="
virtual/libusb:1
@@ -45,6 +44,7 @@ PATCHES=(
"${FILESDIR}"/${P}-tests-no-cxx.patch
"${FILESDIR}"/${P}-cmake-cxx.patch
"${FILESDIR}"/${P}-py312.patch
+ "${FILESDIR}"/${P}-cmake4.patch
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-04-04 20:46 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-03-10 4:51 [gentoo-commits] repo/gentoo:master commit in: dev-embedded/libftdi/files/, dev-embedded/libftdi/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2025-04-04 20:46 Andreas Sturmlechner
2017-01-15 10:33 Pacho Ramos
2015-12-19 16:01 Sven Wegener
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox