diff -Nru libmicam-1.0/CMakeLists.txt libmicam-1.0+20221224111636/CMakeLists.txt --- libmicam-1.0/CMakeLists.txt 2021-12-02 22:36:11.000000000 +0000 +++ libmicam-1.0+20221224111636/CMakeLists.txt 2022-12-18 10:02:43.000000000 +0000 @@ -1,8 +1,8 @@ cmake_minimum_required (VERSION 3.0) project (libmicam) -set (MICAM_VERSION "0.6.9") -set (MICAM_VERSION_MAC "0.5.1") +set (MICAM_VERSION "0.7.2") +set (MICAM_VERSION_MAC "0.6.2") set (MICAM_SOVERSION "0") list (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/") @@ -20,6 +20,8 @@ set_property (TARGET gxccd PROPERTY IMPORTED_LOCATION "libgxccdmac.bin") + FIX_LIBRARY_ID("libgxccd" "libgxccdmac.bin" "Moravian/GXCCD") + elseif (UNIX AND NOT WIN32) if (CMAKE_SYSTEM_PROCESSOR MATCHES "armv+") diff -Nru libmicam-1.0/cmake_modules/FindAHPGT.cmake libmicam-1.0+20221224111636/cmake_modules/FindAHPGT.cmake --- libmicam-1.0/cmake_modules/FindAHPGT.cmake 1970-01-01 00:00:00.000000000 +0000 +++ libmicam-1.0+20221224111636/cmake_modules/FindAHPGT.cmake 2022-12-18 10:02:42.000000000 +0000 @@ -0,0 +1,58 @@ +# - Try to find AHPGT +# Once done this will define +# +# AHPGT_FOUND - system has AHPGT +# AHPGT_INCLUDE_DIR - the AHPGT include directory +# AHPGT_LIBRARIES - Link these to use AHPGT +# AHPGT_VERSION_STRING - Human readable version number of ahp_gt +# AHPGT_VERSION_MAJOR - Major version number of ahp_gt +# AHPGT_VERSION_MINOR - Minor version number of ahp_gt + +# Copyright (c) 2017, Ilia Platone, +# Based on FindLibfacile by Carsten Niehaus, +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + +if (AHPGT_INCLUDE_DIR AND AHPGT_LIBRARIES) + + # in cache already + set(AHPGT_FOUND TRUE) + message(STATUS "Found AHPGT: ${AHPGT_LIBRARIES}") + + +else (AHPGT_INCLUDE_DIR AND AHPGT_LIBRARIES) + + find_path(AHPGT_INCLUDE_DIR ahp_gt.h + PATH_SUFFIXES ahp + ${_obIncDir} + ${GNUWIN32_DIR}/include + ) + + find_library(AHPGT_LIBRARIES NAMES ahp_gt + PATHS + ${_obLinkDir} + ${GNUWIN32_DIR}/lib + /usr/local/lib + HINTS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES} + ) + +if(AHPGT_INCLUDE_DIR AND AHPGT_LIBRARIES) + set(AHPGT_FOUND TRUE) +else (AHPGT_INCLUDE_DIR AND AHPGT_LIBRARIES) + set(AHPGT_FOUND FALSE) +endif(AHPGT_INCLUDE_DIR AND AHPGT_LIBRARIES) + + if (AHPGT_FOUND) + if (NOT AHPGT_FIND_QUIETLY) + message(STATUS "Found AHPGT: ${AHPGT_LIBRARIES}") + endif (NOT AHPGT_FIND_QUIETLY) + else (AHPGT_FOUND) + if (AHPGT_FIND_REQUIRED) + message(FATAL_ERROR "AHPGT not found. Please install libahp_gt-dev") + endif (AHPGT_FIND_REQUIRED) + endif (AHPGT_FOUND) + + mark_as_advanced(AHPGT_LIBRARIES) + +endif (AHPGT_INCLUDE_DIR AND AHPGT_LIBRARIES) diff -Nru libmicam-1.0/cmake_modules/FindFFmpeg.cmake libmicam-1.0+20221224111636/cmake_modules/FindFFmpeg.cmake --- libmicam-1.0/cmake_modules/FindFFmpeg.cmake 2021-10-27 07:10:30.000000000 +0000 +++ libmicam-1.0+20221224111636/cmake_modules/FindFFmpeg.cmake 2022-05-26 01:25:59.000000000 +0000 @@ -79,8 +79,15 @@ pkg_check_modules(AVFORMAT libavformat${_avformat_ver}) pkg_check_modules(AVUTIL libavutil${_avutil_ver}) pkg_check_modules(SWSCALE libswscale${_swscale_ver}) - -else (PKG_CONFIG_FOUND) + +endif (PKG_CONFIG_FOUND) + +if (NOT PKG_CONFIG_FOUND OR + NOT FFMPEG_LIBAVCODEC OR + NOT FFMPEG_LIBAVDEVICE OR + NOT FFMPEG_LIBAVFORMAT OR + NOT FFMPEG_LIBAVUTIL OR + NOT FFMPEG_LIBSWSCALE) # LIBAVCODEC set(PACKAGE_NAME "LIBAVCODEC") @@ -137,7 +144,7 @@ set(SWSCALE_VERSION FFMPEG_PACKAGE_VERSION) endif(FFMPEG_PACKAGE_VERSION_OK) -endif (PKG_CONFIG_FOUND) +endif () find_library(FFMPEG_LIBAVCODEC NAMES avcodec libavcodec diff -Nru libmicam-1.0/cmake_modules/FindFLIPRO.cmake libmicam-1.0+20221224111636/cmake_modules/FindFLIPRO.cmake --- libmicam-1.0/cmake_modules/FindFLIPRO.cmake 1970-01-01 00:00:00.000000000 +0000 +++ libmicam-1.0+20221224111636/cmake_modules/FindFLIPRO.cmake 2022-12-18 10:02:42.000000000 +0000 @@ -0,0 +1,54 @@ +# - Try to find Finger Lakes Instruments Library +# Once done this will define +# +# FLIPRO_FOUND - system has FLI +# FLIPRO_INCLUDE_DIR - the FLI include directory +# FLIPRO_LIBRARIES - Link these to use FLI + +# Copyright (c) 2008, Jasem Mutlaq +# Based on FindLibfacile by Carsten Niehaus, +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + +if (FLIPRO_INCLUDE_DIR AND FLIPRO_LIBRARIES) + + # in cache already + set(FLIPRO_FOUND TRUE) + message(STATUS "Found libflipro: ${FLIPRO_LIBRARIES}") + +else (FLIPRO_INCLUDE_DIR AND FLIPRO_LIBRARIES) + + # Might need to remove lib prefix once FLI fixes their library name + find_path(FLIPRO_INCLUDE_DIR libflipro.h + PATH_SUFFIXES fli + ${_obIncDir} + ${GNUWIN32_DIR}/include + ) + + find_library(FLIPRO_LIBRARIES NAMES libflipro + PATHS + ${_obLinkDir} + ${GNUWIN32_DIR}/lib + ) + + if(FLIPRO_INCLUDE_DIR AND FLIPRO_LIBRARIES) + set(FLIPRO_FOUND TRUE) + else (FLIPRO_INCLUDE_DIR AND FLIPRO_LIBRARIES) + set(FLIPRO_FOUND FALSE) + endif(FLIPRO_INCLUDE_DIR AND FLIPRO_LIBRARIES) + + + if (FLIPRO_FOUND) + if (NOT FLIPRO_FIND_QUIETLY) + message(STATUS "Found FLIPRO: ${FLIPRO_LIBRARIES}") + endif (NOT FLIPRO_FIND_QUIETLY) + else (FLIPRO_FOUND) + if (FLIPRO_FIND_REQUIRED) + message(FATAL_ERROR "FLIPRO not found. Please install it and try again. http://www.indilib.org") + endif (FLIPRO_FIND_REQUIRED) + endif (FLIPRO_FOUND) + + mark_as_advanced(FLIPRO_INCLUDE_DIR FLIPRO_LIBRARIES) + +endif (FLIPRO_INCLUDE_DIR AND FLIPRO_LIBRARIES) diff -Nru libmicam-1.0/cmake_modules/FindLibCameraApps.cmake libmicam-1.0+20221224111636/cmake_modules/FindLibCameraApps.cmake --- libmicam-1.0/cmake_modules/FindLibCameraApps.cmake 1970-01-01 00:00:00.000000000 +0000 +++ libmicam-1.0+20221224111636/cmake_modules/FindLibCameraApps.cmake 2022-12-18 10:02:42.000000000 +0000 @@ -0,0 +1,77 @@ +# - Try to find LIBCAMERAAPPS Library +# Once done this will define +# +# LIBCAMERAAPPS_FOUND - system has LIBCAMERAAPPS +# LIBCAMERAAPPS_APPS - Link these to use Apps +# LIBCAMERAAPPS_ENCODERS - Link these to use Encoders +# LIBCAMERAAPPS_IMAGES - Link these to use Images +# LIBCAMERAAPPS_OUTPUTS - Link these to use Outputs +# LIBCAMERAAPPS_PREVIEW - Link these to use Preview +# LIBCAMERAAPPS_POST - Link these to use Post Processing Stages + +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + +if (LIBCAMERAAPPS_APPS) + + # in cache already + set(LIBCAMERAAPPS_FOUND TRUE) + message(STATUS "Found LIBCAMERAAPPS: ${LIBCAMERAAPPS_APPS}") + +else (LIBCAMERAAPPS_APPS) + + find_library(LIBCAMERAAPPS_APPS NAMES camera_app + PATHS + ${_obLinkDir} + ${GNUWIN32_DIR}/lib + ) + + find_library(LIBCAMERAAPPS_ENCODERS NAMES encoders + PATHS + ${_obLinkDir} + ${GNUWIN32_DIR}/lib + ) + + find_library(LIBCAMERAAPPS_IMAGES NAMES images + PATHS + ${_obLinkDir} + ${GNUWIN32_DIR}/lib + ) + + find_library(LIBCAMERAAPPS_OUTPUTS NAMES outputs + PATHS + ${_obLinkDir} + ${GNUWIN32_DIR}/lib + ) + + find_library(LIBCAMERAAPPS_POST NAMES post_processing_stages + PATHS + ${_obLinkDir} + ${GNUWIN32_DIR}/lib + ) + + find_library(LIBCAMERAAPPS_PREVIEW NAMES preview + PATHS + ${_obLinkDir} + ${GNUWIN32_DIR}/lib + ) + + if(LIBCAMERAAPPS_APPS) + set(LIBCAMERAAPPS_FOUND TRUE) + else (LIBCAMERAAPPS_APPS) + set(LIBCAMERAAPPS_FOUND FALSE) + endif(LIBCAMERAAPPS_APPS) + + if (LIBCAMERAAPPS_FOUND) + if (NOT LIBCAMERAAPPS_FIND_QUIETLY) + message(STATUS "Found LIBCAMERAAPPS Library: ${LIBCAMERAAPPS_APPS}") + endif (NOT LIBCAMERAAPPS_FIND_QUIETLY) + else (LIBCAMERAAPPS_FOUND) + if (LIBCAMERAAPPS_FIND_REQUIRED) + message(FATAL_ERROR "LIBCAMERAAPPS Library not found. Please install libcamera-apps") + endif (LIBCAMERAAPPS_FIND_REQUIRED) + endif (LIBCAMERAAPPS_FOUND) + + mark_as_advanced(LIBCAMERAAPPS_APPS LIBCAMERAAPPS_ENCODERS LIBCAMERAAPPS_IMAGES LIBCAMERAAPPS_OUTPUTS LIBCAMERAAPPS_POST LIBCAMERAAPPS_PREVIEW) + +endif (LIBCAMERAAPPS_APPS) diff -Nru libmicam-1.0/cmake_modules/FindNUTClient.cmake libmicam-1.0+20221224111636/cmake_modules/FindNUTClient.cmake --- libmicam-1.0/cmake_modules/FindNUTClient.cmake 1970-01-01 00:00:00.000000000 +0000 +++ libmicam-1.0+20221224111636/cmake_modules/FindNUTClient.cmake 2022-12-18 10:02:42.000000000 +0000 @@ -0,0 +1,50 @@ +# - Try to find nutclient library (version 2) and include files +# Once done this will define +# +# NUTCLIENT_FOUND - system has NUTCLIENT +# NUTCLIENT_INCLUDE_DIR - the NUTCLIENT include directory +# NUTCLIENT_LIBRARIES - Link these to use NUTCLIENT + +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + +if (NUTCLIENT_INCLUDE_DIR AND NUTCLIENT_LIBRARIES) + + # in cache already + set(NUTCLIENT_FOUND TRUE) + message(STATUS "Found libnutclient: ${NUTCLIENT_LIBRARIES}") + +else (NUTCLIENT_INCLUDE_DIR AND NUTCLIENT_LIBRARIES) + + find_path(NUTCLIENT_INCLUDE_DIR nutclient.h + PATH_SUFFIXES nutclient + ${_obIncDir} + ${GNUWIN32_DIR}/include + ) + + find_library(NUTCLIENT_LIBRARIES NAMES nutclient + PATHS + ${_obLinkDir} + ${GNUWIN32_DIR}/lib + ) + + if(NUTCLIENT_INCLUDE_DIR AND NUTCLIENT_LIBRARIES) + set(NUTCLIENT_FOUND TRUE) + else (NUTCLIENT_INCLUDE_DIR AND NUTCLIENT_LIBRARIES) + set(NUTCLIENT_FOUND FALSE) + endif(NUTCLIENT_INCLUDE_DIR AND NUTCLIENT_LIBRARIES) + + + if (NUTCLIENT_FOUND) + if (NOT NUTCLIENT_FIND_QUIETLY) + message(STATUS "Found NUTCLIENT: ${NUTCLIENT_LIBRARIES}") + endif (NOT NUTCLIENT_FIND_QUIETLY) + else (NUTCLIENT_FOUND) + if (NUTCLIENT_FIND_REQUIRED) + message(FATAL_ERROR "NUTCLIENT not found. Please install libnutclient development package.") + endif (NUTCLIENT_FIND_REQUIRED) + endif (NUTCLIENT_FOUND) + + mark_as_advanced(NUTCLIENT_INCLUDE_DIR NUTCLIENT_LIBRARIES) + +endif (NUTCLIENT_INCLUDE_DIR AND NUTCLIENT_LIBRARIES) diff -Nru libmicam-1.0/cmake_modules/FindOMEGONPROCAM.cmake libmicam-1.0+20221224111636/cmake_modules/FindOMEGONPROCAM.cmake --- libmicam-1.0/cmake_modules/FindOMEGONPROCAM.cmake 1970-01-01 00:00:00.000000000 +0000 +++ libmicam-1.0+20221224111636/cmake_modules/FindOMEGONPROCAM.cmake 2022-06-05 23:28:49.000000000 +0000 @@ -0,0 +1,50 @@ +# - Try to find Omegon Pro Cam Camera Library +# Once done this will define +# +# OMEGONPROCAM_FOUND - system has Omegon Pro Cam +# OMEGONPROCAM_INCLUDE_DIR - the Omegon Pro Cam include directory +# OMEGONPROCAM_LIBRARIES - Link these to use Omegon Pro Cam + +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + +if (OMEGONPROCAM_INCLUDE_DIR AND OMEGONPROCAM_LIBRARIES) + + # in cache already + set(OMEGONPROCAM_FOUND TRUE) + message(STATUS "Found libomegonprocam: ${OMEGONPROCAM_LIBRARIES}") + +else (OMEGONPROCAM_INCLUDE_DIR AND OMEGONPROCAM_LIBRARIES) + + find_path(OMEGONPROCAM_INCLUDE_DIR omegonprocam.h + PATH_SUFFIXES libomegonprocam + ${_obIncDir} + ${GNUWIN32_DIR}/include + ) + + find_library(OMEGONPROCAM_LIBRARIES NAMES omegonprocam + PATHS + ${_obLinkDir} + ${GNUWIN32_DIR}/lib + ) + + if(OMEGONPROCAM_INCLUDE_DIR AND OMEGONPROCAM_LIBRARIES) + set(OMEGONPROCAM_FOUND TRUE) + else (OMEGONPROCAM_INCLUDE_DIR AND OMEGONPROCAM_LIBRARIES) + set(OMEGONPROCAM_FOUND FALSE) + endif(OMEGONPROCAM_INCLUDE_DIR AND OMEGONPROCAM_LIBRARIES) + + + if (OMEGONPROCAM_FOUND) + if (NOT OMEGONPROCAM_FIND_QUIETLY) + message(STATUS "Found OmegonProCam: ${OMEGONPROCAM_LIBRARIES}") + endif (NOT OMEGONPROCAM_FIND_QUIETLY) + else (OMEGONPROCAM_FOUND) + if (OMEGONPROCAM_FIND_REQUIRED) + message(FATAL_ERROR "OmegonProCam not found. Please install OmegonProCam Library http://www.indilib.org") + endif (OMEGONPROCAM_FIND_REQUIRED) + endif (OMEGONPROCAM_FOUND) + + mark_as_advanced(OMEGONPROCAM_INCLUDE_DIR OMEGONPROCAM_LIBRARIES) + +endif (OMEGONPROCAM_INCLUDE_DIR AND OMEGONPROCAM_LIBRARIES) diff -Nru libmicam-1.0/cmake_modules/FindPLAYERONE.cmake libmicam-1.0+20221224111636/cmake_modules/FindPLAYERONE.cmake --- libmicam-1.0/cmake_modules/FindPLAYERONE.cmake 2021-10-27 07:10:30.000000000 +0000 +++ libmicam-1.0+20221224111636/cmake_modules/FindPLAYERONE.cmake 2022-12-18 10:02:42.000000000 +0000 @@ -47,7 +47,7 @@ endif (NOT PLAYERONE_FIND_QUIETLY) else (PLAYERONE_FOUND) if (PLAYERONE_FIND_REQUIRED) - message(FATAL_ERROR "PLAYERONE not found. Please install libPlayerOneCamera.2 http://www.indilib.org") + message(FATAL_ERROR "PLAYERONE not found. Please install libPlayerOneCamera.3 http://www.indilib.org") endif (PLAYERONE_FIND_REQUIRED) endif (PLAYERONE_FOUND) diff -Nru libmicam-1.0/cmake_modules/FindSV305.cmake libmicam-1.0+20221224111636/cmake_modules/FindSV305.cmake --- libmicam-1.0/cmake_modules/FindSV305.cmake 2021-10-27 07:10:30.000000000 +0000 +++ libmicam-1.0+20221224111636/cmake_modules/FindSV305.cmake 1970-01-01 00:00:00.000000000 +0000 @@ -1,52 +0,0 @@ -# - Try to find SV305 Library -# Once done this will define -# -# SV305_FOUND - system has QHY -# SV305_INCLUDE_DIR - the QHY include directory -# SV305_LIBRARIES - Link these to use QHY - -# Redistribution and use is allowed according to the terms of the BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. - -if (SV305_INCLUDE_DIR AND SV305_LIBRARIES) - - # in cache already - set(SV305_FOUND TRUE) - message(STATUS "Found libsv305: ${SV305_LIBRARIES}") - -else (SV305_INCLUDE_DIR AND SV305_LIBRARIES) - - # find headers - find_path(SV305_INCLUDE_DIR NAMES SVBCameraSDK.h - PATH_SUFFIXES libsv305 - ${_obIncDir} - ${GNUWIN32_DIR}/include - ) - - # find libraries - find_library(SV305_LIBRARIES NAMES SVBCameraSDK - PATHS - ${_obLinkDir} - ${GNUWIN32_DIR}/lib - ) - - if(SV305_INCLUDE_DIR AND SV305_LIBRARIES) - set(SV305_FOUND TRUE) - else (SV305_INCLUDE_DIR AND SV305_LIBRARIES) - set(SV305_FOUND FALSE) - endif(SV305_INCLUDE_DIR AND SV305_LIBRARIES) - - - if (SV305_FOUND) - if (NOT SV305_FIND_QUIETLY) - message(STATUS "Found SV305 libraries : ${SV305_LIBRARIES}") - endif (NOT SV305_FIND_QUIETLY) - else (SV305_FOUND) - if (SV305_FIND_REQUIRED) - message(FATAL_ERROR "SV305 libraries not found. Please install libsv305 http://www.indilib.org") - endif (SV305_FIND_REQUIRED) - endif (SV305_FOUND) - - mark_as_advanced(SV305_INCLUDE_DIR SV305_LIBRARIES) - -endif (SV305_INCLUDE_DIR AND SV305_LIBRARIES) diff -Nru libmicam-1.0/cmake_modules/FindSVBONY.cmake libmicam-1.0+20221224111636/cmake_modules/FindSVBONY.cmake --- libmicam-1.0/cmake_modules/FindSVBONY.cmake 1970-01-01 00:00:00.000000000 +0000 +++ libmicam-1.0+20221224111636/cmake_modules/FindSVBONY.cmake 2022-12-18 10:02:42.000000000 +0000 @@ -0,0 +1,52 @@ +# - Try to find SVBONY Library +# Once done this will define +# +# SVBONY_FOUND - system has SVBONY CCD +# SVBONY_INCLUDE_DIR - the SVBONY CCD include directory +# SVBONY_LIBRARIES - Link these to use SVBONY CCD + +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + +if (SVBONY_INCLUDE_DIR AND SVBONY_LIBRARIES) + + # in cache already + set(SVBONY_FOUND TRUE) + message(STATUS "Found libsvbony: ${SVBONY_LIBRARIES}") + +else (SVBONY_INCLUDE_DIR AND SVBONY_LIBRARIES) + + # find headers + find_path(SVBONY_INCLUDE_DIR NAMES SVBCameraSDK.h + PATH_SUFFIXES libsvbony + ${_obIncDir} + ${GNUWIN32_DIR}/include + ) + + # find libraries + find_library(SVBONY_LIBRARIES NAMES SVBCameraSDK + PATHS + ${_obLinkDir} + ${GNUWIN32_DIR}/lib + ) + + if(SVBONY_INCLUDE_DIR AND SVBONY_LIBRARIES) + set(SVBONY_FOUND TRUE) + else (SVBONY_INCLUDE_DIR AND SVBONY_LIBRARIES) + set(SVBONY_FOUND FALSE) + endif(SVBONY_INCLUDE_DIR AND SVBONY_LIBRARIES) + + + if (SVBONY_FOUND) + if (NOT SVBONY_FIND_QUIETLY) + message(STATUS "Found SVBONY libraries : ${SVBONY_LIBRARIES}") + endif (NOT SVBONY_FIND_QUIETLY) + else (SVBONY_FOUND) + if (SVBONY_FIND_REQUIRED) + message(FATAL_ERROR "SVBONY libraries not found. Please install libsvbony http://www.indilib.org") + endif (SVBONY_FIND_REQUIRED) + endif (SVBONY_FOUND) + + mark_as_advanced(SVBONY_INCLUDE_DIR SVBONY_LIBRARIES) + +endif (SVBONY_INCLUDE_DIR AND SVBONY_LIBRARIES) diff -Nru libmicam-1.0/debian/changelog libmicam-1.0+20221224111636/debian/changelog --- libmicam-1.0/debian/changelog 2022-06-07 21:30:36.000000000 +0000 +++ libmicam-1.0+20221224111636/debian/changelog 2022-12-24 11:17:52.000000000 +0000 @@ -1,3 +1,11 @@ +libmicam (1.0+20221224111636-1) unstable; urgency=medium + + * build version from git + * based on indi-3rdparty release 1.9.9 + * new upstream version 1.0 + + -- Thorsten Alteholz Sat, 24 Dec 2022 11:17:52 +0000 + libmicam (1.0-3) unstable; urgency=medium * rebuild with indi 1.9.6 diff -Nru libmicam-1.0/gxccd.h libmicam-1.0+20221224111636/gxccd.h --- libmicam-1.0/gxccd.h 2021-10-27 07:10:31.000000000 +0000 +++ libmicam-1.0+20221224111636/gxccd.h 2022-12-18 10:02:43.000000000 +0000 @@ -1,8 +1,34 @@ /* * The Moravian Instruments (MI) camera library. * - * Copyright 2021, Moravian Instruments + * Copyright (c) 2016-2022, Moravian Instruments * All rights reserved. + * + * Redistribution. Redistribution and use in binary form, without + * modification, are permitted provided that the following conditions are + * met: + * + * - Redistributions must reproduce the above copyright notice and the + * following disclaimer in the documentation and/or other materials + * provided with the distribution. + * - Neither the name of Moravian Instruments nor the names of its + * suppliers may be used to endorse or promote products derived from this + * software without specific prior written permission. + * - No reverse engineering, decompilation, or disassembly of this software + * is permitted. + * + * DISCLAIMER. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND + * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. */ #ifndef GXCCD_H_ @@ -50,6 +76,9 @@ ReceiveTimeout = 30000 MicrometerFilterOffsets = false ClearTime = 15 + HWBinning = false + BinningSum = false + BinningSaturate = false [filters] Luminance, LGray, 0 @@ -73,8 +102,15 @@ * the chip. There is no need to change the default value (15 seconds). * If you want to use advanced USB functions below, you can turn this feature by * setting "ClearTime" to 0 or -1 and clear the chip manualy with gxusb_clear(). + * "HWBinning" controls whether the library bins the image itself or the camera + * does the binning directly in hardware. This setting is valid only for C1x, + * C3, C4 and C5 cameras. + * "BinningSum" controls whether the library/camera sums binned pixels instead + * of averaging them. + * "BinningSaturate" controls whether the library/camera sets resulting binned + * pixel to saturation value if any of the source pixels is saturated. *------------------------------------------------------------------------------ - * Section [filters] is for G2/G3/G4 camera filter wheel configuration. + * Section [filters] is for configuring cameras with filter wheel. * There is no way how to determine the actual filters in the filter wheel * automatically. You must create .ini file with this section. * @@ -198,6 +234,7 @@ gxccd_get_value() */ GBP_GAIN, /* true if camera can return gain in gxccd_get_value() */ GBP_ELECTRONIC_SHUTTER, /* true if camera has electronic shutter */ + GBP_GPS, /* true if camera has gps module */ GBP_CONFIGURED = 127, /* true if camera is configured */ GBP_RGB, /* true if camera has Bayer RGBG filters on the chip */ GBP_CMY, /* true if camera has CMY filters on the chip */ @@ -483,6 +520,29 @@ int gxccd_move_in_progress(camera_t *camera, bool *moving); /* + * Returns actual date and exact time of the last image exposure. + * Date and time is obtained from GPS and is in UTC time standard. + * Subsecond precision is additionally achieved with internal camera counter. + * For this function to work, the camera must contain a GPS receiver module and + * it must be synchronized with at least 5 satellites. You can call + * "gxccd_get_gps_data()" to obtain GPS status. + */ +int gxccd_get_image_time_stamp(camera_t *camera, int *year, int *month, + int *day, int *hour, int *minute, double *second); + +/* + * Returns actual date, exact time, latitude, longitude, mean sea level and + * status of GPS module. Date and time is in UTC time standard. Subsecond precision + * is additionally achieved with internal camera counter. For this function to work, + * the camera must contain a GPS receiver module. Position information needs at + * least 3 satellites, date and time is returned after synchronization with 5 + * satellites. + */ +int gxccd_get_gps_data(camera_t *camera, double *lat, double *lon, double *msl, + int *year, int *month, int *day, int *hour, int *minute, + double *second, unsigned int *satellites, bool *fix); + +/* * If any call fails (returns -1), this function returns failure description * in parameter buf. * The caller must specify the size of the buffer in parameter "size". diff -Nru libmicam-1.0/indi-3rdparty-infos/changelog libmicam-1.0+20221224111636/indi-3rdparty-infos/changelog --- libmicam-1.0/indi-3rdparty-infos/changelog 2021-10-27 07:10:30.000000000 +0000 +++ libmicam-1.0+20221224111636/indi-3rdparty-infos/changelog 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -libmicam (1.0) buster; urgency=medium - - * Initial release - - -- Radek Kaczorek Sat, 25 Jan 2020 11:21:06 +0100 Binary files /tmp/tmpl363bww2/z2A7VQz_lb/libmicam-1.0/libgxccd32.bin and /tmp/tmpl363bww2/6A0evQ19Zd/libmicam-1.0+20221224111636/libgxccd32.bin differ Binary files /tmp/tmpl363bww2/z2A7VQz_lb/libmicam-1.0/libgxccd64.bin and /tmp/tmpl363bww2/6A0evQ19Zd/libmicam-1.0+20221224111636/libgxccd64.bin differ Binary files /tmp/tmpl363bww2/z2A7VQz_lb/libmicam-1.0/libgxccdarmv7.bin and /tmp/tmpl363bww2/6A0evQ19Zd/libmicam-1.0+20221224111636/libgxccdarmv7.bin differ Binary files /tmp/tmpl363bww2/z2A7VQz_lb/libmicam-1.0/libgxccdarmv8.bin and /tmp/tmpl363bww2/6A0evQ19Zd/libmicam-1.0+20221224111636/libgxccdarmv8.bin differ Binary files /tmp/tmpl363bww2/z2A7VQz_lb/libmicam-1.0/libgxccdmac.bin and /tmp/tmpl363bww2/6A0evQ19Zd/libmicam-1.0+20221224111636/libgxccdmac.bin differ diff -Nru libmicam-1.0/libmicam.spec libmicam-1.0+20221224111636/libmicam.spec --- libmicam-1.0/libmicam.spec 2021-12-02 22:36:11.000000000 +0000 +++ libmicam-1.0+20221224111636/libmicam.spec 2022-12-18 10:02:43.000000000 +0000 @@ -1,6 +1,6 @@ %define __cmake_in_source_build %{_vpath_builddir} Name: libmicam -Version:1.9.4.git +Version:1.9.9.git Release: %(date -u +%%Y%%m%%d%%H%%M%%S)%{?dist} Summary: Instrument Neutral Distributed Interface 3rd party drivers @@ -58,7 +58,7 @@ %prep -v -%setup -n %{name}-%{version} +%autosetup -v -p1 -n indi-3rdparty-master %build # This package tries to mix and match PIE and PIC which is wrong and will diff -Nru libmicam-1.0/LICENSE libmicam-1.0+20221224111636/LICENSE --- libmicam-1.0/LICENSE 1970-01-01 00:00:00.000000000 +0000 +++ libmicam-1.0+20221224111636/LICENSE 2022-12-18 10:02:43.000000000 +0000 @@ -0,0 +1,28 @@ +Copyright (c) 2016-2022, Moravian Instruments +All rights reserved. + +Redistribution. Redistribution and use in binary form, without +modification, are permitted provided that the following conditions are +met: + +* Redistributions must reproduce the above copyright notice and the + following disclaimer in the documentation and/or other materials + provided with the distribution. +* Neither the name of Moravian Instruments nor the names of its + suppliers may be used to endorse or promote products derived from this + software without specific prior written permission. +* No reverse engineering, decompilation, or disassembly of this software + is permitted. + +DISCLAIMER. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND +CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, +BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR +TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE +USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH +DAMAGE.