From c5a10079da322e8dd7be3c0a1921493501c4ac4b Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sat, 11 Nov 2017 18:48:47 +0100 Subject: [PATCH 1/6] Change weak dependency to full dependency for EPEL7 --- phd2.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/phd2.spec b/phd2.spec index 7eb6087..12230c9 100644 --- a/phd2.spec +++ b/phd2.spec @@ -1,6 +1,6 @@ Name: phd2 Version: 2.6.4 -Release: 3%{?dist} +Release: 3.1%{?dist} Summary: Telescope guiding software # Main program files are BSD licensed # Some components have different licenses: @@ -45,7 +45,7 @@ BuildRequires: pkgconfig(libindi) BuildRequires: pkgconfig(libusb-1.0) BuildRequires: pkgconfig(zlib) -Recommends: libindi +Requires: libindi %description @@ -116,6 +116,9 @@ fi %changelog +* Sat Nov 11 2017 Mattia Verga - 2.6.4-3.1 +- Change weak dependency to standard dependency for EPEL7 + * Sun Nov 05 2017 Mattia Verga - 2.6.4-3 - Fix spurious exec bits and line endings - Use more macros From 8604d5eaf94b75acd1d686eb60a6c544e6f9db22 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sat, 11 Nov 2017 18:54:48 +0100 Subject: [PATCH 2/6] Change macros to cmake3 for EPEL --- phd2.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/phd2.spec b/phd2.spec index 12230c9..3db0837 100644 --- a/phd2.spec +++ b/phd2.spec @@ -27,7 +27,7 @@ Patch99: phd2_cflags.patch # This is Fedora specific and not reported upstream Patch100: phd2_disable_cams.patch -BuildRequires: cmake +BuildRequires: cmake3 BuildRequires: desktop-file-utils BuildRequires: dos2unix BuildRequires: extra-cmake-modules @@ -67,7 +67,7 @@ dos2unix README-PHD2.txt %build mkdir -p %{_target_platform} pushd %{_target_platform} -%{cmake} -DUSE_SYSTEM_CFITSIO=ON \ +%{cmake3} -DUSE_SYSTEM_CFITSIO=ON \ -DUSE_SYSTEM_LIBUSB=ON \ -DUSE_SYSTEM_EIGEN3=ON \ -DUSE_SYSTEM_GTEST=ON .. @@ -118,6 +118,7 @@ fi %changelog * Sat Nov 11 2017 Mattia Verga - 2.6.4-3.1 - Change weak dependency to standard dependency for EPEL7 +- Change macros to cmake3 in EPEL * Sun Nov 05 2017 Mattia Verga - 2.6.4-3 - Fix spurious exec bits and line endings From d85b25eabf06cbe75cd9e617bd372e62c958411d Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Mon, 7 May 2018 19:11:05 +0200 Subject: [PATCH 3/6] Update to 2.6.5 Remove obsolete scriptlets Use upstream patch to disable third party camera drivers --- .gitignore | 1 + phd2.spec | 37 +++----- phd2_2.6.5_disable_cams.patch | 146 +++++++++++++++++++++++++++++ phd2_appdata_location_change.patch | 12 --- phd2_disable_cams.patch | 76 --------------- sources | 2 +- 6 files changed, 162 insertions(+), 112 deletions(-) create mode 100644 phd2_2.6.5_disable_cams.patch delete mode 100644 phd2_appdata_location_change.patch delete mode 100644 phd2_disable_cams.patch diff --git a/.gitignore b/.gitignore index 755ab01..bfedc60 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /phd2-2.6.4-purged.tar.xz +/phd2-2.6.5-purged.tar.xz diff --git a/phd2.spec b/phd2.spec index 3db0837..f39474f 100644 --- a/phd2.spec +++ b/phd2.spec @@ -1,6 +1,6 @@ Name: phd2 -Version: 2.6.4 -Release: 3.1%{?dist} +Version: 2.6.5 +Release: 1%{?dist} Summary: Telescope guiding software # Main program files are BSD licensed # Some components have different licenses: @@ -16,16 +16,12 @@ Source0: %{name}-%{version}-purged.tar.xz # Script to purge binaries and unneeded files from downloaded sources Source1: generate-tarball.sh -# Correct appdata files location -# https://github.com/OpenPHDGuiding/phd2/pull/658 -Patch1: phd2_appdata_location_change.patch - # Use C++14 flag Patch99: phd2_cflags.patch -# We need to disable camera firmwares we removed from sources -# This is Fedora specific and not reported upstream -Patch100: phd2_disable_cams.patch +# Backported patch from upstream to disable camera firmwares we removed from sources +# https://github.com/OpenPHDGuiding/phd2/issues/690 +Patch100: phd2_2.6.5_disable_cams.patch BuildRequires: cmake3 BuildRequires: desktop-file-utils @@ -70,7 +66,9 @@ pushd %{_target_platform} %{cmake3} -DUSE_SYSTEM_CFITSIO=ON \ -DUSE_SYSTEM_LIBUSB=ON \ -DUSE_SYSTEM_EIGEN3=ON \ - -DUSE_SYSTEM_GTEST=ON .. + -DUSE_SYSTEM_GTEST=ON \ + -DUSE_SYSTEM_LIBINDI=ON \ + -DOPENSOURCE_ONLY=ON .. %make_build @@ -86,24 +84,12 @@ popd # Tests are failing on x86 with GCC7 # https://github.com/OpenPHDGuiding/phd2/issues/608 %ifnarch %{ix86} -make test -C %{_target_platform} +env CTEST_OUTPUT_ON_FAILURE=1 make test -C %{_target_platform} %endif desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{name}.appdata.xml -%post -/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : - -%postun -if [ $1 -eq 0 ] ; then - /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null - /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -fi - -%posttrans -/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - %files -f %{name}.lang %doc README.txt README-PHD2.txt PHD_2.0_Architecture.docx @@ -116,6 +102,11 @@ fi %changelog +* Mon May 07 2018 Mattia Verga - 2.6.5-1 +- Upgrade to 2.6.5 +- Remove obsolete scriptlets +- Use upstream patch to disable third party drivers + * Sat Nov 11 2017 Mattia Verga - 2.6.4-3.1 - Change weak dependency to standard dependency for EPEL7 - Change macros to cmake3 in EPEL diff --git a/phd2_2.6.5_disable_cams.patch b/phd2_2.6.5_disable_cams.patch new file mode 100644 index 0000000..db633c2 --- /dev/null +++ b/phd2_2.6.5_disable_cams.patch @@ -0,0 +1,146 @@ +From 0d87a84540e90bb17e6d4183fd32d422c410861f Mon Sep 17 00:00:00 2001 +From: Andy Galasso +Date: Mon, 7 May 2018 12:19:46 -0400 +Subject: [PATCH] Linux: add option to exclude binary drivers from build (ZWO + and QHY) + +--- + cameras.h | 4 +- + thirdparty/thirdparty.cmake | 104 +++++++++++++++++++++++--------------------- + 2 files changed, 58 insertions(+), 50 deletions(-) + +diff --git a/cameras.h b/cameras.h +index 4d4ba67c..a7cdff02 100644 +--- a/cameras.h ++++ b/cameras.h +@@ -109,7 +109,9 @@ + # define QHY_CAMERA + # endif + # define INDI_CAMERA +-# define ZWO_ASI ++# ifdef HAVE_ZWO_CAMERA ++# define ZWO_ASI ++# endif + # define SXV + # ifdef HAVE_SBIG_CAMERA + # define SBIG +diff --git a/thirdparty/thirdparty.cmake b/thirdparty/thirdparty.cmake +index 2bb1de8c..88157b2d 100644 +--- a/thirdparty/thirdparty.cmake ++++ b/thirdparty/thirdparty.cmake +@@ -1207,60 +1207,66 @@ endif() # APPLE + ############################################# + if(UNIX AND NOT APPLE) + +- if (CMAKE_SYSTEM_PROCESSOR MATCHES "^armv6(.*)") +- set(arch "armv6") +- set(qhyarch "armv6") +- elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^armv7(.*)|arm64|aarch64|^armv8(.*)") +- if(CMAKE_SIZEOF_VOID_P EQUAL 8) +- set(arch "armv8") +- set(qhyarch "armv8") +- else() +- set(arch "armv7") +- set(qhyarch "armv7") +- endif() +- elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "x86|X86|amd64|AMD64|i.86") +- if(CMAKE_SIZEOF_VOID_P EQUAL 8) +- set(arch "x64") +- set(qhyarch "x86_64") +- else() +- set(arch "x86") +- set(qhyarch "x86_32") +- endif() +- else() +- message(FATAL_ERROR "unknown system architecture") +- endif() +- +- find_path(ZWO_INCLUDE_DIR ASICamera2.h +- NO_DEFAULT_PATHS +- PATHS ${PHD_PROJECT_ROOT_DIR}/cameras +- ) ++ if (NOT OPENSOURCE_ONLY) ++ ++ if (CMAKE_SYSTEM_PROCESSOR MATCHES "^armv6(.*)") ++ set(zwoarch "armv6") ++ set(qhyarch "armv6") ++ elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^armv7(.*)|arm64|aarch64|^armv8(.*)") ++ if(CMAKE_SIZEOF_VOID_P EQUAL 8) ++ set(zwoarch "armv8") ++ set(qhyarch "armv8") ++ else() ++ set(zwoarch "armv7") ++ set(qhyarch "armv7") ++ endif() ++ elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "x86|X86|amd64|AMD64|i.86") ++ if(CMAKE_SIZEOF_VOID_P EQUAL 8) ++ set(zwoarch "x64") ++ set(qhyarch "x86_64") ++ else() ++ set(zwoarch "x86") ++ set(qhyarch "x86_32") ++ endif() ++ else() ++ message(FATAL_ERROR "unknown system architecture") ++ endif() + +- find_library(asiCamera2 +- NAMES ASICamera2 +- NO_DEFAULT_PATHS +- PATHS ${PHD_PROJECT_ROOT_DIR}/cameras/zwolibs/${arch}) +- if(NOT asiCamera2) +- message(FATAL_ERROR "Cannot find the asiCamera2 drivers") +- endif() +- message(STATUS "Found ASICamera2 lib ${asiCamera2}") +- set(PHD_LINK_EXTERNAL ${PHD_LINK_EXTERNAL} ${asiCamera2}) ++ find_path(ZWO_INCLUDE_DIR ASICamera2.h ++ NO_DEFAULT_PATHS ++ PATHS ${PHD_PROJECT_ROOT_DIR}/cameras ++ ) + +- if(IS_DIRECTORY ${PHD_PROJECT_ROOT_DIR}/cameras/qhyccdlibs/linux/${qhyarch}) +- add_definitions(-DHAVE_QHY_CAMERA=1) ++ find_library(asiCamera2 ++ NAMES ASICamera2 ++ NO_DEFAULT_PATHS ++ PATHS ${PHD_PROJECT_ROOT_DIR}/cameras/zwolibs/${zwoarch}) + +- # be careful not to pick up any other qhy lib on the system +- find_library( qhylib +- NAMES qhy +- NO_DEFAULT_PATH +- PATHS ${PHD_PROJECT_ROOT_DIR}/cameras/qhyccdlibs/linux/${qhyarch}) +- if(NOT qhylib) +- message(FATAL_ERROR "Cannot find the qhy SDK libs") ++ if(NOT asiCamera2) ++ message(FATAL_ERROR "Cannot find the asiCamera2 drivers") + endif() +- set(PHD_LINK_EXTERNAL ${PHD_LINK_EXTERNAL} ${qhylib}) +- endif() ++ message(STATUS "Found ASICamera2 lib ${asiCamera2}") ++ add_definitions(-DHAVE_ZWO_CAMERA=1) ++ set(PHD_LINK_EXTERNAL ${PHD_LINK_EXTERNAL} ${asiCamera2}) ++ ++ if(IS_DIRECTORY ${PHD_PROJECT_ROOT_DIR}/cameras/qhyccdlibs/linux/${qhyarch}) ++ add_definitions(-DHAVE_QHY_CAMERA=1) ++ ++ # be careful not to pick up any other qhy lib on the system ++ find_library(qhylib ++ NAMES qhy ++ NO_DEFAULT_PATH ++ PATHS ${PHD_PROJECT_ROOT_DIR}/cameras/qhyccdlibs/linux/${qhyarch}) ++ if(NOT qhylib) ++ message(FATAL_ERROR "Cannot find the qhy SDK libs") ++ endif() ++ set(PHD_LINK_EXTERNAL ${PHD_LINK_EXTERNAL} ${qhylib}) ++ endif() ++ ++ # temporarily disable qhy camera pending fix for link error on Ubuntu Trusty ++ remove_definitions(-DHAVE_QHY_CAMERA=1) + +- # temporarily disable qhy camera pending fix for link error on Ubuntu Trusty +- remove_definitions(-DHAVE_QHY_CAMERA=1) ++ endif() # OPENSOURCE_ONLY + + # math library is needed, and should be one of the last things to link to here + find_library(mathlib NAMES m) diff --git a/phd2_appdata_location_change.patch b/phd2_appdata_location_change.patch deleted file mode 100644 index 8e5aace..0000000 --- a/phd2_appdata_location_change.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -U 3 -dHrN -- a/cmake_modules/PHD2Packaging.cmake b/cmake_modules/PHD2Packaging.cmake ---- a/cmake_modules/PHD2Packaging.cmake 2017-09-26 00:21:15.000000000 +0200 -+++ b/cmake_modules/PHD2Packaging.cmake 2017-11-02 18:18:54.455096341 +0100 -@@ -74,7 +74,7 @@ - install(FILES ${phd_src_dir}/phd2.desktop - DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications/ ) - install(FILES ${phd_src_dir}/phd2.appdata.xml -- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/appdata/ ) -+ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/metainfo/ ) - - # Make Debian package - set(CPACK_GENERATOR "DEB") diff --git a/phd2_disable_cams.patch b/phd2_disable_cams.patch deleted file mode 100644 index 96ad505..0000000 --- a/phd2_disable_cams.patch +++ /dev/null @@ -1,76 +0,0 @@ -diff -U 3 -dHrN -- a/cameras.h b/cameras.h ---- a/cameras.h 2017-09-04 23:55:17.000000000 +0200 -+++ b/cameras.h 2017-09-06 20:25:22.743663856 +0200 -@@ -109,7 +109,7 @@ - # define QHY_CAMERA - # endif - # define INDI_CAMERA --# define ZWO_ASI -+//# define ZWO_ASI - # define SXV - # ifdef HAVE_SBIG_CAMERA - # define SBIG -diff -U 3 -dHrN -- a/thirdparty/thirdparty.cmake b/thirdparty/thirdparty.cmake ---- a/thirdparty/thirdparty.cmake 2017-09-26 00:21:15.000000000 +0200 -+++ b/thirdparty/thirdparty.cmake 2017-11-02 19:04:42.283172290 +0100 -@@ -1042,35 +1042,35 @@ - set(qhyarch "x86_32") - endif() - else() -- message(FATAL_ERROR "unknown system architecture") -+ message(WARNING "unknown system architecture") - endif() - -- find_path(ZWO_INCLUDE_DIR ASICamera2.h -- PATHS -- ${PHD_PROJECT_ROOT_DIR}/cameras -- ) -- -- find_library(asiCamera2 -- NAMES ASICamera2 -- PATHS ${PHD_PROJECT_ROOT_DIR}/cameras/zwolibs/${arch}) -- if(NOT asiCamera2) -- message(FATAL_ERROR "Cannot find the asiCamera2 drivers") -- endif() -- set(PHD_LINK_EXTERNAL ${PHD_LINK_EXTERNAL} ${asiCamera2}) -- -- if(IS_DIRECTORY ${PHD_PROJECT_ROOT_DIR}/cameras/qhyccdlibs/linux/${qhyarch}) -- add_definitions(-DHAVE_QHY_CAMERA=1) -+# find_path(ZWO_INCLUDE_DIR ASICamera2.h -+# PATHS -+# ${PHD_PROJECT_ROOT_DIR}/cameras -+# ) -+# -+# find_library(asiCamera2 -+# NAMES ASICamera2 -+# PATHS ${PHD_PROJECT_ROOT_DIR}/cameras/zwolibs/${arch}) -+# if(NOT asiCamera2) -+# message(FATAL_ERROR "Cannot find the asiCamera2 drivers") -+# endif() -+# set(PHD_LINK_EXTERNAL ${PHD_LINK_EXTERNAL} ${asiCamera2}) -+# -+# if(IS_DIRECTORY ${PHD_PROJECT_ROOT_DIR}/cameras/qhyccdlibs/linux/${qhyarch}) -+# add_definitions(-DHAVE_QHY_CAMERA=1) - - # be careful not to pick up any other qhy lib on the system -- find_library( qhylib -- NAMES qhy -- NO_DEFAULT_PATH -- PATHS ${PHD_PROJECT_ROOT_DIR}/cameras/qhyccdlibs/linux/${qhyarch}) -- if(NOT qhylib) -- message(FATAL_ERROR "Cannot find the qhy SDK libs") -- endif() -- set(PHD_LINK_EXTERNAL ${PHD_LINK_EXTERNAL} ${qhylib}) -- endif() -+# find_library( qhylib -+# NAMES qhy -+# NO_DEFAULT_PATH -+# PATHS ${PHD_PROJECT_ROOT_DIR}/cameras/qhyccdlibs/linux/${qhyarch}) -+# if(NOT qhylib) -+# message(FATAL_ERROR "Cannot find the qhy SDK libs") -+# endif() -+# set(PHD_LINK_EXTERNAL ${PHD_LINK_EXTERNAL} ${qhylib}) -+# endif() - - # temporarily disable qhy camera pending fix for link error on Ubuntu Trusty - remove_definitions(-DHAVE_QHY_CAMERA=1) diff --git a/sources b/sources index a106e1d..21f6d85 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phd2-2.6.4-purged.tar.xz) = 1dedb5174d9a393cbf804a4539a38afe9fd035374cd73465bc2474180d58fdbb8b9c677b00204746de72d7d374303a17e07f8537ed71a22cafea1e889f476c86 +SHA512 (phd2-2.6.5-purged.tar.xz) = 7ec3d92d5181dca6f735f923940a464d31b1138a143e3bf31d6a6e231b8b77a504c172f2b6f833f2cab43051f0397d1901f6bc8780b92e16dbd6d556d319e92f From b5d96bd683dcf4ba4e177abdb69bd96e4ee3388f Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sat, 30 Mar 2019 10:29:08 +0100 Subject: [PATCH 4/6] Update to 2.6.6 --- .gitignore | 1 + generate-tarball.sh | 2 +- phd2.spec | 20 ++-- phd2_2.6.5_disable_cams.patch | 146 ------------------------------ phd2_2.6.6_disable_openssag.patch | 43 +++++++++ sources | 2 +- 6 files changed, 55 insertions(+), 159 deletions(-) delete mode 100644 phd2_2.6.5_disable_cams.patch create mode 100644 phd2_2.6.6_disable_openssag.patch diff --git a/.gitignore b/.gitignore index bfedc60..41fca93 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /phd2-2.6.4-purged.tar.xz /phd2-2.6.5-purged.tar.xz +/phd2-2.6.6-purged.tar.xz diff --git a/generate-tarball.sh b/generate-tarball.sh index 15f7ce8..ed87723 100755 --- a/generate-tarball.sh +++ b/generate-tarball.sh @@ -10,7 +10,6 @@ rm -rf phd2-$VERSION/extra_frameworks rm -rf phd2-$VERSION/thirdparty/*.zip rm -rf phd2-$VERSION/thirdparty/*.tar.gz rm -rf phd2-$VERSION/thirdparty/*.tar.bz2 -rm -rf phd2-$VERSION/thirdparty/extra_frameworks rm -rf phd2-$VERSION/thirdparty/frameworks rm -rf phd2-$VERSION/thirdparty/HID_Utilities rm -rf phd2-$VERSION/thirdparty/include @@ -18,6 +17,7 @@ rm -rf phd2-$VERSION/thirdparty/openssag find . -name "*.dll" -type f -delete find . -name "*.lib" -type f -delete find . -name "*.a" -type f -delete +find . -name "*.so" -type f -delete rm -rf phd2-$VERSION/cameras/qhyccdlibs/qhyfirmware.zip tar -cJvf phd2-$VERSION-purged.tar.xz phd2-$VERSION diff --git a/phd2.spec b/phd2.spec index f39474f..1ab5708 100644 --- a/phd2.spec +++ b/phd2.spec @@ -1,5 +1,5 @@ Name: phd2 -Version: 2.6.5 +Version: 2.6.6 Release: 1%{?dist} Summary: Telescope guiding software # Main program files are BSD licensed @@ -19,9 +19,9 @@ Source1: generate-tarball.sh # Use C++14 flag Patch99: phd2_cflags.patch -# Backported patch from upstream to disable camera firmwares we removed from sources -# https://github.com/OpenPHDGuiding/phd2/issues/690 -Patch100: phd2_2.6.5_disable_cams.patch +# Disable OpenSSAG +# https://github.com/OpenPHDGuiding/phd2/pull/758 +Patch100: phd2_2.6.6_disable_openssag.patch BuildRequires: cmake3 BuildRequires: desktop-file-utils @@ -57,8 +57,6 @@ or spectroscopy. find icons -type f -print0 |xargs -0 chmod -x chmod -x PHD_2.0_Architecture.docx -# Fix line ending -dos2unix README-PHD2.txt %build mkdir -p %{_target_platform} @@ -81,18 +79,14 @@ popd %find_lang %{name} %check -# Tests are failing on x86 with GCC7 -# https://github.com/OpenPHDGuiding/phd2/issues/608 -%ifnarch %{ix86} env CTEST_OUTPUT_ON_FAILURE=1 make test -C %{_target_platform} -%endif desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{name}.appdata.xml %files -f %{name}.lang -%doc README.txt README-PHD2.txt PHD_2.0_Architecture.docx +%doc README.txt PHD_2.0_Architecture.docx %license LICENSE.txt %{_bindir}/* %{_datadir}/metainfo/%{name}.appdata.xml @@ -102,6 +96,10 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{name}. %changelog +* Sat Mar 30 2019 Mattia Verga - 2.6.6-1 +- Upgrade to 2.6.6 +- Enable tests on i686 + * Mon May 07 2018 Mattia Verga - 2.6.5-1 - Upgrade to 2.6.5 - Remove obsolete scriptlets diff --git a/phd2_2.6.5_disable_cams.patch b/phd2_2.6.5_disable_cams.patch deleted file mode 100644 index db633c2..0000000 --- a/phd2_2.6.5_disable_cams.patch +++ /dev/null @@ -1,146 +0,0 @@ -From 0d87a84540e90bb17e6d4183fd32d422c410861f Mon Sep 17 00:00:00 2001 -From: Andy Galasso -Date: Mon, 7 May 2018 12:19:46 -0400 -Subject: [PATCH] Linux: add option to exclude binary drivers from build (ZWO - and QHY) - ---- - cameras.h | 4 +- - thirdparty/thirdparty.cmake | 104 +++++++++++++++++++++++--------------------- - 2 files changed, 58 insertions(+), 50 deletions(-) - -diff --git a/cameras.h b/cameras.h -index 4d4ba67c..a7cdff02 100644 ---- a/cameras.h -+++ b/cameras.h -@@ -109,7 +109,9 @@ - # define QHY_CAMERA - # endif - # define INDI_CAMERA --# define ZWO_ASI -+# ifdef HAVE_ZWO_CAMERA -+# define ZWO_ASI -+# endif - # define SXV - # ifdef HAVE_SBIG_CAMERA - # define SBIG -diff --git a/thirdparty/thirdparty.cmake b/thirdparty/thirdparty.cmake -index 2bb1de8c..88157b2d 100644 ---- a/thirdparty/thirdparty.cmake -+++ b/thirdparty/thirdparty.cmake -@@ -1207,60 +1207,66 @@ endif() # APPLE - ############################################# - if(UNIX AND NOT APPLE) - -- if (CMAKE_SYSTEM_PROCESSOR MATCHES "^armv6(.*)") -- set(arch "armv6") -- set(qhyarch "armv6") -- elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^armv7(.*)|arm64|aarch64|^armv8(.*)") -- if(CMAKE_SIZEOF_VOID_P EQUAL 8) -- set(arch "armv8") -- set(qhyarch "armv8") -- else() -- set(arch "armv7") -- set(qhyarch "armv7") -- endif() -- elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "x86|X86|amd64|AMD64|i.86") -- if(CMAKE_SIZEOF_VOID_P EQUAL 8) -- set(arch "x64") -- set(qhyarch "x86_64") -- else() -- set(arch "x86") -- set(qhyarch "x86_32") -- endif() -- else() -- message(FATAL_ERROR "unknown system architecture") -- endif() -- -- find_path(ZWO_INCLUDE_DIR ASICamera2.h -- NO_DEFAULT_PATHS -- PATHS ${PHD_PROJECT_ROOT_DIR}/cameras -- ) -+ if (NOT OPENSOURCE_ONLY) -+ -+ if (CMAKE_SYSTEM_PROCESSOR MATCHES "^armv6(.*)") -+ set(zwoarch "armv6") -+ set(qhyarch "armv6") -+ elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^armv7(.*)|arm64|aarch64|^armv8(.*)") -+ if(CMAKE_SIZEOF_VOID_P EQUAL 8) -+ set(zwoarch "armv8") -+ set(qhyarch "armv8") -+ else() -+ set(zwoarch "armv7") -+ set(qhyarch "armv7") -+ endif() -+ elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "x86|X86|amd64|AMD64|i.86") -+ if(CMAKE_SIZEOF_VOID_P EQUAL 8) -+ set(zwoarch "x64") -+ set(qhyarch "x86_64") -+ else() -+ set(zwoarch "x86") -+ set(qhyarch "x86_32") -+ endif() -+ else() -+ message(FATAL_ERROR "unknown system architecture") -+ endif() - -- find_library(asiCamera2 -- NAMES ASICamera2 -- NO_DEFAULT_PATHS -- PATHS ${PHD_PROJECT_ROOT_DIR}/cameras/zwolibs/${arch}) -- if(NOT asiCamera2) -- message(FATAL_ERROR "Cannot find the asiCamera2 drivers") -- endif() -- message(STATUS "Found ASICamera2 lib ${asiCamera2}") -- set(PHD_LINK_EXTERNAL ${PHD_LINK_EXTERNAL} ${asiCamera2}) -+ find_path(ZWO_INCLUDE_DIR ASICamera2.h -+ NO_DEFAULT_PATHS -+ PATHS ${PHD_PROJECT_ROOT_DIR}/cameras -+ ) - -- if(IS_DIRECTORY ${PHD_PROJECT_ROOT_DIR}/cameras/qhyccdlibs/linux/${qhyarch}) -- add_definitions(-DHAVE_QHY_CAMERA=1) -+ find_library(asiCamera2 -+ NAMES ASICamera2 -+ NO_DEFAULT_PATHS -+ PATHS ${PHD_PROJECT_ROOT_DIR}/cameras/zwolibs/${zwoarch}) - -- # be careful not to pick up any other qhy lib on the system -- find_library( qhylib -- NAMES qhy -- NO_DEFAULT_PATH -- PATHS ${PHD_PROJECT_ROOT_DIR}/cameras/qhyccdlibs/linux/${qhyarch}) -- if(NOT qhylib) -- message(FATAL_ERROR "Cannot find the qhy SDK libs") -+ if(NOT asiCamera2) -+ message(FATAL_ERROR "Cannot find the asiCamera2 drivers") - endif() -- set(PHD_LINK_EXTERNAL ${PHD_LINK_EXTERNAL} ${qhylib}) -- endif() -+ message(STATUS "Found ASICamera2 lib ${asiCamera2}") -+ add_definitions(-DHAVE_ZWO_CAMERA=1) -+ set(PHD_LINK_EXTERNAL ${PHD_LINK_EXTERNAL} ${asiCamera2}) -+ -+ if(IS_DIRECTORY ${PHD_PROJECT_ROOT_DIR}/cameras/qhyccdlibs/linux/${qhyarch}) -+ add_definitions(-DHAVE_QHY_CAMERA=1) -+ -+ # be careful not to pick up any other qhy lib on the system -+ find_library(qhylib -+ NAMES qhy -+ NO_DEFAULT_PATH -+ PATHS ${PHD_PROJECT_ROOT_DIR}/cameras/qhyccdlibs/linux/${qhyarch}) -+ if(NOT qhylib) -+ message(FATAL_ERROR "Cannot find the qhy SDK libs") -+ endif() -+ set(PHD_LINK_EXTERNAL ${PHD_LINK_EXTERNAL} ${qhylib}) -+ endif() -+ -+ # temporarily disable qhy camera pending fix for link error on Ubuntu Trusty -+ remove_definitions(-DHAVE_QHY_CAMERA=1) - -- # temporarily disable qhy camera pending fix for link error on Ubuntu Trusty -- remove_definitions(-DHAVE_QHY_CAMERA=1) -+ endif() # OPENSOURCE_ONLY - - # math library is needed, and should be one of the last things to link to here - find_library(mathlib NAMES m) diff --git a/phd2_2.6.6_disable_openssag.patch b/phd2_2.6.6_disable_openssag.patch new file mode 100644 index 0000000..92656f2 --- /dev/null +++ b/phd2_2.6.6_disable_openssag.patch @@ -0,0 +1,43 @@ +diff -U 3 -dHrN -- a/thirdparty/thirdparty.cmake b/thirdparty/thirdparty.cmake +--- a/thirdparty/thirdparty.cmake 2019-03-24 19:50:39.000000000 +0100 ++++ b/thirdparty/thirdparty.cmake 2019-03-29 18:30:18.853081815 +0100 +@@ -1295,23 +1295,23 @@ + # temporarily disable qhy camera pending fix for link error on Ubuntu Trusty + remove_definitions(-DHAVE_QHY_CAMERA=1) + +- endif() # OPENSOURCE_ONLY ++ set(LIBOPENSSAG openssag) ++ set(libopenssag_dir ${thirdparty_dir}/${LIBOPENSSAG}/src) ++ include_directories(${libopenssag_dir}) ++ set(libOPENSSAG_SRC ++ ${libopenssag_dir}/firmware.h ++ ${libopenssag_dir}/loader.cpp ++ ${libopenssag_dir}/openssag_priv.h ++ ${libopenssag_dir}/openssag.cpp ++ ${libopenssag_dir}/openssag.h ++ ) ++ add_library(OpenSSAG ${libOPENSSAG_SRC}) ++ target_link_libraries(OpenSSAG openphd_libusb) ++ target_include_directories(OpenSSAG PRIVATE ${thirdparty_dir}/${LIBOPENSSAG}/src) ++ set(PHD_LINK_EXTERNAL ${PHD_LINK_EXTERNAL} OpenSSAG) ++ set_property(TARGET OpenSSAG PROPERTY FOLDER "Thirdparty/") + +- set(LIBOPENSSAG openssag) +- set(libopenssag_dir ${thirdparty_dir}/${LIBOPENSSAG}/src) +- include_directories(${libopenssag_dir}) +- set(libOPENSSAG_SRC +- ${libopenssag_dir}/firmware.h +- ${libopenssag_dir}/loader.cpp +- ${libopenssag_dir}/openssag_priv.h +- ${libopenssag_dir}/openssag.cpp +- ${libopenssag_dir}/openssag.h +- ) +- add_library(OpenSSAG ${libOPENSSAG_SRC}) +- target_link_libraries(OpenSSAG openphd_libusb) +- target_include_directories(OpenSSAG PRIVATE ${thirdparty_dir}/${LIBOPENSSAG}/src) +- set(PHD_LINK_EXTERNAL ${PHD_LINK_EXTERNAL} OpenSSAG) +- set_property(TARGET OpenSSAG PROPERTY FOLDER "Thirdparty/") ++ endif() # OPENSOURCE_ONLY + + # math library is needed, and should be one of the last things to link to here + find_library(mathlib NAMES m) diff --git a/sources b/sources index 21f6d85..e806d51 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phd2-2.6.5-purged.tar.xz) = 7ec3d92d5181dca6f735f923940a464d31b1138a143e3bf31d6a6e231b8b77a504c172f2b6f833f2cab43051f0397d1901f6bc8780b92e16dbd6d556d319e92f +SHA512 (phd2-2.6.6-purged.tar.xz) = 72ae939c1ed4917d35a7620a02b92bea64ee1e2f8d1b94db6ff11d7402829f6994cd6a8bede292e128d421a13ede718c34b2a898695111bbbe92a35d390349eb From 2dd5102ba972367668dfa9b8bbba9827fd1f8fad Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sat, 8 Feb 2020 17:55:17 +0100 Subject: [PATCH 5/6] Update to 2.6.7 stable. --- .gitignore | 1 + generate-tarball.sh | 2 ++ phd2.spec | 9 +++---- phd2_2.6.6_disable_openssag.patch | 43 ------------------------------- sources | 2 +- 5 files changed, 8 insertions(+), 49 deletions(-) delete mode 100644 phd2_2.6.6_disable_openssag.patch diff --git a/.gitignore b/.gitignore index 41fca93..17bbfb4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /phd2-2.6.4-purged.tar.xz /phd2-2.6.5-purged.tar.xz /phd2-2.6.6-purged.tar.xz +/phd2-2.6.7-purged.tar.xz diff --git a/generate-tarball.sh b/generate-tarball.sh index ed87723..35b828a 100755 --- a/generate-tarball.sh +++ b/generate-tarball.sh @@ -14,8 +14,10 @@ rm -rf phd2-$VERSION/thirdparty/frameworks rm -rf phd2-$VERSION/thirdparty/HID_Utilities rm -rf phd2-$VERSION/thirdparty/include rm -rf phd2-$VERSION/thirdparty/openssag +rm -rf phd2-$VERSION/thirdparty/VidCapture find . -name "*.dll" -type f -delete find . -name "*.lib" -type f -delete +find . -name "*.dylib" -type f -delete find . -name "*.a" -type f -delete find . -name "*.so" -type f -delete rm -rf phd2-$VERSION/cameras/qhyccdlibs/qhyfirmware.zip diff --git a/phd2.spec b/phd2.spec index 1ab5708..df4d0dd 100644 --- a/phd2.spec +++ b/phd2.spec @@ -1,5 +1,5 @@ Name: phd2 -Version: 2.6.6 +Version: 2.6.7 Release: 1%{?dist} Summary: Telescope guiding software # Main program files are BSD licensed @@ -19,10 +19,6 @@ Source1: generate-tarball.sh # Use C++14 flag Patch99: phd2_cflags.patch -# Disable OpenSSAG -# https://github.com/OpenPHDGuiding/phd2/pull/758 -Patch100: phd2_2.6.6_disable_openssag.patch - BuildRequires: cmake3 BuildRequires: desktop-file-utils BuildRequires: dos2unix @@ -96,6 +92,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{name}. %changelog +* Sat Feb 08 2020 Mattia Verga - 2.6.7-1 +- Upgrade to 2.6.7 + * Sat Mar 30 2019 Mattia Verga - 2.6.6-1 - Upgrade to 2.6.6 - Enable tests on i686 diff --git a/phd2_2.6.6_disable_openssag.patch b/phd2_2.6.6_disable_openssag.patch deleted file mode 100644 index 92656f2..0000000 --- a/phd2_2.6.6_disable_openssag.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -U 3 -dHrN -- a/thirdparty/thirdparty.cmake b/thirdparty/thirdparty.cmake ---- a/thirdparty/thirdparty.cmake 2019-03-24 19:50:39.000000000 +0100 -+++ b/thirdparty/thirdparty.cmake 2019-03-29 18:30:18.853081815 +0100 -@@ -1295,23 +1295,23 @@ - # temporarily disable qhy camera pending fix for link error on Ubuntu Trusty - remove_definitions(-DHAVE_QHY_CAMERA=1) - -- endif() # OPENSOURCE_ONLY -+ set(LIBOPENSSAG openssag) -+ set(libopenssag_dir ${thirdparty_dir}/${LIBOPENSSAG}/src) -+ include_directories(${libopenssag_dir}) -+ set(libOPENSSAG_SRC -+ ${libopenssag_dir}/firmware.h -+ ${libopenssag_dir}/loader.cpp -+ ${libopenssag_dir}/openssag_priv.h -+ ${libopenssag_dir}/openssag.cpp -+ ${libopenssag_dir}/openssag.h -+ ) -+ add_library(OpenSSAG ${libOPENSSAG_SRC}) -+ target_link_libraries(OpenSSAG openphd_libusb) -+ target_include_directories(OpenSSAG PRIVATE ${thirdparty_dir}/${LIBOPENSSAG}/src) -+ set(PHD_LINK_EXTERNAL ${PHD_LINK_EXTERNAL} OpenSSAG) -+ set_property(TARGET OpenSSAG PROPERTY FOLDER "Thirdparty/") - -- set(LIBOPENSSAG openssag) -- set(libopenssag_dir ${thirdparty_dir}/${LIBOPENSSAG}/src) -- include_directories(${libopenssag_dir}) -- set(libOPENSSAG_SRC -- ${libopenssag_dir}/firmware.h -- ${libopenssag_dir}/loader.cpp -- ${libopenssag_dir}/openssag_priv.h -- ${libopenssag_dir}/openssag.cpp -- ${libopenssag_dir}/openssag.h -- ) -- add_library(OpenSSAG ${libOPENSSAG_SRC}) -- target_link_libraries(OpenSSAG openphd_libusb) -- target_include_directories(OpenSSAG PRIVATE ${thirdparty_dir}/${LIBOPENSSAG}/src) -- set(PHD_LINK_EXTERNAL ${PHD_LINK_EXTERNAL} OpenSSAG) -- set_property(TARGET OpenSSAG PROPERTY FOLDER "Thirdparty/") -+ endif() # OPENSOURCE_ONLY - - # math library is needed, and should be one of the last things to link to here - find_library(mathlib NAMES m) diff --git a/sources b/sources index e806d51..6596aae 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phd2-2.6.6-purged.tar.xz) = 72ae939c1ed4917d35a7620a02b92bea64ee1e2f8d1b94db6ff11d7402829f6994cd6a8bede292e128d421a13ede718c34b2a898695111bbbe92a35d390349eb +SHA512 (phd2-2.6.7-purged.tar.xz) = efa43bb8c90df8c60fc0063e74d079644266bbbbff2dbac6155e782f12579419a6aec4c6e1cc93e49e37bf33abc2597c9a2f594ec2e5848da334226d44c06087 From c632269da1386cac8c5824b3194192c6e5aaeeaf Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Mon, 18 May 2020 13:57:53 +0200 Subject: [PATCH 6/6] Upgrade to 2.6.8 --- .gitignore | 1 + phd2.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 17bbfb4..875a5b0 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /phd2-2.6.5-purged.tar.xz /phd2-2.6.6-purged.tar.xz /phd2-2.6.7-purged.tar.xz +/phd2-2.6.8-purged.tar.xz diff --git a/phd2.spec b/phd2.spec index df4d0dd..f47d2a1 100644 --- a/phd2.spec +++ b/phd2.spec @@ -1,5 +1,5 @@ Name: phd2 -Version: 2.6.7 +Version: 2.6.8 Release: 1%{?dist} Summary: Telescope guiding software # Main program files are BSD licensed @@ -92,6 +92,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{name}. %changelog +* Mon May 18 2020 Mattia Verga - 2.6.8-1 +- Upgrade to 2.6.8 + * Sat Feb 08 2020 Mattia Verga - 2.6.7-1 - Upgrade to 2.6.7 diff --git a/sources b/sources index 6596aae..f8ea090 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phd2-2.6.7-purged.tar.xz) = efa43bb8c90df8c60fc0063e74d079644266bbbbff2dbac6155e782f12579419a6aec4c6e1cc93e49e37bf33abc2597c9a2f594ec2e5848da334226d44c06087 +SHA512 (phd2-2.6.8-purged.tar.xz) = 8f57cf49972af92e7618f39352fda2d890286cca7697e7c855f9ceab108172263693ff61bb25bc4a979d3196fa1bcd5bb8c5a6886350c435246f7993772ad1e2