1 |
commit: 9ff2abdce32cba2a7c34121e13640c35bbcaa69f |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu May 26 14:26:08 2022 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu May 26 14:26:08 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ff2abdc |
7 |
|
8 |
sci-libs/indilib: Drop 1.9.4 |
9 |
|
10 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
sci-libs/indilib/Manifest | 1 - |
14 |
.../indilib/files/indilib-1.9.4-musl-stdint.patch | 108 --------------------- |
15 |
sci-libs/indilib/indilib-1.9.4.ebuild | 73 -------------- |
16 |
3 files changed, 182 deletions(-) |
17 |
|
18 |
diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest |
19 |
index 4eb5e3d5c30d..e9732c8ecb85 100644 |
20 |
--- a/sci-libs/indilib/Manifest |
21 |
+++ b/sci-libs/indilib/Manifest |
22 |
@@ -1,3 +1,2 @@ |
23 |
DIST indilib-1.9.2.tar.gz 2335834 BLAKE2B 47d8bde8e3c783cefb23c8a8f865fa46bb9a6ed4ee08618d198680f3036e9ca9a16178b1ec4dab070d0cb3ec8d638847cedb752a2a5a1d5e2dc5ddbd362c0a86 SHA512 0a1ada5b5880553ddbcf794bac952ddce76d3aa46652c48621e284a04a7d3d9ba7492d8874bf30f7e3f614a904a829109eaee9dae53dd5854d72bb1c98740f44 |
24 |
-DIST indilib-1.9.4.tar.gz 2370816 BLAKE2B 4df98abfaecdfe226d889e063928d3d5a09f9141b7bbeb2798da8190f874d0137313ff05b9c524a645440298d79655f9627ac611ae3132ee30f902e46d2db34d SHA512 2331d49545cfeb5904529f74b52ba0454c81066cb644e158e159a8f3597269d6d48bb1a608162771108c30f2fdb7e21fc5c1078b152f0e2a640f2e10ad3f9142 |
25 |
DIST indilib-1.9.5.1.tar.gz 2420537 BLAKE2B 1be0f19a92cfb9d36ba88fc51adf55f5c39743efc4da352d1f11f4eb9e8a82c0624d29de1032a0b2a0a96babb13b33e225ef453ef92d091c695cc0a62642900c SHA512 80e764eff9ce40754bd1ba3dc8a49714aeccb3fc2d2e623f50dff25d7bcef9f9744b48fa052c60a94105677479a1629cc80f452002e1e00fc9f6549c1809df65 |
26 |
|
27 |
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 |
28 |
deleted file mode 100644 |
29 |
index 9adfae6bac25..000000000000 |
30 |
--- a/sci-libs/indilib/files/indilib-1.9.4-musl-stdint.patch |
31 |
+++ /dev/null |
32 |
@@ -1,108 +0,0 @@ |
33 |
-https://patch-diff.githubusercontent.com/raw/indilib/indi/pull/1618.patch |
34 |
- |
35 |
-From: Sam James <sam@g.o> |
36 |
-Date: Sun, 6 Feb 2022 08:16:44 +0000 |
37 |
-Subject: [PATCH] Use <stdint.h> for uint* types (fix build on musl) |
38 |
- |
39 |
-<stdint.h> is already being used in some places, as are its |
40 |
-types, e.g. uint8_t, but in some places, non-standard types |
41 |
-like u_int16_t were being mix-and-matched. |
42 |
- |
43 |
-Consistently use the <stdint.h> types to fix build on e.g. |
44 |
-musl. |
45 |
- |
46 |
-Bug: https://bugs.gentoo.org/829487 |
47 |
-Signed-off-by: Sam James <sam@g.o> |
48 |
---- a/base64.c |
49 |
-+++ b/base64.c |
50 |
-@@ -45,7 +45,7 @@ |
51 |
- * Swap bytes in 16-bit value. |
52 |
- */ |
53 |
- //#define bswap_16(x) __builtin_bswap16 (x); |
54 |
--#define bswap_16(x) ((__uint16_t) ((((x) >> 8) & 0xff) | (((x) & 0xff) << 8))) |
55 |
-+#define bswap_16(x) ((uint16_t) ((((x) >> 8) & 0xff) | (((x) & 0xff) << 8))) |
56 |
- |
57 |
- #include <arpa/inet.h> |
58 |
- #define IS_BIG_ENDIAN (1 == htons(1)) |
59 |
---- a/drivers/focuser/focuslynxbase.cpp |
60 |
-+++ b/drivers/focuser/focuslynxbase.cpp |
61 |
-@@ -2821,7 +2821,7 @@ bool FocusLynxBase::SyncFocuser(uint32_t ticks) |
62 |
- /************************************************************************************ |
63 |
- * |
64 |
- * ***********************************************************************************/ |
65 |
--//bool FocusLynxBase::setMaxTravel(u_int16_t travel) |
66 |
-+//bool FocusLynxBase::setMaxTravel(uint16_t travel) |
67 |
- bool FocusLynxBase::SetFocuserMaxPosition(uint32_t ticks) |
68 |
- { |
69 |
- char cmd[LYNX_MAX] = {0}; |
70 |
-@@ -2886,7 +2886,7 @@ bool FocusLynxBase::SetFocuserMaxPosition(uint32_t ticks) |
71 |
- /************************************************************************************ |
72 |
- * |
73 |
- * ***********************************************************************************/ |
74 |
--bool FocusLynxBase::setStepSize(u_int16_t stepsize) |
75 |
-+bool FocusLynxBase::setStepSize(uint16_t stepsize) |
76 |
- { |
77 |
- char cmd[LYNX_MAX] = {0}; |
78 |
- int errcode = 0; |
79 |
---- a/drivers/focuser/focuslynxbase.h |
80 |
-+++ b/drivers/focuser/focuslynxbase.h |
81 |
-@@ -28,6 +28,7 @@ |
82 |
- #include "connectionplugins/connectiontcp.h" |
83 |
- |
84 |
- #include <map> |
85 |
-+#include <stdint.h> |
86 |
- #include <termios.h> |
87 |
- #include <unistd.h> |
88 |
- #include <memory> |
89 |
-@@ -154,7 +155,7 @@ class FocusLynxBase : public INDI::Focuser |
90 |
- // Set functions |
91 |
- |
92 |
- // Position |
93 |
-- bool setStepSize(u_int16_t stepsize); |
94 |
-+ bool setStepSize(uint16_t stepsize); |
95 |
- |
96 |
- // Temperature |
97 |
- bool setTemperatureCompensation(bool enable); |
98 |
---- a/drivers/rotator/gemini.h |
99 |
-+++ b/drivers/rotator/gemini.h |
100 |
-@@ -23,6 +23,7 @@ |
101 |
- #include "indifocuser.h" |
102 |
- #include "indirotatorinterface.h" |
103 |
- |
104 |
-+#include <stdint.h> |
105 |
- #include <map> |
106 |
- |
107 |
- class Gemini : public INDI::Focuser, public INDI::RotatorInterface |
108 |
-@@ -132,7 +133,7 @@ class Gemini : public INDI::Focuser, public INDI::RotatorInterface |
109 |
- // Set functions |
110 |
- |
111 |
- // Position |
112 |
-- bool setFocusPosition(u_int16_t position); |
113 |
-+ bool setFocusPosition(uint16_t position); |
114 |
- |
115 |
- // Temperature |
116 |
- bool setTemperatureCompensation(bool enable); |
117 |
---- a/drivers/telescope/celestrondriver.h |
118 |
-+++ b/drivers/telescope/celestrondriver.h |
119 |
-@@ -28,10 +28,7 @@ |
120 |
- #include <string> |
121 |
- #include "indicom.h" |
122 |
- |
123 |
--#ifdef __FreeBSD__ |
124 |
- #include <stdint.h> |
125 |
--typedef uint8_t u_int8_t; |
126 |
--#endif |
127 |
- |
128 |
- //#include <thread> |
129 |
- //#include <condition_variable> |
130 |
-@@ -312,8 +309,8 @@ class CelestronDriver |
131 |
- |
132 |
- // get and set guide rate |
133 |
- // 0 to 255 corresponding to 0 to 100% sidereal |
134 |
-- bool get_guide_rate(CELESTRON_AXIS axis, u_int8_t * rate); |
135 |
-- bool set_guide_rate(CELESTRON_AXIS axis, u_int8_t rate); |
136 |
-+ bool get_guide_rate(CELESTRON_AXIS axis, uint8_t * rate); |
137 |
-+ bool set_guide_rate(CELESTRON_AXIS axis, uint8_t rate); |
138 |
- |
139 |
- // Pointing state, pier side, returns 'E' or 'W' |
140 |
- bool get_pier_side(char * sop); |
141 |
|
142 |
diff --git a/sci-libs/indilib/indilib-1.9.4.ebuild b/sci-libs/indilib/indilib-1.9.4.ebuild |
143 |
deleted file mode 100644 |
144 |
index 54d7bca89031..000000000000 |
145 |
--- a/sci-libs/indilib/indilib-1.9.4.ebuild |
146 |
+++ /dev/null |
147 |
@@ -1,73 +0,0 @@ |
148 |
-# Copyright 1999-2022 Gentoo Authors |
149 |
-# Distributed under the terms of the GNU General Public License v2 |
150 |
- |
151 |
-EAPI=8 |
152 |
- |
153 |
-inherit cmake udev |
154 |
- |
155 |
-DESCRIPTION="INDI Astronomical Control Protocol library" |
156 |
-HOMEPAGE="https://www.indilib.org/" |
157 |
-SRC_URI="https://github.com/${PN}/${PN/lib/}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
158 |
-S="${WORKDIR}/${P/lib/}" |
159 |
- |
160 |
-LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+" |
161 |
-SLOT="0/1" |
162 |
-KEYWORDS="amd64 ppc ppc64 ~riscv ~x86" |
163 |
-IUSE="ogg rtlsdr test websocket" |
164 |
- |
165 |
-RESTRICT="!test? ( test )" |
166 |
- |
167 |
-RDEPEND=" |
168 |
- net-misc/curl |
169 |
- sci-libs/cfitsio:= |
170 |
- sci-libs/fftw:3.0= |
171 |
- sci-libs/gsl:= |
172 |
- sci-libs/libnova:= |
173 |
- sys-libs/zlib |
174 |
- virtual/jpeg:0 |
175 |
- virtual/libusb:0 |
176 |
- ogg? ( |
177 |
- media-libs/libogg |
178 |
- media-libs/libtheora |
179 |
- ) |
180 |
- rtlsdr? ( net-wireless/rtl-sdr ) |
181 |
- websocket? ( dev-libs/boost:= ) |
182 |
-" |
183 |
-DEPEND="${RDEPEND} |
184 |
- kernel_linux? ( sys-kernel/linux-headers ) |
185 |
- test? ( >=dev-cpp/gtest-1.8.0 ) |
186 |
- websocket? ( dev-cpp/websocketpp ) |
187 |
-" |
188 |
- |
189 |
-PATCHES=( |
190 |
- "${FILESDIR}"/${PN}-1.9.4-musl-stdint.patch |
191 |
-) |
192 |
- |
193 |
-src_configure() { |
194 |
- local mycmakeargs=( |
195 |
- -DINDI_BUILD_QT5_CLIENT=OFF |
196 |
- -DUDEVRULES_INSTALL_DIR="${EPREFIX}$(get_udevdir)"/rules.d |
197 |
- $(cmake_use_find_package ogg OggTheora) |
198 |
- $(cmake_use_find_package rtlsdr RTLSDR) |
199 |
- -DINDI_BUILD_UNITTESTS=$(usex test) |
200 |
- -DINDI_BUILD_WEBSOCKET=$(usex websocket) |
201 |
- ) |
202 |
- |
203 |
- cmake_src_configure |
204 |
-} |
205 |
- |
206 |
-src_test() { |
207 |
- local myctestargs=() |
208 |
- |
209 |
- if use ppc || use ppc64 || use sparc ; then |
210 |
- # Broken on big endian for quite some time. |
211 |
- # Reported upstream: file needs to be replaced w/ a normal library |
212 |
- # for b64. |
213 |
- # bug #763126 |
214 |
- myctestargs+=( |
215 |
- -E "(test_base64)" |
216 |
- ) |
217 |
- fi |
218 |
- |
219 |
- BUILD_DIR="${BUILD_DIR}"/test cmake_src_test |
220 |
-} |