From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E9704158087 for ; Sun, 6 Feb 2022 09:12:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D958B2BC010; Sun, 6 Feb 2022 09:12:55 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 61CB82BC010 for ; Sun, 6 Feb 2022 09:12:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0C01C342AC1 for ; Sun, 6 Feb 2022 09:12:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 59AE82AF for ; Sun, 6 Feb 2022 09:12:51 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1644138756.e35e4ff449e6652e55bc03dadbe6cb0629141175.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/indilib/, sci-libs/indilib/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/indilib/files/indilib-1.9.4-musl-stdint.patch sci-libs/indilib/indilib-1.9.4.ebuild X-VCS-Directories: sci-libs/indilib/files/ sci-libs/indilib/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: e35e4ff449e6652e55bc03dadbe6cb0629141175 X-VCS-Branch: master Date: Sun, 6 Feb 2022 09:12:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2ffe17c3-3f42-4e54-b175-39bb1018b2e0 X-Archives-Hash: c4f8a78506ae56c1f11f32dfeb82f06d commit: e35e4ff449e6652e55bc03dadbe6cb0629141175 Author: Sam James gentoo org> AuthorDate: Sun Feb 6 09:12:04 2022 +0000 Commit: Sam James gentoo 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 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 +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.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