Hello community, here is the log from the commit of package libindi for openSUSE:Factory checked in at 2020-02-25 16:04:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libindi (Old) and /work/SRC/openSUSE:Factory/.libindi.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libindi" Tue Feb 25 16:04:01 2020 rev:38 rq:778767 version:1.8.4 Changes: -------- --- /work/SRC/openSUSE:Factory/libindi/libindi.changes 2020-01-16 18:23:03.261036191 +0100 +++ /work/SRC/openSUSE:Factory/.libindi.new.26092/libindi.changes 2020-02-25 16:04:39.444349051 +0100 @@ -1,0 +2,22 @@ +Mon Feb 24 08:44:29 UTC 2020 - [email protected] + +- Update to version 1.8.4: + * New TeenAstro Mount driver. + * New DSP plugin for Signal Processing. + * New INDI interface for correlators. + * Draft for Pulse Detectors (revealers, dosimeters, cosmic ray). + * Created SensorInterface and Spectrograph, Detector subclasses. + * Celestron PEC control is added that provides seek index, stop, + playback and record commands. + * Celestron negative UTC fix. + * Fixed iOptron mount firmware parsing. + * Fixed version read in MoonLite focuser. + * DeepSkyDad3 backlash compensation. + * CCD Simulator bayer support. + * FCUSB2 support. + * Fixed complation on FreeBSD. +- Add remove-unused-websocket-block.patch to fix build with + websocketpp +- Remove conditionals for outdated distribution versions + +------------------------------------------------------------------- Old: ---- indi-1.8.3.tar.gz New: ---- indi-1.8.4.tar.gz remove-unused-websocket-block.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libindi.spec ++++++ --- /var/tmp/diff_new_pack.8nKugs/_old 2020-02-25 16:04:44.876362458 +0100 +++ /var/tmp/diff_new_pack.8nKugs/_new 2020-02-25 16:04:44.880362468 +0100 @@ -1,7 +1,7 @@ # # spec file for package libindi # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %define so_ver 1 %define _udevdir %(pkg-config --variable udevdir udev) Name: libindi -Version: 1.8.3 +Version: 1.8.4 Release: 0 Summary: Instrument Neutral Distributed Interface License: GPL-2.0-or-later AND LGPL-2.1-or-later AND GPL-3.0-or-later @@ -28,9 +28,13 @@ Source0: https://github.com/indilib/indi/archive/v%{version}.tar.gz#/indi-%{version}.tar.gz # PATCH-FIX-UPSTREAM Patch0: 0001-Fix-warnings.patch +# PATCH-FIX-UPSTREAM +Patch1: remove-unused-websocket-block.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: gsl-devel +BuildRequires: libboost_system-devel +BuildRequires: libboost_thread-devel BuildRequires: libcfitsio-devel BuildRequires: libcurl-devel BuildRequires: libnova-devel @@ -46,13 +50,6 @@ BuildRequires: pkgconfig(theora) BuildRequires: pkgconfig(udev) Requires: libindi-plugins = %{version} -%if 0%{?suse_version} >= 1330 -BuildRequires: libboost_system-devel -BuildRequires: libboost_thread-devel -%else -BuildRequires: gcc7 -BuildRequires: gcc7-c++ -%endif %description INDI is an Instrument Neutral Distributed Interface control protocol @@ -128,16 +125,9 @@ # libindi doesn't check whether CMAKE_INSTALL_LIBDIR is relative or not... sed -i 's|${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}|${CMAKE_INSTALL_LIBDIR}|' libs/indibase/alignment/CMakeLists.txt -%if 0%{?suse_version} < 1330 -export CC=gcc-7 -export CXX=g++-7 -%endif - %cmake -DUDEVRULES_INSTALL_DIR=%{_udevdir}/rules.d \ -DINDI_BUILD_QT5_CLIENT=ON \ -%if 0%{?suse_version} >= 1330 -DINDI_BUILD_WEBSOCKET=ON \ -%endif -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now" %make_jobs ++++++ indi-1.8.3.tar.gz -> indi-1.8.4.tar.gz ++++++ ++++ 15095 lines of diff (skipped) ++++++ remove-unused-websocket-block.patch ++++++ >From cfbf0465cbccf1a1af1a511b673f54086654b2b3 Mon Sep 17 00:00:00 2001 From: Jasem Mutlaq <[email protected]> Date: Wed, 12 Feb 2020 21:57:15 +0300 Subject: [PATCH] remove unused websocket block --- libs/indibase/dsp/dspinterface.cpp | 67 ++++++++++++++---------------- 1 file changed, 32 insertions(+), 35 deletions(-) diff --git a/libs/indibase/dsp/dspinterface.cpp b/libs/indibase/dsp/dspinterface.cpp index ebf7e4479..0cd322a6c 100644 --- a/libs/indibase/dsp/dspinterface.cpp +++ b/libs/indibase/dsp/dspinterface.cpp @@ -105,9 +105,12 @@ const char *Interface::getDeviceName() void Interface::ISGetProperties(const char *dev) { INDI_UNUSED(dev); - if (m_Device->isConnected()) { + if (m_Device->isConnected()) + { m_Device->defineSwitch(&ActivateSP); - } else { + } + else + { m_Device->deleteProperty(ActivateSP.name); PluginActive = false; Deactivated(); @@ -116,9 +119,12 @@ void Interface::ISGetProperties(const char *dev) bool Interface::updateProperties() { - if (m_Device->isConnected()) { + if (m_Device->isConnected()) + { m_Device->defineSwitch(&ActivateSP); - } else { + } + else + { m_Device->deleteProperty(ActivateSP.name); PluginActive = false; Deactivated(); @@ -128,12 +134,17 @@ bool Interface::updateProperties() bool Interface::ISNewSwitch(const char *dev, const char *name, ISState *states, char *names[], int n) { - if(!strcmp(dev, getDeviceName())&&!strcmp(name, ActivateSP.name)) { - for (int i = 0; i < n; i++) { - if (!strcmp(names[i], "DSP_ACTIVATE_ON") && states[i] == ISS_ON) { + if(!strcmp(dev, getDeviceName()) && !strcmp(name, ActivateSP.name)) + { + for (int i = 0; i < n; i++) + { + if (!strcmp(names[i], "DSP_ACTIVATE_ON") && states[i] == ISS_ON) + { PluginActive = true; Activated(); - } else { + } + else + { PluginActive = false; Deactivated(); } @@ -187,7 +198,8 @@ uint8_t* Interface::Callback(uint8_t* buf, uint32_t ndims, int* dims, int bits_p bool Interface::processBLOB(uint8_t* buf, uint32_t ndims, int* dims, int bits_per_sample) { - if(PluginActive) { + if(PluginActive) + { bool sendCapture = (m_Device->getSwitch("UPLOAD_MODE")->sp[0].s == ISS_ON || m_Device->getSwitch("UPLOAD_MODE")->sp[2].s == ISS_ON); bool saveCapture = (m_Device->getSwitch("UPLOAD_MODE")->sp[1].s == ISS_ON || m_Device->getSwitch("UPLOAD_MODE")->sp[2].s == ISS_ON); @@ -207,7 +219,7 @@ bool Interface::processBLOB(uint8_t* buf, uint32_t ndims, int* dims, int bits_pe { long len = 1; uint32_t i; - for (len = 1, i = 0; i < BufferSizesQty; len*=BufferSizes[i++]); + for (len = 1, i = 0; i < BufferSizesQty; len *= BufferSizes[i++]); len *= getBPS() / 8; uploadFile(buffer, len, sendCapture, saveCapture, FitsB.format); } @@ -329,7 +341,7 @@ void Interface::addFITSKeywords(fitsfile *fptr, uint8_t* buf, int len) } void Interface::fits_update_key_s(fitsfile *fptr, int type, std::string name, void *p, std::string explanation, - int *status) + int *status) { // this function is for removing warnings about deprecated string conversion to char* (from arg 5) fits_update_key(fptr, type, name.c_str(), p, const_cast<char *>(explanation.c_str()), status); @@ -344,7 +356,7 @@ bool Interface::sendFITS(uint8_t *buf, bool sendCapture, bool saveCapture) int byte_type = 0; int status = 0; long naxis = BufferSizesQty; - long *naxes = static_cast<long*>(malloc(sizeof(long)*BufferSizesQty)); + long *naxes = static_cast<long*>(malloc(sizeof(long) * BufferSizesQty)); for(uint32_t d = 0; d < BufferSizesQty; d++) naxes[d] = BufferSizes[d]; int nelements = 0; @@ -394,7 +406,7 @@ bool Interface::sendFITS(uint8_t *buf, bool sendCapture, bool saveCapture) } long len = 1; uint32_t i; - for (len = 1, i = 0; i < BufferSizesQty; len*=BufferSizes[i++]); + for (len = 1, i = 0; i < BufferSizesQty; len *= BufferSizes[i++]); nelements = static_cast<int>(len); // Now we have to send fits format data to the client @@ -515,30 +527,15 @@ bool Interface::uploadFile(const void *fitsData, size_t totalBytes, bool sendCap if (sendCapture) { -#ifdef HAVE_WEBSOCKET - if (HasWebSocket() && WebSocketS[WEBSOCKET_ENABLED].s == ISS_ON) - { - auto start = std::chrono::high_resolution_clock::now(); - // Send format/size/..etc first later - wsServer.send_text(std::string(FitsB.format)); - wsServer.send_binary(FitsB.blob, FitsB.bloblen); - - auto end = std::chrono::high_resolution_clock::now(); - std::chrono::duration<double> diff = end - start; - LOGF_DEBUG("Websocket transfer took %g seconds", diff.count()); - } - else -#endif - { - auto start = std::chrono::high_resolution_clock::now(); - IDSetBLOB(&FitsBP, nullptr); - auto end = std::chrono::high_resolution_clock::now(); - std::chrono::duration<double> diff = end - start; - LOGF_DEBUG("BLOB transfer took %g seconds", diff.count()); - } + auto start = std::chrono::high_resolution_clock::now(); + IDSetBLOB(&FitsBP, nullptr); + auto end = std::chrono::high_resolution_clock::now(); + std::chrono::duration<double> diff = end - start; + LOGF_DEBUG("BLOB transfer took %g seconds", diff.count()); } + DEBUG(INDI::Logger::DBG_DEBUG, "Upload complete"); return true; @@ -635,7 +632,7 @@ void Interface::setStream(void *buf, uint32_t dims, int *sizes, int bits_per_sam uint8_t* Interface::getStream() { - void *buffer = malloc(stream->len*getBPS()/8); + void *buffer = malloc(stream->len * getBPS() / 8); switch (getBPS()) { case 8:
