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