Accepting request 1115801 from graphics
OBS-URL: https://build.opensuse.org/request/show/1115801 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/siril?expand=0&rev=19
This commit is contained in:
commit
519c8c7520
@ -1,26 +0,0 @@
|
|||||||
From 15d475774e4f9e0498618466f8e349070688f4dc Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
|
|
||||||
Date: Fri, 23 Jun 2023 16:35:09 +0200
|
|
||||||
Subject: [PATCH] Fix compilation with Exiv 0.28
|
|
||||||
|
|
||||||
Extracted from commit a593c2b10c9090b5f991718148d61c0fa156fb41.
|
|
||||||
---
|
|
||||||
src/core/exif.cpp | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/src/core/exif.cpp b/src/core/exif.cpp
|
|
||||||
index 6bc5c52..266abec 100644
|
|
||||||
--- a/src/core/exif.cpp
|
|
||||||
+++ b/src/core/exif.cpp
|
|
||||||
@@ -108,7 +108,7 @@ int siril_get_thumbnail_exiv(const char *path, uint8_t **buffer, size_t *size, c
|
|
||||||
//std::cerr << "[exiv2] "<< path << ": found thumbnail "<< preview.width() << "x" << preview.height() << std::endl;
|
|
||||||
memcpy(*buffer, tmp, _size);
|
|
||||||
return 0;
|
|
||||||
- } catch (Exiv2::AnyError &e) {
|
|
||||||
+ } catch (Exiv2::Error &e) {
|
|
||||||
std::string s(e.what());
|
|
||||||
std::cerr << "[exiv2]: " << s << std::endl;
|
|
||||||
return 1;
|
|
||||||
--
|
|
||||||
2.41.0
|
|
||||||
|
|
22
fix-exiv2.patch
Normal file
22
fix-exiv2.patch
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
Index: siril-1.2.0/src/core/exif.cpp
|
||||||
|
===================================================================
|
||||||
|
--- siril-1.2.0.orig/src/core/exif.cpp
|
||||||
|
+++ siril-1.2.0/src/core/exif.cpp
|
||||||
|
@@ -121,10 +121,16 @@ int siril_get_thumbnail_exiv(const char
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
+#if EXIV2_TEST_VERSION(0,28,0)
|
||||||
|
+ typedef Exiv2::Image::UniquePtr ImagePtr;
|
||||||
|
+#else
|
||||||
|
+ typedef Exiv2::Image::AutoPtr ImagePtr;
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
gchar* siril_get_date_from_exif(const char *filename) {
|
||||||
|
#ifdef HAVE_EXIV2
|
||||||
|
try {
|
||||||
|
- Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(WIDEN(filename));
|
||||||
|
+ ImagePtr image = Exiv2::ImageFactory::open(WIDEN(filename));
|
||||||
|
if (image.get() == 0) {
|
||||||
|
fprintf(stderr, "Error Cannot open the file.\n");
|
||||||
|
return NULL;
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:994a6c4c1508e339b5904b6dc8b3f91f9371d6f826d390b4763880f28a493017
|
|
||||||
size 2893872
|
|
3
siril-1.2.0.tar.bz2
Normal file
3
siril-1.2.0.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:a64aa3a1b718366c0e6b551b04a08d44e6c85dbff13273671dfeb17735352650
|
||||||
|
size 4500147
|
@ -1,3 +1,76 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Sep 21 05:49:59 UTC 2023 - Paolo Stivanin <info@paolostivanin.com>
|
||||||
|
|
||||||
|
- Update to 1.2.0:
|
||||||
|
* Fixed crash in background extraction samples removing (#1123)
|
||||||
|
* Fixed crash in binning with ushort images (4d4d4878)
|
||||||
|
* Fixed crash in findstar when a large saturated patch was close to border
|
||||||
|
* Fixed memory leaks in deconvolution code (3e122ad7)
|
||||||
|
* Fixed sorting in the rightmost columns in Dynamic PSF window (75586c04)
|
||||||
|
* Added logging typed command in stdout (06f67292)
|
||||||
|
* Improved path-checking and messages for astrometry.net local solver (Windows) (!524)
|
||||||
|
* Prevent crash using recomposition tool eyedroppers without images loaded (!526)
|
||||||
|
* Fixed HaOiii script failure if input image has odd dimensions (!533)
|
||||||
|
* Fixed errors in GNUplot process handling (!538)
|
||||||
|
* Fixed crash with seqextract_HaOIII command (!535)
|
||||||
|
* Fixed crash when trying to export csv from empty plot (#1150)
|
||||||
|
* Fixed deleting RA/Dec info when undoing an astrometry solve (#1119)
|
||||||
|
* Improved error detection and messages for astrometry (!516)
|
||||||
|
* Fixed sampling range specification for siril internal solver (!549)
|
||||||
|
* Fixed all command descriptions (!546)
|
||||||
|
* Fixed SER orientation after AVI conversion (#1120)
|
||||||
|
* Fixed rescaling float images upon loading when not in [0,1] range (#1155)
|
||||||
|
* Fixed initialization of guide image for clamping (#1114)
|
||||||
|
* Fixed disabling weighting in the GUI when widget is not visible (#1158)
|
||||||
|
* Fixed output_norm behavior for stacking to ignore border values (#1159)
|
||||||
|
* Fixed the check for the no space left condition in the conversion (#1108)
|
||||||
|
* Fixed DATE_OBS missing on seqapplyreg if interp was set to NONE (#1156)
|
||||||
|
* Fixed photometry issue with 8-bit .ser file (#1160)
|
||||||
|
* Fixed removing zero values in histogram calculations (#1164)
|
||||||
|
* Fixed pixel sizes after HaOIII extrcation (#1175)
|
||||||
|
* Fixed crash when passing only constants in pm expression (#1176)
|
||||||
|
* Fixed incorrect channel when adding star from selection in RGB vport (#1180)
|
||||||
|
* Allow to access to non-local disk (#1182)
|
||||||
|
* Allow the Star Recomposition UI to scroll when larger than the dialog (#1172)
|
||||||
|
* Fixed wrong Bayer interpretation after FITS-SER conversion (#1193)
|
||||||
|
* Fixed pixelmath argument parsing error (#1189)
|
||||||
|
* Fixed handling of special characters in sequence name during conversion
|
||||||
|
* Fixed crash in seqstarnet when processing single-file sequences (SER, FITSEQ)
|
||||||
|
* Fixed hang in seqstarnet when processing a single-file sequence with no star mask
|
||||||
|
* Fixed using default masters names in calibrate (GUI)
|
||||||
|
* Fixed invoking external programs in CLI mode (Windows only)
|
||||||
|
* Fixed stream setting for all versions of ffmpeg (mp4 export crash)
|
||||||
|
* Fixed crash when doing manual registration of sequence with variable image sizes (now disabled)
|
||||||
|
* Fixed UI and command issues in deconvolution code
|
||||||
|
* Fixed star recomposition issue where LIVETIME and STACKCNT could be doubled when processing
|
||||||
|
the starless and star mask parts of the same image
|
||||||
|
* Fixed “image copy error in previews” bug in asinh transformation
|
||||||
|
* Fixed reset of the viewports when reopening the RGB composition tool after opening a mono sequence
|
||||||
|
* Fixed star detection for undersampled mono images
|
||||||
|
* Fixed sequence cleaning with opened image and resetting the reference image
|
||||||
|
* Fixed photometry with 32bit images from PRISM
|
||||||
|
* Fixed incorrect behaviour when resetting right-hand stretch type in star recomposition tool
|
||||||
|
* Fixed sequence handling when images have different number of layers
|
||||||
|
* Fixed GNUplot terminals so they remain interactive and free resources when closed
|
||||||
|
* Fixed crash that could occur when parsing string keywords that contained forbidden characters
|
||||||
|
* Fixed calling external processes that left too many opened file descriptors
|
||||||
|
* Fixed Stop behavior for starnet and local astrometry.net
|
||||||
|
* Fixed crash when running merge_cfa in headless mode
|
||||||
|
* Fixed console logs output on Windows when messages contained widechars
|
||||||
|
* Fixed networking detection at build-time and made it and exiv2 optional
|
||||||
|
* Fixed bug in NetPBM file import
|
||||||
|
* Changed gnuplot initialization to keep plots open after stopping main process (and fixed leak)
|
||||||
|
* Changed image opening for all images not from Siril (ensures DATAMAX is correct)
|
||||||
|
* Improved parsing of localization data for wider imaging software compatibility
|
||||||
|
* Improved DATE-OBS control and log for solar system features
|
||||||
|
* Improved clipping model in luminance-based GHS stretches
|
||||||
|
* Improved Wayland support
|
||||||
|
* Reviewed and fixed coordinate conversion from WCS to display for annotations, nomad command, pcc
|
||||||
|
* Improved astrometry.net handling on Windows to support more recent cygwin builds
|
||||||
|
* Updated URLs to query online catalogs
|
||||||
|
- Drop upstreamed 0001-Fix-compilation-with-Exiv-0.28.patch.
|
||||||
|
- Add fix-exiv2.patch.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Jun 23 14:36:11 UTC 2023 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
|
Fri Jun 23 14:36:11 UTC 2023 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
|
||||||
|
|
||||||
|
10
siril.spec
10
siril.spec
@ -17,23 +17,25 @@
|
|||||||
|
|
||||||
|
|
||||||
Name: siril
|
Name: siril
|
||||||
Version: 1.0.6
|
Version: 1.2.0
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: An astronomical image processing software for Linux. (IRIS clone)
|
Summary: An astronomical image processing software for Linux. (IRIS clone)
|
||||||
License: BSL-1.0 AND GPL-3.0-or-later
|
License: BSL-1.0 AND GPL-3.0-or-later
|
||||||
Group: Productivity/Scientific/Physics
|
Group: Productivity/Scientific/Physics
|
||||||
URL: https://www.siril.org/
|
URL: https://www.siril.org/
|
||||||
Source: https://gitlab.com/free-astro/siril/-/archive/%{version}/siril-%{version}.tar.bz2
|
Source: https://gitlab.com/free-astro/siril/-/archive/%{version}/siril-%{version}.tar.bz2
|
||||||
# PATCH-FIX-UPSTREAM -- https://gitlab.com/free-astro/siril/-/commit/a593c2b10c9090b5f991718148d61c0fa156fb41
|
Patch0: fix-exiv2.patch
|
||||||
Patch0: 0001-Fix-compilation-with-Exiv-0.28.patch
|
BuildRequires: cmake
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
BuildRequires: meson >= 0.53.0
|
BuildRequires: libheif-devel
|
||||||
|
BuildRequires: meson >= 0.56.0
|
||||||
BuildRequires: pkgconfig
|
BuildRequires: pkgconfig
|
||||||
BuildRequires: pkgconfig(cfitsio)
|
BuildRequires: pkgconfig(cfitsio)
|
||||||
BuildRequires: pkgconfig(exiv2) >= 0.25
|
BuildRequires: pkgconfig(exiv2) >= 0.25
|
||||||
BuildRequires: pkgconfig(ffms2)
|
BuildRequires: pkgconfig(ffms2)
|
||||||
BuildRequires: pkgconfig(fftw3)
|
BuildRequires: pkgconfig(fftw3)
|
||||||
|
BuildRequires: pkgconfig(glib-2.0) >= 2.56.0
|
||||||
BuildRequires: pkgconfig(gsl)
|
BuildRequires: pkgconfig(gsl)
|
||||||
BuildRequires: pkgconfig(gtk+-3.0) >= 3.20.0
|
BuildRequires: pkgconfig(gtk+-3.0) >= 3.20.0
|
||||||
BuildRequires: pkgconfig(json-glib-1.0) >= 1.2.6
|
BuildRequires: pkgconfig(json-glib-1.0) >= 1.2.6
|
||||||
|
Loading…
x
Reference in New Issue
Block a user