diff -Nru libfli-2.0/cmake_modules/FindFFmpeg.cmake libfli-2.0+20220607003743/cmake_modules/FindFFmpeg.cmake --- libfli-2.0/cmake_modules/FindFFmpeg.cmake 2021-10-27 07:10:30.000000000 +0000 +++ libfli-2.0+20220607003743/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 libfli-2.0/cmake_modules/FindOMEGONPROCAM.cmake libfli-2.0+20220607003743/cmake_modules/FindOMEGONPROCAM.cmake --- libfli-2.0/cmake_modules/FindOMEGONPROCAM.cmake 1970-01-01 00:00:00.000000000 +0000 +++ libfli-2.0+20220607003743/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 libfli-2.0/debian/changelog libfli-2.0+20220607003743/debian/changelog --- libfli-2.0/debian/changelog 2021-12-12 21:30:07.000000000 +0000 +++ libfli-2.0+20220607003743/debian/changelog 2022-06-07 00:37:54.000000000 +0000 @@ -1,3 +1,10 @@ +libfli (2.0+20220607003743-1) unstable; urgency=medium + + * build version from git + * based on indi-3rdparty release 1.9.6 + + -- Thorsten Alteholz Tue, 07 Jun 2022 00:37:54 +0000 + libfli (2.0-2) unstable; urgency=medium * upload sources diff -Nru libfli-2.0/indi-3rdparty-infos/changelog libfli-2.0+20220607003743/indi-3rdparty-infos/changelog --- libfli-2.0/indi-3rdparty-infos/changelog 2021-10-27 07:10:30.000000000 +0000 +++ libfli-2.0+20220607003743/indi-3rdparty-infos/changelog 1970-01-01 00:00:00.000000000 +0000 @@ -1,30 +0,0 @@ -libfli (2.0) bionic; urgency=medium - - * New release based on libusb - - -- Jasem Mutlaq Wed, 14 Feb 2018 13:00:00 +0300 - -libfli (1.9) bionic; urgency=medium - - * New release - - -- Jasem Mutlaq Sun, 22 Jan 2018 08:45:00 +0300 - -libfli1 (1.8.ubuntu5) oneiric; urgency=low - - * Oneiric release - - -- Jasem Mutlaq Sun, 15 Jan 2012 14:00:00 +0300 - -libfli1 (1.8ubuntu4) natty; urgency=low - - * Natty release - - -- Jasem Mutlaq Tue, 31 May 2011 23:20:22 +0300 - -libfli1 (1.8ubuntu3) maverick; urgency=low - - * Do not use version numbers in dev packages. - - -- Jasem Mutlaq Fri, 08 Apr 2011 23:43:12 +0300 - diff -Nru libfli-2.0/unix/libusb/libfli-usb-sys.c libfli-2.0+20220607003743/unix/libusb/libfli-usb-sys.c --- libfli-2.0/unix/libusb/libfli-usb-sys.c 2021-10-27 07:10:31.000000000 +0000 +++ libfli-2.0+20220607003743/unix/libusb/libfli-usb-sys.c 2022-01-27 20:29:34.000000000 +0000 @@ -260,7 +260,7 @@ break; } - /* Set *len to the number of bytes actually transfered */ + /* Set *len to the number of bytes actually transferred */ if (remaining) err = -errno; *len -= remaining; diff -Nru libfli-2.0/unix/linux/libfli-usb-sys.c libfli-2.0+20220607003743/unix/linux/libfli-usb-sys.c --- libfli-2.0/unix/linux/libfli-usb-sys.c 2021-10-27 07:10:31.000000000 +0000 +++ libfli-2.0+20220607003743/unix/linux/libfli-usb-sys.c 2022-01-27 20:29:34.000000000 +0000 @@ -173,7 +173,7 @@ bulkxfer.timeout = DEVICE->io_timeout; bulkxfer.buf = buf + *len - remaining; - /* This ioctl returns the number of bytes transfered */ + /* This ioctl returns the number of bytes transferred */ bytes = ioctl(io->fd, (ep & USB_DIR_IN) ? FLIUSB_BULKREAD : FLIUSB_BULKWRITE, &bulkxfer);