mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-21 22:47:14 -08:00
sci-libs/indilib: Drop 1.9.4
Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
@@ -1,3 +1,2 @@
|
||||
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
|
||||
|
||||
@@ -1,108 +0,0 @@
|
||||
https://patch-diff.githubusercontent.com/raw/indilib/indi/pull/1618.patch
|
||||
|
||||
From: Sam James <sam@gentoo.org>
|
||||
Date: Sun, 6 Feb 2022 08:16:44 +0000
|
||||
Subject: [PATCH] Use <stdint.h> for uint* types (fix build on musl)
|
||||
|
||||
<stdint.h> 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 <stdint.h> types to fix build on e.g.
|
||||
musl.
|
||||
|
||||
Bug: https://bugs.gentoo.org/829487
|
||||
Signed-off-by: Sam James <sam@gentoo.org>
|
||||
--- 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 <arpa/inet.h>
|
||||
#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 <map>
|
||||
+#include <stdint.h>
|
||||
#include <termios.h>
|
||||
#include <unistd.h>
|
||||
#include <memory>
|
||||
@@ -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 <stdint.h>
|
||||
#include <map>
|
||||
|
||||
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 <string>
|
||||
#include "indicom.h"
|
||||
|
||||
-#ifdef __FreeBSD__
|
||||
#include <stdint.h>
|
||||
-typedef uint8_t u_int8_t;
|
||||
-#endif
|
||||
|
||||
//#include <thread>
|
||||
//#include <condition_variable>
|
||||
@@ -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);
|
||||
@@ -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
|
||||
}
|
||||
Reference in New Issue
Block a user