From 026061ba423025e6713112920f290759cdee03c4 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 25 Dec 2023 19:30:41 +0000 Subject: gentoo auto-resync : 25:12:2023 - 19:30:41 --- sci-libs/Manifest.gz | Bin 45146 -> 45145 bytes sci-libs/indilib/Manifest | 5 +- .../files/indilib-2.0.5-link-system-httplib.patch | 21 ++++++ sci-libs/indilib/indilib-2.0.3.ebuild | 76 -------------------- sci-libs/indilib/indilib-2.0.5.ebuild | 80 +++++++++++++++++++++ 5 files changed, 104 insertions(+), 78 deletions(-) create mode 100644 sci-libs/indilib/files/indilib-2.0.5-link-system-httplib.patch delete mode 100644 sci-libs/indilib/indilib-2.0.3.ebuild create mode 100644 sci-libs/indilib/indilib-2.0.5.ebuild (limited to 'sci-libs') diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz index d396b3c9c9db..bb18f91004be 100644 Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest index e29eada37f26..d063951dc74e 100644 --- a/sci-libs/indilib/Manifest +++ b/sci-libs/indilib/Manifest @@ -1,5 +1,6 @@ -DIST indilib-2.0.3.tar.gz 2713456 BLAKE2B b74f3319c744227b533616ec369cb6f379253928c1d73ef8336d122152fcb866403efe8c7aa6f65c99ba10149b0b2b43c4a86a87f82353ce045602b261b75618 SHA512 323e694f90d71cf26da8b05d60d136f2422dc12e31ec88012250faf795e67bb95da2fd729cacc5bfa7cb74cc8fe1e12a0512cb57e694c87f362a4828228db0b7 +AUX indilib-2.0.5-link-system-httplib.patch 890 BLAKE2B adb4eb3f3730a95423e490c92bef6071a16598358aeda451f34d9f52bf9d3658cde81c1d3288e1433eb38a5961ff62dc8980b5195513d27bc55388fb36ce8fee SHA512 ee7baf6a681aa02fb7a5ae82832cb832d056d985607eb7df1b7f509501db57f22500eacd05bdc7e2e265db24a2e8ed7fab4693c4e0bd1884c7682ecf889efb3e DIST indilib-2.0.4.tar.gz 2778082 BLAKE2B 21573abeb054f6693d29e5e67908be8be06246c138dba7dd8815c80d338fe8dbc202b103454f8e9a0b97e0fa05d5464547f32a2aa6bc0fa6189ddabd1f67428c SHA512 cb8c05ed2d814350e8357dfb3fd42ce5f2db88a0d150b0feb63fcb85cadd70369bfce1600a60837e242e5815ad076923428c456f4b331ffe1a22a2c02e11ced4 -EBUILD indilib-2.0.3.ebuild 1674 BLAKE2B 17ec34ee35842998d1e7b1b7c46a4bb250d653312adc07d8b8ccc7bd0a77e08b6f181bf5fdc3e10a94c9a2f1721c2e602e246898babbadded9d2cd19939e6e3e SHA512 98d92b929252ae0de2afc159fe8a3e1f36bba325badf91886019969cae78f01f1a332c385d79ff048b4c7cfab621a71549d4389e3169844e0f6ae1bd3bd316ee +DIST indilib-2.0.5.tar.gz 2781981 BLAKE2B 7347c3e6cf5a32d1b136d8251253154fe7b25252070c34b8d03627e02c2cb3472ed2f44a12a7b7d87f95ba6b6b18a66a9cd528d5cba64c5df0a167fa6a20e017 SHA512 42cdc6d48ac1daf39ab96552dc134aa400bb847d2bcf22f0845aec9639ed44cdf9a2abb4b80d7c3b1c15b76b6f3d3a86333cc7a1a0b84033bc5404b78d758ea2 EBUILD indilib-2.0.4.ebuild 1674 BLAKE2B 17ec34ee35842998d1e7b1b7c46a4bb250d653312adc07d8b8ccc7bd0a77e08b6f181bf5fdc3e10a94c9a2f1721c2e602e246898babbadded9d2cd19939e6e3e SHA512 98d92b929252ae0de2afc159fe8a3e1f36bba325badf91886019969cae78f01f1a332c385d79ff048b4c7cfab621a71549d4389e3169844e0f6ae1bd3bd316ee +EBUILD indilib-2.0.5.ebuild 1765 BLAKE2B d35e43b25a0e6201ec8b62f548e36c48c487246dfbc1171722e8731702a7d4758bc8e28feee9bf0404e455e1979dd5257f922c8e21895cd491d3922dcfceb312 SHA512 0bb803246b4dda254c7eba45f17350007d33202e22e6157bbda365964a4c6699380aee0f53fb96ce0840d46f31a08c20cac0bcf775dc91a2a40f218b33354e36 MISC metadata.xml 562 BLAKE2B 675fbd88b6ea5004a89e4d86f397e924317f56ad98743d1d8cd9758f92b516cf70386f4eb59c8869451acd6b312c50a05b37a9ca3cedac87599bd90cd46d6ddd SHA512 ebef1f64112d45534b6ea13ce54b2ee57349d11486b881be277d669e984891fe9d8ca3839aadbbece908f55bd027060739460929bd7e0400cd04e639c7d2186f diff --git a/sci-libs/indilib/files/indilib-2.0.5-link-system-httplib.patch b/sci-libs/indilib/files/indilib-2.0.5-link-system-httplib.patch new file mode 100644 index 000000000000..5f50d6967444 --- /dev/null +++ b/sci-libs/indilib/files/indilib-2.0.5-link-system-httplib.patch @@ -0,0 +1,21 @@ +From 0d5beb7fe9d8a7f0fa6f56044077f83605a778fa Mon Sep 17 00:00:00 2001 +From: Mario Haustein +Date: Sat, 2 Dec 2023 10:06:59 +0100 +Subject: [PATCH] Link against httplib if using system libraries (#1968) + +--- + drivers/telescope/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/telescope/CMakeLists.txt b/drivers/telescope/CMakeLists.txt +index 331a30d84e..9c2f9f234c 100644 +--- a/drivers/telescope/CMakeLists.txt ++++ b/drivers/telescope/CMakeLists.txt +@@ -262,6 +262,6 @@ install(TARGETS indi_skywatcherAltAzMount RUNTIME DESTINATION bin) + add_executable(indi_planewave_telescope + planewave_mount.cpp) + +-target_link_libraries(indi_planewave_telescope indidriver) ++target_link_libraries(indi_planewave_telescope indidriver ${HTTPLIB_LIBRARY}) + + install(TARGETS indi_planewave_telescope RUNTIME DESTINATION bin) diff --git a/sci-libs/indilib/indilib-2.0.3.ebuild b/sci-libs/indilib/indilib-2.0.3.ebuild deleted file mode 100644 index 9f35ab2702f0..000000000000 --- a/sci-libs/indilib/indilib-2.0.3.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake udev - -DESCRIPTION="INDI Astronomical Control Protocol library" -HOMEPAGE="https://www.indilib.org/" -SRC_URI="https://github.com/${PN}/${PN/lib/}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${P/lib/}" - -LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+" -SLOT="0/1" -KEYWORDS="amd64 ~ppc ppc64 ~riscv ~x86" -IUSE="ogg rtlsdr test websocket" - -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/libev - media-libs/libjpeg-turbo:= - net-misc/curl - sci-libs/cfitsio:= - sci-libs/fftw:3.0= - sci-libs/gsl:= - sci-libs/libnova:= - sys-libs/zlib - virtual/libusb:1 - ogg? ( - media-libs/libogg - media-libs/libtheora - ) - rtlsdr? ( net-wireless/rtl-sdr ) - websocket? ( dev-libs/boost:= ) -" -DEPEND="${RDEPEND} - kernel_linux? ( sys-kernel/linux-headers ) - test? ( >=dev-cpp/gtest-1.8.0 ) - websocket? ( dev-cpp/websocketpp ) -" - -src_configure() { - local mycmakeargs=( - -DINDI_BUILD_QT5_CLIENT=OFF - -DINDI_BUILD_SHARED=ON - -DINDI_BUILD_STATIC=OFF - -DINDI_BUILD_XISF=OFF # not packaged - -DUDEVRULES_INSTALL_DIR="${EPREFIX}$(get_udevdir)"/rules.d - $(cmake_use_find_package ogg OggTheora) - $(cmake_use_find_package rtlsdr RTLSDR) - -DINDI_BUILD_UNITTESTS=$(usex test) - -DINDI_BUILD_INTEGTESTS=$(usex test) - -DINDI_BUILD_WEBSOCKET=$(usex websocket) - ) - - cmake_src_configure -} - -src_test() { - # Unit tests - BUILD_DIR="${BUILD_DIR}"/test cmake_src_test - - # Integration tests - # They fail in parallel because they try to bind to the same port more - # than once. - BUILD_DIR="${BUILD_DIR}"/integs cmake_src_test -j1 -} - -pkg_postinst() { - udev_reload -} - -pkg_postrm() { - udev_reload -} diff --git a/sci-libs/indilib/indilib-2.0.5.ebuild b/sci-libs/indilib/indilib-2.0.5.ebuild new file mode 100644 index 000000000000..82fc5ae8b896 --- /dev/null +++ b/sci-libs/indilib/indilib-2.0.5.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake udev + +DESCRIPTION="INDI Astronomical Control Protocol library" +HOMEPAGE="https://www.indilib.org/" +SRC_URI="https://github.com/${PN}/${PN/lib/}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${P/lib/}" + +LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+" +SLOT="0/1" +KEYWORDS="~amd64 ~x86" +IUSE="ogg rtlsdr test websocket" + +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-cpp/cpp-httplib:= + dev-libs/libev + media-libs/libjpeg-turbo:= + net-misc/curl + sci-libs/cfitsio:= + sci-libs/fftw:3.0= + sci-libs/gsl:= + sci-libs/libnova:= + sys-libs/zlib + virtual/libusb:1 + ogg? ( + media-libs/libogg + media-libs/libtheora + ) + rtlsdr? ( net-wireless/rtl-sdr ) + websocket? ( dev-libs/boost:= ) +" +DEPEND="${RDEPEND} + kernel_linux? ( sys-kernel/linux-headers ) + test? ( >=dev-cpp/gtest-1.8.0 ) + websocket? ( dev-cpp/websocketpp ) +" + +PATCHES=( "${FILESDIR}/${P}-link-system-httplib.patch" ) + +src_configure() { + local mycmakeargs=( + -DINDI_SYSTEM_HTTPLIB=ON + -DINDI_BUILD_QT5_CLIENT=OFF + -DINDI_BUILD_SHARED=ON + -DINDI_BUILD_STATIC=OFF + -DINDI_BUILD_XISF=OFF # not packaged + -DUDEVRULES_INSTALL_DIR="${EPREFIX}$(get_udevdir)"/rules.d + $(cmake_use_find_package ogg OggTheora) + $(cmake_use_find_package rtlsdr RTLSDR) + -DINDI_BUILD_UNITTESTS=$(usex test) + -DINDI_BUILD_INTEGTESTS=$(usex test) + -DINDI_BUILD_WEBSOCKET=$(usex websocket) + ) + + cmake_src_configure +} + +src_test() { + # Unit tests + BUILD_DIR="${BUILD_DIR}"/test cmake_src_test + + # Integration tests + # They fail in parallel because they try to bind to the same port more + # than once. + BUILD_DIR="${BUILD_DIR}"/integs cmake_src_test -j1 +} + +pkg_postinst() { + udev_reload +} + +pkg_postrm() { + udev_reload +} -- cgit v1.2.3