* [gentoo-commits] repo/gentoo:master commit in: sci-libs/indilib/, sci-libs/indilib/files/
@ 2021-07-14 13:44 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2021-07-14 13:44 UTC (permalink / raw
To: gentoo-commits
commit: 31f57fcf95df722dbe0263d5e41863cd3ad48d3b
Author: Alexey Sokolov <sokolov <AT> google <DOT> com>
AuthorDate: Mon Jul 5 16:00:39 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jul 14 13:43:39 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31f57fcf
sci-libs/indilib: fix include
Closes: https://bugs.gentoo.org/800614
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Closes: https://github.com/gentoo/gentoo/pull/21538
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../indilib/files/indilib-1.9.1-fix-include.patch | 26 +++++++++
sci-libs/indilib/indilib-1.9.1-r1.ebuild | 61 ++++++++++++++++++++++
2 files changed, 87 insertions(+)
diff --git a/sci-libs/indilib/files/indilib-1.9.1-fix-include.patch b/sci-libs/indilib/files/indilib-1.9.1-fix-include.patch
new file mode 100644
index 00000000000..7e3e24880d4
--- /dev/null
+++ b/sci-libs/indilib/files/indilib-1.9.1-fix-include.patch
@@ -0,0 +1,26 @@
+From 907b3d81f27593e709af9e3f2cdc6dab05d6d80a Mon Sep 17 00:00:00 2001
+From: Paolo Stivanin <paolostivanin@users.noreply.github.com>
+Date: Tue, 29 Jun 2021 08:52:04 +0200
+Subject: [PATCH] Fix indimacros include path on baseclient.h (#1503)
+
+---
+ libs/indibase/baseclient.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libs/indibase/baseclient.h b/libs/indibase/baseclient.h
+index 6d5e49b9a..2656d7486 100644
+--- a/libs/indibase/baseclient.h
++++ b/libs/indibase/baseclient.h
+@@ -20,11 +20,11 @@
+
+ #include "indiapi.h"
+ #include "indibase.h"
++#include "indimacros.h"
+
+ #include <string>
+ #include <vector>
+
+-#include <indimacros.h>
+ #include <memory>
+
+ // #define MAXRBUF 2048 // #PS: defined in indibase.h
diff --git a/sci-libs/indilib/indilib-1.9.1-r1.ebuild b/sci-libs/indilib/indilib-1.9.1-r1.ebuild
new file mode 100644
index 00000000000..eb8784d3454
--- /dev/null
+++ b/sci-libs/indilib/indilib-1.9.1-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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="
+ 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}"/indilib-1.9.1-fix-include.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() {
+ BUILD_DIR="${BUILD_DIR}"/test cmake_src_test
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/indilib/, sci-libs/indilib/files/
@ 2022-02-06 9:12 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2022-02-06 9:12 UTC (permalink / raw
To: gentoo-commits
commit: e35e4ff449e6652e55bc03dadbe6cb0629141175
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 6 09:12:04 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 6 09:12:36 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e35e4ff4
sci-libs/indilib: fix musl build
Closes: https://bugs.gentoo.org/829487
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../indilib/files/indilib-1.9.4-musl-stdint.patch | 108 +++++++++++++++++++++
sci-libs/indilib/indilib-1.9.4.ebuild | 4 +
2 files changed, 112 insertions(+)
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
new file mode 100644
index 000000000000..9adfae6bac25
--- /dev/null
+++ b/sci-libs/indilib/files/indilib-1.9.4-musl-stdint.patch
@@ -0,0 +1,108 @@
+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);
diff --git a/sci-libs/indilib/indilib-1.9.4.ebuild b/sci-libs/indilib/indilib-1.9.4.ebuild
index b6d000763a3b..6180a9207d72 100644
--- a/sci-libs/indilib/indilib-1.9.4.ebuild
+++ b/sci-libs/indilib/indilib-1.9.4.ebuild
@@ -39,6 +39,10 @@ DEPEND="${RDEPEND}
websocket? ( dev-cpp/websocketpp )
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.9.4-musl-stdint.patch
+)
+
src_configure() {
local mycmakeargs=(
-DINDI_BUILD_QT5_CLIENT=OFF
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/indilib/, sci-libs/indilib/files/
@ 2022-05-26 14:36 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2022-05-26 14:36 UTC (permalink / raw
To: gentoo-commits
commit: 9ff2abdce32cba2a7c34121e13640c35bbcaa69f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May 26 14:26:08 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May 26 14:26:08 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ff2abdc
sci-libs/indilib: Drop 1.9.4
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-libs/indilib/Manifest | 1 -
.../indilib/files/indilib-1.9.4-musl-stdint.patch | 108 ---------------------
sci-libs/indilib/indilib-1.9.4.ebuild | 73 --------------
3 files changed, 182 deletions(-)
diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest
index 4eb5e3d5c30d..e9732c8ecb85 100644
--- a/sci-libs/indilib/Manifest
+++ b/sci-libs/indilib/Manifest
@@ -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
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 <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);
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
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/indilib/, sci-libs/indilib/files/
@ 2023-07-31 16:26 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2023-07-31 16:26 UTC (permalink / raw
To: gentoo-commits
commit: 5fe9b7a2fcbef952d86aa0bdafecdc2a734ed3fd
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 31 16:25:41 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jul 31 16:25:58 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fe9b7a2
sci-libs/indilib: Fix musl build
Closes: https://bugs.gentoo.org/873403
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-libs/indilib/files/indilib-2.0.2-musl.patch | 37 +++++++++++++++++++++++++
sci-libs/indilib/indilib-2.0.2.ebuild | 2 ++
2 files changed, 39 insertions(+)
diff --git a/sci-libs/indilib/files/indilib-2.0.2-musl.patch b/sci-libs/indilib/files/indilib-2.0.2-musl.patch
new file mode 100644
index 000000000000..5e906bdef748
--- /dev/null
+++ b/sci-libs/indilib/files/indilib-2.0.2-musl.patch
@@ -0,0 +1,37 @@
+From 2e95bc3a8487912c3edc5d83e00557d20335ba3e Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Wed, 26 Jul 2023 05:30:00 +0100
+Subject: [PATCH] drivers: auxiliary: use stdint.h types (fix musl build)
+ (#1914)
+
+---
+ drivers/auxiliary/pegasus_upb.cpp | 2 +-
+ drivers/auxiliary/pegasus_upb.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/auxiliary/pegasus_upb.cpp b/drivers/auxiliary/pegasus_upb.cpp
+index 6aa290a2d8..437d3e19cc 100644
+--- a/drivers/auxiliary/pegasus_upb.cpp
++++ b/drivers/auxiliary/pegasus_upb.cpp
+@@ -1356,7 +1356,7 @@ bool PegasusUPB::sensorUpdated(const std::vector<std::string> &result, uint8_t s
+ //////////////////////////////////////////////////////////////////////
+ ///
+ //////////////////////////////////////////////////////////////////////
+-bool PegasusUPB::stepperUpdated(const std::vector<std::string> &result, u_int8_t index)
++bool PegasusUPB::stepperUpdated(const std::vector<std::string> &result, uint8_t index)
+ {
+ if (lastStepperData.empty())
+ return true;
+diff --git a/drivers/auxiliary/pegasus_upb.h b/drivers/auxiliary/pegasus_upb.h
+index 47546f7453..7b6cae6de9 100644
+--- a/drivers/auxiliary/pegasus_upb.h
++++ b/drivers/auxiliary/pegasus_upb.h
+@@ -141,7 +141,7 @@ class PegasusUPB : public INDI::DefaultDevice, public INDI::FocuserInterface, pu
+ * If the previous stepper data is empty then this will always
+ * return true.
+ */
+- bool stepperUpdated(const std::vector<std::string> &result, u_int8_t index);
++ bool stepperUpdated(const std::vector<std::string> &result, uint8_t index);
+
+ int PortFD { -1 };
+ bool setupComplete { false };
diff --git a/sci-libs/indilib/indilib-2.0.2.ebuild b/sci-libs/indilib/indilib-2.0.2.ebuild
index d7542c61a1ac..64fd177a06a1 100644
--- a/sci-libs/indilib/indilib-2.0.2.ebuild
+++ b/sci-libs/indilib/indilib-2.0.2.ebuild
@@ -40,6 +40,8 @@ DEPEND="${RDEPEND}
websocket? ( dev-cpp/websocketpp )
"
+PATCHES=( "${FILESDIR}/${P}-musl.patch" ) # git master, bug 873403
+
src_configure() {
local mycmakeargs=(
-DINDI_BUILD_QT5_CLIENT=OFF
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/indilib/, sci-libs/indilib/files/
@ 2023-12-25 17:04 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2023-12-25 17:04 UTC (permalink / raw
To: gentoo-commits
commit: f21f07420f2c100faca18b4f221ccc1604933c6b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 25 15:30:28 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec 25 17:03:51 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f21f0742
sci-libs/indilib: add 2.0.5
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-libs/indilib/Manifest | 1 +
.../files/indilib-2.0.5-link-system-httplib.patch | 21 ++++++
sci-libs/indilib/indilib-2.0.5.ebuild | 80 ++++++++++++++++++++++
3 files changed, 102 insertions(+)
diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest
index 7eeba85ab97f..d05290120206 100644
--- a/sci-libs/indilib/Manifest
+++ b/sci-libs/indilib/Manifest
@@ -1 +1,2 @@
DIST indilib-2.0.4.tar.gz 2778082 BLAKE2B 21573abeb054f6693d29e5e67908be8be06246c138dba7dd8815c80d338fe8dbc202b103454f8e9a0b97e0fa05d5464547f32a2aa6bc0fa6189ddabd1f67428c SHA512 cb8c05ed2d814350e8357dfb3fd42ce5f2db88a0d150b0feb63fcb85cadd70369bfce1600a60837e242e5815ad076923428c456f4b331ffe1a22a2c02e11ced4
+DIST indilib-2.0.5.tar.gz 2781981 BLAKE2B 7347c3e6cf5a32d1b136d8251253154fe7b25252070c34b8d03627e02c2cb3472ed2f44a12a7b7d87f95ba6b6b18a66a9cd528d5cba64c5df0a167fa6a20e017 SHA512 42cdc6d48ac1daf39ab96552dc134aa400bb847d2bcf22f0845aec9639ed44cdf9a2abb4b80d7c3b1c15b76b6f3d3a86333cc7a1a0b84033bc5404b78d758ea2
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 <mario.haustein@hrz.tu-chemnitz.de>
+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.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
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-libs/indilib/, sci-libs/indilib/files/
@ 2025-10-23 13:47 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2025-10-23 13:47 UTC (permalink / raw
To: gentoo-commits
commit: 6ba3b909ae4163b63e6d44a5fc7c601dd4efc8f3
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 23 13:46:25 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Oct 23 13:47:39 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ba3b909
sci-libs/indilib: Unbundle dev-libs/hidapi
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/indilib-2.1.6-system-hidapi.patch | 370 +++++++++++++++++++++
sci-libs/indilib/indilib-2.1.6-r1.ebuild | 4 +
2 files changed, 374 insertions(+)
diff --git a/sci-libs/indilib/files/indilib-2.1.6-system-hidapi.patch b/sci-libs/indilib/files/indilib-2.1.6-system-hidapi.patch
new file mode 100644
index 000000000000..636e9b74204d
--- /dev/null
+++ b/sci-libs/indilib/files/indilib-2.1.6-system-hidapi.patch
@@ -0,0 +1,370 @@
+From 3fe3a66ff3f89a5412f044fe098725b0437c3552 Mon Sep 17 00:00:00 2001
+From: Mattia Verga <mattia.verga@tiscali.it>
+Date: Mon, 13 Oct 2025 19:27:50 +0200
+Subject: [PATCH] Allow using hidapi from system (#2272)
+
+Signed-off-by: Mattia Verga <mattia.verga@tiscali.it>
+---
+ CMakeLists.txt | 17 ++++++++++++++++-
+ drivers/focuser/CMakeLists.txt | 12 ++++++------
+ drivers/focuser/activefocuser.h | 8 +++++++-
+ drivers/focuser/activefocuser_utils.h | 10 ++++++++--
+ drivers/focuser/fcusb.h | 8 +++++++-
+ drivers/focuser/hitecastrodcfocuser.h | 7 ++++++-
+ drivers/focuser/perfectstar.h | 7 ++++++-
+ drivers/focuser/si_efs.h | 7 ++++++-
+ libs/hid/CMakeLists.txt | 6 +++---
+ libs/hid/hid_libusb.c | 2 +-
+ libs/hid/hid_mac.c | 2 +-
+ libs/hid/hid_win.c | 2 +-
+ libs/hid/hidtest.cpp | 2 +-
+ libs/hid/{hidapi.h => indi_hidapi.h} | 0
+ libs/indibase/CMakeLists.txt | 7 ++++++-
+ obsolete/focusmaster.h | 8 +++++++-
+ 16 files changed, 82 insertions(+), 23 deletions(-)
+ rename libs/hid/{hidapi.h => indi_hidapi.h} (100%)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e36fe1334d..0e84420db7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -102,6 +102,7 @@ OPTION(INDI_BUILD_EXAMPLES "Build INDI examples" ON)
+ OPTION(INDI_INSTALL_UDEV_RULES "Install INDI udev rules" ON)
+
+ # System provided or bundled libs
++OPTION(INDI_SYSTEM_HIDAPILIB "Use system provided hidapilib" OFF)
+ OPTION(INDI_SYSTEM_HTTPLIB "Use system provided httplib" OFF)
+ OPTION(INDI_SYSTEM_JSONLIB "Use system provided json library" OFF)
+
+@@ -177,6 +178,18 @@ install(FILES
+ # ##################################################################################################
+ # #################################### bundled libs ##############################################
+ # ##################################################################################################
++if(INDI_SYSTEM_HIDAPILIB)
++ find_package(hidapi REQUIRED)
++ set(SYSTEM_HIDAPILIB 1)
++ set(HIDAPILIB hidapi::libusb)
++ add_definitions(-D_USE_SYSTEM_HIDAPILIB)
++ message(STATUS "Using system provided hidapilib version ${hidapi_VERSION_STR}")
++else()
++ set(SYSTEM_HIDAPILIB 0)
++ set(HIDAPILIB "")
++ message(STATUS "Using bundled hidapi")
++endif(INDI_SYSTEM_HIDAPILIB)
++
+ if(INDI_SYSTEM_HTTPLIB)
+ find_package(httplib REQUIRED)
+ include_directories(${HTTPLIB_INCLUDE_DIR})
+@@ -322,7 +335,9 @@ if(INDI_BUILD_DRIVERS OR INDI_BUILD_COMMON)
+ add_subdirectory(libs/eventloop)
+ add_subdirectory(libs/dsp)
+ add_subdirectory(libs/fpack)
+- add_subdirectory(libs/hid)
++ if(NOT SYSTEM_HIDAPILIB)
++ add_subdirectory(libs/hid)
++ endif(NOT SYSTEM_HIDAPILIB)
+
+ # #################################################
+ # ########## INDI Driver Library ##################
+diff --git a/drivers/focuser/CMakeLists.txt b/drivers/focuser/CMakeLists.txt
+index 6ebe06711d..b8d4a9f522 100644
+--- a/drivers/focuser/CMakeLists.txt
++++ b/drivers/focuser/CMakeLists.txt
+@@ -29,7 +29,7 @@ SET(fcusb_SRC
+ fcusb.cpp)
+
+ add_executable(indi_fcusb_focus ${fcusb_SRC})
+-target_link_libraries(indi_fcusb_focus indidriver)
++target_link_libraries(indi_fcusb_focus indidriver ${HIDAPILIB})
+ install(TARGETS indi_fcusb_focus RUNTIME DESTINATION bin)
+
+ # ############### Rigelsys NFocus Focuser ################
+@@ -180,7 +180,7 @@ install(TARGETS indi_esattoarco_focus RUNTIME DESTINATION bin)
+ # focusmaster.cpp)
+
+ # add_executable(indi_focusmaster_focus ${focusmaster_SRC})
+-# target_link_libraries(indi_focusmaster_focus indidriver)
++# target_link_libraries(indi_focusmaster_focus indidriver ${HIDAPILIB})
+ # install(TARGETS indi_focusmaster_focus RUNTIME DESTINATION bin)
+
+ # ############### RainbowAstro RSF Focuser ################
+@@ -310,7 +310,7 @@ SET(perfectstar_SRC
+ perfectstar.cpp)
+
+ add_executable(indi_perfectstar_focus ${perfectstar_SRC})
+-target_link_libraries(indi_perfectstar_focus indidriver)
++target_link_libraries(indi_perfectstar_focus indidriver ${HIDAPILIB})
+ install(TARGETS indi_perfectstar_focus RUNTIME DESTINATION bin)
+
+ # ############### Starlight Instruments EFS ################
+@@ -318,7 +318,7 @@ SET(siefs_SRC
+ si_efs.cpp)
+
+ add_executable(indi_siefs_focus ${siefs_SRC})
+-target_link_libraries(indi_siefs_focus indidriver)
++target_link_libraries(indi_siefs_focus indidriver ${HIDAPILIB})
+ install(TARGETS indi_siefs_focus RUNTIME DESTINATION bin)
+
+ # ############### hitechfocus Focuser ################
+@@ -326,7 +326,7 @@ SET(hitecastrodcfocuser_SRC
+ hitecastrodcfocuser.cpp)
+
+ add_executable(indi_hitecastrodc_focus ${hitecastrodcfocuser_SRC})
+-target_link_libraries(indi_hitecastrodc_focus indidriver)
++target_link_libraries(indi_hitecastrodc_focus indidriver ${HIDAPILIB})
+ install(TARGETS indi_hitecastrodc_focus RUNTIME DESTINATION bin)
+
+ # ############### DeepSky Dad AF1 ################
+@@ -398,5 +398,5 @@ SET(activefocuser_SRC
+
+ add_executable(indi_activefocuser_focus ${activefocuser_SRC})
+
+-target_link_libraries(indi_activefocuser_focus indidriver)
++target_link_libraries(indi_activefocuser_focus indidriver ${HIDAPILIB})
+ install(TARGETS indi_activefocuser_focus RUNTIME DESTINATION bin)
+diff --git a/drivers/focuser/activefocuser.h b/drivers/focuser/activefocuser.h
+index 8ace38e3b0..44c9ffa23f 100644
+--- a/drivers/focuser/activefocuser.h
++++ b/drivers/focuser/activefocuser.h
+@@ -20,7 +20,13 @@
+ #include <cstring>
+ #include <sstream>
+ #include <unistd.h>
+-#include "hidapi.h"
++
++#ifdef _USE_SYSTEM_HIDAPILIB
++#include <hidapi/hidapi.h>
++#else
++#include <indi_hidapi.h>
++#endif
++
+ #include "indifocuser.h"
+
+ class ActiveFocuser : public INDI::Focuser
+diff --git a/drivers/focuser/activefocuser_utils.h b/drivers/focuser/activefocuser_utils.h
+index ffbc420fa7..adf1ec7a65 100644
+--- a/drivers/focuser/activefocuser_utils.h
++++ b/drivers/focuser/activefocuser_utils.h
+@@ -23,7 +23,13 @@
+
+ #include <map>
+ #include <string>
+-#include <hidapi.h>
++
++#ifdef _USE_SYSTEM_HIDAPILIB
++#include <hidapi/hidapi.h>
++#else
++#include <indi_hidapi.h>
++#endif
++
+ #include <mutex>
+ #include <future>
+ #include <cstring>
+@@ -130,4 +136,4 @@ class ActiveFocuserUtils
+ ~ActiveFocuserUtils() = delete;
+ void operator=(const ActiveFocuserUtils &) = delete;
+
+-};
+\ No newline at end of file
++};
+diff --git a/drivers/focuser/fcusb.h b/drivers/focuser/fcusb.h
+index ade3f91cd8..27d62a2006 100644
+--- a/drivers/focuser/fcusb.h
++++ b/drivers/focuser/fcusb.h
+@@ -21,7 +21,13 @@
+ #pragma once
+
+ #include "indifocuser.h"
+-#include "hidapi.h"
++
++#ifdef _USE_SYSTEM_HIDAPILIB
++#include <hidapi/hidapi.h>
++#else
++#include <indi_hidapi.h>
++#endif
++
+
+ #include <map>
+
+diff --git a/drivers/focuser/hitecastrodcfocuser.h b/drivers/focuser/hitecastrodcfocuser.h
+index 7d0ad0ff3a..7dcb6f3b05 100644
+--- a/drivers/focuser/hitecastrodcfocuser.h
++++ b/drivers/focuser/hitecastrodcfocuser.h
+@@ -20,7 +20,12 @@
+
+ #pragma once
+
+-#include "hidapi.h"
++#ifdef _USE_SYSTEM_HIDAPILIB
++#include <hidapi/hidapi.h>
++#else
++#include <indi_hidapi.h>
++#endif
++
+ #include "indifocuser.h"
+ #include "indiusbdevice.h"
+
+diff --git a/drivers/focuser/perfectstar.h b/drivers/focuser/perfectstar.h
+index 17c3e78e58..80e99dc6df 100644
+--- a/drivers/focuser/perfectstar.h
++++ b/drivers/focuser/perfectstar.h
+@@ -21,7 +21,12 @@
+ #pragma once
+
+ #include "indifocuser.h"
+-#include "hidapi.h"
++
++#ifdef _USE_SYSTEM_HIDAPILIB
++#include <hidapi/hidapi.h>
++#else
++#include <indi_hidapi.h>
++#endif
+
+ class PerfectStar : public INDI::Focuser
+ {
+diff --git a/drivers/focuser/si_efs.h b/drivers/focuser/si_efs.h
+index 52990d81d7..8477139e03 100644
+--- a/drivers/focuser/si_efs.h
++++ b/drivers/focuser/si_efs.h
+@@ -21,7 +21,12 @@
+ #pragma once
+
+ #include "indifocuser.h"
+-#include "hidapi.h"
++
++#ifdef _USE_SYSTEM_HIDAPILIB
++#include <hidapi/hidapi.h>
++#else
++#include <indi_hidapi.h>
++#endif
+
+ #include <map>
+
+diff --git a/libs/hid/CMakeLists.txt b/libs/hid/CMakeLists.txt
+index a663b91ca2..3bfec800e4 100644
+--- a/libs/hid/CMakeLists.txt
++++ b/libs/hid/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ cmake_minimum_required(VERSION 3.18)
+-project(hid C)
++project(indi_hid C)
+ if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.31)
+ cmake_policy(SET CMP0177 NEW)
+ endif()
+@@ -8,7 +8,7 @@ add_library(${PROJECT_NAME} OBJECT "")
+
+ # Headers
+ list(APPEND ${PROJECT_NAME}_HEADERS
+- hidapi.h
++ indi_hidapi.h
+ )
+
+ list(APPEND ${PROJECT_NAME}_PRIVATE_HEADERS
+@@ -51,5 +51,5 @@ elseif(CYGWIN OR UNIX)
+ endif()
+
+ add_executable(indi_hid_test hidtest.cpp)
+-target_link_libraries(indi_hid_test hid ${USB1_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${LIBS})
++target_link_libraries(indi_hid_test indi_hid ${USB1_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${LIBS})
+ install(TARGETS indi_hid_test RUNTIME DESTINATION bin)
+diff --git a/libs/hid/hid_libusb.c b/libs/hid/hid_libusb.c
+index 527168f0f9..06a632334b 100644
+--- a/libs/hid/hid_libusb.c
++++ b/libs/hid/hid_libusb.c
+@@ -33,7 +33,7 @@
+
+ #define _GNU_SOURCE // needed for wcsdup() before glibc 2.10
+
+-#include "hidapi.h"
++#include "indi_hidapi.h"
+ #include "locale_compat.h"
+
+ /* GNU / LibUSB */
+diff --git a/libs/hid/hid_mac.c b/libs/hid/hid_mac.c
+index e752334ce1..25e0c09883 100644
+--- a/libs/hid/hid_mac.c
++++ b/libs/hid/hid_mac.c
+@@ -29,7 +29,7 @@
+
+ /* See Apple Technical Note TN2187 for details on IOHidManager. */
+
+-#include "hidapi.h"
++#include "indi_hidapi.h"
+
+ #include <IOKit/hid/IOHIDManager.h>
+ #include <IOKit/hid/IOHIDKeys.h>
+diff --git a/libs/hid/hid_win.c b/libs/hid/hid_win.c
+index 0d214444c5..f70ede8599 100644
+--- a/libs/hid/hid_win.c
++++ b/libs/hid/hid_win.c
+@@ -65,7 +65,7 @@ extern "C" {
+ #include <stdio.h>
+ #include <stdlib.h>
+
+-#include "hidapi.h"
++#include "indi_hidapi.h"
+
+ #ifdef _MSC_VER
+ // Thanks Microsoft, but I know how to use strncpy().
+diff --git a/libs/hid/hidtest.cpp b/libs/hid/hidtest.cpp
+index fe110329aa..2992bb7cb0 100644
+--- a/libs/hid/hidtest.cpp
++++ b/libs/hid/hidtest.cpp
+@@ -18,7 +18,7 @@
+ #include <wchar.h>
+ #include <string.h>
+ #include <stdlib.h>
+-#include "hidapi.h"
++#include "indi_hidapi.h"
+
+ // Headers needed for sleeping.
+ #ifdef _WIN32
+diff --git a/libs/hid/hidapi.h b/libs/hid/indi_hidapi.h
+similarity index 100%
+rename from libs/hid/hidapi.h
+rename to libs/hid/indi_hidapi.h
+diff --git a/libs/indibase/CMakeLists.txt b/libs/indibase/CMakeLists.txt
+index f1a6e5d147..db1cc3a52c 100644
+--- a/libs/indibase/CMakeLists.txt
++++ b/libs/indibase/CMakeLists.txt
+@@ -18,8 +18,8 @@ list(APPEND ${PROJECT_NAME}_LIBS
+ eventloop
+ dsp
+ fpack
+- hid
+ AlignmentDriver
++ ${HIDAPILIB}
+ ${USB1_LIBRARIES}
+ ${NOVA_LIBRARIES}
+ ${CMAKE_THREAD_LIBS_INIT}
+@@ -31,6 +31,11 @@ list(APPEND ${PROJECT_NAME}_LIBS
+ ${CURL}
+ )
+
++# When bundled hid library is used
++if(NOT SYSTEM_HIDAPILIB)
++ list(APPEND ${PROJECT_NAME}_LIBS indi_hid)
++endif()
++
+ # Add Iconv - FreeBSD/OpenBSD need to find the correct GNU iconv library.
+ if(CYGWIN OR UNIX OR (CMAKE_SYSTEM_NAME MATCHES "FreeBSD|OpenBSD"))
+ find_package(Iconv REQUIRED)
+diff --git a/obsolete/focusmaster.h b/obsolete/focusmaster.h
+index 68cdce9266..2756ea13f7 100644
+--- a/obsolete/focusmaster.h
++++ b/obsolete/focusmaster.h
+@@ -21,7 +21,13 @@
+ #pragma once
+
+ #include "indifocuser.h"
+-#include "hidapi.h"
++
++#ifdef _USE_SYSTEM_HIDAPILIB
++#include <hidapi/hidapi.h>
++#else
++#include <indi_hidapi.h>
++#endif
++
+
+ class FocusMaster : public INDI::Focuser
+ {
diff --git a/sci-libs/indilib/indilib-2.1.6-r1.ebuild b/sci-libs/indilib/indilib-2.1.6-r1.ebuild
index 2c0e63f16a1b..863d8a02cb83 100644
--- a/sci-libs/indilib/indilib-2.1.6-r1.ebuild
+++ b/sci-libs/indilib/indilib-2.1.6-r1.ebuild
@@ -20,6 +20,7 @@ RESTRICT="!test? ( test )"
RDEPEND="
dev-cpp/cpp-httplib:=
dev-cpp/nlohmann_json
+ dev-libs/hidapi
dev-libs/libev
media-libs/libjpeg-turbo:=
net-misc/curl
@@ -40,8 +41,11 @@ DEPEND="${RDEPEND}
test? ( >=dev-cpp/gtest-1.8.0 )
"
+PATCHES=( "${FILESDIR}/${P}-system-hidapi.patch" ) # git master
+
src_configure() {
local mycmakeargs=(
+ -DINDI_SYSTEM_HIDAPILIB=ON
-DINDI_SYSTEM_HTTPLIB=ON
-DINDI_SYSTEM_JSONLIB=ON
-DINDI_BUILD_QT5_CLIENT=OFF
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2025-10-23 13:47 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-02-06 9:12 [gentoo-commits] repo/gentoo:master commit in: sci-libs/indilib/, sci-libs/indilib/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2025-10-23 13:47 Andreas Sturmlechner
2023-12-25 17:04 Andreas Sturmlechner
2023-07-31 16:26 Andreas Sturmlechner
2022-05-26 14:36 Andreas Sturmlechner
2021-07-14 13:44 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox