Compare commits

...
Sign in to create a new pull request.

48 commits

Author SHA1 Message Date
Mattia Verga
cd94a23e7c Update to 2.6.14 (Fedora#2420907) 2025-12-14 09:56:51 +01:00
Sandro Mani
ad7d26fb03 Fix build against eigen3-5.0.0 2025-10-15 20:15:18 +02:00
Fedora Release Engineering
853c8d2ee1 Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-25 05:06:58 +00:00
Mattia Verga
b0b16005cf Use standard %ctest (Fedora#2381095) 2025-07-20 10:59:39 +02:00
Fedora Release Engineering
c5902a82b5 Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-18 08:50:54 +00:00
Mattia Verga
3e95906a5f Rebuilt for libnova v0.16 2025-01-11 10:28:25 +01:00
Terje Røsten
7e43e46fa3 Fix missing include 2024-11-03 19:51:40 +01:00
Mattia Verga
02b9303ec6 Add gcc and gcc-c++ to BRs (fix F41 FTB fedora#2301036) 2024-08-02 18:31:11 +02:00
Fedora Release Engineering
0773e0070f Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-19 06:40:26 +00:00
Fedora Release Engineering
b0bc54a8ef Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-25 22:23:28 +00:00
Fedora Release Engineering
e197ccaf72 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-21 20:38:01 +00:00
Mattia Verga
77e6896cf6 Update to 2.6.13 (fedora#2255705) 2024-01-03 17:02:11 +01:00
Mattia Verga
1a2a1d93c3 Update to stable 2.6.12 (fedora#2250966) 2023-11-23 19:10:43 +01:00
Fedora Release Engineering
bdc618a26e Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-21 03:59:31 +00:00
Mattia Verga
e04b7fe386 Stop building on ix86 2023-02-15 10:18:42 +01:00
Mattia Verga
6ec6880306 Update to latest snapshot
... for libindi 2.0 compatibility
- Update license tag to SPDX
2023-02-15 09:57:29 +01:00
Fedora Release Engineering
66b8cecbda Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-20 08:13:05 +00:00
Maxwell G
0ab98442d1
Rebuild for cfitsio 4.2 2022-12-29 09:43:27 -10:00
Mattia Verga
a817793031 Convert to rpmautospec 2022-10-18 08:39:56 +02:00
Scott Talbert
46ca41f200 Rebuild with wxWidgets 3.2 2022-08-04 14:33:17 -04:00
Fedora Release Engineering
71b0c6e776 Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-22 13:06:12 +00:00
Mattia Verga
6e1849cdf1 Disable parallel build 2022-02-26 11:46:17 +01:00
Mattia Verga
e6a308aca1 Update to 2.6.11 (fedora#2057427) 2022-02-24 10:38:04 +01:00
Fedora Release Engineering
2517e2e681 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-21 07:12:20 +00:00
Mattia Verga
7b6d8f080d Replace _target_platform macro with _vpath_builddir 2021-07-31 10:01:54 +02:00
Fedora Release Engineering
49c33f8958 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-23 01:29:19 +00:00
Mattia Verga
af1c24385a Update to 2.6.10 2021-06-27 13:25:58 +02:00
Mattia Verga
f79c7bfa52 Rebuild for cfitsio soname bump 2021-02-11 18:06:49 +01:00
Fedora Release Engineering
e20f6bc823 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-01-27 06:18:16 +00:00
Mattia Verga
4f42342b13 Use new cmake macros 2020-08-04 18:40:19 +02:00
Mattia Verga
5d7738e87e Another rebuild attempt for F33 Mass Rebuild after gettext has been fixed 2020-08-04 18:10:53 +02:00
Fedora Release Engineering
a56355bea4 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-08-01 07:03:12 +00:00
Fedora Release Engineering
60c85a5ab3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-07-28 20:34:58 +00:00
Mattia Verga
acd0d34e51 Update to 2.6.9 2020-07-05 11:40:07 +02:00
Mattia Verga
3cecb7fe72 Upgrade to 2.6.8 2020-05-18 13:57:53 +02:00
Mattia Verga
0c8b2b7f29 Update to 2.6.7 stable. 2020-02-08 17:55:17 +01:00
Fedora Release Engineering
4ef7cbb3c6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-01-30 06:44:00 +00:00
Fedora Release Engineering
778381ae4f - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-07-26 08:36:28 +00:00
Mattia Verga
6a280e5572 Update to 2.6.6 2019-03-30 10:29:08 +01:00
Fedora Release Engineering
a513215361 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-02-02 02:08:04 +00:00
Fedora Release Engineering
04fae7b1f7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-07-13 21:07:15 +00:00
Christian Dersch
1ad3903574 rebuilt for cfitsio 3.450 2018-05-26 12:08:33 +02:00
Mattia Verga
195a9fea69 Specify libindi to be >= 1.5
Tests are still failing on i686, so exclude them again.
2018-05-07 19:34:42 +02:00
Mattia Verga
d05674d0db Update to 2.6.5
Remove obsolete scriptlets
Use upstream patch to disable third party camera drivers
2018-05-07 19:11:05 +02:00
Christian Dersch
1b370aa5db rebuilt for cfitsio 3.420 (so version bump) 2018-02-23 20:47:49 +01:00
Mattia Verga
22927667c4 Enable test output on failures 2018-02-13 18:15:16 +01:00
Fedora Release Engineering
065db5276b - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-02-09 02:55:00 +00:00
Mattia Verga
4f66b0e438 Initial import (#1509034). 2017-11-06 18:18:18 +01:00
8 changed files with 317 additions and 3 deletions

12
.gitignore vendored Normal file
View file

@ -0,0 +1,12 @@
/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
/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
/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

View file

@ -1,3 +0,0 @@
# phd2
The phd2 package

100
changelog Normal file
View file

@ -0,0 +1,100 @@
* Thu Aug 04 2022 Scott Talbert <swt@techie.net> - 2.6.11-4
- Rebuild with wxWidgets 3.2
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.11-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Sat Feb 26 2022 Mattia Verga <mattia.verga@protonmail.com> - 2.6.11-2
- Disable parallel build
* Thu Feb 24 2022 Mattia Verga <mattia.verga@protonmail.com> - 2.6.11-1
- Update to 2.6.11 (fedora#2057427)
* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.10-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Sat Jul 31 2021 Mattia Verga <mattia.verga@protonmail.com> - 2.6.10-3
- Replace _target_platform macro with _vpath_builddir
- Fixes rhbz#1987803
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.10-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Sun Jun 27 2021 Mattia Verga <mattia.verga@protonmail.com> - 2.6.10-1
- Update to 2.6.10
- Fixes rhbz#1976560
* Thu Feb 11 2021 Mattia Verga <mattia.verga@protonmail.com> - 2.6.9-6
- Rebuilt for cfitsio soname bump
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.9-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Aug 04 2020 Mattia Verga <mattia.verga@protonmail.com> - 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 <releng@fedoraproject.org> - 2.6.9-3
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.9-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Sun Jul 05 2020 Mattia Verga <mattia.verga@protonmail.com> - 2.6.9-1
- Upgrade to 2.6.9
- Fixes rhbz#1853866
* Mon May 18 2020 Mattia Verga <mattia.verga@protonmail.com> - 2.6.8-1
- Upgrade to 2.6.8
* Sat Feb 08 2020 Mattia Verga <mattia.verga@protonmail.com> - 2.6.7-1
- Upgrade to 2.6.7
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.6-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Sat Mar 30 2019 Mattia Verga <mattia.verga@protonmail.com> - 2.6.6-1
- Upgrade to 2.6.6
- Enable tests on i686
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.5-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Sat May 26 2018 Christian Dersch <lupinix@mailbox.org> - 2.6.5-2
- rebuilt for cfitsio 3.450
* Mon May 07 2018 Mattia Verga <mattia.verga@email.it> - 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 <lupinix@mailbox.org> - 2.6.4-6
- rebuilt for cfitsio 3.420 (so version bump)
* Tue Feb 13 2018 Mattia Verga <mattia.verga@email.it> - 2.6.4-5
- Enable test output on failures
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.4-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Sun Nov 05 2017 Mattia Verga <mattia.verga@email.it> - 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 <mattia.verga@email.it> - 2.6.4-2
- Breakdown components licenses
- Add some useful docs
- Add weak dependency to libindi
* Thu Nov 02 2017 Mattia Verga <mattia.verga@email.it> - 2.6.4-1
- Initial packaging

29
generate-tarball.sh Executable file
View file

@ -0,0 +1,29 @@
#!/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/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
find . -name "*.so.*" -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

25
phd2-eigen3.patch Normal file
View file

@ -0,0 +1,25 @@
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.")
endif()

118
phd2.spec Normal file
View file

@ -0,0 +1,118 @@
%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.14
%else
Version: 2.6.11^dev4^%{date}%{shortcommit}
%endif
Release: %autorelease
Summary: Telescope guiding software
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/%%{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
# Do not force c++ std
Patch99: phd2_2.9.10_std_cflags.patch
# Fix eigen 5.0.0 detection
Patch101: phd2-eigen3.patch
# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
ExcludeArch: %{ix86}
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
BuildRequires: libindi-static
BuildRequires: libnova-devel
BuildRequires: wxGTK-devel
BuildRequires: pkgconfig(cfitsio)
BuildRequires: pkgconfig(eigen3)
BuildRequires: pkgconfig(libcurl)
BuildRequires: pkgconfig(libindi) >= 1.5
BuildRequires: pkgconfig(libusb-1.0)
BuildRequires: pkgconfig(opencv)
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
%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
chmod -x doc/PHD_2.0_Architecture.docx
%build
%{cmake} -DUSE_SYSTEM_CFITSIO=ON \
-DUSE_SYSTEM_LIBUSB=ON \
-DUSE_SYSTEM_EIGEN3=ON \
-DUSE_SYSTEM_GTEST=ON \
-DUSE_SYSTEM_LIBINDI=ON \
-DOPENSOURCE_ONLY=ON
# Build is not parallel safe
# https://github.com/OpenPHDGuiding/phd2/issues/972
%cmake_build -j1
%install
%cmake_install
%find_lang %{name}
%check
%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
%files -f %{name}.lang
%doc README.txt doc/PHD_2.0_Architecture.docx
%license LICENSE.txt
%{_bindir}/*
%{_datadir}/metainfo/%{name}.appdata.xml
%{_datadir}/applications/%{name}.desktop
%{_datadir}/phd2/
%{_datadir}/pixmaps/*
%changelog
%autochangelog

View file

@ -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()

1
sources Normal file
View file

@ -0,0 +1 @@
SHA512 (phd2-2.6.14-purged.tar.xz) = 649f7bf7e3203097cce4fd37a614653da19d475f4118ae29a45f6db305923657bcfd5a9cb07f0e7d3ce5739c559b1ec2d1f3868a5c29b7afe975d12d22c9e1ec