CVS commit: pkgsrc/misc/indi

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Aug  5 14:51:38 UTC 2024

Modified Files:
        pkgsrc/misc/indi: Makefile PLIST distinfo
        pkgsrc/misc/indi/patches: patch-libs_alignment_CMakeLists.txt
Removed Files:
        pkgsrc/misc/indi/patches: patch-libs_indicore_CMakeLists.txt
            patch-libs_indicore_indicom.c patch-libs_indicore_indidevapi.h
            patch-libs_indicore_sharedblob.c patch-libs_sockets_tcpsocket.cpp

Log Message:
indi: updated to 2.0.9

INDI Library v2.0.9

Minor buffer boundary fixes
Weather watcher dynamic labels
fix(drivers): fix curl and iconv dependencies.
Add button for custom resolution in simulator CCD
PegasusAstro FalconV2 Driver
Add Terrans PowerBoxPro V2 Driver
Waveshare Modbus Relay Driver
Add New Driver Terrans PowerBoxGo V2
Fix "Unknown argument: -v" and %include for swig
Feature - ZWO AM5 Buzzer setup
Adding Home support to base class
Universal Roll off roof driver
ZWO AM5 Save home position in the mount


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/misc/indi/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/misc/indi/PLIST pkgsrc/misc/indi/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/misc/indi/patches/patch-libs_alignment_CMakeLists.txt
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/misc/indi/patches/patch-libs_indicore_CMakeLists.txt \
    pkgsrc/misc/indi/patches/patch-libs_indicore_indicom.c \
    pkgsrc/misc/indi/patches/patch-libs_indicore_indidevapi.h \
    pkgsrc/misc/indi/patches/patch-libs_indicore_sharedblob.c \
    pkgsrc/misc/indi/patches/patch-libs_sockets_tcpsocket.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/misc/indi/Makefile
diff -u pkgsrc/misc/indi/Makefile:1.5 pkgsrc/misc/indi/Makefile:1.6
--- pkgsrc/misc/indi/Makefile:1.5       Wed May 29 16:33:32 2024
+++ pkgsrc/misc/indi/Makefile   Mon Aug  5 14:51:37 2024
@@ -1,18 +1,17 @@
-# $NetBSD: Makefile,v 1.5 2024/05/29 16:33:32 adam Exp $
+# $NetBSD: Makefile,v 1.6 2024/08/05 14:51:37 adam Exp $
 
-DISTNAME=      indi-2.0.7
-PKGREVISION=   3
+DISTNAME=      indi-2.0.9
 CATEGORIES=    misc
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=indilib/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      https://github.com/indilib/indi/
+HOMEPAGE=      https://github.com/indilib/indi
 COMMENT=       Implementation of the Instrument-Neutral-Device-Interface protocol
-#LICENSE=      # TODO: (see mk/license.mk)
+LICENSE=       gnu-lgpl-v2.1
 
-USE_LANGUAGES=         c c++
 USE_CXX_FEATURES=      c++17
+USE_LANGUAGES=         c c++
 USE_TOOLS+=            pkg-config
 
 CMAKE_ARGS+=   -DINDI_BUILD_SERVER=NO
@@ -27,7 +26,6 @@ PKGCONFIG_OVERRIDE=   libindi.pc.cmake
 .include "../../math/gsl/buildlink3.mk"
 .include "../../multimedia/libogg/buildlink3.mk"
 .include "../../multimedia/libtheora/buildlink3.mk"
-# not checked but used
 .include "../../www/curl/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/misc/indi/PLIST
diff -u pkgsrc/misc/indi/PLIST:1.1 pkgsrc/misc/indi/PLIST:1.2
--- pkgsrc/misc/indi/PLIST:1.1  Fri May  3 11:17:14 2024
+++ pkgsrc/misc/indi/PLIST      Mon Aug  5 14:51:37 2024
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.1 2024/05/03 11:17:14 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2024/08/05 14:51:37 adam Exp $
 bin/indi_Excalibur
 bin/indi_aaf2_focus
 bin/indi_activefocuser_focus
 bin/indi_alluna_tcs2
 bin/indi_alto
 bin/indi_arduinost4
+bin/indi_astrolink4mini2
 bin/indi_astromech_lpm
 bin/indi_astrometry
 bin/indi_astrotrac_telescope
@@ -30,6 +31,7 @@ bin/indi_esatto_focus
 bin/indi_esattoarco_focus
 bin/indi_eval
 bin/indi_falcon_rotator
+bin/indi_falconv2_rotator
 bin/indi_fcusb_focus
 bin/indi_flipflat
 bin/indi_gemini_focus
@@ -146,7 +148,10 @@ bin/indi_tcfs3_focus
 bin/indi_tcfs_focus
 bin/indi_teenastro_focus
 bin/indi_temma_telescope
+bin/indi_terrans_powerboxgo_v2
+bin/indi_terrans_powerboxpro_v2
 bin/indi_trutech_wheel
+bin/indi_universalror_dome
 bin/indi_uranus_weather
 bin/indi_usbdewpoint
 bin/indi_usbfocusv3_focus
@@ -160,6 +165,7 @@ bin/indi_wandererbox_pro_v3
 bin/indi_wanderercover_v4_ec
 bin/indi_watchdog
 bin/indi_watcher_weather
+bin/indi_wavesharemodbus_relay
 bin/indi_weather_safety_proxy
 bin/indi_xagyl_wheel
 bin/shelyak_usis
@@ -220,10 +226,12 @@ include/libindi/indifocuserinterface.h
 include/libindi/indigps.h
 include/libindi/indigpsinterface.h
 include/libindi/indiguiderinterface.h
+include/libindi/indiinputinterface.h
 include/libindi/indijson.hpp
 include/libindi/indilightboxinterface.h
 include/libindi/indilogger.h
 include/libindi/indimacros.h
+include/libindi/indioutputinterface.h
 include/libindi/indiproperties.h
 include/libindi/indiproperty.h
 include/libindi/indipropertybasic.h
@@ -276,19 +284,19 @@ lib/indi/MathPlugins/libindi_Nearest_Mat
 lib/indi/MathPlugins/libindi_SVD_MathPlugin.so
 lib/libindiAlignmentClient.a
 lib/libindiAlignmentDriver.so
-lib/libindiAlignmentDriver.so.2
 lib/libindiAlignmentDriver.so.${PKGVERSION}
+lib/libindiAlignmentDriver.so.2
 lib/libindiclient.a
 lib/libindiclient.so
-lib/libindiclient.so.2
 lib/libindiclient.so.${PKGVERSION}
+lib/libindiclient.so.2
 lib/libindidriver.a
 lib/libindidriver.so
-lib/libindidriver.so.2
 lib/libindidriver.so.${PKGVERSION}
+lib/libindidriver.so.2
 lib/libindilx200.so
-lib/libindilx200.so.2
 lib/libindilx200.so.${PKGVERSION}
+lib/libindilx200.so.2
 lib/pkgconfig/libindi.pc
 share/indi/drivers.xml
 share/indi/indi_tcfs_sk.xml
Index: pkgsrc/misc/indi/distinfo
diff -u pkgsrc/misc/indi/distinfo:1.1 pkgsrc/misc/indi/distinfo:1.2
--- pkgsrc/misc/indi/distinfo:1.1       Fri May  3 11:17:14 2024
+++ pkgsrc/misc/indi/distinfo   Mon Aug  5 14:51:37 2024
@@ -1,11 +1,6 @@
-$NetBSD: distinfo,v 1.1 2024/05/03 11:17:14 wiz Exp $
+$NetBSD: distinfo,v 1.2 2024/08/05 14:51:37 adam Exp $
 
-BLAKE2s (indi-2.0.7.tar.gz) = c65ea1384e77d74b06ec2c63761ea12a23d12c88e226c2685a77e8282d7fa76a
-SHA512 (indi-2.0.7.tar.gz) = 292c0a5b8f07b24c42ea9424be19012c97317206b837d8601ec4d771fa35c314bf00712509f8199ee3da193ea12f0c3e90036a49deece304dc256cdeba60810d
-Size (indi-2.0.7.tar.gz) = 2843758 bytes
-SHA1 (patch-libs_alignment_CMakeLists.txt) = c33eff42aa5aa7c264df4dda9f0ad728fb783252
-SHA1 (patch-libs_indicore_CMakeLists.txt) = 6dca6faa75570ef890f08d2c2273a52501f1dbb7
-SHA1 (patch-libs_indicore_indicom.c) = 1dcba7770f0021bdcd26eed2381e7397494ac29f
-SHA1 (patch-libs_indicore_indidevapi.h) = 31ccbc3c8a33767341e4eadef05ae56a4241aeb8
-SHA1 (patch-libs_indicore_sharedblob.c) = 716e28a3b283a729947d269b8a10eff5242de239
-SHA1 (patch-libs_sockets_tcpsocket.cpp) = dac402efc5c98f0b3f81f74f29e07a825dc5d042
+BLAKE2s (indi-2.0.9.tar.gz) = 6fbd152798d2383139c9b44fd523c304c43b3f3729943c641960ff3b15ec6e15
+SHA512 (indi-2.0.9.tar.gz) = b5e1ef58c2139bd5dd79e72d9d25d5c0730f29dff2db0001db5b1d0eff029f60f714c13e14e820f5ccfa8ab6cba25f4cd16e699f9842fa722ef961d00fc8c4a4
+Size (indi-2.0.9.tar.gz) = 2894181 bytes
+SHA1 (patch-libs_alignment_CMakeLists.txt) = 46824a50efabdf5bb03943b413a70d8753cfd3fc

Index: pkgsrc/misc/indi/patches/patch-libs_alignment_CMakeLists.txt
diff -u pkgsrc/misc/indi/patches/patch-libs_alignment_CMakeLists.txt:1.1 pkgsrc/misc/indi/patches/patch-libs_alignment_CMakeLists.txt:1.2
--- pkgsrc/misc/indi/patches/patch-libs_alignment_CMakeLists.txt:1.1    Fri May  3 11:17:14 2024
+++ pkgsrc/misc/indi/patches/patch-libs_alignment_CMakeLists.txt        Mon Aug  5 14:51:37 2024
@@ -1,20 +1,26 @@
-$NetBSD: patch-libs_alignment_CMakeLists.txt,v 1.1 2024/05/03 11:17:14 wiz Exp $
+$NetBSD: patch-libs_alignment_CMakeLists.txt,v 1.2 2024/08/05 14:51:37 adam Exp $
 
-Use CMAKE_DL_LIBS for libdl, which does not exist everywhere.
+On Darwin, set correct install name dir for plug-ins.
 
---- libs/alignment/CMakeLists.txt.orig 2024-05-03 10:36:05.404763201 +0000
+--- libs/alignment/CMakeLists.txt.orig 2024-08-05 10:54:29.125435547 +0000
 +++ libs/alignment/CMakeLists.txt
-@@ -32,11 +32,11 @@ add_library(AlignmentDriver SHARED ${Ali
- set_target_properties(AlignmentDriver PROPERTIES COMPILE_FLAGS "-fPIC")
+@@ -145,6 +145,9 @@ set(NearestMathPlugin_SRCS
+ )
  
- IF(APPLE)
--    target_link_libraries(AlignmentDriver dl -L/usr/local/lib ${GSL_LIBRARIES})
-+    target_link_libraries(AlignmentDriver ${CMAKE_DL_LIBS} -L/usr/local/lib ${GSL_LIBRARIES})
- ELSE()
-     # Force linking all referenced libraries because of libgsl is not linked against cblas library on Linux
-     SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-as-needed")
--    target_link_libraries(AlignmentDriver dl ${GSL_LIBRARIES}
-+    target_link_libraries(AlignmentDriver ${CMAKE_DL_LIBS} ${GSL_LIBRARIES}
-         $<$<PLATFORM_ID:CYGWIN>:indidriver>
-     )
- ENDIF()
+ add_library(indi_Nearest_MathPlugin SHARED ${NearestMathPlugin_SRCS})
++IF(APPLE)
++    set_property(TARGET indi_Nearest_MathPlugin PROPERTY INSTALL_NAME_DIR ${INDI_MATH_PLUGINS_DIRECTORY})
++ENDIF()
+ target_include_directories(indi_Nearest_MathPlugin
+     PRIVATE
+         ${libindi_SOURCE_DIR}/libs/indicore
+@@ -168,6 +171,9 @@ set(SVDMathPlugin_SRCS
+ 
+ add_library(indi_SVD_MathPlugin SHARED ${SVDMathPlugin_SRCS})
+ set_property(TARGET indi_SVD_MathPlugin APPEND PROPERTY COMPILE_DEFINITIONS SVD_TRANSFORM_MATRIX)
++IF(APPLE)
++    set_property(TARGET indi_SVD_MathPlugin PROPERTY INSTALL_NAME_DIR ${INDI_MATH_PLUGINS_DIRECTORY})
++ENDIF()
+ target_link_libraries(indi_SVD_MathPlugin
+     indidriver
+     $<$<PLATFORM_ID:CYGWIN>:AlignmentDriver>