diff --git a/devel/indi/Makefile b/devel/indi/Makefile index 67d82b2ed22b..1f0aece1a535 100644 --- a/devel/indi/Makefile +++ b/devel/indi/Makefile @@ -1,28 +1,29 @@ PORTNAME= indi DISTVERSIONPREFIX= v -DISTVERSION= 1.9.6 -PORTREVISION= 2 +DISTVERSION= 2.1.1 CATEGORIES= devel MAINTAINER= acm@FreeBSD.org COMMENT= Implementation of the Instrument-Neutral-Device-Interface protocol WWW= https://github.com/indilib/indi LICENSE= LGPL21 BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat LIB_DEPENDS= libcfitsio.so:astro/cfitsio \ libnova.so:astro/libnova \ libcurl.so:ftp/curl \ libgsl.so:math/gsl \ libfftw3.so:math/fftw3 \ libtheora.so:multimedia/libtheora \ - libogg.so:audio/libogg + libogg.so:audio/libogg \ + libev.so:devel/libev \ + libxisf.so:graphics/libxisf USES= cmake jpeg iconv ninja pkgconfig USE_GITHUB= yes GH_ACCOUNT= indilib USE_LDCONFIG= yes .include diff --git a/devel/indi/distinfo b/devel/indi/distinfo index fc5f4a0ec9fa..c9190c87ec7a 100644 --- a/devel/indi/distinfo +++ b/devel/indi/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1653199904 -SHA256 (indilib-indi-v1.9.6_GH0.tar.gz) = ee16b4bb01f436ab54596c5999227cb5938b2bb2dd83fdc0f01edffd752f9dd8 -SIZE (indilib-indi-v1.9.6_GH0.tar.gz) = 2422813 +TIMESTAMP = 1735436768 +SHA256 (indilib-indi-v2.1.1_GH0.tar.gz) = 919862d5ccb4ea91ecb0e94f8f89a88c76bd1716e0098be07870c4408b233a20 +SIZE (indilib-indi-v2.1.1_GH0.tar.gz) = 2929685 diff --git a/devel/indi/files/patch-libs_indibase_dsp_dspinterface.cpp b/devel/indi/files/patch-libs_indibase_dsp_dspinterface.cpp deleted file mode 100644 index 07dc70d35c8d..000000000000 --- a/devel/indi/files/patch-libs_indibase_dsp_dspinterface.cpp +++ /dev/null @@ -1,15 +0,0 @@ ---- libs/indibase/dsp/dspinterface.cpp.orig 2022-05-21 13:52:23 UTC -+++ libs/indibase/dsp/dspinterface.cpp -@@ -336,9 +336,9 @@ dsp_stream_p Interface::loadFITS(char* buffer, int len - long ndims; - long bits_per_sample; - int status; -- off_t offset; -- off_t head; -- off_t end; -+ OFF_T offset; -+ OFF_T head; -+ OFF_T end; - fitsfile *fptr; - void* buf; - char error_status[MAXINDINAME]; diff --git a/devel/indi/files/patch-libs_indibase_property_indipropertybasic.cpp b/devel/indi/files/patch-libs_indibase_property_indipropertybasic.cpp deleted file mode 100644 index 88fb1d26d317..000000000000 --- a/devel/indi/files/patch-libs_indibase_property_indipropertybasic.cpp +++ /dev/null @@ -1,22 +0,0 @@ ---- libs/indibase/property/indipropertybasic.cpp.orig 2022-05-21 13:52:23 UTC -+++ libs/indibase/property/indipropertybasic.cpp -@@ -16,6 +16,7 @@ - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -+#include - #include "indipropertybasic.h" - #include "indipropertybasic_p.h" - -@@ -342,9 +343,10 @@ const WidgetView *PropertyBasic::at(size_t index - } - - template --WidgetView &PropertyBasic::operator[](size_t index) const -+WidgetView &PropertyBasic::operator[](ssize_t index) const - { - D_PTR(const PropertyBasic); -+ assert(index >= 0); - return *d->property.at(index); - } - diff --git a/devel/indi/files/patch-libs_indibase_property_indipropertybasic.h b/devel/indi/files/patch-libs_indibase_property_indipropertybasic.h deleted file mode 100644 index 383a82ef1277..000000000000 --- a/devel/indi/files/patch-libs_indibase_property_indipropertybasic.h +++ /dev/null @@ -1,11 +0,0 @@ ---- libs/indibase/property/indipropertybasic.h.orig 2022-05-21 13:52:23 UTC -+++ libs/indibase/property/indipropertybasic.h -@@ -110,7 +110,7 @@ class PropertyBasic : public INDI::Property (public) - - const WidgetView *at(size_t index) const; - -- WidgetView &operator[](size_t index) const; -+ WidgetView &operator[](ssize_t index) const; - - public: // STL-style iterators - WidgetView *begin(); diff --git a/devel/indi/pkg-plist b/devel/indi/pkg-plist index 114ee09aa942..ebbc7124a71b 100644 --- a/devel/indi/pkg-plist +++ b/devel/indi/pkg-plist @@ -1,258 +1,312 @@ +bin/indi_Excalibur bin/indi_aaf2_focus bin/indi_activefocuser_focus +bin/indi_alluna_tcs2 +bin/indi_alto bin/indi_arduinost4 +bin/indi_astrolink4 +bin/indi_astrolink4mini2 bin/indi_astromech_lpm +bin/indi_astromechfoc bin/indi_astrometry bin/indi_astrotrac_telescope bin/indi_baader_dome bin/indi_celestron_gps bin/indi_celestron_sct_focus +bin/indi_cheapodc bin/indi_crux_mount bin/indi_ddw_dome bin/indi_deepskydad_af1_focus bin/indi_deepskydad_af2_focus bin/indi_deepskydad_af3_focus -bin/indi_deepskydad_fp1 +bin/indi_deepskydad_fp bin/indi_deepskydad_fr1 bin/indi_dmfc_focus bin/indi_domepro2_dome +bin/indi_dragon_light +bin/indi_dragonlair_dome +bin/indi_dreamfocuser_focus bin/indi_dsc_telescope bin/indi_efa_focus bin/indi_eq500x_telescope +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 bin/indi_getprop +bin/indi_giotto bin/indi_gpusb bin/indi_hid_test bin/indi_hitecastrodc_focus +bin/indi_ieaf_focus bin/indi_ieq_telescope bin/indi_ieqlegacy_telescope bin/indi_imager_agent bin/indi_integra_focus bin/indi_ioptronHC8406 +bin/indi_ioptron_wheel bin/indi_ioptronv3_telescope +bin/indi_lacerta_mfoc_fmc_focus bin/indi_lacerta_mfoc_focus bin/indi_lakeside_focus bin/indi_lx200_10micron bin/indi_lx200_16 bin/indi_lx200_OnStep +bin/indi_lx200_OpenAstroTech bin/indi_lx200_TeenAstro -bin/indi_lx200ap -bin/indi_lx200ap_gtocp2 +bin/indi_lx200_pegasus_nyx101 +bin/indi_lx200am5 bin/indi_lx200ap_v2 bin/indi_lx200autostar bin/indi_lx200basic bin/indi_lx200classic bin/indi_lx200fs2 bin/indi_lx200gemini bin/indi_lx200generic bin/indi_lx200gotonova bin/indi_lx200gps bin/indi_lx200pulsar2 bin/indi_lx200ss2000pc bin/indi_lx200zeq25 bin/indi_lynx_focus bin/indi_manual_wheel bin/indi_mbox_weather bin/indi_meta_weather bin/indi_microtouch_focus bin/indi_moonlite_focus bin/indi_moonlitedro_focus +bin/indi_myDewControllerPro +bin/indi_mydcp4esp32 bin/indi_myfocuserpro2_focus bin/indi_nexdome_beaver bin/indi_nfocus bin/indi_nframe_rotator bin/indi_nightcrawler_focus bin/indi_nstep_focus bin/indi_onfocus_focus bin/indi_openweathermap_weather bin/indi_optec_wheel bin/indi_paramount_telescope bin/indi_pegasus_flatmaster bin/indi_pegasus_focuscube +bin/indi_pegasus_focuscube3 bin/indi_pegasus_ppb bin/indi_pegasus_ppba +bin/indi_pegasus_prodigyMF bin/indi_pegasus_scopsoag +bin/indi_pegasus_spb bin/indi_pegasus_uch bin/indi_pegasus_upb +bin/indi_pegasusindigo_wheel bin/indi_perfectstar_focus bin/indi_planewave_deltat +bin/indi_planewave_telescope bin/indi_pmc8_telescope bin/indi_pyxis_rotator bin/indi_qhycfw1_wheel bin/indi_qhycfw2_wheel bin/indi_qhycfw3_wheel bin/indi_quantum_wheel bin/indi_rainbow_telescope bin/indi_rainbowrsf_focus bin/indi_rbfocus_focus bin/indi_rigel_dome bin/indi_robo_focus bin/indi_rolloff_dome bin/indi_scopedome_dome bin/indi_script_dome bin/indi_script_telescope bin/indi_sestosenso2_focus bin/indi_sestosenso_focus bin/indi_setprop bin/indi_siefs_focus bin/indi_simulator_ccd bin/indi_simulator_dome bin/indi_simulator_focus bin/indi_simulator_gps bin/indi_simulator_guide bin/indi_simulator_lightpanel bin/indi_simulator_receiver bin/indi_simulator_rotator bin/indi_simulator_sqm bin/indi_simulator_telescope bin/indi_simulator_weather bin/indi_simulator_wheel bin/indi_skycommander_telescope bin/indi_skysafari bin/indi_skywatcherAltAzMount -bin/indi_skywatcherAltAzSimple bin/indi_smartfocus_focus bin/indi_snapcap +bin/indi_spectracyber bin/indi_sqm_weather bin/indi_star2000 bin/indi_steeldrive2_focus bin/indi_steeldrive_focus bin/indi_synscan_telescope bin/indi_synscanlegacy_telescope 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 bin/indi_v4l2_ccd bin/indi_vantage_weather +bin/indi_wanderer_cover bin/indi_wanderer_lite_rotator +bin/indi_wanderer_rotator_lite_v2 +bin/indi_wanderer_rotator_mini +bin/indi_wandererbox_plus_v3 +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/indiserver +bin/shelyak_usis +include/libindi/abstractbaseclient.h include/libindi/alignment/AlignmentSubsystemForDrivers.h include/libindi/alignment/AlignmentSubsystemForMathPlugins.h include/libindi/alignment/BasicMathPlugin.h include/libindi/alignment/BuiltInMathPlugin.h include/libindi/alignment/ClientAPIForAlignmentDatabase.h include/libindi/alignment/ClientAPIForMathPluginManagement.h include/libindi/alignment/Common.h include/libindi/alignment/ConvexHull.h include/libindi/alignment/DriverCommon.h include/libindi/alignment/InMemoryDatabase.h include/libindi/alignment/MapPropertiesToInMemoryDatabase.h include/libindi/alignment/MathPlugin.h include/libindi/alignment/MathPluginManagement.h include/libindi/alignment/NearestMathPlugin.h include/libindi/alignment/SVDMathPlugin.h include/libindi/alignment/TelescopeDirectionVectorSupportFunctions.h include/libindi/base64.h include/libindi/baseclient.h include/libindi/basedevice.h include/libindi/connectionplugins/connectioninterface.h include/libindi/connectionplugins/connectionserial.h include/libindi/connectionplugins/connectiontcp.h include/libindi/defaultdevice.h include/libindi/dsp.h include/libindi/dsp/convolution.h include/libindi/dsp/dspinterface.h include/libindi/dsp/manager.h include/libindi/dsp/transforms.h include/libindi/eventloop.h +include/libindi/fits.h +include/libindi/fits_extensions.h +include/libindi/fitsidi.h +include/libindi/fitskeyword.h include/libindi/hidapi.h +include/libindi/httplib.h include/libindi/indiapi.h include/libindi/indibase.h include/libindi/indibasetypes.h include/libindi/indiccd.h include/libindi/indiccdchip.h include/libindi/indicom.h include/libindi/indicontroller.h include/libindi/indicorrelator.h include/libindi/indidetector.h include/libindi/indidevapi.h include/libindi/indidome.h include/libindi/indidriver.h include/libindi/indidustcapinterface.h include/libindi/indielapsedtimer.h include/libindi/indifilterinterface.h include/libindi/indifilterwheel.h include/libindi/indifocuser.h 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 include/libindi/indipropertyblob.h include/libindi/indipropertylight.h include/libindi/indipropertynumber.h include/libindi/indipropertyswitch.h include/libindi/indipropertytext.h include/libindi/indipropertyview.h include/libindi/indireceiver.h include/libindi/indirotator.h include/libindi/indirotatorinterface.h include/libindi/indisensorinterface.h include/libindi/indisinglethreadpool.h include/libindi/indispectrograph.h include/libindi/indistandardproperty.h include/libindi/inditelescope.h include/libindi/inditimer.h include/libindi/indiusbdevice.h include/libindi/indiutility.h include/libindi/indiversion.h include/libindi/indiweather.h include/libindi/indiweatherinterface.h include/libindi/indiwidgettraits.h include/libindi/indiwidgetview.h +include/libindi/inicpp.h include/libindi/libastro.h include/libindi/lilxml.h include/libindi/mounts/lx200driver.h include/libindi/mounts/lx200telescope.h +include/libindi/parentdevice.h include/libindi/pid.h +include/libindi/sdfits.h +include/libindi/sharedblob.h include/libindi/stream/ccvt.h include/libindi/stream/ccvt_types.h include/libindi/stream/encoder/encoderinterface.h include/libindi/stream/encoder/encodermanager.h include/libindi/stream/encoder/mjpegencoder.h include/libindi/stream/encoder/rawencoder.h include/libindi/stream/fpsmeter.h include/libindi/stream/gammalut16.h include/libindi/stream/jpegutils.h include/libindi/stream/recorder/recorderinterface.h include/libindi/stream/recorder/recordermanager.h include/libindi/stream/recorder/serrecorder.h include/libindi/stream/streammanager.h include/libindi/stream/uniquequeue.h include/libindi/v4l2_builtin_decoder.h include/libindi/v4l2_colorspace.h include/libindi/v4l2_decode.h lib/indi/MathPlugins/libindi_Nearest_MathPlugin.so lib/indi/MathPlugins/libindi_SVD_MathPlugin.so lib/libindiAlignmentClient.a lib/libindiAlignmentDriver.so -lib/libindiAlignmentDriver.so.1 -lib/libindiAlignmentDriver.so.1.9.6 +lib/libindiAlignmentDriver.so.2 +lib/libindiAlignmentDriver.so.2.1.1 lib/libindiclient.a +lib/libindiclient.so +lib/libindiclient.so.2 +lib/libindiclient.so.2.1.1 lib/libindidriver.a lib/libindidriver.so -lib/libindidriver.so.1 -lib/libindidriver.so.1.9.6 +lib/libindidriver.so.2 +lib/libindidriver.so.2.1.1 lib/libindilx200.so -lib/libindilx200.so.1 -lib/libindilx200.so.1.9.6 +lib/libindilx200.so.2 +lib/libindilx200.so.2.1.1 libdata/pkgconfig/libindi.pc %%DATADIR%%/drivers.xml %%DATADIR%%/indi_tcfs_sk.xml +%%DATADIR%%/shelyak_boards.json