From 4f66b0e438bd8702fa06aea350704779564aed49 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Mon, 6 Nov 2017 18:18:18 +0100 Subject: [PATCH 01/48] Initial import (#1509034). --- .gitignore | 1 + README.md | 3 - generate-tarball.sh | 26 ++++++ phd2.spec | 131 +++++++++++++++++++++++++++++ phd2_appdata_location_change.patch | 12 +++ phd2_cflags.patch | 18 ++++ phd2_disable_cams.patch | 76 +++++++++++++++++ sources | 1 + 8 files changed, 265 insertions(+), 3 deletions(-) create mode 100644 .gitignore delete mode 100644 README.md create mode 100755 generate-tarball.sh create mode 100644 phd2.spec create mode 100644 phd2_appdata_location_change.patch create mode 100644 phd2_cflags.patch create mode 100644 phd2_disable_cams.patch create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..755ab01 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/phd2-2.6.4-purged.tar.xz diff --git a/README.md b/README.md deleted file mode 100644 index 9722aaf..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# phd2 - -The phd2 package \ No newline at end of file diff --git a/generate-tarball.sh b/generate-tarball.sh new file mode 100755 index 0000000..15f7ce8 --- /dev/null +++ b/generate-tarball.sh @@ -0,0 +1,26 @@ +#!/bin/sh + +VERSION=$1 + +tar -xzvf phd2-$VERSION.tar.gz + +#Remove pre-built software +rm -rf phd2-$VERSION/WinLibs +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 +rm -rf phd2-$VERSION/thirdparty/openssag +find . -name "*.dll" -type f -delete +find . -name "*.lib" -type f -delete +find . -name "*.a" -type f -delete +rm -rf phd2-$VERSION/cameras/qhyccdlibs/qhyfirmware.zip + +tar -cJvf phd2-$VERSION-purged.tar.xz phd2-$VERSION + +#Remove temporary directory +rm -rf phd2-$VERSION diff --git a/phd2.spec b/phd2.spec new file mode 100644 index 0000000..7eb6087 --- /dev/null +++ b/phd2.spec @@ -0,0 +1,131 @@ +Name: phd2 +Version: 2.6.4 +Release: 3%{?dist} +Summary: Telescope guiding software +# Main program files are BSD licensed +# Some components have different licenses: +# QHY camera headers are GPLv2+ +# SX camera headers are ICU +# INDI GUI is LGPLv2+ +License: BSD and (GPLv2+ and MIT and LGPLv2+) +URL: http://openphdguiding.org/ +# Download upstream tarball from +# https://github.com/OpenPHDGuiding/%%{name}/archive/v%%{version}.tar.gz +# and then run ./generate-tarball.sh %%{version} +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 + +BuildRequires: cmake +BuildRequires: desktop-file-utils +BuildRequires: dos2unix +BuildRequires: extra-cmake-modules +BuildRequires: gettext +BuildRequires: gtest-devel +BuildRequires: libappstream-glib +BuildRequires: libindi-static +BuildRequires: libnova-devel +BuildRequires: wxGTK3-devel + +BuildRequires: pkgconfig(cfitsio) +BuildRequires: pkgconfig(eigen3) +BuildRequires: pkgconfig(libcurl) +BuildRequires: pkgconfig(libindi) +BuildRequires: pkgconfig(libusb-1.0) +BuildRequires: pkgconfig(zlib) + +Recommends: libindi + + +%description +PHD2 is telescope guiding software that simplifies the process of tracking +a guide star, letting you concentrate on other aspects of deep-sky imaging +or spectroscopy. + + +%prep +%autosetup -p1 + +# Remove spurious executable bit set on icons and docs +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} +pushd %{_target_platform} +%{cmake} -DUSE_SYSTEM_CFITSIO=ON \ + -DUSE_SYSTEM_LIBUSB=ON \ + -DUSE_SYSTEM_EIGEN3=ON \ + -DUSE_SYSTEM_GTEST=ON .. + +%make_build + + +%install +pushd %{_target_platform} +%make_install +popd + +%find_lang %{name} + +%check +# Tests are failing on x86 with GCC7 +# https://github.com/OpenPHDGuiding/phd2/issues/608 +%ifnarch %{ix86} +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 +%license LICENSE.txt +%{_bindir}/* +%{_datadir}/metainfo/%{name}.appdata.xml +%{_datadir}/applications/%{name}.desktop +%{_datadir}/phd2/ +%{_datadir}/pixmaps/* + + +%changelog +* Sun Nov 05 2017 Mattia Verga - 2.6.4-3 +- Fix spurious exec bits and line endings +- Use more macros +- Purge another unneeded directory from sources +- Use C++14 flag + +* Sat Nov 04 2017 Mattia Verga - 2.6.4-2 +- Breakdown components licenses +- Add some useful docs +- Add weak dependency to libindi + +* Thu Nov 02 2017 Mattia Verga - 2.6.4-1 +- Initial packaging diff --git a/phd2_appdata_location_change.patch b/phd2_appdata_location_change.patch new file mode 100644 index 0000000..8e5aace --- /dev/null +++ b/phd2_appdata_location_change.patch @@ -0,0 +1,12 @@ +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_cflags.patch b/phd2_cflags.patch new file mode 100644 index 0000000..52f31f2 --- /dev/null +++ b/phd2_cflags.patch @@ -0,0 +1,18 @@ +diff -U 3 -dHrN -- a/cmake_modules/compiler_options.cmake b/cmake_modules/compiler_options.cmake +--- a/cmake_modules/compiler_options.cmake 2017-09-26 00:21:15.000000000 +0200 ++++ b/cmake_modules/compiler_options.cmake 2017-11-05 08:22:16.662695768 +0100 +@@ -64,10 +64,13 @@ + #set(CMAKE_LIBRARY_ARCHITECTURE x86) + else() + # c++11 options ++ check_cxx_compiler_flag(-std=c++14 HAS_CXX14_FLAG) + check_cxx_compiler_flag(-std=c++11 HAS_CXX11_FLAG) + check_cxx_compiler_flag(-std=c++0x HAS_CXX0X_FLAG) + +- if(HAS_CXX11_FLAG) ++ if(HAS_CXX14_FLAG) ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14") ++ elseif(HAS_CXX11_FLAG) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") + elseif(HAS_CXX0X_FLAG) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") diff --git a/phd2_disable_cams.patch b/phd2_disable_cams.patch new file mode 100644 index 0000000..96ad505 --- /dev/null +++ b/phd2_disable_cams.patch @@ -0,0 +1,76 @@ +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 new file mode 100644 index 0000000..a106e1d --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (phd2-2.6.4-purged.tar.xz) = 1dedb5174d9a393cbf804a4539a38afe9fd035374cd73465bc2474180d58fdbb8b9c677b00204746de72d7d374303a17e07f8537ed71a22cafea1e889f476c86 From 065db5276b37c118971ada3e2ad7578018b4023e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 02:55:00 +0000 Subject: [PATCH 02/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- phd2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/phd2.spec b/phd2.spec index 7eb6087..7daec32 100644 --- a/phd2.spec +++ b/phd2.spec @@ -1,6 +1,6 @@ Name: phd2 Version: 2.6.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Telescope guiding software # Main program files are BSD licensed # Some components have different licenses: @@ -116,6 +116,9 @@ fi %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 2.6.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Sun Nov 05 2017 Mattia Verga - 2.6.4-3 - Fix spurious exec bits and line endings - Use more macros From 22927667c4fe7c112a6a70467944ffe32814d7ed Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Tue, 13 Feb 2018 18:15:16 +0100 Subject: [PATCH 03/48] Enable test output on failures --- phd2.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/phd2.spec b/phd2.spec index 7daec32..d77cb0c 100644 --- a/phd2.spec +++ b/phd2.spec @@ -1,6 +1,6 @@ Name: phd2 Version: 2.6.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Telescope guiding software # Main program files are BSD licensed # Some components have different licenses: @@ -86,7 +86,7 @@ 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 @@ -116,6 +116,9 @@ fi %changelog +* Tue Feb 13 2018 Mattia Verga - 2.6.4-5 +- Enable test output on failures + * Fri Feb 09 2018 Fedora Release Engineering - 2.6.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 1b370aa5db920f7ede6a4216592ddad09a8ca598 Mon Sep 17 00:00:00 2001 From: Christian Dersch Date: Fri, 23 Feb 2018 20:47:49 +0100 Subject: [PATCH 04/48] rebuilt for cfitsio 3.420 (so version bump) --- phd2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/phd2.spec b/phd2.spec index d77cb0c..b7cdc4f 100644 --- a/phd2.spec +++ b/phd2.spec @@ -1,6 +1,6 @@ Name: phd2 Version: 2.6.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Telescope guiding software # Main program files are BSD licensed # Some components have different licenses: @@ -116,6 +116,9 @@ fi %changelog +* Fri Feb 23 2018 Christian Dersch - 2.6.4-6 +- rebuilt for cfitsio 3.420 (so version bump) + * Tue Feb 13 2018 Mattia Verga - 2.6.4-5 - Enable test output on failures From d05674d0db255df967d12a18ee2f4ce84c3cfdcf Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Mon, 7 May 2018 19:11:05 +0200 Subject: [PATCH 05/48] Update to 2.6.5 Remove obsolete scriptlets Use upstream patch to disable third party camera drivers --- .gitignore | 1 + phd2.spec | 39 +++----- phd2_2.6.5_disable_cams.patch | 146 +++++++++++++++++++++++++++++ phd2_appdata_location_change.patch | 12 --- phd2_disable_cams.patch | 76 --------------- sources | 2 +- 6 files changed, 163 insertions(+), 113 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 b7cdc4f..7cd04a3 100644 --- a/phd2.spec +++ b/phd2.spec @@ -1,6 +1,6 @@ Name: phd2 -Version: 2.6.4 -Release: 6%{?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: cmake BuildRequires: desktop-file-utils @@ -70,7 +66,9 @@ pushd %{_target_platform} %{cmake} -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 @@ -85,25 +83,13 @@ popd %check # Tests are failing on x86 with GCC7 # https://github.com/OpenPHDGuiding/phd2/issues/608 -%ifnarch %{ix86} +#%%ifnarch %%{ix86} env CTEST_OUTPUT_ON_FAILURE=1 make test -C %{_target_platform} -%endif +#%%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 + * Fri Feb 23 2018 Christian Dersch - 2.6.4-6 - rebuilt for cfitsio 3.420 (so version bump) 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 195a9fea693b22bf98b85797ee1d3920d0b2c53a Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Mon, 7 May 2018 19:34:42 +0200 Subject: [PATCH 06/48] Specify libindi to be >= 1.5 Tests are still failing on i686, so exclude them again. --- phd2.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/phd2.spec b/phd2.spec index 7cd04a3..747f800 100644 --- a/phd2.spec +++ b/phd2.spec @@ -37,7 +37,7 @@ BuildRequires: wxGTK3-devel BuildRequires: pkgconfig(cfitsio) BuildRequires: pkgconfig(eigen3) BuildRequires: pkgconfig(libcurl) -BuildRequires: pkgconfig(libindi) +BuildRequires: pkgconfig(libindi) >= 1.5 BuildRequires: pkgconfig(libusb-1.0) BuildRequires: pkgconfig(zlib) @@ -81,11 +81,11 @@ popd %find_lang %{name} %check -# Tests are failing on x86 with GCC7 +# Tests are failing on x86 with GCC >= 7 # https://github.com/OpenPHDGuiding/phd2/issues/608 -#%%ifnarch %%{ix86} +%ifnarch %{ix86} env CTEST_OUTPUT_ON_FAILURE=1 make test -C %{_target_platform} -#%%endif +%endif desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{name}.appdata.xml @@ -106,6 +106,7 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{name}. - Upgrade to 2.6.5 - Remove obsolete scriptlets - Use upstream patch to disable third party drivers +- Specify libindi to be >= 1.5 * Fri Feb 23 2018 Christian Dersch - 2.6.4-6 - rebuilt for cfitsio 3.420 (so version bump) From 1ad390357403de0ec0c0bd3d2950d1de8255583f Mon Sep 17 00:00:00 2001 From: Christian Dersch Date: Sat, 26 May 2018 12:08:33 +0200 Subject: [PATCH 07/48] rebuilt for cfitsio 3.450 --- phd2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/phd2.spec b/phd2.spec index 747f800..6795243 100644 --- a/phd2.spec +++ b/phd2.spec @@ -1,6 +1,6 @@ Name: phd2 Version: 2.6.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Telescope guiding software # Main program files are BSD licensed # Some components have different licenses: @@ -102,6 +102,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{name}. %changelog +* Sat May 26 2018 Christian Dersch - 2.6.5-2 +- rebuilt for cfitsio 3.450 + * Mon May 07 2018 Mattia Verga - 2.6.5-1 - Upgrade to 2.6.5 - Remove obsolete scriptlets From 04fae7b1f76c3ab9e4938f49cee9c09628123e4d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 21:07:15 +0000 Subject: [PATCH 08/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- phd2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/phd2.spec b/phd2.spec index 6795243..7dc2ca7 100644 --- a/phd2.spec +++ b/phd2.spec @@ -1,6 +1,6 @@ Name: phd2 Version: 2.6.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Telescope guiding software # Main program files are BSD licensed # Some components have different licenses: @@ -102,6 +102,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{name}. %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 2.6.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Sat May 26 2018 Christian Dersch - 2.6.5-2 - rebuilt for cfitsio 3.450 From a513215361d60413c2855b29ee6b468bb2b8e83b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 2 Feb 2019 02:08:04 +0000 Subject: [PATCH 09/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- phd2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/phd2.spec b/phd2.spec index 7dc2ca7..a6eb072 100644 --- a/phd2.spec +++ b/phd2.spec @@ -1,6 +1,6 @@ Name: phd2 Version: 2.6.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Telescope guiding software # Main program files are BSD licensed # Some components have different licenses: @@ -102,6 +102,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{name}. %changelog +* Sat Feb 02 2019 Fedora Release Engineering - 2.6.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Jul 13 2018 Fedora Release Engineering - 2.6.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 6a280e5572e25137783511585f8b4c46ebacbf49 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sat, 30 Mar 2019 10:29:08 +0100 Subject: [PATCH 10/48] Update to 2.6.6 --- .gitignore | 1 + generate-tarball.sh | 2 +- phd2.spec | 22 ++--- phd2_2.6.5_disable_cams.patch | 146 ------------------------------ phd2_2.6.6_disable_openssag.patch | 43 +++++++++ sources | 2 +- 6 files changed, 56 insertions(+), 160 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 a6eb072..b3c12d5 100644 --- a/phd2.spec +++ b/phd2.spec @@ -1,6 +1,6 @@ Name: phd2 -Version: 2.6.5 -Release: 4%{?dist} +Version: 2.6.6 +Release: 1%{?dist} Summary: Telescope guiding software # Main program files are BSD licensed # Some components have different licenses: @@ -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: cmake 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 GCC >= 7 -# 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 + * Sat Feb 02 2019 Fedora Release Engineering - 2.6.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild 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 778381ae4f65f98112e22fa9262a40bd9557e3fa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jul 2019 08:36:28 +0000 Subject: [PATCH 11/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- phd2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/phd2.spec b/phd2.spec index b3c12d5..9e31899 100644 --- a/phd2.spec +++ b/phd2.spec @@ -1,6 +1,6 @@ Name: phd2 Version: 2.6.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Telescope guiding software # Main program files are BSD licensed # Some components have different licenses: @@ -96,6 +96,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{name}. %changelog +* Fri Jul 26 2019 Fedora Release Engineering - 2.6.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sat Mar 30 2019 Mattia Verga - 2.6.6-1 - Upgrade to 2.6.6 - Enable tests on i686 From 4ef7cbb3c64fd5667c3f8d2d913c8208748fca40 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 30 Jan 2020 06:44:00 +0000 Subject: [PATCH 12/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- phd2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/phd2.spec b/phd2.spec index 9e31899..a8c4c70 100644 --- a/phd2.spec +++ b/phd2.spec @@ -1,6 +1,6 @@ Name: phd2 Version: 2.6.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Telescope guiding software # Main program files are BSD licensed # Some components have different licenses: @@ -96,6 +96,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{name}. %changelog +* Thu Jan 30 2020 Fedora Release Engineering - 2.6.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Jul 26 2019 Fedora Release Engineering - 2.6.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 0c8b2b7f2980dde1d92a04d2a488d3c87a8a787c Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sat, 8 Feb 2020 17:55:17 +0100 Subject: [PATCH 13/48] Update to 2.6.7 stable. --- .gitignore | 1 + generate-tarball.sh | 2 ++ phd2.spec | 11 ++++---- phd2_2.6.6_disable_openssag.patch | 43 ------------------------------- sources | 2 +- 5 files changed, 9 insertions(+), 50 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 a8c4c70..0e35890 100644 --- a/phd2.spec +++ b/phd2.spec @@ -1,6 +1,6 @@ Name: phd2 -Version: 2.6.6 -Release: 3%{?dist} +Version: 2.6.7 +Release: 1%{?dist} Summary: Telescope guiding software # Main program files are BSD licensed # Some components have different licenses: @@ -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: cmake 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 + * Thu Jan 30 2020 Fedora Release Engineering - 2.6.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild 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 3cecb7fe7249d9b02929fc89691cdc99bc702a2e Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Mon, 18 May 2020 13:57:53 +0200 Subject: [PATCH 14/48] 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 0e35890..cdbca27 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 From acd0d34e5137d414956f796c0c1bc25ee2718ea4 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sun, 5 Jul 2020 11:40:07 +0200 Subject: [PATCH 15/48] Update to 2.6.9 --- .gitignore | 1 + phd2.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 875a5b0..92d3fe4 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /phd2-2.6.6-purged.tar.xz /phd2-2.6.7-purged.tar.xz /phd2-2.6.8-purged.tar.xz +/phd2-2.6.9-purged.tar.xz diff --git a/phd2.spec b/phd2.spec index cdbca27..a3f992f 100644 --- a/phd2.spec +++ b/phd2.spec @@ -1,5 +1,5 @@ Name: phd2 -Version: 2.6.8 +Version: 2.6.9 Release: 1%{?dist} Summary: Telescope guiding software # Main program files are BSD licensed @@ -92,6 +92,10 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{name}. %changelog +* Sun Jul 05 2020 Mattia Verga - 2.6.9-1 +- Upgrade to 2.6.9 +- Fixes rhbz#1853866 + * Mon May 18 2020 Mattia Verga - 2.6.8-1 - Upgrade to 2.6.8 diff --git a/sources b/sources index f8ea090..532421d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phd2-2.6.8-purged.tar.xz) = 8f57cf49972af92e7618f39352fda2d890286cca7697e7c855f9ceab108172263693ff61bb25bc4a979d3196fa1bcd5bb8c5a6886350c435246f7993772ad1e2 +SHA512 (phd2-2.6.9-purged.tar.xz) = 0aeef297506ffdf0f4b78c00de6ae53f547e15a57f11a51388a0b173ba2a4761acacedb1bef5117e736d8ab660e2e0a58678082cbc4dffe6319a0bba8f724465 From 60c85a5ab35dfbfdf9f82a2836feee7faaddd86f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 20:34:58 +0000 Subject: [PATCH 16/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- phd2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/phd2.spec b/phd2.spec index a3f992f..016732a 100644 --- a/phd2.spec +++ b/phd2.spec @@ -1,6 +1,6 @@ Name: phd2 Version: 2.6.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Telescope guiding software # Main program files are BSD licensed # Some components have different licenses: @@ -92,6 +92,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{name}. %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 2.6.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Sun Jul 05 2020 Mattia Verga - 2.6.9-1 - Upgrade to 2.6.9 - Fixes rhbz#1853866 From a56355bea47802b1a046e839fd9fef548612c799 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 07:03:12 +0000 Subject: [PATCH 17/48] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- phd2.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/phd2.spec b/phd2.spec index 016732a..b8579fd 100644 --- a/phd2.spec +++ b/phd2.spec @@ -1,6 +1,6 @@ Name: phd2 Version: 2.6.9 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Telescope guiding software # Main program files are BSD licensed # Some components have different licenses: @@ -92,6 +92,10 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{name}. %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 2.6.9-3 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jul 28 2020 Fedora Release Engineering - 2.6.9-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 5d7738e87e2456d853277f2c27a60e0e57c0a489 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Tue, 4 Aug 2020 18:10:53 +0200 Subject: [PATCH 18/48] Another rebuild attempt for F33 Mass Rebuild after gettext has been fixed --- phd2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/phd2.spec b/phd2.spec index b8579fd..ca0b8e6 100644 --- a/phd2.spec +++ b/phd2.spec @@ -1,6 +1,6 @@ Name: phd2 Version: 2.6.9 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Telescope guiding software # Main program files are BSD licensed # Some components have different licenses: @@ -92,6 +92,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{name}. %changelog +* Tue Aug 04 2020 Mattia Verga - 2.6.9-4 +- Another rebuild attempt for F33 Mass Rebuild after gettext has been fixed + * Sat Aug 01 2020 Fedora Release Engineering - 2.6.9-3 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 4f42342b13320f5249a4670dda39b6e35dff4e8d Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Tue, 4 Aug 2020 18:40:19 +0200 Subject: [PATCH 19/48] Use new cmake macros --- phd2.spec | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/phd2.spec b/phd2.spec index ca0b8e6..3bbcd88 100644 --- a/phd2.spec +++ b/phd2.spec @@ -55,22 +55,18 @@ chmod -x PHD_2.0_Architecture.docx %build -mkdir -p %{_target_platform} -pushd %{_target_platform} %{cmake} -DUSE_SYSTEM_CFITSIO=ON \ -DUSE_SYSTEM_LIBUSB=ON \ -DUSE_SYSTEM_EIGEN3=ON \ -DUSE_SYSTEM_GTEST=ON \ -DUSE_SYSTEM_LIBINDI=ON \ - -DOPENSOURCE_ONLY=ON .. + -DOPENSOURCE_ONLY=ON -%make_build +%cmake_build %install -pushd %{_target_platform} -%make_install -popd +%cmake_install %find_lang %{name} @@ -94,6 +90,7 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{name}. %changelog * Tue Aug 04 2020 Mattia Verga - 2.6.9-4 - Another rebuild attempt for F33 Mass Rebuild after gettext has been fixed +- Use new cmake macros * Sat Aug 01 2020 Fedora Release Engineering - 2.6.9-3 - Second attempt - Rebuilt for From e20f6bc823373bf6a4b3679892fcc0e20172a483 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 06:18:16 +0000 Subject: [PATCH 20/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- phd2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/phd2.spec b/phd2.spec index 3bbcd88..0758a94 100644 --- a/phd2.spec +++ b/phd2.spec @@ -1,6 +1,6 @@ Name: phd2 Version: 2.6.9 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Telescope guiding software # Main program files are BSD licensed # Some components have different licenses: @@ -88,6 +88,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{name}. %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 2.6.9-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Aug 04 2020 Mattia Verga - 2.6.9-4 - Another rebuild attempt for F33 Mass Rebuild after gettext has been fixed - Use new cmake macros From f79c7bfa52beb0e40f02f876bb946ce1ae0c3f5f Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Thu, 11 Feb 2021 18:06:49 +0100 Subject: [PATCH 21/48] Rebuild for cfitsio soname bump --- phd2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/phd2.spec b/phd2.spec index 0758a94..e358b1c 100644 --- a/phd2.spec +++ b/phd2.spec @@ -1,6 +1,6 @@ Name: phd2 Version: 2.6.9 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Telescope guiding software # Main program files are BSD licensed # Some components have different licenses: @@ -88,6 +88,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{name}. %changelog +* Thu Feb 11 2021 Mattia Verga - 2.6.9-6 +- Rebuilt for cfitsio soname bump + * Wed Jan 27 2021 Fedora Release Engineering - 2.6.9-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From af1c24385adee70d46a0a60a3256c91cf6b74f68 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sun, 27 Jun 2021 13:25:58 +0200 Subject: [PATCH 22/48] Update to 2.6.10 --- .gitignore | 1 + phd2.spec | 12 ++++++++---- phd2_2.9.10_std_cflags.patch | 32 ++++++++++++++++++++++++++++++++ phd2_cflags.patch | 18 ------------------ sources | 2 +- 5 files changed, 42 insertions(+), 23 deletions(-) create mode 100644 phd2_2.9.10_std_cflags.patch delete mode 100644 phd2_cflags.patch diff --git a/.gitignore b/.gitignore index 92d3fe4..78dc24c 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /phd2-2.6.7-purged.tar.xz /phd2-2.6.8-purged.tar.xz /phd2-2.6.9-purged.tar.xz +/phd2-2.6.10-purged.tar.xz diff --git a/phd2.spec b/phd2.spec index e358b1c..ea39d0f 100644 --- a/phd2.spec +++ b/phd2.spec @@ -1,6 +1,6 @@ Name: phd2 -Version: 2.6.9 -Release: 6%{?dist} +Version: 2.6.10 +Release: 1%{?dist} Summary: Telescope guiding software # Main program files are BSD licensed # Some components have different licenses: @@ -16,8 +16,8 @@ Source0: %{name}-%{version}-purged.tar.xz # Script to purge binaries and unneeded files from downloaded sources Source1: generate-tarball.sh -# Use C++14 flag -Patch99: phd2_cflags.patch +# Do not force c++ std +Patch99: phd2_2.9.10_std_cflags.patch BuildRequires: cmake BuildRequires: desktop-file-utils @@ -88,6 +88,10 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{name}. %changelog +* Sun Jun 27 2021 Mattia Verga - 2.6.10-1 +- Update to 2.6.10 +- Fixes rhbz#1976560 + * Thu Feb 11 2021 Mattia Verga - 2.6.9-6 - Rebuilt for cfitsio soname bump diff --git a/phd2_2.9.10_std_cflags.patch b/phd2_2.9.10_std_cflags.patch new file mode 100644 index 0000000..f0f4d1b --- /dev/null +++ b/phd2_2.9.10_std_cflags.patch @@ -0,0 +1,32 @@ +diff -udHrN -- a/cmake_modules/compiler_options.cmake b/cmake_modules/compiler_options.cmake +--- a/cmake_modules/compiler_options.cmake 2021-06-26 21:07:31.000000000 +0200 ++++ b/cmake_modules/compiler_options.cmake 2021-06-27 12:09:22.294653542 +0200 +@@ -57,28 +57,3 @@ + # Set the possible values of build type for cmake-gui + set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo") + endif() +- +-# compiler capabilities +-include(CheckCXXCompilerFlag) +-if(WIN32) +- set(FIND_LIBRARY_USE_LIB64_PATHS FALSE) +- #set(CMAKE_LIBRARY_ARCHITECTURE x86) +-else() +- # c++11 options +- check_cxx_compiler_flag(-std=c++11 HAS_CXX11_FLAG) +- check_cxx_compiler_flag(-std=c++0x HAS_CXX0X_FLAG) +- +- if(HAS_CXX11_FLAG) +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") +- elseif(HAS_CXX0X_FLAG) +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") +- endif() +- +- if(APPLE) +- check_cxx_compiler_flag(-stdlib=libc++ HAS_LIBCXX11_FLAG) +- +- if(HAS_LIBCXX11_FLAG) +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++") +- endif() +- endif() +-endif() diff --git a/phd2_cflags.patch b/phd2_cflags.patch deleted file mode 100644 index 52f31f2..0000000 --- a/phd2_cflags.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -U 3 -dHrN -- a/cmake_modules/compiler_options.cmake b/cmake_modules/compiler_options.cmake ---- a/cmake_modules/compiler_options.cmake 2017-09-26 00:21:15.000000000 +0200 -+++ b/cmake_modules/compiler_options.cmake 2017-11-05 08:22:16.662695768 +0100 -@@ -64,10 +64,13 @@ - #set(CMAKE_LIBRARY_ARCHITECTURE x86) - else() - # c++11 options -+ check_cxx_compiler_flag(-std=c++14 HAS_CXX14_FLAG) - check_cxx_compiler_flag(-std=c++11 HAS_CXX11_FLAG) - check_cxx_compiler_flag(-std=c++0x HAS_CXX0X_FLAG) - -- if(HAS_CXX11_FLAG) -+ if(HAS_CXX14_FLAG) -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14") -+ elseif(HAS_CXX11_FLAG) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") - elseif(HAS_CXX0X_FLAG) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") diff --git a/sources b/sources index 532421d..fefb522 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phd2-2.6.9-purged.tar.xz) = 0aeef297506ffdf0f4b78c00de6ae53f547e15a57f11a51388a0b173ba2a4761acacedb1bef5117e736d8ab660e2e0a58678082cbc4dffe6319a0bba8f724465 +SHA512 (phd2-2.6.10-purged.tar.xz) = 4da83c5f99a4328d773b4d321513f3d89cb8bf81444e83ca752e0a1a5310f8070b106427ef19136afe5a004cc12f0ddf79e34f16c1da0bd55cf847cdde3c689d From 49c33f8958f1285f2fba6bc8a876b2f617ac042b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 01:29:19 +0000 Subject: [PATCH 23/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- phd2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/phd2.spec b/phd2.spec index ea39d0f..b5e54a0 100644 --- a/phd2.spec +++ b/phd2.spec @@ -1,6 +1,6 @@ Name: phd2 Version: 2.6.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Telescope guiding software # Main program files are BSD licensed # Some components have different licenses: @@ -88,6 +88,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{name}. %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 2.6.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Sun Jun 27 2021 Mattia Verga - 2.6.10-1 - Update to 2.6.10 - Fixes rhbz#1976560 From 7b6d8f080dbd9d10fd1143816df4e9f1f57b6927 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sat, 31 Jul 2021 10:01:54 +0200 Subject: [PATCH 24/48] Replace _target_platform macro with _vpath_builddir --- phd2.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/phd2.spec b/phd2.spec index b5e54a0..afdbe35 100644 --- a/phd2.spec +++ b/phd2.spec @@ -1,6 +1,6 @@ Name: phd2 Version: 2.6.10 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Telescope guiding software # Main program files are BSD licensed # Some components have different licenses: @@ -71,7 +71,7 @@ chmod -x PHD_2.0_Architecture.docx %find_lang %{name} %check -env CTEST_OUTPUT_ON_FAILURE=1 make test -C %{_target_platform} +env CTEST_OUTPUT_ON_FAILURE=1 make test -C %{_vpath_builddir} desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{name}.appdata.xml @@ -88,6 +88,10 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{name}. %changelog +* Sat Jul 31 2021 Mattia Verga - 2.6.10-3 +- Replace _target_platform macro with _vpath_builddir +- Fixes rhbz#1987803 + * Fri Jul 23 2021 Fedora Release Engineering - 2.6.10-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 2517e2e6816f38ba3d95ae2533e81313a8b9b405 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jan 2022 07:12:20 +0000 Subject: [PATCH 25/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- phd2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/phd2.spec b/phd2.spec index afdbe35..7715256 100644 --- a/phd2.spec +++ b/phd2.spec @@ -1,6 +1,6 @@ Name: phd2 Version: 2.6.10 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Telescope guiding software # Main program files are BSD licensed # Some components have different licenses: @@ -88,6 +88,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{name}. %changelog +* Fri Jan 21 2022 Fedora Release Engineering - 2.6.10-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Sat Jul 31 2021 Mattia Verga - 2.6.10-3 - Replace _target_platform macro with _vpath_builddir - Fixes rhbz#1987803 From e6a308aca10178406578c60a79309ec511333bb8 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Thu, 24 Feb 2022 10:38:04 +0100 Subject: [PATCH 26/48] Update to 2.6.11 (fedora#2057427) --- .gitignore | 1 + phd2.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 78dc24c..090270b 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /phd2-2.6.8-purged.tar.xz /phd2-2.6.9-purged.tar.xz /phd2-2.6.10-purged.tar.xz +/phd2-2.6.11-purged.tar.xz diff --git a/phd2.spec b/phd2.spec index 7715256..7412d45 100644 --- a/phd2.spec +++ b/phd2.spec @@ -1,6 +1,6 @@ Name: phd2 -Version: 2.6.10 -Release: 4%{?dist} +Version: 2.6.11 +Release: 1%{?dist} Summary: Telescope guiding software # Main program files are BSD licensed # Some components have different licenses: @@ -88,6 +88,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{name}. %changelog +* Thu Feb 24 2022 Mattia Verga - 2.6.11-1 +- Update to 2.6.11 (fedora#2057427) + * Fri Jan 21 2022 Fedora Release Engineering - 2.6.10-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index fefb522..4467b7e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phd2-2.6.10-purged.tar.xz) = 4da83c5f99a4328d773b4d321513f3d89cb8bf81444e83ca752e0a1a5310f8070b106427ef19136afe5a004cc12f0ddf79e34f16c1da0bd55cf847cdde3c689d +SHA512 (phd2-2.6.11-purged.tar.xz) = 0fa640cf528d9b4a5a2119d41f63aa8af82cf2e1d588884d85b1ff5731a3641f06e380828450b727b0fd44efba0f2aa7face1b0090eea4cc21374acf58ffb316 From 6e1849cdf1dcad43e65e2441bd29f459fc7f4186 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sat, 26 Feb 2022 11:46:17 +0100 Subject: [PATCH 27/48] Disable parallel build --- phd2.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/phd2.spec b/phd2.spec index 7412d45..b2e780a 100644 --- a/phd2.spec +++ b/phd2.spec @@ -1,6 +1,6 @@ Name: phd2 Version: 2.6.11 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Telescope guiding software # Main program files are BSD licensed # Some components have different licenses: @@ -62,7 +62,9 @@ chmod -x PHD_2.0_Architecture.docx -DUSE_SYSTEM_LIBINDI=ON \ -DOPENSOURCE_ONLY=ON -%cmake_build +# Build is not parallel safe +# https://github.com/OpenPHDGuiding/phd2/issues/972 +%cmake_build -j1 %install @@ -88,6 +90,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{name}. %changelog +* Sat Feb 26 2022 Mattia Verga - 2.6.11-2 +- Disable parallel build + * Thu Feb 24 2022 Mattia Verga - 2.6.11-1 - Update to 2.6.11 (fedora#2057427) From 71b0c6e77624cd5aa09c670d02bdd9bd1da1c86c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 13:06:12 +0000 Subject: [PATCH 28/48] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- phd2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/phd2.spec b/phd2.spec index b2e780a..9911cce 100644 --- a/phd2.spec +++ b/phd2.spec @@ -1,6 +1,6 @@ Name: phd2 Version: 2.6.11 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Telescope guiding software # Main program files are BSD licensed # Some components have different licenses: @@ -90,6 +90,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{name}. %changelog +* Fri Jul 22 2022 Fedora Release Engineering - 2.6.11-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Feb 26 2022 Mattia Verga - 2.6.11-2 - Disable parallel build From 46ca41f2007e433ebcc5e9c961402a3098205422 Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Thu, 4 Aug 2022 14:33:17 -0400 Subject: [PATCH 29/48] Rebuild with wxWidgets 3.2 --- phd2.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/phd2.spec b/phd2.spec index 9911cce..06682cc 100644 --- a/phd2.spec +++ b/phd2.spec @@ -1,6 +1,6 @@ Name: phd2 Version: 2.6.11 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Telescope guiding software # Main program files are BSD licensed # Some components have different licenses: @@ -28,7 +28,7 @@ BuildRequires: gtest-devel BuildRequires: libappstream-glib BuildRequires: libindi-static BuildRequires: libnova-devel -BuildRequires: wxGTK3-devel +BuildRequires: wxGTK-devel BuildRequires: pkgconfig(cfitsio) BuildRequires: pkgconfig(eigen3) @@ -90,6 +90,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{name}. %changelog +* Thu Aug 04 2022 Scott Talbert - 2.6.11-4 +- Rebuild with wxWidgets 3.2 + * Fri Jul 22 2022 Fedora Release Engineering - 2.6.11-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From a817793031e88f18a764982b37142b6ef7e1c38c Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Tue, 18 Oct 2022 08:39:56 +0200 Subject: [PATCH 30/48] Convert to rpmautospec --- changelog | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++++ phd2.spec | 103 ++---------------------------------------------------- 2 files changed, 102 insertions(+), 101 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..ae480fa --- /dev/null +++ b/changelog @@ -0,0 +1,100 @@ +* Thu Aug 04 2022 Scott Talbert - 2.6.11-4 +- Rebuild with wxWidgets 3.2 + +* Fri Jul 22 2022 Fedora Release Engineering - 2.6.11-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Feb 26 2022 Mattia Verga - 2.6.11-2 +- Disable parallel build + +* Thu Feb 24 2022 Mattia Verga - 2.6.11-1 +- Update to 2.6.11 (fedora#2057427) + +* Fri Jan 21 2022 Fedora Release Engineering - 2.6.10-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Sat Jul 31 2021 Mattia Verga - 2.6.10-3 +- Replace _target_platform macro with _vpath_builddir +- Fixes rhbz#1987803 + +* Fri Jul 23 2021 Fedora Release Engineering - 2.6.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Sun Jun 27 2021 Mattia Verga - 2.6.10-1 +- Update to 2.6.10 +- Fixes rhbz#1976560 + +* Thu Feb 11 2021 Mattia Verga - 2.6.9-6 +- Rebuilt for cfitsio soname bump + +* Wed Jan 27 2021 Fedora Release Engineering - 2.6.9-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Aug 04 2020 Mattia Verga - 2.6.9-4 +- Another rebuild attempt for F33 Mass Rebuild after gettext has been fixed +- Use new cmake macros + +* Sat Aug 01 2020 Fedora Release Engineering - 2.6.9-3 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 2.6.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sun Jul 05 2020 Mattia Verga - 2.6.9-1 +- Upgrade to 2.6.9 +- Fixes rhbz#1853866 + +* 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 + +* Thu Jan 30 2020 Fedora Release Engineering - 2.6.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Fri Jul 26 2019 Fedora Release Engineering - 2.6.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sat Mar 30 2019 Mattia Verga - 2.6.6-1 +- Upgrade to 2.6.6 +- Enable tests on i686 + +* Sat Feb 02 2019 Fedora Release Engineering - 2.6.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 2.6.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Sat May 26 2018 Christian Dersch - 2.6.5-2 +- rebuilt for cfitsio 3.450 + +* 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 +- Specify libindi to be >= 1.5 + +* Fri Feb 23 2018 Christian Dersch - 2.6.4-6 +- rebuilt for cfitsio 3.420 (so version bump) + +* Tue Feb 13 2018 Mattia Verga - 2.6.4-5 +- Enable test output on failures + +* Fri Feb 09 2018 Fedora Release Engineering - 2.6.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Sun Nov 05 2017 Mattia Verga - 2.6.4-3 +- Fix spurious exec bits and line endings +- Use more macros +- Purge another unneeded directory from sources +- Use C++14 flag + +* Sat Nov 04 2017 Mattia Verga - 2.6.4-2 +- Breakdown components licenses +- Add some useful docs +- Add weak dependency to libindi + +* Thu Nov 02 2017 Mattia Verga - 2.6.4-1 +- Initial packaging diff --git a/phd2.spec b/phd2.spec index 06682cc..b66259d 100644 --- a/phd2.spec +++ b/phd2.spec @@ -1,6 +1,6 @@ Name: phd2 Version: 2.6.11 -Release: 4%{?dist} +Release: %autorelease Summary: Telescope guiding software # Main program files are BSD licensed # Some components have different licenses: @@ -90,103 +90,4 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{name}. %changelog -* Thu Aug 04 2022 Scott Talbert - 2.6.11-4 -- Rebuild with wxWidgets 3.2 - -* Fri Jul 22 2022 Fedora Release Engineering - 2.6.11-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Feb 26 2022 Mattia Verga - 2.6.11-2 -- Disable parallel build - -* Thu Feb 24 2022 Mattia Verga - 2.6.11-1 -- Update to 2.6.11 (fedora#2057427) - -* Fri Jan 21 2022 Fedora Release Engineering - 2.6.10-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Sat Jul 31 2021 Mattia Verga - 2.6.10-3 -- Replace _target_platform macro with _vpath_builddir -- Fixes rhbz#1987803 - -* Fri Jul 23 2021 Fedora Release Engineering - 2.6.10-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Sun Jun 27 2021 Mattia Verga - 2.6.10-1 -- Update to 2.6.10 -- Fixes rhbz#1976560 - -* Thu Feb 11 2021 Mattia Verga - 2.6.9-6 -- Rebuilt for cfitsio soname bump - -* Wed Jan 27 2021 Fedora Release Engineering - 2.6.9-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Aug 04 2020 Mattia Verga - 2.6.9-4 -- Another rebuild attempt for F33 Mass Rebuild after gettext has been fixed -- Use new cmake macros - -* Sat Aug 01 2020 Fedora Release Engineering - 2.6.9-3 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jul 28 2020 Fedora Release Engineering - 2.6.9-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Sun Jul 05 2020 Mattia Verga - 2.6.9-1 -- Upgrade to 2.6.9 -- Fixes rhbz#1853866 - -* 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 - -* Thu Jan 30 2020 Fedora Release Engineering - 2.6.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Jul 26 2019 Fedora Release Engineering - 2.6.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sat Mar 30 2019 Mattia Verga - 2.6.6-1 -- Upgrade to 2.6.6 -- Enable tests on i686 - -* Sat Feb 02 2019 Fedora Release Engineering - 2.6.5-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jul 13 2018 Fedora Release Engineering - 2.6.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Sat May 26 2018 Christian Dersch - 2.6.5-2 -- rebuilt for cfitsio 3.450 - -* 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 -- Specify libindi to be >= 1.5 - -* Fri Feb 23 2018 Christian Dersch - 2.6.4-6 -- rebuilt for cfitsio 3.420 (so version bump) - -* Tue Feb 13 2018 Mattia Verga - 2.6.4-5 -- Enable test output on failures - -* Fri Feb 09 2018 Fedora Release Engineering - 2.6.4-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Sun Nov 05 2017 Mattia Verga - 2.6.4-3 -- Fix spurious exec bits and line endings -- Use more macros -- Purge another unneeded directory from sources -- Use C++14 flag - -* Sat Nov 04 2017 Mattia Verga - 2.6.4-2 -- Breakdown components licenses -- Add some useful docs -- Add weak dependency to libindi - -* Thu Nov 02 2017 Mattia Verga - 2.6.4-1 -- Initial packaging +%autochangelog From 0ab98442d111f658897406c298771e99c56e9618 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Thu, 29 Dec 2022 09:43:27 -1000 Subject: [PATCH 31/48] Rebuild for cfitsio 4.2 From 66b8cecbda881bd1f85a9f9f216c406146b1eef4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 20 Jan 2023 08:13:05 +0000 Subject: [PATCH 32/48] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 6ec68803067da57bfd478ceeaa4239453bb7d156 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Wed, 15 Feb 2023 09:57:29 +0100 Subject: [PATCH 33/48] Update to latest snapshot ... for libindi 2.0 compatibility - Update license tag to SPDX --- .gitignore | 1 + phd2.spec | 29 ++++++++++++++++++++++------- sources | 2 +- 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 090270b..ab81096 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /phd2-2.6.9-purged.tar.xz /phd2-2.6.10-purged.tar.xz /phd2-2.6.11-purged.tar.xz +/phd2-a205f63238c8505cf641057d8d82734e51f9ab15-purged.tar.xz diff --git a/phd2.spec b/phd2.spec index b66259d..92bf91b 100644 --- a/phd2.spec +++ b/phd2.spec @@ -1,18 +1,29 @@ +#%%global gittag v2.6.11 +%global commit a205f63238c8505cf641057d8d82734e51f9ab15 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global date 20230212 + Name: phd2 +%if "%{?gittag}" Version: 2.6.11 +%else +Version: 2.6.11^dev4^%{date}%{shortcommit} +%endif Release: %autorelease Summary: Telescope guiding software -# Main program files are BSD licensed -# Some components have different licenses: -# QHY camera headers are GPLv2+ -# SX camera headers are ICU -# INDI GUI is LGPLv2+ -License: BSD and (GPLv2+ and MIT and LGPLv2+) +License: BSD-3-Clause AND LGPL-2.1-or-later AND ICU URL: http://openphdguiding.org/ +%if "%{?gittag}" # Download upstream tarball from -# https://github.com/OpenPHDGuiding/%%{name}/archive/v%%{version}.tar.gz +# https://github.com/OpenPHDGuiding/%%{name}/archive/%%{gittag}.tar.gz # and then run ./generate-tarball.sh %%{version} Source0: %{name}-%{version}-purged.tar.xz +%else +# Download upstream tarball from +# https://github.com/OpenPHDGuiding/%%{name}/archive/%%{commit}/%%{name}-%%{commit}.tar.gz +# and then run ./generate-tarball.sh %%{commit} +Source0: %{name}-%{commit}-purged.tar.xz +%endif # Script to purge binaries and unneeded files from downloaded sources Source1: generate-tarball.sh @@ -47,7 +58,11 @@ or spectroscopy. %prep +%if "%{?gittag}" %autosetup -p1 +%else +%autosetup -n %{name}-%{commit} -p1 +%endif # Remove spurious executable bit set on icons and docs find icons -type f -print0 |xargs -0 chmod -x diff --git a/sources b/sources index 4467b7e..7861c66 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phd2-2.6.11-purged.tar.xz) = 0fa640cf528d9b4a5a2119d41f63aa8af82cf2e1d588884d85b1ff5731a3641f06e380828450b727b0fd44efba0f2aa7face1b0090eea4cc21374acf58ffb316 +SHA512 (phd2-a205f63238c8505cf641057d8d82734e51f9ab15-purged.tar.xz) = 383fbed8f7770693e27b98210ad83baced7a24328f965bb3c4c2dd7a8eb0742496a086c418d2b38ea54e9b1882abd9e667978ff6ddddacd8c853e99337ea5d13 From e04b7fe386f77bcff3e3bc796558d4d2a19098b9 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Wed, 15 Feb 2023 10:18:42 +0100 Subject: [PATCH 34/48] Stop building on ix86 --- phd2.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/phd2.spec b/phd2.spec index 92bf91b..6c842a8 100644 --- a/phd2.spec +++ b/phd2.spec @@ -30,6 +30,9 @@ Source1: generate-tarball.sh # Do not force c++ std Patch99: phd2_2.9.10_std_cflags.patch +# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval +ExcludeArch: %{ix86} + BuildRequires: cmake BuildRequires: desktop-file-utils BuildRequires: dos2unix From bdc618a26e315506cbcaf2990feac56bac0e7721 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jul 2023 03:59:31 +0000 Subject: [PATCH 35/48] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 1a2a1d93c3c68ac1ca9aa88b7a3851ed056838d2 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Thu, 23 Nov 2023 19:10:43 +0100 Subject: [PATCH 36/48] Update to stable 2.6.12 (fedora#2250966) --- .gitignore | 1 + phd2.spec | 10 +++++----- sources | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index ab81096..f1a8b19 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /phd2-2.6.10-purged.tar.xz /phd2-2.6.11-purged.tar.xz /phd2-a205f63238c8505cf641057d8d82734e51f9ab15-purged.tar.xz +/phd2-2.6.12-purged.tar.xz diff --git a/phd2.spec b/phd2.spec index 6c842a8..bf04914 100644 --- a/phd2.spec +++ b/phd2.spec @@ -1,11 +1,11 @@ -#%%global gittag v2.6.11 -%global commit a205f63238c8505cf641057d8d82734e51f9ab15 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global date 20230212 +%global gittag v2.6.12 +#%%global commit a205f63238c8505cf641057d8d82734e51f9ab15 +#%%global shortcommit %%(c=%%{commit}; echo ${c:0:7}) +#%%global date 20230212 Name: phd2 %if "%{?gittag}" -Version: 2.6.11 +Version: 2.6.12 %else Version: 2.6.11^dev4^%{date}%{shortcommit} %endif diff --git a/sources b/sources index 7861c66..961442d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phd2-a205f63238c8505cf641057d8d82734e51f9ab15-purged.tar.xz) = 383fbed8f7770693e27b98210ad83baced7a24328f965bb3c4c2dd7a8eb0742496a086c418d2b38ea54e9b1882abd9e667978ff6ddddacd8c853e99337ea5d13 +SHA512 (phd2-2.6.12-purged.tar.xz) = c9855abcedec4522b9f259338f6c60f3d28264e2f5b0ca152e6669b2aa374a1d200b65ae97f8d62bbf71bb96c54e40cffeabbe73210617994a06baef54828699 From 77e6896cf6b8398cb60a516b399d8606cd01e48a Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Wed, 3 Jan 2024 17:02:11 +0100 Subject: [PATCH 37/48] Update to 2.6.13 (fedora#2255705) --- .gitignore | 1 + phd2.spec | 4 ++-- sources | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f1a8b19..84aab6f 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /phd2-2.6.11-purged.tar.xz /phd2-a205f63238c8505cf641057d8d82734e51f9ab15-purged.tar.xz /phd2-2.6.12-purged.tar.xz +/phd2-2.6.13-purged.tar.xz diff --git a/phd2.spec b/phd2.spec index bf04914..e66dd41 100644 --- a/phd2.spec +++ b/phd2.spec @@ -1,11 +1,11 @@ -%global gittag v2.6.12 +%global gittag v2.6.13 #%%global commit a205f63238c8505cf641057d8d82734e51f9ab15 #%%global shortcommit %%(c=%%{commit}; echo ${c:0:7}) #%%global date 20230212 Name: phd2 %if "%{?gittag}" -Version: 2.6.12 +Version: 2.6.13 %else Version: 2.6.11^dev4^%{date}%{shortcommit} %endif diff --git a/sources b/sources index 961442d..1f580ba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phd2-2.6.12-purged.tar.xz) = c9855abcedec4522b9f259338f6c60f3d28264e2f5b0ca152e6669b2aa374a1d200b65ae97f8d62bbf71bb96c54e40cffeabbe73210617994a06baef54828699 +SHA512 (phd2-2.6.13-purged.tar.xz) = 5553b4bf3a51dfec32e98f5bd6d65f202a8071557f867f39ace1ba2cdb2cf66511a846e18104a85f16b1d8e3d202bf24b32f38294f630ad8373ebafe1ebbd770 From e197ccaf72a5900f7ba39241696b6293378ffe43 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 20:38:01 +0000 Subject: [PATCH 38/48] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From b0bc54a8ef5a3c41435eff14223a4c47d5fab774 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 22:23:28 +0000 Subject: [PATCH 39/48] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 0773e0070ff1375cf89800e516dd849e1a0d6ee9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 06:40:26 +0000 Subject: [PATCH 40/48] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 02b9303ec6eb964cc42df826fb105057a751fa00 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Fri, 2 Aug 2024 18:31:11 +0200 Subject: [PATCH 41/48] Add gcc and gcc-c++ to BRs (fix F41 FTB fedora#2301036) --- phd2.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/phd2.spec b/phd2.spec index e66dd41..772f1a6 100644 --- a/phd2.spec +++ b/phd2.spec @@ -37,6 +37,8 @@ BuildRequires: cmake BuildRequires: desktop-file-utils BuildRequires: dos2unix BuildRequires: extra-cmake-modules +BuildRequires: gcc +BuildRequires: gcc-c++ BuildRequires: gettext BuildRequires: gtest-devel BuildRequires: libappstream-glib From 7e43e46fa353dff91e7ae9e5f0db1ff2d1649904 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Terje=20R=C3=B8sten?= Date: Sun, 3 Nov 2024 19:51:40 +0100 Subject: [PATCH 42/48] Fix missing include --- phd2-2.6.13-include.patch | 12 ++++++++++++ phd2.spec | 1 + 2 files changed, 13 insertions(+) create mode 100644 phd2-2.6.13-include.patch diff --git a/phd2-2.6.13-include.patch b/phd2-2.6.13-include.patch new file mode 100644 index 0000000..6f4b63b --- /dev/null +++ b/phd2-2.6.13-include.patch @@ -0,0 +1,12 @@ +diff --git a/contributions/MPI_IS_gaussian_process/tests/gaussian_process/gp_guider_test.cpp b/contributions/MPI_IS_gaussian_process/tests/gaussian_process/gp_guider_test.cpp +index 019c16f..8518bf3 100644 +--- a/contributions/MPI_IS_gaussian_process/tests/gaussian_process/gp_guider_test.cpp ++++ b/contributions/MPI_IS_gaussian_process/tests/gaussian_process/gp_guider_test.cpp +@@ -38,6 +38,7 @@ + #include + #include + #include ++#include + #include "gaussian_process_guider.h" + + #include diff --git a/phd2.spec b/phd2.spec index 772f1a6..3bd664c 100644 --- a/phd2.spec +++ b/phd2.spec @@ -29,6 +29,7 @@ Source1: generate-tarball.sh # Do not force c++ std Patch99: phd2_2.9.10_std_cflags.patch +Patch100: phd2-2.6.13-include.patch # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval ExcludeArch: %{ix86} From 3e95906a5f40deeea06b721037f4be1f021404ee Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sat, 11 Jan 2025 10:28:25 +0100 Subject: [PATCH 43/48] Rebuilt for libnova v0.16 From c5902a82b5249d9ec6318e42232d864bd14e521e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 08:50:54 +0000 Subject: [PATCH 44/48] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From b0b16005cf1f91f9cca0b37e5b6aa95a0d803b78 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sun, 20 Jul 2025 10:59:39 +0200 Subject: [PATCH 45/48] Use standard %ctest (Fedora#2381095) --- phd2.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/phd2.spec b/phd2.spec index 3bd664c..4a214bd 100644 --- a/phd2.spec +++ b/phd2.spec @@ -94,7 +94,8 @@ chmod -x PHD_2.0_Architecture.docx %find_lang %{name} %check -env CTEST_OUTPUT_ON_FAILURE=1 make test -C %{_vpath_builddir} +%ctest +#env CTEST_OUTPUT_ON_FAILURE=1 make test -C %%{_vpath_builddir} desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{name}.appdata.xml From 853c8d2ee17fbaff2beffc65106232f8baac4965 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 05:06:58 +0000 Subject: [PATCH 46/48] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From ad7d26fb03f10adb8de0ee269aa881c828813d31 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 15 Oct 2025 20:15:18 +0200 Subject: [PATCH 47/48] Fix build against eigen3-5.0.0 --- phd2-cassert.patch | 11 +++++++++++ phd2-eigen3.patch | 13 +++++++++++++ phd2.spec | 5 +++++ 3 files changed, 29 insertions(+) create mode 100644 phd2-cassert.patch create mode 100644 phd2-eigen3.patch diff --git a/phd2-cassert.patch b/phd2-cassert.patch new file mode 100644 index 0000000..f038f72 --- /dev/null +++ b/phd2-cassert.patch @@ -0,0 +1,11 @@ +diff -rupN phd2-2.6.13/contributions/MPI_IS_gaussian_process/src/gaussian_process.cpp phd2-2.6.13-new/contributions/MPI_IS_gaussian_process/src/gaussian_process.cpp +--- phd2-2.6.13/contributions/MPI_IS_gaussian_process/src/gaussian_process.cpp 2023-12-22 23:20:44.000000000 +0100 ++++ phd2-2.6.13-new/contributions/MPI_IS_gaussian_process/src/gaussian_process.cpp 2025-10-15 15:21:41.904181644 +0200 +@@ -41,6 +41,7 @@ + * @brief The GP class implements the Gaussian Process functionality. + */ + ++#include + #include + + #include "gaussian_process.h" diff --git a/phd2-eigen3.patch b/phd2-eigen3.patch new file mode 100644 index 0000000..d3ee84d --- /dev/null +++ b/phd2-eigen3.patch @@ -0,0 +1,13 @@ +diff -rupN --no-dereference phd2-2.6.13/thirdparty/thirdparty.cmake phd2-2.6.13-new/thirdparty/thirdparty.cmake +--- phd2-2.6.13/thirdparty/thirdparty.cmake 2023-12-22 23:20:44.000000000 +0100 ++++ phd2-2.6.13-new/thirdparty/thirdparty.cmake 2025-10-15 15:21:16.903932111 +0200 +@@ -528,6 +528,9 @@ endif() + + if(USE_SYSTEM_EIGEN3) + find_package(Eigen3 REQUIRED) ++ if(TARGET Eigen3::Eigen) ++ get_target_property(EIGEN3_INCLUDE_DIR Eigen3::Eigen INTERFACE_INCLUDE_DIRECTORIES) ++ endif() + set(EIGEN_SRC ${EIGEN3_INCLUDE_DIR}) + message(STATUS "Using system's Eigen3.") + else(USE_SYSTEM_EIGEN3) diff --git a/phd2.spec b/phd2.spec index 4a214bd..6860dfa 100644 --- a/phd2.spec +++ b/phd2.spec @@ -31,6 +31,11 @@ Source1: generate-tarball.sh Patch99: phd2_2.9.10_std_cflags.patch Patch100: phd2-2.6.13-include.patch +# Fix eigen 5.0.0 detection +Patch101: phd2-eigen3.patch +# Fix missing cassert include +Patch102: phd2-cassert.patch + # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval ExcludeArch: %{ix86} From cd94a23e7c4555840900cc71d7fc32a0910799fe Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sun, 14 Dec 2025 09:56:51 +0100 Subject: [PATCH 48/48] Update to 2.6.14 (Fedora#2420907) --- .gitignore | 1 + generate-tarball.sh | 1 + phd2-2.6.13-include.patch | 12 ------------ phd2-cassert.patch | 11 ----------- phd2-eigen3.patch | 26 +++++++++++++++++++------- phd2.spec | 12 +++++------- sources | 2 +- 7 files changed, 27 insertions(+), 38 deletions(-) delete mode 100644 phd2-2.6.13-include.patch delete mode 100644 phd2-cassert.patch diff --git a/.gitignore b/.gitignore index 84aab6f..5b1a282 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /phd2-a205f63238c8505cf641057d8d82734e51f9ab15-purged.tar.xz /phd2-2.6.12-purged.tar.xz /phd2-2.6.13-purged.tar.xz +/phd2-2.6.14-purged.tar.xz diff --git a/generate-tarball.sh b/generate-tarball.sh index 35b828a..650599b 100755 --- a/generate-tarball.sh +++ b/generate-tarball.sh @@ -20,6 +20,7 @@ find . -name "*.lib" -type f -delete find . -name "*.dylib" -type f -delete find . -name "*.a" -type f -delete find . -name "*.so" -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-2.6.13-include.patch b/phd2-2.6.13-include.patch deleted file mode 100644 index 6f4b63b..0000000 --- a/phd2-2.6.13-include.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/contributions/MPI_IS_gaussian_process/tests/gaussian_process/gp_guider_test.cpp b/contributions/MPI_IS_gaussian_process/tests/gaussian_process/gp_guider_test.cpp -index 019c16f..8518bf3 100644 ---- a/contributions/MPI_IS_gaussian_process/tests/gaussian_process/gp_guider_test.cpp -+++ b/contributions/MPI_IS_gaussian_process/tests/gaussian_process/gp_guider_test.cpp -@@ -38,6 +38,7 @@ - #include - #include - #include -+#include - #include "gaussian_process_guider.h" - - #include diff --git a/phd2-cassert.patch b/phd2-cassert.patch deleted file mode 100644 index f038f72..0000000 --- a/phd2-cassert.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -rupN phd2-2.6.13/contributions/MPI_IS_gaussian_process/src/gaussian_process.cpp phd2-2.6.13-new/contributions/MPI_IS_gaussian_process/src/gaussian_process.cpp ---- phd2-2.6.13/contributions/MPI_IS_gaussian_process/src/gaussian_process.cpp 2023-12-22 23:20:44.000000000 +0100 -+++ phd2-2.6.13-new/contributions/MPI_IS_gaussian_process/src/gaussian_process.cpp 2025-10-15 15:21:41.904181644 +0200 -@@ -41,6 +41,7 @@ - * @brief The GP class implements the Gaussian Process functionality. - */ - -+#include - #include - - #include "gaussian_process.h" diff --git a/phd2-eigen3.patch b/phd2-eigen3.patch index d3ee84d..ca33330 100644 --- a/phd2-eigen3.patch +++ b/phd2-eigen3.patch @@ -1,13 +1,25 @@ -diff -rupN --no-dereference phd2-2.6.13/thirdparty/thirdparty.cmake phd2-2.6.13-new/thirdparty/thirdparty.cmake ---- phd2-2.6.13/thirdparty/thirdparty.cmake 2023-12-22 23:20:44.000000000 +0100 -+++ phd2-2.6.13-new/thirdparty/thirdparty.cmake 2025-10-15 15:21:16.903932111 +0200 -@@ -528,6 +528,9 @@ endif() - - if(USE_SYSTEM_EIGEN3) +diff: a/cameras/playerone/linux/arm32/libPlayerOneCamera.so: File o directory non esistente +diff: a/cameras/playerone/linux/arm32/libPlayerOneCamera.so.3: File o directory non esistente +diff: a/cameras/playerone/linux/arm32/libPlayerOneCamera.so.3.7: File o directory non esistente +diff: a/cameras/playerone/linux/arm64/libPlayerOneCamera.so: File o directory non esistente +diff: a/cameras/playerone/linux/arm64/libPlayerOneCamera.so.3: File o directory non esistente +diff: a/cameras/playerone/linux/arm64/libPlayerOneCamera.so.3.7: File o directory non esistente +diff: a/cameras/playerone/linux/x64/libPlayerOneCamera.so: File o directory non esistente +diff: a/cameras/playerone/linux/x64/libPlayerOneCamera.so.3: File o directory non esistente +diff: a/cameras/playerone/linux/x64/libPlayerOneCamera.so.3.7: File o directory non esistente +diff: a/cameras/playerone/linux/x86/libPlayerOneCamera.so: File o directory non esistente +diff: a/cameras/playerone/linux/x86/libPlayerOneCamera.so.3: File o directory non esistente +diff: a/cameras/playerone/linux/x86/libPlayerOneCamera.so.3.7: File o directory non esistente +diff -U 3 -dHrN a/thirdparty/thirdparty.cmake b/thirdparty/thirdparty.cmake +--- a/thirdparty/thirdparty.cmake 2025-12-10 05:46:14.000000000 +0100 ++++ b/thirdparty/thirdparty.cmake 2025-12-14 09:44:56.704446893 +0100 +@@ -384,6 +384,9 @@ + set(EIGEN_SRC ${VCPKG_INCLUDE}/eigen3) + else() find_package(Eigen3 REQUIRED) + if(TARGET Eigen3::Eigen) + get_target_property(EIGEN3_INCLUDE_DIR Eigen3::Eigen INTERFACE_INCLUDE_DIRECTORIES) + endif() set(EIGEN_SRC ${EIGEN3_INCLUDE_DIR}) message(STATUS "Using system's Eigen3.") - else(USE_SYSTEM_EIGEN3) + endif() diff --git a/phd2.spec b/phd2.spec index 6860dfa..6dfbdd3 100644 --- a/phd2.spec +++ b/phd2.spec @@ -1,11 +1,11 @@ -%global gittag v2.6.13 +%global gittag v2.6.14 #%%global commit a205f63238c8505cf641057d8d82734e51f9ab15 #%%global shortcommit %%(c=%%{commit}; echo ${c:0:7}) #%%global date 20230212 Name: phd2 %if "%{?gittag}" -Version: 2.6.13 +Version: 2.6.14 %else Version: 2.6.11^dev4^%{date}%{shortcommit} %endif @@ -29,12 +29,9 @@ Source1: generate-tarball.sh # Do not force c++ std Patch99: phd2_2.9.10_std_cflags.patch -Patch100: phd2-2.6.13-include.patch # Fix eigen 5.0.0 detection Patch101: phd2-eigen3.patch -# Fix missing cassert include -Patch102: phd2-cassert.patch # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval ExcludeArch: %{ix86} @@ -57,6 +54,7 @@ BuildRequires: pkgconfig(eigen3) BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(libindi) >= 1.5 BuildRequires: pkgconfig(libusb-1.0) +BuildRequires: pkgconfig(opencv) BuildRequires: pkgconfig(zlib) Recommends: libindi @@ -77,7 +75,7 @@ or spectroscopy. # Remove spurious executable bit set on icons and docs find icons -type f -print0 |xargs -0 chmod -x -chmod -x PHD_2.0_Architecture.docx +chmod -x doc/PHD_2.0_Architecture.docx %build @@ -107,7 +105,7 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{name}. %files -f %{name}.lang -%doc README.txt PHD_2.0_Architecture.docx +%doc README.txt doc/PHD_2.0_Architecture.docx %license LICENSE.txt %{_bindir}/* %{_datadir}/metainfo/%{name}.appdata.xml diff --git a/sources b/sources index 1f580ba..77f1981 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phd2-2.6.13-purged.tar.xz) = 5553b4bf3a51dfec32e98f5bd6d65f202a8071557f867f39ace1ba2cdb2cf66511a846e18104a85f16b1d8e3d202bf24b32f38294f630ad8373ebafe1ebbd770 +SHA512 (phd2-2.6.14-purged.tar.xz) = 649f7bf7e3203097cce4fd37a614653da19d475f4118ae29a45f6db305923657bcfd5a9cb07f0e7d3ce5739c559b1ec2d1f3868a5c29b7afe975d12d22c9e1ec