Attachment 255695 Details for Bug 276820 – [PATCH] devel/indi: update 1.9.6 → 2.1.1

[patch] [PATCH] devel/indi: update 1.9.6 → 2.1.1

0001-devel-indi-update-1.9.6-2.1.1.patch (text/plain), 12.04 KB, created by Älven on 2024-12-08 05:31:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Älven

Created: 2024-12-08 05:31:15 UTC

Size: 12.04 KB

patch

obsolete

>From 7963ede878f82abdb6b39b63245d72952f9dc826 Mon Sep 17 00:00:00 2001
>From: Ãlven <alster@vinterdalen.se>
>Date: Sun, 8 Dec 2024 09:05:28 +0400
>Subject: [PATCH] devel/indi: update 1.9.6 â 2.1.1
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>+ Add XISF format support via graphics/libxisf
>---
> devel/indi/Makefile                           | 16 ++--
> devel/indi/distinfo                           |  6 +-
> .../patch-libs_indibase_dsp_dspinterface.cpp  | 15 ----
> ...bs_indibase_property_indipropertybasic.cpp | 22 ------
> ...libs_indibase_property_indipropertybasic.h | 11 ---
> devel/indi/pkg-descr                          | 24 +++++-
> devel/indi/pkg-plist                          | 74 ++++++++++++++++---
> 7 files changed, 98 insertions(+), 70 deletions(-)
> delete mode 100644 devel/indi/files/patch-libs_indibase_dsp_dspinterface.cpp
> delete mode 100644 devel/indi/files/patch-libs_indibase_property_indipropertybasic.cpp
> delete mode 100644 devel/indi/files/patch-libs_indibase_property_indipropertybasic.h
>
>diff --git a/devel/indi/Makefile b/devel/indi/Makefile
>index 67d82b2ed22b..2df67e670f62 100644
>--- a/devel/indi/Makefile
>+++ b/devel/indi/Makefile
>@@ -1,23 +1,25 @@
> PORTNAME=	indi
> DISTVERSIONPREFIX=	v
>-DISTVERSION=	1.9.6
>-PORTREVISION=	2
>-CATEGORIES=	devel
>+DISTVERSION=	2.1.1
>+CATEGORIES=	devel astro
> 
> MAINTAINER=	acm@FreeBSD.org
> COMMENT=	Implementation of the Instrument-Neutral-Device-Interface protocol
>-WWW=		https://github.com/indilib/indi
>+WWW=		https://www.indilib.org/ \
>+		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 \
>+		libev.so:devel/libev \
> 		libfftw3.so:math/fftw3 \
>+		libgsl.so:math/gsl \
>+		libnova.so:astro/libnova \
>+		libogg.so:audio/libogg \
> 		libtheora.so:multimedia/libtheora \
>-		libogg.so:audio/libogg
>+		libXISF.so:graphics/libxisf
> 
> USES=		cmake jpeg iconv ninja pkgconfig
> USE_GITHUB=	yes
>diff --git a/devel/indi/distinfo b/devel/indi/distinfo
>index fc5f4a0ec9fa..765659b0a9a0 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 = 1733631540
>+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 <cassert>
>- #include "indipropertybasic.h"
>- #include "indipropertybasic_p.h"
>- 
>-@@ -342,9 +343,10 @@ const WidgetView<T> *PropertyBasic<T>::at(size_t index
>- }
>- 
>- template <typename T>
>--WidgetView<T> &PropertyBasic<T>::operator[](size_t index) const
>-+WidgetView<T> &PropertyBasic<T>::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<T> *at(size_t index) const;
>- 
>--    WidgetView<T> &operator[](size_t index) const;
>-+    WidgetView<T> &operator[](ssize_t index) const;
>- 
>- public: // STL-style iterators
>-     WidgetView<T> *begin();
>diff --git a/devel/indi/pkg-descr b/devel/indi/pkg-descr
>index 1eb0c8918cf2..2dc9214e1a5f 100644
>--- a/devel/indi/pkg-descr
>+++ b/devel/indi/pkg-descr
>@@ -1,3 +1,23 @@
>-INDI is a standard for astronomical instrumentation control. INDI Library is
>-an Open Source POSIX implementation of the Instrument-Neutral-Device-Interface
>+INDI is a standard for astronomical instrumentation control. INDI Library is an
>+Open Source POSIX implementation of the Instrument-Neutral-Device-Interface
> protocol.
>+
>+INDI core library is composed of the following components:
>+
>+* INDI Server.
>+* INDI Core Drivers: Hardware drivers that communicate with the equipment.
>+    Many devices are supported including:
>+-   Mounts
>+-   CCDs, CMOS, Webcams, DSLRs (Canon, Nikon, Sony, Pentax..etc).
>+-   Focusers
>+-   Filter Wheels
>+-   Adaptive Optics
>+-   Domes
>+-   GPS
>+-   Weather Stations
>+-   Controllers
>+-   Auxiliary Devices (switches, watchdog, relays, light sources, measurement
>+    devices..etc).
>+* Client Library: Cross-platform POSIX and Qt5-based client libraries. The
>+     client libraries can be embedded in 3rd party applications to communicate
>+     with INDI server and devices.
>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,48 +1,65 @@
>+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
>@@ -62,6 +79,8 @@ 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
>@@ -74,13 +93,18 @@ 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
>@@ -115,9 +139,9 @@ 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
>@@ -128,17 +152,30 @@ 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
>@@ -168,7 +205,12 @@ 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
>@@ -188,10 +230,14 @@ 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
>@@ -217,11 +263,15 @@ 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
>@@ -243,16 +293,20 @@ 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
>-- 
>2.47.1
>

Actions: View | Diff

Attachments on bug 276820: 255695 | 256273