From 0f558761aa2dee1017b4751e4017205e015a9560 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 29 Jun 2022 12:04:12 +0100 Subject: gentoo resync : 29.12.2022 --- sci-libs/indilib/Manifest | 9 +- .../indilib/files/indilib-1.9.4-musl-stdint.patch | 108 --------------------- sci-libs/indilib/indilib-1.9.2.ebuild | 69 ------------- sci-libs/indilib/indilib-1.9.4.ebuild | 73 -------------- sci-libs/indilib/indilib-1.9.5.1.ebuild | 69 ------------- sci-libs/indilib/indilib-1.9.6-r1.ebuild | 77 +++++++++++++++ 6 files changed, 79 insertions(+), 326 deletions(-) delete mode 100644 sci-libs/indilib/files/indilib-1.9.4-musl-stdint.patch delete mode 100644 sci-libs/indilib/indilib-1.9.2.ebuild delete mode 100644 sci-libs/indilib/indilib-1.9.4.ebuild delete mode 100644 sci-libs/indilib/indilib-1.9.5.1.ebuild create mode 100644 sci-libs/indilib/indilib-1.9.6-r1.ebuild (limited to 'sci-libs/indilib') diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest index bca2c622f3e0..bd7b01648150 100644 --- a/sci-libs/indilib/Manifest +++ b/sci-libs/indilib/Manifest @@ -1,8 +1,3 @@ -AUX indilib-1.9.4-musl-stdint.patch 3712 BLAKE2B 6642d8dc96779aaba01cccbb4ef5f2ab280ce4f9d8076c244d52d085545679c56b8aa0490fb331617becd4ba2eed62aa1a8bd1f9f3bae9b94b145b5148dd7748 SHA512 31b9d57b2353e5876da74048839e3b94f35c087d38834429dd6955045ae64f8c7cbc6f8f3f5e6f7441044cc5b80655eec8476726cf10f5de0e1d6a07c4a4d2fb -DIST indilib-1.9.2.tar.gz 2335834 BLAKE2B 47d8bde8e3c783cefb23c8a8f865fa46bb9a6ed4ee08618d198680f3036e9ca9a16178b1ec4dab070d0cb3ec8d638847cedb752a2a5a1d5e2dc5ddbd362c0a86 SHA512 0a1ada5b5880553ddbcf794bac952ddce76d3aa46652c48621e284a04a7d3d9ba7492d8874bf30f7e3f614a904a829109eaee9dae53dd5854d72bb1c98740f44 -DIST indilib-1.9.4.tar.gz 2370816 BLAKE2B 4df98abfaecdfe226d889e063928d3d5a09f9141b7bbeb2798da8190f874d0137313ff05b9c524a645440298d79655f9627ac611ae3132ee30f902e46d2db34d SHA512 2331d49545cfeb5904529f74b52ba0454c81066cb644e158e159a8f3597269d6d48bb1a608162771108c30f2fdb7e21fc5c1078b152f0e2a640f2e10ad3f9142 -DIST indilib-1.9.5.1.tar.gz 2420537 BLAKE2B 1be0f19a92cfb9d36ba88fc51adf55f5c39743efc4da352d1f11f4eb9e8a82c0624d29de1032a0b2a0a96babb13b33e225ef453ef92d091c695cc0a62642900c SHA512 80e764eff9ce40754bd1ba3dc8a49714aeccb3fc2d2e623f50dff25d7bcef9f9744b48fa052c60a94105677479a1629cc80f452002e1e00fc9f6549c1809df65 -EBUILD indilib-1.9.2.ebuild 1537 BLAKE2B ae5d0101c31c4bd95bb688856b5113cbdfff59d7a494b98f916378c4e0d86c94d729c48386c04857e8806764d7f9684195b134e099b723408ba3d35259266ebf SHA512 df6496a6fad0246217468105f06ee3a4a368810cbcfaa4907481c230ea7bf8182d683d60292522bc61eeefdcdb75a1f3c28611bf331d86e10732db365e0a8468 -EBUILD indilib-1.9.4.ebuild 1596 BLAKE2B 1a9be2d46147a85a30c01c96d12325e45a3713e1a7e212937564826222d2244052cdbc440cde002ee930d3c494c36f6aa7a2c1ef41df674293d562363e900882 SHA512 b3a896bc74c205043377901bb660f9852fa348e9637df0c3175c6174ea35d8cca6c817c325491473518b3a751ff11fe7f804df4765132f09466129b055bbd3f2 -EBUILD indilib-1.9.5.1.ebuild 1538 BLAKE2B 726604e729b18065d8ee12a1411a7eae118311bad40e8c87d2c8d32ce157ce16432665c605ddd8b552f89e09f6915264f382c2812eab186d8e548bd3cc8c5181 SHA512 d3f8de3e30d5a5f8bf7bed35bd84f5e5ce9bb32a589f1c5bbe33f5876f5ddadf326c65196932173b67e02dce88c2adf4a394d84886069166bfd76cca4e50c8f4 +DIST indilib-1.9.6.tar.gz 2422813 BLAKE2B 5f45f1c53d4cc459d840aca3a27a9cefcd0b988fda7a4f7a3988aa2ef0b0c7c762403b76676160f14767fd8214b69f8d5ff183fcd4f1d951d7e3d2f1ba42e35b SHA512 f85cec8dc4bda4d4bf5b7787eec409bcebe5e569aa5abc7c21904c8bb8bb471b9c0a505394a0f7ce4965e233191ef859cfc2e76148af51753525788f80cf2ee6 +EBUILD indilib-1.9.6-r1.ebuild 1613 BLAKE2B 25beb2e2984c8fe759a8f624abf06dcab61c1e17fc139fcdfa70eebf1cb55c59280915217976e8aa72ab78522c23d6a84bf710d705f09d57f9ce3b5e3e611567 SHA512 d30af17b2a4f9beae44611d330ad7fdbd264f76681074701e8bf2976f28eab6ce4662aef34fb786344859e98180f5228381330347e157974d0acdaf2f63dfa9e MISC metadata.xml 562 BLAKE2B 675fbd88b6ea5004a89e4d86f397e924317f56ad98743d1d8cd9758f92b516cf70386f4eb59c8869451acd6b312c50a05b37a9ca3cedac87599bd90cd46d6ddd SHA512 ebef1f64112d45534b6ea13ce54b2ee57349d11486b881be277d669e984891fe9d8ca3839aadbbece908f55bd027060739460929bd7e0400cd04e639c7d2186f diff --git a/sci-libs/indilib/files/indilib-1.9.4-musl-stdint.patch b/sci-libs/indilib/files/indilib-1.9.4-musl-stdint.patch deleted file mode 100644 index 9adfae6bac25..000000000000 --- a/sci-libs/indilib/files/indilib-1.9.4-musl-stdint.patch +++ /dev/null @@ -1,108 +0,0 @@ -https://patch-diff.githubusercontent.com/raw/indilib/indi/pull/1618.patch - -From: Sam James -Date: Sun, 6 Feb 2022 08:16:44 +0000 -Subject: [PATCH] Use for uint* types (fix build on musl) - - is already being used in some places, as are its -types, e.g. uint8_t, but in some places, non-standard types -like u_int16_t were being mix-and-matched. - -Consistently use the types to fix build on e.g. -musl. - -Bug: https://bugs.gentoo.org/829487 -Signed-off-by: Sam James ---- a/base64.c -+++ b/base64.c -@@ -45,7 +45,7 @@ - * Swap bytes in 16-bit value. - */ - //#define bswap_16(x) __builtin_bswap16 (x); --#define bswap_16(x) ((__uint16_t) ((((x) >> 8) & 0xff) | (((x) & 0xff) << 8))) -+#define bswap_16(x) ((uint16_t) ((((x) >> 8) & 0xff) | (((x) & 0xff) << 8))) - - #include - #define IS_BIG_ENDIAN (1 == htons(1)) ---- a/drivers/focuser/focuslynxbase.cpp -+++ b/drivers/focuser/focuslynxbase.cpp -@@ -2821,7 +2821,7 @@ bool FocusLynxBase::SyncFocuser(uint32_t ticks) - /************************************************************************************ - * - * ***********************************************************************************/ --//bool FocusLynxBase::setMaxTravel(u_int16_t travel) -+//bool FocusLynxBase::setMaxTravel(uint16_t travel) - bool FocusLynxBase::SetFocuserMaxPosition(uint32_t ticks) - { - char cmd[LYNX_MAX] = {0}; -@@ -2886,7 +2886,7 @@ bool FocusLynxBase::SetFocuserMaxPosition(uint32_t ticks) - /************************************************************************************ - * - * ***********************************************************************************/ --bool FocusLynxBase::setStepSize(u_int16_t stepsize) -+bool FocusLynxBase::setStepSize(uint16_t stepsize) - { - char cmd[LYNX_MAX] = {0}; - int errcode = 0; ---- a/drivers/focuser/focuslynxbase.h -+++ b/drivers/focuser/focuslynxbase.h -@@ -28,6 +28,7 @@ - #include "connectionplugins/connectiontcp.h" - - #include -+#include - #include - #include - #include -@@ -154,7 +155,7 @@ class FocusLynxBase : public INDI::Focuser - // Set functions - - // Position -- bool setStepSize(u_int16_t stepsize); -+ bool setStepSize(uint16_t stepsize); - - // Temperature - bool setTemperatureCompensation(bool enable); ---- a/drivers/rotator/gemini.h -+++ b/drivers/rotator/gemini.h -@@ -23,6 +23,7 @@ - #include "indifocuser.h" - #include "indirotatorinterface.h" - -+#include - #include - - class Gemini : public INDI::Focuser, public INDI::RotatorInterface -@@ -132,7 +133,7 @@ class Gemini : public INDI::Focuser, public INDI::RotatorInterface - // Set functions - - // Position -- bool setFocusPosition(u_int16_t position); -+ bool setFocusPosition(uint16_t position); - - // Temperature - bool setTemperatureCompensation(bool enable); ---- a/drivers/telescope/celestrondriver.h -+++ b/drivers/telescope/celestrondriver.h -@@ -28,10 +28,7 @@ - #include - #include "indicom.h" - --#ifdef __FreeBSD__ - #include --typedef uint8_t u_int8_t; --#endif - - //#include - //#include -@@ -312,8 +309,8 @@ class CelestronDriver - - // get and set guide rate - // 0 to 255 corresponding to 0 to 100% sidereal -- bool get_guide_rate(CELESTRON_AXIS axis, u_int8_t * rate); -- bool set_guide_rate(CELESTRON_AXIS axis, u_int8_t rate); -+ bool get_guide_rate(CELESTRON_AXIS axis, uint8_t * rate); -+ bool set_guide_rate(CELESTRON_AXIS axis, uint8_t rate); - - // Pointing state, pier side, returns 'E' or 'W' - bool get_pier_side(char * sop); diff --git a/sci-libs/indilib/indilib-1.9.2.ebuild b/sci-libs/indilib/indilib-1.9.2.ebuild deleted file mode 100644 index 0f889477df8c..000000000000 --- a/sci-libs/indilib/indilib-1.9.2.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2021 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=" - net-misc/curl - sci-libs/cfitsio:= - sci-libs/fftw:3.0= - sci-libs/gsl:= - sci-libs/libnova:= - sys-libs/zlib - virtual/jpeg:0 - virtual/libusb:0 - 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 - -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_WEBSOCKET=$(usex websocket) - ) - - cmake_src_configure -} - -src_test() { - local myctestargs=() - - if use ppc || use ppc64 || use sparc ; then - # Broken on big endian for quite some time. - # Reported upstream: file needs to be replaced w/ a normal library - # for b64. - # bug #763126 - myctestargs+=( - -E "(test_base64)" - ) - fi - - BUILD_DIR="${BUILD_DIR}"/test cmake_src_test -} diff --git a/sci-libs/indilib/indilib-1.9.4.ebuild b/sci-libs/indilib/indilib-1.9.4.ebuild deleted file mode 100644 index 54d7bca89031..000000000000 --- a/sci-libs/indilib/indilib-1.9.4.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2022 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=" - net-misc/curl - sci-libs/cfitsio:= - sci-libs/fftw:3.0= - sci-libs/gsl:= - sci-libs/libnova:= - sys-libs/zlib - virtual/jpeg:0 - virtual/libusb:0 - 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}"/${PN}-1.9.4-musl-stdint.patch -) - -src_configure() { - local mycmakeargs=( - -DINDI_BUILD_QT5_CLIENT=OFF - -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_WEBSOCKET=$(usex websocket) - ) - - cmake_src_configure -} - -src_test() { - local myctestargs=() - - if use ppc || use ppc64 || use sparc ; then - # Broken on big endian for quite some time. - # Reported upstream: file needs to be replaced w/ a normal library - # for b64. - # bug #763126 - myctestargs+=( - -E "(test_base64)" - ) - fi - - BUILD_DIR="${BUILD_DIR}"/test cmake_src_test -} diff --git a/sci-libs/indilib/indilib-1.9.5.1.ebuild b/sci-libs/indilib/indilib-1.9.5.1.ebuild deleted file mode 100644 index 79e0a912fc19..000000000000 --- a/sci-libs/indilib/indilib-1.9.5.1.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2022 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=" - net-misc/curl - sci-libs/cfitsio:= - sci-libs/fftw:3.0= - sci-libs/gsl:= - sci-libs/libnova:= - sys-libs/zlib - virtual/jpeg:0 - virtual/libusb:0 - 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 - -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_WEBSOCKET=$(usex websocket) - ) - - cmake_src_configure -} - -src_test() { - local myctestargs=() - - if use ppc || use ppc64 || use sparc ; then - # Broken on big endian for quite some time. - # Reported upstream: file needs to be replaced w/ a normal library - # for b64. - # bug #763126 - myctestargs+=( - -E "(test_base64)" - ) - fi - - BUILD_DIR="${BUILD_DIR}"/test cmake_src_test -} diff --git a/sci-libs/indilib/indilib-1.9.6-r1.ebuild b/sci-libs/indilib/indilib-1.9.6-r1.ebuild new file mode 100644 index 000000000000..af62007d828a --- /dev/null +++ b/sci-libs/indilib/indilib-1.9.6-r1.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2022 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=" + 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:0 + 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 + -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_WEBSOCKET=$(usex websocket) + ) + + cmake_src_configure +} + +src_test() { + local myctestargs=() + + if use ppc || use ppc64 || use sparc ; then + # Broken on big endian for quite some time. + # Reported upstream: file needs to be replaced w/ a normal library + # for b64. + # bug #763126 + myctestargs+=( + -E "(test_base64)" + ) + fi + + BUILD_DIR="${BUILD_DIR}"/test cmake_src_test +} + +pkg_postinst() { + udev_reload +} + +pkg_postrm() { + udev_reload +} -- cgit v1.2.3