diff -Nru indi-avalonud-2.2+t202312031409~ubuntu23.10.1/debian/changelog indi-avalonud-2.2+t202402030647~ubuntu23.10.1/debian/changelog --- indi-avalonud-2.2+t202312031409~ubuntu23.10.1/debian/changelog 2023-12-03 14:09:22.000000000 +0000 +++ indi-avalonud-2.2+t202402030647~ubuntu23.10.1/debian/changelog 2024-02-03 06:47:30.000000000 +0000 @@ -1,8 +1,8 @@ -indi-avalonud (2.2+t202312031409~ubuntu23.10.1) mantic; urgency=low +indi-avalonud (2.2+t202402030647~ubuntu23.10.1) mantic; urgency=low * Auto build. - -- Jasem Mutlaq Sun, 03 Dec 2023 14:09:22 +0000 + -- Jasem Mutlaq Sat, 03 Feb 2024 06:47:30 +0000 indi-avalonud (2.2) jammy; urgency=medium diff -Nru indi-avalonud-2.2+t202312031409~ubuntu23.10.1/debian/git-build-recipe.manifest indi-avalonud-2.2+t202402030647~ubuntu23.10.1/debian/git-build-recipe.manifest --- indi-avalonud-2.2+t202312031409~ubuntu23.10.1/debian/git-build-recipe.manifest 2023-12-03 14:09:22.000000000 +0000 +++ indi-avalonud-2.2+t202402030647~ubuntu23.10.1/debian/git-build-recipe.manifest 2024-02-03 06:47:30.000000000 +0000 @@ -1,5 +1,5 @@ -# git-build-recipe format 0.4 deb-version {debupstream}+t202312031409 +# git-build-recipe format 0.4 deb-version {debupstream}+t202402030647 lp:~mutlaqja/+git/dummy git-commit:9a182f35d7f48b02de1170889c0798f3ab639afb -nest-part src lp:~mutlaqja/libindi/+git/trunk indi-avalonud indi-avalonud git-commit:56f87edccfa1b35d2a839f4cec20f8810788e334 -nest-part cmake lp:~mutlaqja/libindi/+git/trunk cmake_modules indi-avalonud/cmake_modules git-commit:56f87edccfa1b35d2a839f4cec20f8810788e334 -nest-part pack lp:~mutlaqja/libindi/+git/trunk debian/indi-avalonud debian git-commit:56f87edccfa1b35d2a839f4cec20f8810788e334 +nest-part src lp:~mutlaqja/libindi/+git/trunk indi-avalonud indi-avalonud git-commit:bb07fa3ebecce9da97a2d9e03e2f86b542691c91 +nest-part cmake lp:~mutlaqja/libindi/+git/trunk cmake_modules indi-avalonud/cmake_modules git-commit:bb07fa3ebecce9da97a2d9e03e2f86b542691c91 +nest-part pack lp:~mutlaqja/libindi/+git/trunk debian/indi-avalonud debian git-commit:bb07fa3ebecce9da97a2d9e03e2f86b542691c91 diff -Nru indi-avalonud-2.2+t202312031409~ubuntu23.10.1/indi-avalonud/CMakeLists.txt indi-avalonud-2.2+t202402030647~ubuntu23.10.1/indi-avalonud/CMakeLists.txt --- indi-avalonud-2.2+t202312031409~ubuntu23.10.1/indi-avalonud/CMakeLists.txt 2023-12-03 14:09:18.000000000 +0000 +++ indi-avalonud-2.2+t202402030647~ubuntu23.10.1/indi-avalonud/CMakeLists.txt 2024-02-03 06:47:27.000000000 +0000 @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.16) project(indi-avalonud CXX C) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/") @@ -13,6 +13,16 @@ find_package(Threads REQUIRED) find_package(ZMQ REQUIRED) +if(INDI_JSONLIB) + set(JSONLIB "") + message(STATUS "Using indi bundled json library") +else(INDI_JSONLIB) + find_package(nlohmann_json REQUIRED) + add_definitions(-D_USE_SYSTEM_JSONLIB) + set(JSONLIB nlohmann_json::nlohmann_json) + message(STATUS "Using system provided Niels Lohmann's json library") +endif(INDI_JSONLIB) + configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h @@ -37,7 +47,7 @@ indi_avalonud_telescope ${CMAKE_CURRENT_SOURCE_DIR}/indi_avalonud_telescope.cpp ) -target_link_libraries(indi_avalonud_telescope ${INDI_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${ZMQ_LIBRARIES}) +target_link_libraries(indi_avalonud_telescope ${INDI_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${ZMQ_LIBRARIES} ${JSONLIB}) install(TARGETS indi_avalonud_telescope RUNTIME DESTINATION bin) @@ -47,7 +57,7 @@ indi_avalonud_focuser ${CMAKE_CURRENT_SOURCE_DIR}/indi_avalonud_focuser.cpp ) -target_link_libraries(indi_avalonud_focuser ${INDI_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${ZMQ_LIBRARIES}) +target_link_libraries(indi_avalonud_focuser ${INDI_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${ZMQ_LIBRARIES} ${JSONLIB}) install(TARGETS indi_avalonud_focuser RUNTIME DESTINATION bin) @@ -57,7 +67,7 @@ indi_avalonud_aux ${CMAKE_CURRENT_SOURCE_DIR}/indi_avalonud_aux.cpp ) -target_link_libraries(indi_avalonud_aux ${INDI_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${ZMQ_LIBRARIES}) +target_link_libraries(indi_avalonud_aux ${INDI_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${ZMQ_LIBRARIES} ${JSONLIB}) install(TARGETS indi_avalonud_aux RUNTIME DESTINATION bin) diff -Nru indi-avalonud-2.2+t202312031409~ubuntu23.10.1/indi-avalonud/cmake_modules/FindGPIOD.cmake indi-avalonud-2.2+t202402030647~ubuntu23.10.1/indi-avalonud/cmake_modules/FindGPIOD.cmake --- indi-avalonud-2.2+t202312031409~ubuntu23.10.1/indi-avalonud/cmake_modules/FindGPIOD.cmake 1970-01-01 00:00:00.000000000 +0000 +++ indi-avalonud-2.2+t202402030647~ubuntu23.10.1/indi-avalonud/cmake_modules/FindGPIOD.cmake 2024-02-03 06:47:28.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-avalonud-2.2+t202312031409~ubuntu23.10.1/indi-avalonud/cmake_modules/FindINDI.cmake indi-avalonud-2.2+t202402030647~ubuntu23.10.1/indi-avalonud/cmake_modules/FindINDI.cmake --- indi-avalonud-2.2+t202312031409~ubuntu23.10.1/indi-avalonud/cmake_modules/FindINDI.cmake 2023-12-03 14:09:20.000000000 +0000 +++ indi-avalonud-2.2+t202402030647~ubuntu23.10.1/indi-avalonud/cmake_modules/FindINDI.cmake 2024-02-03 06:47:28.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-avalonud-2.2+t202312031409~ubuntu23.10.1/indi-avalonud/cmake_modules/FindLibCamera.cmake indi-avalonud-2.2+t202402030647~ubuntu23.10.1/indi-avalonud/cmake_modules/FindLibCamera.cmake --- indi-avalonud-2.2+t202312031409~ubuntu23.10.1/indi-avalonud/cmake_modules/FindLibCamera.cmake 1970-01-01 00:00:00.000000000 +0000 +++ indi-avalonud-2.2+t202402030647~ubuntu23.10.1/indi-avalonud/cmake_modules/FindLibCamera.cmake 2024-02-03 06:47:28.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-avalonud-2.2+t202312031409~ubuntu23.10.1/indi-avalonud/cmake_modules/FindLibCameraApps.cmake indi-avalonud-2.2+t202402030647~ubuntu23.10.1/indi-avalonud/cmake_modules/FindLibCameraApps.cmake --- indi-avalonud-2.2+t202312031409~ubuntu23.10.1/indi-avalonud/cmake_modules/FindLibCameraApps.cmake 2023-12-03 14:09:20.000000000 +0000 +++ indi-avalonud-2.2+t202402030647~ubuntu23.10.1/indi-avalonud/cmake_modules/FindLibCameraApps.cmake 2024-02-03 06:47:28.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-avalonud-2.2+t202312031409~ubuntu23.10.1/indi-avalonud/indi_avalonud_aux.cpp indi-avalonud-2.2+t202402030647~ubuntu23.10.1/indi-avalonud/indi_avalonud_aux.cpp --- indi-avalonud-2.2+t202312031409~ubuntu23.10.1/indi-avalonud/indi_avalonud_aux.cpp 2023-12-03 14:09:18.000000000 +0000 +++ indi-avalonud-2.2+t202402030647~ubuntu23.10.1/indi-avalonud/indi_avalonud_aux.cpp 2024-02-03 06:47:27.000000000 +0000 @@ -25,7 +25,11 @@ #include #include #include -#include +#ifdef _USE_SYSTEM_JSONLIB +#include +#else +#include +#endif #include #include #include diff -Nru indi-avalonud-2.2+t202312031409~ubuntu23.10.1/indi-avalonud/indi_avalonud_focuser.cpp indi-avalonud-2.2+t202402030647~ubuntu23.10.1/indi-avalonud/indi_avalonud_focuser.cpp --- indi-avalonud-2.2+t202312031409~ubuntu23.10.1/indi-avalonud/indi_avalonud_focuser.cpp 2023-12-03 14:09:18.000000000 +0000 +++ indi-avalonud-2.2+t202402030647~ubuntu23.10.1/indi-avalonud/indi_avalonud_focuser.cpp 2024-02-03 06:47:27.000000000 +0000 @@ -25,7 +25,11 @@ #include #include #include -#include +#ifdef _USE_SYSTEM_JSONLIB +#include +#else +#include +#endif #include #include #include diff -Nru indi-avalonud-2.2+t202312031409~ubuntu23.10.1/indi-avalonud/indi_avalonud_telescope.cpp indi-avalonud-2.2+t202402030647~ubuntu23.10.1/indi-avalonud/indi_avalonud_telescope.cpp --- indi-avalonud-2.2+t202312031409~ubuntu23.10.1/indi-avalonud/indi_avalonud_telescope.cpp 2023-12-03 14:09:18.000000000 +0000 +++ indi-avalonud-2.2+t202402030647~ubuntu23.10.1/indi-avalonud/indi_avalonud_telescope.cpp 2024-02-03 06:47:27.000000000 +0000 @@ -34,7 +34,11 @@ #include #include #include -#include +#ifdef _USE_SYSTEM_JSONLIB +#include +#else +#include +#endif #include #include #include