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-eigen3.patch b/phd2-eigen3.patch new file mode 100644 index 0000000..ca33330 --- /dev/null +++ b/phd2-eigen3.patch @@ -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() diff --git a/phd2.spec b/phd2.spec index 772f1a6..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 @@ -30,6 +30,9 @@ 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} @@ -51,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 @@ -71,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 @@ -93,14 +97,15 @@ 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 %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