diff -Nru indi-bresserexos2-1.0+t202310010920~ubuntu22.04.1/debian/changelog indi-bresserexos2-1.0+t202404031306~ubuntu22.04.1/debian/changelog --- indi-bresserexos2-1.0+t202310010920~ubuntu22.04.1/debian/changelog 2023-10-01 09:20:25.000000000 +0000 +++ indi-bresserexos2-1.0+t202404031306~ubuntu22.04.1/debian/changelog 2024-04-03 13:06:46.000000000 +0000 @@ -1,8 +1,8 @@ -indi-bresserexos2 (1.0+t202310010920~ubuntu22.04.1) jammy; urgency=low +indi-bresserexos2 (1.0+t202404031306~ubuntu22.04.1) jammy; urgency=low * Auto build. - -- Jasem Mutlaq Sun, 01 Oct 2023 09:20:25 +0000 + -- Jasem Mutlaq Wed, 03 Apr 2024 13:06:46 +0000 indi-bresserexos2 (1.0) bionic; urgency=medium diff -Nru indi-bresserexos2-1.0+t202310010920~ubuntu22.04.1/debian/git-build-recipe.manifest indi-bresserexos2-1.0+t202404031306~ubuntu22.04.1/debian/git-build-recipe.manifest --- indi-bresserexos2-1.0+t202310010920~ubuntu22.04.1/debian/git-build-recipe.manifest 2023-10-01 09:20:25.000000000 +0000 +++ indi-bresserexos2-1.0+t202404031306~ubuntu22.04.1/debian/git-build-recipe.manifest 2024-04-03 13:06:46.000000000 +0000 @@ -1,5 +1,5 @@ -# git-build-recipe format 0.4 deb-version {debupstream}+t202310010920 +# git-build-recipe format 0.4 deb-version {debupstream}+t202404031306 lp:~mutlaqja/+git/dummy git-commit:9a182f35d7f48b02de1170889c0798f3ab639afb -nest-part src lp:~mutlaqja/libindi/+git/trunk indi-bresserexos2 indi-bresserexos2 git-commit:aec8c34f763762f03a34b789f6ed5da1450c18ff -nest-part cmake lp:~mutlaqja/libindi/+git/trunk cmake_modules indi-bresserexos2/cmake_modules git-commit:aec8c34f763762f03a34b789f6ed5da1450c18ff -nest-part pack lp:~mutlaqja/libindi/+git/trunk debian/indi-bresserexos2 debian git-commit:aec8c34f763762f03a34b789f6ed5da1450c18ff +nest-part src lp:~mutlaqja/libindi/+git/trunk indi-bresserexos2 indi-bresserexos2 git-commit:cd5aac9913e2e3473cdc3f6e8ff2dfee4f24c525 +nest-part cmake lp:~mutlaqja/libindi/+git/trunk cmake_modules indi-bresserexos2/cmake_modules git-commit:cd5aac9913e2e3473cdc3f6e8ff2dfee4f24c525 +nest-part pack lp:~mutlaqja/libindi/+git/trunk debian/indi-bresserexos2 debian git-commit:cd5aac9913e2e3473cdc3f6e8ff2dfee4f24c525 diff -Nru indi-bresserexos2-1.0+t202310010920~ubuntu22.04.1/indi-bresserexos2/CMakeLists.txt indi-bresserexos2-1.0+t202404031306~ubuntu22.04.1/indi-bresserexos2/CMakeLists.txt --- indi-bresserexos2-1.0+t202310010920~ubuntu22.04.1/indi-bresserexos2/CMakeLists.txt 2023-10-01 09:20:22.000000000 +0000 +++ indi-bresserexos2-1.0+t202404031306~ubuntu22.04.1/indi-bresserexos2/CMakeLists.txt 2024-04-03 13:06:42.000000000 +0000 @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.16) project(indi-bresserexos2 VERSION 0.901) LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/") diff -Nru indi-bresserexos2-1.0+t202310010920~ubuntu22.04.1/indi-bresserexos2/cmake_modules/FindASTROASIS.cmake indi-bresserexos2-1.0+t202404031306~ubuntu22.04.1/indi-bresserexos2/cmake_modules/FindASTROASIS.cmake --- indi-bresserexos2-1.0+t202310010920~ubuntu22.04.1/indi-bresserexos2/cmake_modules/FindASTROASIS.cmake 2023-10-01 09:20:24.000000000 +0000 +++ indi-bresserexos2-1.0+t202404031306~ubuntu22.04.1/indi-bresserexos2/cmake_modules/FindASTROASIS.cmake 2024-04-03 13:06:43.000000000 +0000 @@ -22,12 +22,22 @@ ${GNUWIN32_DIR}/include ) - find_library(ASTROASIS_LIBRARIES NAMES oasisfocuser + find_library(ASTROASIS_FOCUSER_LIBRARIES NAMES oasisfocuser PATHS ${_obLinkDir} ${GNUWIN32_DIR}/lib ) + find_library(ASTROASIS_FILTER_WHEEL_LIBRARIES NAMES oasisfilterwheel + PATHS + ${_obLinkDir} + ${GNUWIN32_DIR}/lib + ) + + if (ASTROASIS_FOCUSER_LIBRARIES AND ASTROASIS_FILTER_WHEEL_LIBRARIES) + set(ASTROASIS_LIBRARIES ${ASTROASIS_FOCUSER_LIBRARIES} ${ASTROASIS_FILTER_WHEEL_LIBRARIES}) + endif (ASTROASIS_FOCUSER_LIBRARIES AND ASTROASIS_FILTER_WHEEL_LIBRARIES) + if(ASTROASIS_INCLUDE_DIR AND ASTROASIS_LIBRARIES) set(ASTROASIS_FOUND TRUE) else (ASTROASIS_INCLUDE_DIR AND ASTROASIS_LIBRARIES) diff -Nru indi-bresserexos2-1.0+t202310010920~ubuntu22.04.1/indi-bresserexos2/cmake_modules/FindGPIOD.cmake indi-bresserexos2-1.0+t202404031306~ubuntu22.04.1/indi-bresserexos2/cmake_modules/FindGPIOD.cmake --- indi-bresserexos2-1.0+t202310010920~ubuntu22.04.1/indi-bresserexos2/cmake_modules/FindGPIOD.cmake 1970-01-01 00:00:00.000000000 +0000 +++ indi-bresserexos2-1.0+t202404031306~ubuntu22.04.1/indi-bresserexos2/cmake_modules/FindGPIOD.cmake 2024-04-03 13:06:43.000000000 +0000 @@ -0,0 +1,55 @@ +# - Try to find GPIOD +# Once done this will define +# +# GPIOD_FOUND - system has libgpiod +# GPIOD_INCLUDE_DIR - the libgpiod include directory +# GPIOD_LIBRARIES - Link these to use libgpiod +# +# N.B. This is for C++ only, you need to include +# +#include +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + +if (GPIOD_INCLUDE_DIR AND GPIOD_LIBRARIES) + + # in cache already + set(GPIOD_FOUND TRUE) + message(STATUS "Found libgpiod: ${GPIOD_LIBRARIES}") + +else (GPIOD_INCLUDE_DIR AND GPIOD_LIBRARIES) + + find_path(GPIOD_INCLUDE_DIR gpiod.hpp + ${_obIncDir} + ${GNUWIN32_DIR}/include + /usr/local/include + ) + + find_library(GPIOD_LIBRARIES NAMES gpiodcxx + PATHS + ${_obLinkDir} + ${GNUWIN32_DIR}/lib + /usr/local/lib + ) + + if(GPIOD_INCLUDE_DIR AND GPIOD_LIBRARIES) + set(GPIOD_FOUND TRUE) + else (GPIOD_INCLUDE_DIR AND GPIOD_LIBRARIES) + set(GPIOD_FOUND FALSE) + endif(GPIOD_INCLUDE_DIR AND GPIOD_LIBRARIES) + + + if (GPIOD_FOUND) + if (NOT GPIOD_FIND_QUIETLY) + message(STATUS "Found GPIOD: ${GPIOD_LIBRARIES}") + endif (NOT GPIOD_FIND_QUIETLY) + else (GPIOD_FOUND) + if (GPIOD_FIND_REQUIRED) + message(FATAL_ERROR "libgpiod not found. Please install libgpiod-dev") + endif (GPIOD_FIND_REQUIRED) + endif (GPIOD_FOUND) + + mark_as_advanced(GPIOD_INCLUDE_DIR GPIOD_LIBRARIES) + +endif (GPIOD_INCLUDE_DIR AND GPIOD_LIBRARIES) diff -Nru indi-bresserexos2-1.0+t202310010920~ubuntu22.04.1/indi-bresserexos2/cmake_modules/FindINDI.cmake indi-bresserexos2-1.0+t202404031306~ubuntu22.04.1/indi-bresserexos2/cmake_modules/FindINDI.cmake --- indi-bresserexos2-1.0+t202310010920~ubuntu22.04.1/indi-bresserexos2/cmake_modules/FindINDI.cmake 2023-10-01 09:20:24.000000000 +0000 +++ indi-bresserexos2-1.0+t202404031306~ubuntu22.04.1/indi-bresserexos2/cmake_modules/FindINDI.cmake 2024-04-03 13:06:43.000000000 +0000 @@ -16,6 +16,7 @@ # The following variables will be defined for your use: # - INDI_FOUND : were all of your specified components found (include dependencies)? # - INDI_WEBSOCKET : was INDI compiled with websocket support? +# - INDI_JSONLIB : was INDI compiled with bundled json library? # - INDI_INCLUDE_DIR : INDI include directory # - INDI_DATA_DIR : INDI include directory # - INDI_LIBRARIES : INDI libraries @@ -199,6 +200,21 @@ SET(INDI_WEBSOCKET FALSE) endif() +find_path( + BUNDLED_JSONLIB + indijson.hpp + PATH_SUFFIXES libindi + ${PC_INDI_INCLUDE_DIR} + ${_obIncDir} + ${GNUWIN32_DIR}/include +) + +if (BUNDLED_JSONLIB) + SET(INDI_JSONLIB TRUE) +else() + SET(INDI_JSONLIB FALSE) +endif() + find_path(${INDI_PUBLIC_VAR_NS}_DATA_DIR drivers.xml PATH_SUFFIXES share/indi diff -Nru indi-bresserexos2-1.0+t202310010920~ubuntu22.04.1/indi-bresserexos2/cmake_modules/FindLibCamera.cmake indi-bresserexos2-1.0+t202404031306~ubuntu22.04.1/indi-bresserexos2/cmake_modules/FindLibCamera.cmake --- indi-bresserexos2-1.0+t202310010920~ubuntu22.04.1/indi-bresserexos2/cmake_modules/FindLibCamera.cmake 1970-01-01 00:00:00.000000000 +0000 +++ indi-bresserexos2-1.0+t202404031306~ubuntu22.04.1/indi-bresserexos2/cmake_modules/FindLibCamera.cmake 2024-04-03 13:06:43.000000000 +0000 @@ -0,0 +1,49 @@ +# - Try to find LIBCAMERA Library +# Once done this will define +# +# LibCamera_FOUND - system has LibCamera +# LibCamera_LIBRARY - Link these to use LibCamera +# LibCamera_INCLUDE_DIR - Libcamera include Dir + +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + +if (LibCamera_INCLUDE_DIR AND LibCamera_LIBRARY) + + # in cache already + set(LibCamera_FOUND TRUE) + message(STATUS "Found LIBCAMERAAPPS: ${LibCamera_INCLUDE_DIR}") + +else (LibCamera_INCLUDE_DIR AND LibCamera_LIBRARY) + + find_library(LibCamera_LIBRARY NAMES camera + PATHS + ${_obLinkDir} + ${GNUWIN32_DIR}/lib + ) + + find_path(LibCamera_INCLUDE_DIR libcamera/camera_manager.h + PATH_SUFFIXES libcamera + ${_obIncDir} + ${GNUWIN32_DIR}/include + ) + + if (LibCamera_INCLUDE_DIR AND LibCamera_LIBRARY) + set(LibCamera_FOUND TRUE) + else(LibCamera_INCLUDE_DIR AND LibCamera_LIBRARY) + set(LibCamera_FOUND FALSE) + endif(LibCamera_INCLUDE_DIR AND LibCamera_LIBRARY) + + if (LibCamera_FOUND) + if (NOT LibCamera_FIND_QUIETLY) + message(STATUS "Found LIBCAMERA Library: ${LibCamera_LIBRARY}") + endif (NOT LibCamera_FIND_QUIETLY) + else (LibCamera_FOUND) + if (LibCamera_FIND_REQUIRED) + message(FATAL_ERROR "LIBCAMERA Library not found. Please install libcamera-dev") + endif (LibCamera_FIND_REQUIRED) + endif (LibCamera_FOUND) + + mark_as_advanced(LibCamera_LIBRARY LibCamera_INCLUDE_DIR) + +endif (LibCamera_INCLUDE_DIR AND LibCamera_LIBRARY) diff -Nru indi-bresserexos2-1.0+t202310010920~ubuntu22.04.1/indi-bresserexos2/cmake_modules/FindLibCameraApps.cmake indi-bresserexos2-1.0+t202404031306~ubuntu22.04.1/indi-bresserexos2/cmake_modules/FindLibCameraApps.cmake --- indi-bresserexos2-1.0+t202310010920~ubuntu22.04.1/indi-bresserexos2/cmake_modules/FindLibCameraApps.cmake 2023-10-01 09:20:24.000000000 +0000 +++ indi-bresserexos2-1.0+t202404031306~ubuntu22.04.1/indi-bresserexos2/cmake_modules/FindLibCameraApps.cmake 2024-04-03 13:06:43.000000000 +0000 @@ -1,77 +1,49 @@ # - 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 +# LibCameraApps_FOUND - system has LIBCAMERAAPPS +# LibCameraApps_LIBRARY - Link these to use LibCameraApps +# LibCameraApps_INCLUDE_DIR - LibcameraApps include Dir # 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) +if (LibCameraApps_INCLUDE_DIR AND LibCameraApps_LIBRARY) # in cache already - set(LIBCAMERAAPPS_FOUND TRUE) - message(STATUS "Found LIBCAMERAAPPS: ${LIBCAMERAAPPS_APPS}") + set(LibCameraApps_FOUND TRUE) + message(STATUS "Found LIBCAMERAAPPS: ${LibCameraApps_INCLUDE_DIR}") -else (LIBCAMERAAPPS_APPS) +else (LibCameraApps_INCLUDE_DIR AND LibCameraApps_LIBRARY) - find_library(LIBCAMERAAPPS_APPS NAMES camera_app + find_library(LibCameraApps_LIBRARY 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_path(LibCameraApps_INCLUDE_DIR core/rpicam_app.hpp + PATH_SUFFIXES rpicam-apps + ${_obIncDir} + ${GNUWIN32_DIR}/include + ) - 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_INCLUDE_DIR AND LibCameraApps_LIBRARY) + set(LibCameraApps_FOUND TRUE) + else(LibCameraApps_INCLUDE_DIR AND LibCameraApps_LIBRARY) + set(LibCameraApps_FOUND FALSE) + endif(LibCameraApps_INCLUDE_DIR AND LibCameraApps_LIBRARY) - 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) + if (LibCameraApps_FOUND) + if (NOT LibCameraApps_FIND_QUIETLY) + message(STATUS "Found LIBCAMERAAPPS Library: ${LibCameraApps_LIBRARY}") + endif (NOT LibCameraApps_FIND_QUIETLY) + else (LibCameraApps_FOUND) + if (LibCameraApps_FIND_REQUIRED) + message(FATAL_ERROR "LIBCAMERAAPPS Library not found. Please install rpicam-apps") + endif (LibCameraApps_FIND_REQUIRED) + endif (LibCameraApps_FOUND) - mark_as_advanced(LIBCAMERAAPPS_APPS LIBCAMERAAPPS_ENCODERS LIBCAMERAAPPS_IMAGES LIBCAMERAAPPS_OUTPUTS LIBCAMERAAPPS_POST LIBCAMERAAPPS_PREVIEW) + mark_as_advanced(LibCameraApps_LIBRARY LibCameraApps_INCLUDE_DIR) -endif (LIBCAMERAAPPS_APPS) +endif (LibCameraApps_INCLUDE_DIR AND LibCameraApps_LIBRARY) diff -Nru indi-bresserexos2-1.0+t202310010920~ubuntu22.04.1/indi-bresserexos2/cmake_modules/FindMEADECAM.cmake indi-bresserexos2-1.0+t202404031306~ubuntu22.04.1/indi-bresserexos2/cmake_modules/FindMEADECAM.cmake --- indi-bresserexos2-1.0+t202310010920~ubuntu22.04.1/indi-bresserexos2/cmake_modules/FindMEADECAM.cmake 1970-01-01 00:00:00.000000000 +0000 +++ indi-bresserexos2-1.0+t202404031306~ubuntu22.04.1/indi-bresserexos2/cmake_modules/FindMEADECAM.cmake 2024-04-03 13:06:43.000000000 +0000 @@ -0,0 +1,50 @@ +# - Try to find Meade Cam Camera Library +# Once done this will define +# +# MEADECAM_FOUND - system has Meade Cam +# MEADECAM_INCLUDE_DIR - the Meade Cam include directory +# MEADECAM_LIBRARIES - Link these to use Meade Cam + +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + +if (MEADECAM_INCLUDE_DIR AND MEADECAM_LIBRARIES) + + # in cache already + set(MEADECAM_FOUND TRUE) + message(STATUS "Found libmeadecam: ${MEADECAM_LIBRARIES}") + +else (MEADECAM_INCLUDE_DIR AND MEADECAM_LIBRARIES) + + find_path(MEADECAM_INCLUDE_DIR meadecam.h + PATH_SUFFIXES libmeadecam + ${_obIncDir} + ${GNUWIN32_DIR}/include + ) + + find_library(MEADECAM_LIBRARIES NAMES meadecam + PATHS + ${_obLinkDir} + ${GNUWIN32_DIR}/lib + ) + + if(MEADECAM_INCLUDE_DIR AND MEADECAM_LIBRARIES) + set(MEADECAM_FOUND TRUE) + else (MEADECAM_INCLUDE_DIR AND MEADECAM_LIBRARIES) + set(MEADECAM_FOUND FALSE) + endif(MEADECAM_INCLUDE_DIR AND MEADECAM_LIBRARIES) + + + if (MEADECAM_FOUND) + if (NOT MEADECAM_FIND_QUIETLY) + message(STATUS "Found MeadeCam: ${MEADECAM_LIBRARIES}") + endif (NOT MEADECAM_FIND_QUIETLY) + else (MEADECAM_FOUND) + if (MEADECAM_FIND_REQUIRED) + message(FATAL_ERROR "MeadeCam not found. Please install MeadeCam Library http://www.indilib.org") + endif (MEADECAM_FIND_REQUIRED) + endif (MEADECAM_FOUND) + + mark_as_advanced(MEADECAM_INCLUDE_DIR MEADECAM_LIBRARIES) + +endif (MEADECAM_INCLUDE_DIR AND MEADECAM_LIBRARIES) diff -Nru indi-bresserexos2-1.0+t202310010920~ubuntu22.04.1/indi-bresserexos2/cmake_modules/FindZMQ.cmake indi-bresserexos2-1.0+t202404031306~ubuntu22.04.1/indi-bresserexos2/cmake_modules/FindZMQ.cmake --- indi-bresserexos2-1.0+t202310010920~ubuntu22.04.1/indi-bresserexos2/cmake_modules/FindZMQ.cmake 1970-01-01 00:00:00.000000000 +0000 +++ indi-bresserexos2-1.0+t202404031306~ubuntu22.04.1/indi-bresserexos2/cmake_modules/FindZMQ.cmake 2024-04-03 13:06:43.000000000 +0000 @@ -0,0 +1,49 @@ +# - Try to find ZMQ +# Once done this will define +# +# ZMQ_FOUND - system has ZMQ +# ZMQ_INCLUDE_DIR - the ZMQ include directory +# ZMQ_LIBRARIES - Link these to use ZMQ + +if (ZMQ_INCLUDE_DIR AND ZMQ_LIBRARIES) + + # in cache already + set(ZMQ_FOUND TRUE) + message(STATUS "Found libzmq: ${ZMQ_LIBRARIES}") + +else (ZMQ_INCLUDE_DIR AND ZMQ_LIBRARIES) + + find_path(ZMQ_INCLUDE_DIR + NAMES zmq.h + ${_obIncDir} + ${GNUWIN32_DIR}/include + ) + + find_library(ZMQ_LIBRARIES + NAMES zmq + PATHS + ${_obLinkDir} + ${GNUWIN32_DIR}/lib + ) + + + if(ZMQ_INCLUDE_DIR AND ZMQ_LIBRARIES) + set(ZMQ_FOUND TRUE) + else(ZMQ_INCLUDE_DIR AND ZMQ_LIBRARIES) + set(ZMQ_FOUND FALSE) + endif(ZMQ_INCLUDE_DIR AND ZMQ_LIBRARIES) + + + if (ZMQ_FOUND) + if (NOT ZMQ_FIND_QUIETLY) + message(STATUS "Found ZMQ ${ZMQ_LIBRARIES}") + endif (NOT ZMQ_FIND_QUIETLY) + else (ZMQ_FOUND) + if (ZMQ_FIND_REQUIRED) + message(STATUS "ZMQ not found. Please install libzmq development package.") + endif (ZMQ_FIND_REQUIRED) + endif (ZMQ_FOUND) + + mark_as_advanced(ZMQ_INCLUDE_DIR ZMQ_LIBRARIES) + +endif (ZMQ_INCLUDE_DIR AND ZMQ_LIBRARIES)