diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
| commit | 0f558761aa2dee1017b4751e4017205e015a9560 (patch) | |
| tree | 037df795519468a25d9362b4e95cdaeb84eb1cf9 /net-libs/libad9361-iio | |
| parent | 752d6256e5204b958b0ef7905675a940b5e9172f (diff) | |
gentoo resync : 29.12.2022
Diffstat (limited to 'net-libs/libad9361-iio')
6 files changed, 157 insertions, 12 deletions
diff --git a/net-libs/libad9361-iio/Manifest b/net-libs/libad9361-iio/Manifest index b02a34b9c59f..13b3c65712cf 100644 --- a/net-libs/libad9361-iio/Manifest +++ b/net-libs/libad9361-iio/Manifest @@ -1,4 +1,8 @@ +AUX libad9361-iio-0.2-cmake-gnuinstalldirs.patch 1815 BLAKE2B b6836af3ce9f1bf3d8eae92ff42cf38e11227fe02af032246c3f3344e92a2399175a6e0f1faf09e2e2124615fbc95283a5817aba7aad4d7b3dc500f01750bf37 SHA512 546e2d0e71ff6c0fc201a3ef41fb0d63e728da72fc89c5a92a0a5bf17cd8f7fb63bb094ebd82573d4ac26abd484857bd5d998a6e220a3ab8e0775304c20b1971 +AUX libad9361-iio-0.2-fix-lld-tests.patch 2089 BLAKE2B fb462846e61b94e9b1a0aaa444c24fbdec12c12d19761dac402b70914ed7b88ed0821015d2d9bf6a6eef8b860b40642727649597f74af2a4d6a4cb18b5ffd8fc SHA512 6d79873358441229e024b99c722138bd76f8a228d5aad79432c212be88b6bfc3e662fa63ccce355ac4ea1e732f20d3c51ded1fbf51785f68e57eea6668ef32b1 +AUX libad9361-iio-0.2-libdir-pkgconfig.patch 513 BLAKE2B 77291cea5d1dfa99646673881b5c7acf248928103476605946aa4decc09bc87aaf210378bea2846cd1ab1b8717ed54baa8c1028c0223b53a28b86a06021fe2e2 SHA512 9d161de025db149ad27b6e6ce6b9b1a7b4f4c6293b3936a2f8bb004bcdc70e88680d781c76e882cd2d1b2afcecd0b3624e45e8864f2b45bb19b20bc3f80dacb1 DIST libad9361-iio-0.2.tar.gz 167678 BLAKE2B 9880114bc53f3d4975dbe0773f8d112e40b0df47e34985bdc68c5b6740aee2c140ced39353929a793c2b327b5811461436ceb2934c2a71fc7b92b218092d468d SHA512 f95fa955531198ab33c16d41685d23140e875b2eafa1da10cdf60a7bf1ae760e86e2d3d28c9ab36a3a7b7a90e36bb53456dec1d6e537a1574a5505b7595e764c +EBUILD libad9361-iio-0.2-r1.ebuild 758 BLAKE2B d81208c182f607eee214db6105ba729fdcfa9bf3dd7d5df44986ee7592732498fed33e10e6ad34f44ffab2349233a38b2b6ddcc2b3a946e190b87f13c6c98272 SHA512 7b1dfa6f5520e84dc6dacc02baeb2be2aee6a115f1c794a6cbc41b2938c55679508cc1742f7da57ac0306e0d264dfc3d8d9a8a578870dc3d1d9da53e235e3410 EBUILD libad9361-iio-0.2.ebuild 826 BLAKE2B 832a9a9aced0c02089ef6394db31edddee0a70e0f384012c668e63926a0e4b9f197f6376c62ee45f1600d582daaa433860050530bf3fa06069ec14e917dbeedc SHA512 60b37610799f64713e44eacd6e2f459cdbe5af370404c4525b72859c62c88e3fbd79ec7e0226fb9980bd3705af2cc07901da233e8bd5109364bb9613607a3620 -EBUILD libad9361-iio-9999.ebuild 819 BLAKE2B 44f462e8370973c1b815982283c272a1c46ef6a5bbd7c6e7eea20af219bf7e3893519825ddd19993bdbf5dc4f160bf23187c4cd81dd3e85d955c5f6369fdb5a1 SHA512 d6aa9a469260bf74e53ba27e3ec1217cc98bc5889edb876a1fee132804e0b9edbc8d6507f2f42e296b374215c6855f79eff4ee2c6690b6420cf3caea637f3d6e +EBUILD libad9361-iio-9999.ebuild 758 BLAKE2B d81208c182f607eee214db6105ba729fdcfa9bf3dd7d5df44986ee7592732498fed33e10e6ad34f44ffab2349233a38b2b6ddcc2b3a946e190b87f13c6c98272 SHA512 7b1dfa6f5520e84dc6dacc02baeb2be2aee6a115f1c794a6cbc41b2938c55679508cc1742f7da57ac0306e0d264dfc3d8d9a8a578870dc3d1d9da53e235e3410 MISC metadata.xml 442 BLAKE2B 4aaee897fc8e0ec7c1081c20bcee1470aaeebd3f14252177861cbaff053a29c4b4b6a5476015252d8a75e8dd191d45e3c3c6f0cd6a08f41d3374831f3c392ac0 SHA512 b8e19d2f3382733f2756c406a7f08635956973c32cd8ec400bed18445dffb51d0595c09040de74bf907d32f6119976326b4ba914d29e74e65a9bc7eb1d3016cc diff --git a/net-libs/libad9361-iio/files/libad9361-iio-0.2-cmake-gnuinstalldirs.patch b/net-libs/libad9361-iio/files/libad9361-iio-0.2-cmake-gnuinstalldirs.patch new file mode 100644 index 000000000000..5a69010eb184 --- /dev/null +++ b/net-libs/libad9361-iio/files/libad9361-iio-0.2-cmake-gnuinstalldirs.patch @@ -0,0 +1,50 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -13,6 +13,8 @@ + cmake_minimum_required(VERSION 2.8.7) + project(ad9361 C) + ++include(GNUInstallDirs) ++ + set(LIBAD9361_VERSION_MAJOR 0) + set(LIBAD9361_VERSION_MINOR 2) + set(VERSION ${LIBAD9361_VERSION_MAJOR}.${LIBAD9361_VERSION_MINOR}) +@@ -59,10 +61,6 @@ endif() + + add_definitions(-D_POSIX_C_SOURCE=199309L -DLIBAD9361_EXPORTS=1) + +-set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" +- CACHE PATH "Installation directory for libraries") +-mark_as_advanced(INSTALL_LIB_DIR) +- + find_library(LIBIIO_LIBRARIES iio) + find_path(LIBIIO_INCLUDEDIR iio.h) + +@@ -98,21 +96,17 @@ configure_file(libad9361-iio.iss.cmakein ${CMAKE_CURRENT_BINARY_DIR}/libad9361-i + + set(LIBAD9361_PC ${CMAKE_CURRENT_BINARY_DIR}/libad9361.pc) + configure_file(libad9361.pc.cmakein ${LIBAD9361_PC} @ONLY) +-install(FILES ${LIBAD9361_PC} DESTINATION ${INSTALL_LIB_DIR}/pkgconfig) ++install(FILES ${LIBAD9361_PC} DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + + if(NOT SKIP_INSTALL_ALL) + install(TARGETS ad9361 +- ARCHIVE DESTINATION lib +- LIBRARY DESTINATION "${INSTALL_LIB_DIR}" +- RUNTIME DESTINATION bin +- FRAMEWORK DESTINATION lib +- PUBLIC_HEADER DESTINATION include) ++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" ++ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" ++ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" ++ FRAMEWORK DESTINATION "${CMAKE_INSTALL_LIBDIR}" ++ PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") + endif() + +-set(CMAKE_INSTALL_DOCDIR "" CACHE PATH "documentation root (DATAROOTDIR/doc/${PROJECT_NAME}${LIBAD9361_VERSION_MAJOR}-doc)") +-include(GNUInstallDirs) +-set(CMAKE_INSTALL_DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${PROJECT_NAME}${LIBAD9361_VERSION_MAJOR}-doc") +- + find_package(Doxygen) + if(DOXYGEN_FOUND) + option(WITH_DOC "Generate documentation with Doxygen" ON) diff --git a/net-libs/libad9361-iio/files/libad9361-iio-0.2-fix-lld-tests.patch b/net-libs/libad9361-iio/files/libad9361-iio-0.2-fix-lld-tests.patch new file mode 100644 index 000000000000..00ef9e0a6869 --- /dev/null +++ b/net-libs/libad9361-iio/files/libad9361-iio-0.2-fix-lld-tests.patch @@ -0,0 +1,49 @@ +https://bugs.gentoo.org/831322 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -1,17 +1,29 @@ + add_executable(FilterDesignerTest filter_designer_test.c) +-target_link_libraries(FilterDesignerTest LINK_PRIVATE ${LIBIIO_LIBRARIES} ad9361) ++if(WIN32) ++ target_link_libraries(FilterDesignerTest LINK_PRIVATE ${LIBIIO_LIBRARIES} ad9361) ++else() ++ target_link_libraries(FilterDesignerTest LINK_PRIVATE ${LIBIIO_LIBRARIES} ad9361 m) ++endif() + add_test(NAME FilterDesignerTest + COMMAND FilterDesignerTest + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) + + add_executable(GenerateRatesTest gen_rates_test.c) +-target_link_libraries(GenerateRatesTest LINK_PRIVATE ${LIBIIO_LIBRARIES} ad9361) ++if(WIN32) ++ target_link_libraries(GenerateRatesTest LINK_PRIVATE ${LIBIIO_LIBRARIES} ad9361) ++else() ++ target_link_libraries(GenerateRatesTest LINK_PRIVATE ${LIBIIO_LIBRARIES} ad9361 m) ++endif() + add_test(NAME GenerateRatesTest + COMMAND GenerateRatesTest + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) + + add_executable(FilterDesignerHardwareTest filter_designer_hw.c) +-target_link_libraries(FilterDesignerHardwareTest LINK_PRIVATE ${LIBIIO_LIBRARIES} ad9361) ++if(WIN32) ++ target_link_libraries(FilterDesignerHardwareTest LINK_PRIVATE ${LIBIIO_LIBRARIES} ad9361) ++else() ++ target_link_libraries(FilterDesignerHardwareTest LINK_PRIVATE ${LIBIIO_LIBRARIES} ad9361 m) ++endif() + add_test(NAME FilterDesignerHardwareTest + COMMAND FilterDesignerHardwareTest + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) +@@ -27,7 +39,11 @@ add_test(NAME FMComms5SyncTest + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) + + add_executable(AutoRateTest auto_rate_test_hw.c) +-target_link_libraries(AutoRateTest LINK_PRIVATE ${LIBIIO_LIBRARIES} ad9361) ++if(WIN32) ++ target_link_libraries(AutoRateTest LINK_PRIVATE ${LIBIIO_LIBRARIES} ad9361) ++else() ++ target_link_libraries(AutoRateTest LINK_PRIVATE ${LIBIIO_LIBRARIES} ad9361 m) ++endif() + add_test(NAME AutoRateTest + COMMAND AutoRateTest + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/net-libs/libad9361-iio/files/libad9361-iio-0.2-libdir-pkgconfig.patch b/net-libs/libad9361-iio/files/libad9361-iio-0.2-libdir-pkgconfig.patch new file mode 100644 index 000000000000..a23205e44da9 --- /dev/null +++ b/net-libs/libad9361-iio/files/libad9361-iio-0.2-libdir-pkgconfig.patch @@ -0,0 +1,14 @@ +--- a/libad9361.pc.cmakein ++++ b/libad9361.pc.cmakein +@@ -1,8 +1,8 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=@CMAKE_INSTALL_PREFIX@ +-libdir=@CMAKE_INSTALL_PREFIX@/lib +-sharedlibdir=@CMAKE_INSTALL_PREFIX@/lib +-includedir=@CMAKE_INSTALL_PREFIX@/include ++libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ ++sharedlibdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ ++includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@ + + Name: libad9361 + Description: Device specific library for AD936X transceivers diff --git a/net-libs/libad9361-iio/libad9361-iio-0.2-r1.ebuild b/net-libs/libad9361-iio/libad9361-iio-0.2-r1.ebuild new file mode 100644 index 000000000000..596e74764626 --- /dev/null +++ b/net-libs/libad9361-iio/libad9361-iio-0.2-r1.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="IIO AD9361 library for filter design and handling, multi-chip sync, etc" +HOMEPAGE="https://github.com/analogdevicesinc/libad9361-iio" +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://github.com/analogdevicesinc/libad9361-iio" + inherit git-r3 +else + SRC_URI="https://github.com/analogdevicesinc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~riscv ~x86" +fi + +LICENSE="LGPL-2.1" +SLOT="0/${PV}" + +RDEPEND="net-libs/libiio:=" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-0.2-fix-lld-tests.patch + "${FILESDIR}"/${PN}-0.2-libdir-pkgconfig.patch + "${FILESDIR}"/${PN}-0.2-cmake-gnuinstalldirs.patch +) diff --git a/net-libs/libad9361-iio/libad9361-iio-9999.ebuild b/net-libs/libad9361-iio/libad9361-iio-9999.ebuild index 630cb27fb6e9..596e74764626 100644 --- a/net-libs/libad9361-iio/libad9361-iio-9999.ebuild +++ b/net-libs/libad9361-iio/libad9361-iio-9999.ebuild @@ -1,17 +1,18 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + inherit cmake -DESCRIPTION="IIO AD9361 library for filter design and handling, multi-chip sync, etc." +DESCRIPTION="IIO AD9361 library for filter design and handling, multi-chip sync, etc" HOMEPAGE="https://github.com/analogdevicesinc/libad9361-iio" -if [ "${PV}" = "9999" ]; then +if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/analogdevicesinc/libad9361-iio" inherit git-r3 else SRC_URI="https://github.com/analogdevicesinc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 ~riscv ~x86" fi LICENSE="LGPL-2.1" @@ -20,9 +21,8 @@ SLOT="0/${PV}" RDEPEND="net-libs/libiio:=" DEPEND="${RDEPEND}" -src_prepare() { - sed -i -e "s:"${CMAKE_INSTALL_PREFIX}/lib":"${CMAKE_INSTALL_PREFIX}/$(get_libdir)":g" \ - -e "s:\${PROJECT_NAME}\${LIBAD9361_VERSION_MAJOR}-doc:${P}:" CMakeLists.txt || die - cmake_src_prepare - eapply_user -} +PATCHES=( + "${FILESDIR}"/${PN}-0.2-fix-lld-tests.patch + "${FILESDIR}"/${PN}-0.2-libdir-pkgconfig.patch + "${FILESDIR}"/${PN}-0.2-cmake-gnuinstalldirs.patch +) |