Compare commits
15 Commits
| Author | SHA256 | Date | |
|---|---|---|---|
| 93b897e5fe | |||
| d659a9f32a | |||
| 2c17094795 | |||
| f608671a50 | |||
| d5dd847ebb | |||
| 75e74d097a | |||
| 4ebe42407a | |||
| b61e1fbbc2 | |||
| a5f699c8ad | |||
| 138d739fd6 | |||
| deec546fb6 | |||
| 82ad9bef60 | |||
| d1a6db5b81 | |||
| 766a9afc74 | |||
| 693da428c4 |
34
fix-cmakelists.patch
Normal file
34
fix-cmakelists.patch
Normal file
@@ -0,0 +1,34 @@
|
|||||||
|
Index: tenmon/CMakeLists.txt
|
||||||
|
===================================================================
|
||||||
|
--- tenmon.orig/CMakeLists.txt
|
||||||
|
+++ tenmon/CMakeLists.txt
|
||||||
|
@@ -24,8 +24,8 @@ find_library(RAW_LIB NAMES raw_r REQUIRE
|
||||||
|
find_library(WCS_LIB wcs wcslib REQUIRED)
|
||||||
|
find_library(LCMS2_LIB lcms2 REQUIRED)
|
||||||
|
find_library(STELLARSOLVER_LIB NAMES stellarsolver stellarsolver6)
|
||||||
|
-
|
||||||
|
-add_subdirectory(libXISF)
|
||||||
|
+find_library(LibXISF_LIBRARY NAMES libXISF XISF REQUIRED)
|
||||||
|
+find_library(ZSTD_LIB NAMES zstd REQUIRED)
|
||||||
|
|
||||||
|
set(TENMON_SRC
|
||||||
|
src/about.cpp src/about.h
|
||||||
|
@@ -79,7 +79,7 @@ endif()
|
||||||
|
qt_add_executable(tenmon WIN32 MACOSX_BUNDLE ${tenmon_ICON} ${TENMON_SRC})
|
||||||
|
|
||||||
|
find_path(FITS_INCLUDE fitsio2.h PATH_SUFFIXES cfitsio REQUIRED)
|
||||||
|
-target_include_directories(tenmon PRIVATE ${FITS_INCLUDE} ${CMAKE_BINARY_DIR} ${libXISF_SOURCE_DIR} "src")
|
||||||
|
+target_include_directories(tenmon PRIVATE ${FITS_INCLUDE} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src)
|
||||||
|
|
||||||
|
option(COLOR_MANAGMENT "Enable sRGB framebuffer support for gamma correct images and color profiles support" ON)
|
||||||
|
if(COLOR_MANAGMENT)
|
||||||
|
@@ -105,7 +105,8 @@ if(STELLARSOLVER_INCLUDE AND STELLARSOLV
|
||||||
|
message(STATUS "Found stellarsolver ${STELLARSOLVER_INCLUDE} ${STELLARSOLVER_LIB}")
|
||||||
|
endif(STELLARSOLVER_INCLUDE AND STELLARSOLVER_LIB)
|
||||||
|
|
||||||
|
-target_link_libraries(tenmon PRIVATE Qt6::Widgets Qt6::Sql Qt6::OpenGLWidgets Qt6::Qml Qt6::Charts ${EXIF_LIB} ${FITS_LIB} ${RAW_LIB} ${WCS_LIB} ${LCMS2_LIB} XISF)
|
||||||
|
+target_link_libraries(tenmon PRIVATE Qt6::Widgets Qt6::Sql Qt6::OpenGLWidgets Qt6::Qml Qt6::Charts ${EXIF_LIB} ${FITS_LIB} ${RAW_LIB} ${WCS_LIB} ${LCMS2_LIB} ${LibXISF_LIBRARY} ${ZSTD_LIB})
|
||||||
|
+
|
||||||
|
if(APPLE)
|
||||||
|
target_link_libraries(tenmon PRIVATE Qt6::DBus "-framework CoreFoundation")
|
||||||
|
elseif(UNIX)
|
||||||
@@ -1,30 +1,25 @@
|
|||||||
diff -ru orig/main.cpp mod/main.cpp
|
Index: tenmon/src/main.cpp
|
||||||
--- orig/main.cpp 2024-06-10 22:39:52.000000000 +0200
|
===================================================================
|
||||||
+++ mod/main.cpp 2024-06-12 07:44:13.782719909 +0200
|
--- tenmon.orig/src/main.cpp
|
||||||
@@ -3,7 +3,7 @@
|
+++ tenmon/src/main.cpp
|
||||||
#include <QSurfaceFormat>
|
@@ -5,6 +5,7 @@
|
||||||
#include <QTranslator>
|
#include <QCommandLineParser>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
-#include "libxisf.h"
|
#include "../thumbnailer/genthumbnail.h"
|
||||||
+#include <libxisf.h>
|
+#include <libxisf.h>
|
||||||
|
|
||||||
int main(int argc, char *argv[])
|
int main(int argc, char *argv[])
|
||||||
{
|
{
|
||||||
diff -ru orig/scriptengine.cpp mod/scriptengine.cpp
|
Index: tenmon/src/scriptengine.cpp
|
||||||
--- orig/scriptengine.cpp 2024-06-10 22:39:52.000000000 +0200
|
===================================================================
|
||||||
+++ mod/scriptengine.cpp 2024-06-12 07:44:24.692828986 +0200
|
--- tenmon.orig/src/scriptengine.cpp
|
||||||
@@ -1,4 +1,5 @@
|
+++ tenmon/src/scriptengine.cpp
|
||||||
#include "scriptengine.h"
|
@@ -10,7 +10,7 @@
|
||||||
+
|
#include "loadimage.h"
|
||||||
#include <QDir>
|
|
||||||
#include <QFileInfo>
|
|
||||||
#include <QDebug>
|
|
||||||
@@ -8,7 +9,7 @@
|
|
||||||
#include "loadrunable.h"
|
|
||||||
#include "batchprocessing.h"
|
#include "batchprocessing.h"
|
||||||
#include <fitsio2.h>
|
#include <fitsio2.h>
|
||||||
-#include "libXISF/libxisf.h"
|
-#include "libxisf.h"
|
||||||
+#include <libxisf.h>
|
+#include <libxisf.h>
|
||||||
|
#ifdef PLATESOLVER
|
||||||
namespace Script
|
#include "solver.h"
|
||||||
{
|
#endif // PLATESOLVER
|
||||||
|
|||||||
@@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:9a0ca57e8eebbb5d59c049220dc6e25433126a39dd9407aaa78949abc41b34a1
|
|
||||||
size 231445
|
|
||||||
3
tenmon-20250915.tar.gz
Normal file
3
tenmon-20250915.tar.gz
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:6e1cb161517e3e31c22a416d210f7de68b5c8d31c58fecd61e4fb98005ee526b
|
||||||
|
size 1470222
|
||||||
@@ -1,3 +1,37 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Oct 17 07:49:50 UTC 2025 - Paolo Stivanin <info@paolostivanin.com>
|
||||||
|
|
||||||
|
- Update to 20250915:
|
||||||
|
* Draw equatorial grid and objects overlay
|
||||||
|
* File Manager
|
||||||
|
* Support for PCL:AstrometricSolution
|
||||||
|
* Script console
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Apr 1 12:47:56 UTC 2025 - Paolo Stivanin <info@paolostivanin.com>
|
||||||
|
|
||||||
|
- Update to 20250318:
|
||||||
|
* Use only single database
|
||||||
|
* Add generating thumbnails from cmd line
|
||||||
|
* Configurable threshold
|
||||||
|
* Fix Do not prepend \\ to network share paths
|
||||||
|
* Add ability to have user defined colormaps
|
||||||
|
* For setSolverProfile use index 1-8
|
||||||
|
* Add best fit on image load
|
||||||
|
* Remove startfit
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Sun Feb 9 16:54:17 UTC 2025 - Paolo Stivanin <info@paolostivanin.com>
|
||||||
|
|
||||||
|
- Update to 20250126:
|
||||||
|
* Support for really big images +50000px
|
||||||
|
* Add setting solver profile in scripts
|
||||||
|
* Plate solving
|
||||||
|
* Open marked files as directory
|
||||||
|
* Improved ICC color profile handling
|
||||||
|
* Add *.fz and *.fts as FITS extension
|
||||||
|
- Rename use_system_libxisf.patch to fix-cmakelists.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Sep 13 12:54:08 UTC 2024 - Paolo Stivanin <info@paolostivanin.com>
|
Fri Sep 13 12:54:08 UTC 2024 - Paolo Stivanin <info@paolostivanin.com>
|
||||||
|
|
||||||
|
|||||||
11
tenmon.spec
11
tenmon.spec
@@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package tenmon
|
# spec file for package tenmon
|
||||||
#
|
#
|
||||||
# Copyright (c) 2024 SUSE LLC
|
# Copyright (c) 2025 SUSE LLC and contributors
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@@ -21,20 +21,22 @@
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
Name: tenmon
|
Name: tenmon
|
||||||
Version: 20240816
|
Version: 20250915
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: FITS and XISF image viewer, converter and indexer
|
Summary: FITS and XISF image viewer, converter and indexer
|
||||||
License: GPL-3.0-or-later
|
License: GPL-3.0-or-later
|
||||||
URL: https://gitea.nouspiro.space/nou/tenmon/
|
URL: https://gitea.nouspiro.space/nou/tenmon/
|
||||||
Source: https://gitea.nouspiro.space/nou/tenmon/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
Source: https://gitea.nouspiro.space/nou/tenmon/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||||
# PATCH-FIX-UPSTREAM
|
# PATCH-FIX-UPSTREAM
|
||||||
Patch0: use_system_libxisf.patch
|
Patch0: fix-cmakelists.patch
|
||||||
# PATCH-FIX-UPSTREAM
|
# PATCH-FIX-UPSTREAM
|
||||||
Patch1: fix-libxisf-include.patch
|
Patch1: fix-libxisf-include.patch
|
||||||
BuildRequires: gcc%{?force_gcc_version}-c++ >= 12
|
BuildRequires: gcc%{?force_gcc_version}-c++ >= 12
|
||||||
BuildRequires: libXISF-devel >= 0.2.12+git5.d00de20
|
BuildRequires: libXISF-devel >= 0.2.13+git3.556bb22
|
||||||
|
BuildRequires: libzstd-devel
|
||||||
BuildRequires: pkgconfig
|
BuildRequires: pkgconfig
|
||||||
BuildRequires: qt6-base-devel >= 6.2.0
|
BuildRequires: qt6-base-devel >= 6.2.0
|
||||||
|
BuildRequires: pkgconfig(Qt6Charts)
|
||||||
BuildRequires: pkgconfig(Qt6OpenGL)
|
BuildRequires: pkgconfig(Qt6OpenGL)
|
||||||
BuildRequires: pkgconfig(Qt6Qml)
|
BuildRequires: pkgconfig(Qt6Qml)
|
||||||
BuildRequires: pkgconfig(Qt6Sql)
|
BuildRequires: pkgconfig(Qt6Sql)
|
||||||
@@ -92,5 +94,6 @@ export CXXFLAGS=$(echo "$CXXFLAGS -Wno-switch -Wno-catch-value")
|
|||||||
%{_datadir}/icons/hicolor/128x128/apps/space.nouspiro.tenmon.png
|
%{_datadir}/icons/hicolor/128x128/apps/space.nouspiro.tenmon.png
|
||||||
%{_datadir}/icons/hicolor/64x64/apps/space.nouspiro.tenmon.png
|
%{_datadir}/icons/hicolor/64x64/apps/space.nouspiro.tenmon.png
|
||||||
%{_datadir}/metainfo/space.nouspiro.tenmon.metainfo.xml
|
%{_datadir}/metainfo/space.nouspiro.tenmon.metainfo.xml
|
||||||
|
%{_datadir}/mime/packages/space.nouspiro.tenmon.xisf.xml
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
|||||||
@@ -1,30 +0,0 @@
|
|||||||
Index: tenmon/CMakeLists.txt
|
|
||||||
===================================================================
|
|
||||||
--- tenmon.orig/CMakeLists.txt
|
|
||||||
+++ tenmon/CMakeLists.txt
|
|
||||||
@@ -24,8 +24,7 @@ find_library(EXIF_LIB exif REQUIRED)
|
|
||||||
find_library(FITS_LIB cfitsio REQUIRED)
|
|
||||||
find_library(RAW_LIB NAMES raw_r REQUIRED)
|
|
||||||
find_library(WCS_LIB wcs wcslib PATHS REQUIRED)
|
|
||||||
-
|
|
||||||
-add_subdirectory(libXISF)
|
|
||||||
+find_library(LibXISF_LIBRARY NAMES libXISF XISF REQUIRED)
|
|
||||||
|
|
||||||
set(TENMON_SRC
|
|
||||||
about.cpp about.h
|
|
||||||
@@ -78,13 +77,13 @@ endif()
|
|
||||||
qt_add_executable(tenmon WIN32 MACOSX_BUNDLE ${tenmon_ICON} ${TENMON_SRC})
|
|
||||||
|
|
||||||
find_path(FITS_INCLUDE fitsio2.h PATH_SUFFIXES cfitsio REQUIRED)
|
|
||||||
-target_include_directories(tenmon PRIVATE ${FITS_INCLUDE} ${CMAKE_BINARY_DIR} ${libXISF_SOURCE_DIR})
|
|
||||||
+target_include_directories(tenmon PRIVATE ${FITS_INCLUDE} ${CMAKE_BINARY_DIR})
|
|
||||||
|
|
||||||
if(UNIX AND NOT APPLE)
|
|
||||||
target_include_directories(tenmon PRIVATE ${GIO_INCLUDE_DIRS})
|
|
||||||
endif()
|
|
||||||
|
|
||||||
-target_link_libraries(tenmon PRIVATE Qt6::Widgets Qt6::Sql Qt6::OpenGLWidgets Qt6::Qml ${GSL_LIB} ${GSLCBLAS_LIB} ${EXIF_LIB} ${FITS_LIB} ${RAW_LIB} ${WCS_LIB} XISF)
|
|
||||||
+target_link_libraries(tenmon PRIVATE Qt6::Widgets Qt6::Sql Qt6::OpenGLWidgets Qt6::Qml ${GSL_LIB} ${GSLCBLAS_LIB} ${EXIF_LIB} ${FITS_LIB} ${RAW_LIB} ${WCS_LIB} ${LibXISF_LIBRARY})
|
|
||||||
if(APPLE)
|
|
||||||
target_link_libraries(tenmon PRIVATE Qt6::DBus "-framework CoreFoundation")
|
|
||||||
elseif(UNIX)
|
|
||||||
Reference in New Issue
Block a user