From cc5a8d863715bbc7ce1e4102c906384c72ed345c Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Tue, 14 Apr 2026 22:02:33 +0200 Subject: [PATCH] sci-libs/indilib: drop 2.1.6-r1, 2.1.7 Signed-off-by: Andreas Sturmlechner --- sci-libs/indilib/Manifest | 2 - .../files/indilib-2.1.6-system-hidapi.patch | 370 ------------------ sci-libs/indilib/indilib-2.1.6-r1.ebuild | 89 ----- sci-libs/indilib/indilib-2.1.7.ebuild | 87 ---- 4 files changed, 548 deletions(-) delete mode 100644 sci-libs/indilib/files/indilib-2.1.6-system-hidapi.patch delete mode 100644 sci-libs/indilib/indilib-2.1.6-r1.ebuild delete mode 100644 sci-libs/indilib/indilib-2.1.7.ebuild diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest index 613909863de19..c5213abb5e511 100644 --- a/sci-libs/indilib/Manifest +++ b/sci-libs/indilib/Manifest @@ -1,4 +1,2 @@ -DIST indilib-2.1.6a.tar.gz 4474992 BLAKE2B a506714cac835ec421a354ae65f892169d23ff216b4fd9a7647624d50d2f2687e766f732be3341a7e689c1e40480a446bcf982b8890cbd664c3b756b78faf63e SHA512 c99ad1709b6bd99ea05f4d1171843f5526a59a034eebdf6ac8590df785f7bae8b19655232db10485f1064b3db65982f06df21fd67452ce586fbed2b7182e24c6 -DIST indilib-2.1.7.tar.gz 3265446 BLAKE2B 6feadae6f0f142ce786c77b6dea10f443a31927c9de0759f7ee1ae81eea6ef296456f16413f5ff49ec61dbf296418a34773191d66875a5f47eb89d2659937a3f SHA512 54ab9bd632befa19a8af04e572808fccc782ec84ce7962940347a3bf49f761ba13af06ced7152828619e0dff2c63f6c19944fe873ead18b6f38c92b11d5ca3e6 DIST indilib-2.1.9.tar.gz 3331587 BLAKE2B 33ec27fa5a530f79f02f9b776d36c24d7a0646c45620a338692c7f9168a74287f83aa7a1f862f558cc4e1f43916deb1280d0ad38a677c051d7a07d3a4d15f8b5 SHA512 c3ed7bc362f032f07f619c6c56eb3a5f1fc00f76a31b800ecdd9d3a6a5eaa3fe01f7a216e5613d251224a52c6f7bf3e0684920b7020626bc030b2c74d1d03626 DIST indilib-2.2.0.tar.gz 3397549 BLAKE2B ef883b5f27cf6fc2a6052ff21d160dc40a6de7e989be8e94963a8500ce741f219f279be45c15ba1d381297c4303edd3d48740a39ec1fc603ceede6f9a065ac1e SHA512 757fb016c954261c55b7d2d8492172107763ffb3d25647aed184b12922014e0c3ad3c0de5345ce6b7f7015e2f6be8e348d6b68f4db11eecd0601a9655a3b0432 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 deleted file mode 100644 index 636e9b74204d1..0000000000000 --- a/sci-libs/indilib/files/indilib-2.1.6-system-hidapi.patch +++ /dev/null @@ -1,370 +0,0 @@ -From 3fe3a66ff3f89a5412f044fe098725b0437c3552 Mon Sep 17 00:00:00 2001 -From: Mattia Verga -Date: Mon, 13 Oct 2025 19:27:50 +0200 -Subject: [PATCH] Allow using hidapi from system (#2272) - -Signed-off-by: Mattia Verga ---- - 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 - #include - #include --#include "hidapi.h" -+ -+#ifdef _USE_SYSTEM_HIDAPILIB -+#include -+#else -+#include -+#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 - #include --#include -+ -+#ifdef _USE_SYSTEM_HIDAPILIB -+#include -+#else -+#include -+#endif -+ - #include - #include - #include -@@ -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 -+#else -+#include -+#endif -+ - - #include - -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 -+#else -+#include -+#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 -+#else -+#include -+#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 -+#else -+#include -+#endif - - #include - -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 - #include -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 - #include - --#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 - #include - #include --#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 -+#else -+#include -+#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 deleted file mode 100644 index 5d8b8d6176861..0000000000000 --- a/sci-libs/indilib/indilib-2.1.6-r1.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake dot-a 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}a.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" - -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 - sci-libs/cfitsio:= - sci-libs/fftw:3.0= - sci-libs/gsl:= - sci-libs/libnova:= - virtual/zlib:= - virtual/libusb:1 - ogg? ( - media-libs/libogg - media-libs/libtheora:= - ) - rtlsdr? ( net-wireless/rtl-sdr:= ) -" -DEPEND="${RDEPEND} - kernel_linux? ( sys-kernel/linux-headers ) - test? ( >=dev-cpp/gtest-1.8.0 ) -" - -PATCHES=( "${FILESDIR}/${P}-system-hidapi.patch" ) # git master - -src_configure() { - lto-guarantee-fat - - local mycmakeargs=( - -DINDI_SYSTEM_HIDAPILIB=ON - -DINDI_SYSTEM_HTTPLIB=ON - -DINDI_SYSTEM_JSONLIB=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 - -DINDI_BUILD_EXAMPLES=OFF # nothing is installed - $(cmake_use_find_package ogg OggTheora) - $(cmake_use_find_package rtlsdr RTLSDR) - -DINDI_BUILD_UNITTESTS=$(usex test) - -DINDI_BUILD_INTEGTESTS=$(usex test) - ) - - 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 -} - -src_install() { - cmake_src_install - strip-lto-bytecode -} - -pkg_postinst() { - udev_reload -} - -pkg_postrm() { - udev_reload -} diff --git a/sci-libs/indilib/indilib-2.1.7.ebuild b/sci-libs/indilib/indilib-2.1.7.ebuild deleted file mode 100644 index 76f8ddde078c1..0000000000000 --- a/sci-libs/indilib/indilib-2.1.7.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2026 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake dot-a 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" - -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 - sci-libs/cfitsio:= - sci-libs/fftw:3.0= - sci-libs/gsl:= - sci-libs/libnova:= - virtual/zlib:= - virtual/libusb:1 - ogg? ( - media-libs/libogg - media-libs/libtheora:= - ) - rtlsdr? ( net-wireless/rtl-sdr:= ) -" -DEPEND="${RDEPEND} - kernel_linux? ( sys-kernel/linux-headers ) - test? ( >=dev-cpp/gtest-1.8.0 ) -" - -src_configure() { - lto-guarantee-fat - - local mycmakeargs=( - -DINDI_SYSTEM_HIDAPILIB=ON - -DINDI_SYSTEM_HTTPLIB=ON - -DINDI_SYSTEM_JSONLIB=ON - -DINDI_BUILD_QT_CLIENT=OFF - -DINDI_BUILD_SHARED=ON - -DINDI_BUILD_STATIC=OFF - -DINDI_BUILD_XISF=OFF # not packaged - -DUDEVRULES_INSTALL_DIR="${EPREFIX}$(get_udevdir)"/rules.d - -DINDI_BUILD_EXAMPLES=OFF # nothing is installed - $(cmake_use_find_package ogg OggTheora) - $(cmake_use_find_package rtlsdr RTLSDR) - -DINDI_BUILD_UNITTESTS=$(usex test) - -DINDI_BUILD_INTEGTESTS=$(usex test) - ) - - 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 -} - -src_install() { - cmake_src_install - strip-lto-bytecode -} - -pkg_postinst() { - udev_reload -} - -pkg_postrm() { - udev_reload -}