diff options
Diffstat (limited to 'dev-embedded')
| -rw-r--r-- | dev-embedded/Manifest.gz | bin | 9563 -> 9566 bytes | |||
| -rw-r--r-- | dev-embedded/libftdi/Manifest | 3 | ||||
| -rw-r--r-- | dev-embedded/libftdi/files/libftdi-1.5-cmake4.patch | 87 | ||||
| -rw-r--r-- | dev-embedded/libftdi/libftdi-1.5-r7.ebuild | 8 |
4 files changed, 93 insertions, 5 deletions
diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz Binary files differindex e6486795906c..832188435fb1 100644 --- a/dev-embedded/Manifest.gz +++ b/dev-embedded/Manifest.gz diff --git a/dev-embedded/libftdi/Manifest b/dev-embedded/libftdi/Manifest index 569adbe6e4ed..6634a4601623 100644 --- a/dev-embedded/libftdi/Manifest +++ b/dev-embedded/libftdi/Manifest @@ -1,6 +1,7 @@ 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-tests-no-cxx.patch 1017 BLAKE2B ff3e05ae2cc48a023c74142f986159f68b6a3e49ccf9684c94b4de2fd03c8d5c53e600810d1e8933e09ed7aa167fab15101344a6bdc8b9e00647f2c86801f694 SHA512 6d0fa3923f8f1e92b22538448368016db24d194b886c4702731eb5038b65c8a03773cfe0a02459cf040574845ab482fb676f01a97f26d5c48065fd9427a11eeb DIST libftdi-0.20.tar.gz 423570 BLAKE2B f0aa420a704e18c4257b99a4593dbaf46a15806d980b24909fe8678b36e74b568cd5915db1e14f8b904541334fbf3d18f069dc479a0bf66b2ea8e113611cb82b SHA512 540e5eb201a65936c3dbabff70c251deba1615874b11ff27c5ca16c39d71c150cf61758a68b541135a444fe32ab403b0fba0daf55c587647aaf9b3f400f1dee7 @@ -8,6 +9,6 @@ DIST libftdi1-1.5.tar.bz2 116297 BLAKE2B 460ab93026e14a452e31fcc6930d305638fdc0e EBUILD libftdi-0.20-r2.ebuild 1934 BLAKE2B 33de7434c3034e134dd8dbd6aabf5ebff8749625b44506025561f7669002026c3d0381ed9addb28b3edfcc32dc86855ec7580fc35ffe08eddea389a523a607e3 SHA512 5cf7dc0ef8f0b905dd2cdad429c38d2ddc74dad99629113013d866de278b70e33ba008730222926fe97cfecc3004dbe00e1ce577f105c171527f8d146dfa9b36 EBUILD libftdi-0.20-r3.ebuild 1942 BLAKE2B 7477140e7110791afdccb8aee76dc7e43e5a565ab57c9736837beed370a58da561442dce5908e673b70878492e745f0e060c01ed8a18aa390a5a48ee66cdcaeb SHA512 f08f2d620d6c8465570490d3bb1f4a717a1b01fc63a507760f13f9452521126e6a961eaadc7cf710af1214d84c19e2c1cae26fe8219d53a7f56ea743e9a8070d EBUILD libftdi-1.5-r5.ebuild 1946 BLAKE2B 55d8e7a04218032ea30f68fb0e8d8defd3473252ca6e0680e14e5fa5bf8d0a3dab96f9ff8fd855299d3cb1a442bded5d38c3c1c319262f0b98da95483fc6622a SHA512 66a6412fa2eee65872235f45684c2f3f09caaca07251a9f46ed3df4ae947bad7f3e56143ed32cc925c3ba04cb17d92ae80228149b943411c9be7d03b5dfd3286 -EBUILD libftdi-1.5-r7.ebuild 1982 BLAKE2B 474eef5f6b51815c8a22ee88cb53b4271dc3e4e381cfc6c4e4edd99267110c9c38a8c02bbf3580e116a38b6c6ccadbc133bb46878b0b2a0d082301575b9c2c96 SHA512 20a27922e375fd7c3077ffaee2c2385e33216017343372577f78315eb9000349effc0c56f36528a027223ca896840f1915f2c7f65caf81d9601bc3e1183955d0 +EBUILD libftdi-1.5-r7.ebuild 2014 BLAKE2B a04b2af7c93a319f288593e59bfdb32080d85c5d6e718ebf71d8f6ba71825ea4f1b7aece7473f2ae33775ab2cd05ef51e31a1c1c763bddc9e02d69e3b012e6eb SHA512 25cc53f3800c4a400632f36d581f39a05522916bca113c22d81f86352a774babed98d9f6af031a4c22240208fa7466b88c0730481495104b2057a49614673504 EBUILD libftdi-9999.ebuild 1830 BLAKE2B fbe0d8d27c3d52ba56cc61463e16605ffeb182c7af9e9e7569d8f11828f844a3d2884259d5a419a12b307af14e7857d2d103cf183625838a4b975577ac26d7bd SHA512 49d92090880b0a449638c585dff4a541db4656f1212d068502e6a56bcc6bfdb4ecdcb2e43e01b8e84b333ab4f17075c22fa55548b20808f09ee88394ff35d6a7 MISC metadata.xml 318 BLAKE2B c2c9ab83d57a082ed6608367f53f0f9420056c909d4ee50641da5b8f12b6a6ca996740fbdcadb0fa08460cb0cbef36dbedfaaf98acaea3eeeeee6afcf7724f54 SHA512 313b5c5dfcf5feb7dc8e41c1cb74939619451cb0747c1a281c9a0e763d26e0850a43e05d8fd2a836389bd75c2a4f153b80986e11be8171e9d93ca234f9df05f2 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() { |