* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/files/, sci-astronomy/siril/
@ 2022-07-15 8:38 Joonas Niilola
0 siblings, 0 replies; 11+ messages in thread
From: Joonas Niilola @ 2022-07-15 8:38 UTC (permalink / raw
To: gentoo-commits
commit: 99460bc8134e7c1ce38d9c2e7884a7019b9e6c61
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 15 08:24:11 2022 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Jul 15 08:38:12 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99460bc8
sci-astronomy/siril: rename a patch file for -9999 ebuild
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
.../files/{siril-dependencies.patch => siril-9999-dependencies.patch} | 0
sci-astronomy/siril/siril-9999.ebuild | 2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-astronomy/siril/files/siril-dependencies.patch b/sci-astronomy/siril/files/siril-9999-dependencies.patch
similarity index 100%
rename from sci-astronomy/siril/files/siril-dependencies.patch
rename to sci-astronomy/siril/files/siril-9999-dependencies.patch
diff --git a/sci-astronomy/siril/siril-9999.ebuild b/sci-astronomy/siril/siril-9999.ebuild
index aff52be8dda4..ebbd20b9dcf6 100644
--- a/sci-astronomy/siril/siril-9999.ebuild
+++ b/sci-astronomy/siril/siril-9999.ebuild
@@ -48,7 +48,7 @@ RDEPEND="
PATCHES=(
"${FILESDIR}/${PN}-docfiles.patch"
- "${FILESDIR}/${PN}-dependencies.patch"
+ "${FILESDIR}/${PN}-9999-dependencies.patch"
)
DOCS=( README.md NEWS ChangeLog AUTHORS )
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/files/, sci-astronomy/siril/
@ 2022-09-13 12:21 Andrew Ammerlaan
0 siblings, 0 replies; 11+ messages in thread
From: Andrew Ammerlaan @ 2022-09-13 12:21 UTC (permalink / raw
To: gentoo-commits
commit: 384365d11cbaddb3fab641f926b49513ce995657
Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Sun Sep 4 21:21:35 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Sep 13 12:20:58 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=384365d1
sci-astronomy/siril: version bump 1.0.5
Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/27147
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sci-astronomy/siril/Manifest | 1 +
.../{siril-1.0.3-dependencies.patch => siril-1.0-dependencies.patch} | 0
sci-astronomy/siril/siril-1.0.3.ebuild | 2 +-
sci-astronomy/siril/{siril-1.0.3.ebuild => siril-1.0.5.ebuild} | 2 +-
4 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/sci-astronomy/siril/Manifest b/sci-astronomy/siril/Manifest
index e88d5eda8409..df8ffdc1a9a0 100644
--- a/sci-astronomy/siril/Manifest
+++ b/sci-astronomy/siril/Manifest
@@ -1,2 +1,3 @@
DIST siril-1.0.1.tar.bz2 2846127 BLAKE2B 15c87e9d3ae175170ad67c1fc65abcca43220d8320df3ba2351cc49d495f9b9dde85d4143b2aa52950b92eb36f10e0ca6548d10e22e072e00596b8fdb535ce1c SHA512 ea35940b370b35802816a90789982dd328ba20d322d092c623c244de949b08810e3ad9552ce3dcc4cc6e2d6b5bf128ac668cbe4ff6ef78d22a4e6ed94b850ffa
DIST siril-1.0.3.tar.bz2 2900334 BLAKE2B 7ec4995ae0f2b66a8575ac6d680dd639bc6d4c429428c2b29eebf8ea1989dae4669bf81b957d4be7889616b09a3b4febb7c1f1da950d36c68bbec152d4cc0041 SHA512 bd8e5d1bba71b0f14f9284a5072e7524d6005c22c55bed45a8e0113456c94ea5ac2a2befbe84c1e827fa410ee9031215343183d2d49f52df681ee4f5dc1a478a
+DIST siril-1.0.5.tar.bz2 2893026 BLAKE2B f8a726962893e90b12c3dfef507652ab7b40ea0be2128ac29d056acb30e827ef35e6671788a8c254d9ea64cc39c8dae00c1e532ed3d6b3a1396ca92da333fe05 SHA512 f2bd614cf14b6b35f458dd75ba4e64db17d051fc9ac36c12e8b1ecdc4c79a19c6427464f3ebb946de80e00d66ed82451f36405c0a7d806332e1b2ce7a835891f
diff --git a/sci-astronomy/siril/files/siril-1.0.3-dependencies.patch b/sci-astronomy/siril/files/siril-1.0-dependencies.patch
similarity index 100%
rename from sci-astronomy/siril/files/siril-1.0.3-dependencies.patch
rename to sci-astronomy/siril/files/siril-1.0-dependencies.patch
diff --git a/sci-astronomy/siril/siril-1.0.3.ebuild b/sci-astronomy/siril/siril-1.0.3.ebuild
index de5d2c77535e..d354aede9fea 100644
--- a/sci-astronomy/siril/siril-1.0.3.ebuild
+++ b/sci-astronomy/siril/siril-1.0.3.ebuild
@@ -48,7 +48,7 @@ RDEPEND="
PATCHES=(
"${FILESDIR}/${PN}-docfiles.patch"
- "${FILESDIR}/${P}-dependencies.patch"
+ "${FILESDIR}/${PN}-$(ver_cut 1-2)-dependencies.patch"
)
DOCS=( README.md NEWS ChangeLog AUTHORS )
diff --git a/sci-astronomy/siril/siril-1.0.3.ebuild b/sci-astronomy/siril/siril-1.0.5.ebuild
similarity index 97%
copy from sci-astronomy/siril/siril-1.0.3.ebuild
copy to sci-astronomy/siril/siril-1.0.5.ebuild
index de5d2c77535e..d354aede9fea 100644
--- a/sci-astronomy/siril/siril-1.0.3.ebuild
+++ b/sci-astronomy/siril/siril-1.0.5.ebuild
@@ -48,7 +48,7 @@ RDEPEND="
PATCHES=(
"${FILESDIR}/${PN}-docfiles.patch"
- "${FILESDIR}/${P}-dependencies.patch"
+ "${FILESDIR}/${PN}-$(ver_cut 1-2)-dependencies.patch"
)
DOCS=( README.md NEWS ChangeLog AUTHORS )
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/files/, sci-astronomy/siril/
@ 2022-10-01 3:16 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2022-10-01 3:16 UTC (permalink / raw
To: gentoo-commits
commit: ddb3e71ded114d3bb1092db19badd0b58cbc4ce8
Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Mon Sep 26 21:41:06 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Oct 1 03:15:41 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddb3e71d
sci-astronomy/siril: Fix building on musl, missing execinfo.h
Closes: https://bugs.gentoo.org/873016
Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/27483
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-astronomy/siril/files/siril-1.0-execinfo.patch | 22 ++++++++++++++++++++++
sci-astronomy/siril/siril-1.0.5.ebuild | 1 +
2 files changed, 23 insertions(+)
diff --git a/sci-astronomy/siril/files/siril-1.0-execinfo.patch b/sci-astronomy/siril/files/siril-1.0-execinfo.patch
new file mode 100644
index 000000000000..c9c7cd81c19f
--- /dev/null
+++ b/sci-astronomy/siril/files/siril-1.0-execinfo.patch
@@ -0,0 +1,22 @@
+commit c009c4c1800086e7f4c4e80939e9ddc8964c8e12
+Author: Mario Haustein <mario.haustein@hrz.tu-chemnitz.de>
+Date: Thu Aug 4 00:27:08 2022 +0200
+
+ Include execinfo.h only if available
+
+Bug: https://bugs.gentoo.org/873016
+Upstream: https://gitlab.com/free-astro/siril/-/merge_requests/284
+
+diff --git a/src/core/signals.c b/src/core/signals.c
+index 74100b3a..0eefd460 100644
+--- a/src/core/signals.c
++++ b/src/core/signals.c
+@@ -25,7 +25,7 @@
+ #ifdef _WIN32
+ #include <windows.h>
+ #include <dbghelp.h>
+-#else
++#elif HAVE_EXECINFO_H
+ #include <execinfo.h>
+ #endif
+
diff --git a/sci-astronomy/siril/siril-1.0.5.ebuild b/sci-astronomy/siril/siril-1.0.5.ebuild
index d354aede9fea..816f638fd2f1 100644
--- a/sci-astronomy/siril/siril-1.0.5.ebuild
+++ b/sci-astronomy/siril/siril-1.0.5.ebuild
@@ -49,6 +49,7 @@ RDEPEND="
PATCHES=(
"${FILESDIR}/${PN}-docfiles.patch"
"${FILESDIR}/${PN}-$(ver_cut 1-2)-dependencies.patch"
+ "${FILESDIR}/${PN}-$(ver_cut 1-2)-execinfo.patch"
)
DOCS=( README.md NEWS ChangeLog AUTHORS )
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/files/, sci-astronomy/siril/
@ 2023-03-08 14:13 Joonas Niilola
0 siblings, 0 replies; 11+ messages in thread
From: Joonas Niilola @ 2023-03-08 14:13 UTC (permalink / raw
To: gentoo-commits
commit: 49f0eeee961ff1ae0abc636c942f2df69160b8ee
Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Fri Feb 24 18:41:48 2023 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Mar 8 14:13:09 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49f0eeee
sci-astronomy/siril: add 1.2.0beta1
Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sci-astronomy/siril/Manifest | 1 +
sci-astronomy/siril/files/siril-1.2-execinfo.patch | 46 +++++++++++++++++
sci-astronomy/siril/files/siril-1.2-htmesh.patch | 57 ++++++++++++++++++++++
.../siril/files/siril-1.2-prototypes.patch | 41 ++++++++++++++++
...{siril-9999.ebuild => siril-1.2.0_beta1.ebuild} | 8 ++-
sci-astronomy/siril/siril-9999.ebuild | 7 ++-
6 files changed, 157 insertions(+), 3 deletions(-)
diff --git a/sci-astronomy/siril/Manifest b/sci-astronomy/siril/Manifest
index d4becddf7d18..fd8857b936e7 100644
--- a/sci-astronomy/siril/Manifest
+++ b/sci-astronomy/siril/Manifest
@@ -1,2 +1,3 @@
DIST siril-1.0.5.tar.bz2 2893026 BLAKE2B f8a726962893e90b12c3dfef507652ab7b40ea0be2128ac29d056acb30e827ef35e6671788a8c254d9ea64cc39c8dae00c1e532ed3d6b3a1396ca92da333fe05 SHA512 f2bd614cf14b6b35f458dd75ba4e64db17d051fc9ac36c12e8b1ecdc4c79a19c6427464f3ebb946de80e00d66ed82451f36405c0a7d806332e1b2ce7a835891f
DIST siril-1.0.6.tar.bz2 2893872 BLAKE2B 1f254dcb774c4bfb14fee4626d40e6eeedf866a7a96dca98502cd84e66b973c2201b1f88e2efcb89ce3401b13bd87a319b2ff11e7ba100d0689c9df429d01957 SHA512 afb5f1768a5884adcc13f2afd6fa386d836df5a1385b916df9df8da1fb464e0c8738123fb485ed92c749e596c744d5252a66444b840223488a0860e9324c4e9d
+DIST siril-1.2.0-beta1.tar.bz2 3869827 BLAKE2B 4ba624e917234f389f3ac1f2baf7519aacf4da6494ff437491103491dcac60ff146665faf0daf700a4d2e375d098b3b9af75c60975b882600ab96700a4dff166 SHA512 e259f46e2792d59f53d1e9e5fd3b33c6a912a9c19b53c4d84a803f153e1c5c4395f2fb413a21887330f41e06b7d62996162e65e73774faadb47ff7edc9f4150d
diff --git a/sci-astronomy/siril/files/siril-1.2-execinfo.patch b/sci-astronomy/siril/files/siril-1.2-execinfo.patch
new file mode 100644
index 000000000000..82f29b290f63
--- /dev/null
+++ b/sci-astronomy/siril/files/siril-1.2-execinfo.patch
@@ -0,0 +1,46 @@
+From 6f959a02d27fb507cda1898a3aa785766e77d404 Mon Sep 17 00:00:00 2001
+From: Mario Haustein <mario.haustein@hrz.tu-chemnitz.de>
+Date: Mon, 27 Feb 2023 17:34:43 +0100
+Subject: [PATCH] fix HAVE_EXECINFO_H logic
+Bug: https://bugs.gentoo.org/898108
+Upstream: https://gitlab.com/free-astro/siril/-/merge_requests/442
+
+---
+ src/core/signals.c | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/src/core/signals.c b/src/core/signals.c
+index 42b369d6..d4745909 100644
+--- a/src/core/signals.c
++++ b/src/core/signals.c
+@@ -55,13 +55,7 @@ static void signal_handled(int s) {
+ g_printf(ANSI_COLOR_RED"%s"ANSI_COLOR_RESET"\n", visit);
+ }
+
+-#if (!defined _WIN32 && defined HAVE_EXECINFO_H)
+- void *stack[STACK_DEPTH];
+-
+- size_t size = backtrace(stack, sizeof(stack) / sizeof(void*));
+-
+- backtrace_symbols_fd(stack, size, fileno((FILE*) stdout));
+-#else
++#ifdef _WIN32
+ unsigned int i;
+ void *stack[STACK_DEPTH];
+ unsigned short size;
+@@ -84,6 +78,12 @@ static void signal_handled(int s) {
+ }
+
+ free(symbol);
++#elif HAVE_EXECINFO_H
++ void *stack[STACK_DEPTH];
++
++ size_t size = backtrace(stack, sizeof(stack) / sizeof(void*));
++
++ backtrace_symbols_fd(stack, size, fileno((FILE*) stdout));
+ #endif
+ }
+ undo_flush();
+--
+2.39.2
+
diff --git a/sci-astronomy/siril/files/siril-1.2-htmesh.patch b/sci-astronomy/siril/files/siril-1.2-htmesh.patch
new file mode 100644
index 000000000000..83f389267c40
--- /dev/null
+++ b/sci-astronomy/siril/files/siril-1.2-htmesh.patch
@@ -0,0 +1,57 @@
+From 915d01b7e94ff0a597685976838ab707917428db Mon Sep 17 00:00:00 2001
+From: Mario Haustein <mario.haustein@hrz.tu-chemnitz.de>
+Date: Fri, 24 Feb 2023 19:00:52 +0100
+Subject: [PATCH] Don't install bundled htmesh static library system wide.
+Upstream: https://gitlab.com/free-astro/siril/-/merge_requests/438
+
+---
+ subprojects/htmesh/CMakeLists.txt | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/subprojects/htmesh/CMakeLists.txt b/subprojects/htmesh/CMakeLists.txt
+index 5c197a9e..189acd3e 100644
+--- a/subprojects/htmesh/CMakeLists.txt
++++ b/subprojects/htmesh/CMakeLists.txt
+@@ -49,9 +49,10 @@ set_target_properties(htmesh PROPERTIES
+ VERSION 1.0.0
+ SOVERSION 1)
+
+-if (NOT ANDROID)
+- install(TARGETS htmesh ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
+-endif ()
++# It is not necessary to install the static library as we just link against it.
++#if (NOT ANDROID)
++# install(TARGETS htmesh ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
++#endif ()
+
+ # If you wish to compile the HTMesh perl wrapper, uncomment this, rebuild and copy the library into /usr/lib/, because we will use it as a shared object. See README in the perl wrapper directory (kstars/kstars/data/tools/HTMesh-*) for more details.
+ #set_property(TARGET htmesh PROPERTY POSITION_INDEPENDENT_CODE YES)
+--
+2.39.2
+
+From 42a12b852f4146aa104350587c456a35501a9707 Mon Sep 17 00:00:00 2001
+From: Mario Haustein <mario.haustein@hrz.tu-chemnitz.de>
+Date: Fri, 24 Feb 2023 18:40:26 +0100
+Subject: [PATCH] Fix typo in htmesh build configuration
+Upstream: https://gitlab.com/free-astro/siril/-/merge_requests/437
+
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 886f3697..1ed39a98 100644
+--- a/meson.build
++++ b/meson.build
+@@ -270,7 +270,7 @@ endif
+ htmesh_dep = sub_proj.dependency('htmesh')
+ htmesh_inc = sub_proj.include_directories('htmesh')
+ else
+- siril_cpp_flag += '-DHAVE_LIBRTPROCESS'
++ siril_cpp_flag += '-DHAVE_HTMESH'
+ endif
+
+ ## Optional dependencies
+--
+2.39.2
+
diff --git a/sci-astronomy/siril/files/siril-1.2-prototypes.patch b/sci-astronomy/siril/files/siril-1.2-prototypes.patch
new file mode 100644
index 000000000000..8b72fef41b49
--- /dev/null
+++ b/sci-astronomy/siril/files/siril-1.2-prototypes.patch
@@ -0,0 +1,41 @@
+From 6c06d62579234e1d0030bad985a9cfcf7249b5d7 Mon Sep 17 00:00:00 2001
+From: Mario Haustein <mario.haustein@hrz.tu-chemnitz.de>
+Date: Mon, 27 Feb 2023 17:49:41 +0100
+Subject: [PATCH 1/2] fix prototypes for functions with parameters
+Bug: https://bugs.gentoo.org/898108
+Upstream: https://gitlab.com/free-astro/siril/-/merge_requests/443
+
+---
+ src/core/processing.h | 2 +-
+ src/gui/save_dialog.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/core/processing.h b/src/core/processing.h
+index 1eba970b..89f24bd3 100644
+--- a/src/core/processing.h
++++ b/src/core/processing.h
+@@ -162,7 +162,7 @@ void wait_for_script_thread();
+ gboolean end_generic(gpointer arg);
+ guint siril_add_idle(GSourceFunc idle_function, gpointer data);
+
+-struct generic_seq_args *create_default_seqargs();
++struct generic_seq_args *create_default_seqargs(sequence *seq);
+
+ int check_threading(threading_type *threads);
+ int limit_threading(threading_type *threads, int min_iterations_per_thread, size_t total_iterations);
+diff --git a/src/gui/save_dialog.h b/src/gui/save_dialog.h
+index c724abb1..586a2ca3 100644
+--- a/src/gui/save_dialog.h
++++ b/src/gui/save_dialog.h
+@@ -20,7 +20,7 @@ enum {
+ };
+
+ void on_header_save_as_button_clicked();
+-void on_header_snapshot_button_clicked();
++void on_header_snapshot_button_clicked(gboolean clipboard);
+ void on_header_save_button_clicked();
+
+ #endif /* SRC_GUI_SAVE_DIALOG_H_ */
+--
+2.39.2
+
diff --git a/sci-astronomy/siril/siril-9999.ebuild b/sci-astronomy/siril/siril-1.2.0_beta1.ebuild
similarity index 88%
copy from sci-astronomy/siril/siril-9999.ebuild
copy to sci-astronomy/siril/siril-1.2.0_beta1.ebuild
index 40c1b926aa34..6ff7d1f45806 100644
--- a/sci-astronomy/siril/siril-9999.ebuild
+++ b/sci-astronomy/siril/siril-1.2.0_beta1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -24,6 +24,7 @@ IUSE="curl ffmpeg heif jpeg libconfig openmp png raw tiff wcs"
DEPEND="
>=dev-libs/glib-2.56.0:2
>=dev-libs/json-glib-1.2.6
+ dev-libs/sleef:=
>=media-gfx/exiv2-0.25
media-libs/librtprocess:=
>=media-libs/opencv-4.4.0:=
@@ -45,9 +46,13 @@ DEPEND="
RDEPEND="
${DEPEND}
"
+BDEPEND="x11-base/xorg-proto"
PATCHES=(
"${FILESDIR}/${PN}-docfiles.patch"
+ "${FILESDIR}/${PN}-$(ver_cut 1-2)-htmesh.patch"
+ "${FILESDIR}/${PN}-$(ver_cut 1-2)-execinfo.patch"
+ "${FILESDIR}/${PN}-$(ver_cut 1-2)-prototypes.patch"
)
DOCS=( README.md NEWS ChangeLog AUTHORS )
@@ -80,6 +85,7 @@ src_configure() {
pkg_postinst() {
xdg_desktop_database_update
+ xdg_icon_cache_update
xdg_mimeinfo_database_update
optfeature "gnuplot support" sci-visualization/gnuplot
}
diff --git a/sci-astronomy/siril/siril-9999.ebuild b/sci-astronomy/siril/siril-9999.ebuild
index 40c1b926aa34..eeffd9b1d7ed 100644
--- a/sci-astronomy/siril/siril-9999.ebuild
+++ b/sci-astronomy/siril/siril-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
EGIT_REPO_URI="https://gitlab.com/free-astro/${PN}.git"
else
SRC_URI="https://gitlab.com/free-astro/siril/-/archive/${PV/_/-}/${PN}-${PV/_/-}.tar.bz2"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="~amd64"
S="${WORKDIR}/${PN}-${PV/_/-}"
fi
@@ -24,6 +24,7 @@ IUSE="curl ffmpeg heif jpeg libconfig openmp png raw tiff wcs"
DEPEND="
>=dev-libs/glib-2.56.0:2
>=dev-libs/json-glib-1.2.6
+ dev-libs/sleef:=
>=media-gfx/exiv2-0.25
media-libs/librtprocess:=
>=media-libs/opencv-4.4.0:=
@@ -45,6 +46,7 @@ DEPEND="
RDEPEND="
${DEPEND}
"
+BDEPEND="x11-base/xorg-proto"
PATCHES=(
"${FILESDIR}/${PN}-docfiles.patch"
@@ -80,6 +82,7 @@ src_configure() {
pkg_postinst() {
xdg_desktop_database_update
+ xdg_icon_cache_update
xdg_mimeinfo_database_update
optfeature "gnuplot support" sci-visualization/gnuplot
}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/files/, sci-astronomy/siril/
@ 2023-03-08 14:13 Joonas Niilola
0 siblings, 0 replies; 11+ messages in thread
From: Joonas Niilola @ 2023-03-08 14:13 UTC (permalink / raw
To: gentoo-commits
commit: 6f2c740b93a92bd8ed15d5ef3ee27c89778fbc9d
Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Fri Feb 24 18:42:57 2023 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Mar 8 14:13:09 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f2c740b
sci-astronomy/siril: drop 1.0.5-r1
Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/29773
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sci-astronomy/siril/Manifest | 1 -
.../siril/files/siril-1.0-execinfo-r1.patch | 22 ------
sci-astronomy/siril/siril-1.0.5-r1.ebuild | 86 ----------------------
3 files changed, 109 deletions(-)
diff --git a/sci-astronomy/siril/Manifest b/sci-astronomy/siril/Manifest
index fd8857b936e7..3b4007fb5011 100644
--- a/sci-astronomy/siril/Manifest
+++ b/sci-astronomy/siril/Manifest
@@ -1,3 +1,2 @@
-DIST siril-1.0.5.tar.bz2 2893026 BLAKE2B f8a726962893e90b12c3dfef507652ab7b40ea0be2128ac29d056acb30e827ef35e6671788a8c254d9ea64cc39c8dae00c1e532ed3d6b3a1396ca92da333fe05 SHA512 f2bd614cf14b6b35f458dd75ba4e64db17d051fc9ac36c12e8b1ecdc4c79a19c6427464f3ebb946de80e00d66ed82451f36405c0a7d806332e1b2ce7a835891f
DIST siril-1.0.6.tar.bz2 2893872 BLAKE2B 1f254dcb774c4bfb14fee4626d40e6eeedf866a7a96dca98502cd84e66b973c2201b1f88e2efcb89ce3401b13bd87a319b2ff11e7ba100d0689c9df429d01957 SHA512 afb5f1768a5884adcc13f2afd6fa386d836df5a1385b916df9df8da1fb464e0c8738123fb485ed92c749e596c744d5252a66444b840223488a0860e9324c4e9d
DIST siril-1.2.0-beta1.tar.bz2 3869827 BLAKE2B 4ba624e917234f389f3ac1f2baf7519aacf4da6494ff437491103491dcac60ff146665faf0daf700a4d2e375d098b3b9af75c60975b882600ab96700a4dff166 SHA512 e259f46e2792d59f53d1e9e5fd3b33c6a912a9c19b53c4d84a803f153e1c5c4395f2fb413a21887330f41e06b7d62996162e65e73774faadb47ff7edc9f4150d
diff --git a/sci-astronomy/siril/files/siril-1.0-execinfo-r1.patch b/sci-astronomy/siril/files/siril-1.0-execinfo-r1.patch
deleted file mode 100644
index c9c7cd81c19f..000000000000
--- a/sci-astronomy/siril/files/siril-1.0-execinfo-r1.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-commit c009c4c1800086e7f4c4e80939e9ddc8964c8e12
-Author: Mario Haustein <mario.haustein@hrz.tu-chemnitz.de>
-Date: Thu Aug 4 00:27:08 2022 +0200
-
- Include execinfo.h only if available
-
-Bug: https://bugs.gentoo.org/873016
-Upstream: https://gitlab.com/free-astro/siril/-/merge_requests/284
-
-diff --git a/src/core/signals.c b/src/core/signals.c
-index 74100b3a..0eefd460 100644
---- a/src/core/signals.c
-+++ b/src/core/signals.c
-@@ -25,7 +25,7 @@
- #ifdef _WIN32
- #include <windows.h>
- #include <dbghelp.h>
--#else
-+#elif HAVE_EXECINFO_H
- #include <execinfo.h>
- #endif
-
diff --git a/sci-astronomy/siril/siril-1.0.5-r1.ebuild b/sci-astronomy/siril/siril-1.0.5-r1.ebuild
deleted file mode 100644
index fc3329c88116..000000000000
--- a/sci-astronomy/siril/siril-1.0.5-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson optfeature toolchain-funcs xdg
-
-DESCRIPTION="A free astronomical image processing software"
-HOMEPAGE="https://www.siril.org/"
-
-if [[ ${PV} == "9999" ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://gitlab.com/free-astro/${PN}.git"
-else
- SRC_URI="https://gitlab.com/free-astro/siril/-/archive/${PV/_/-}/${PN}-${PV/_/-}.tar.bz2"
- KEYWORDS="amd64 x86"
- S="${WORKDIR}/${PN}-${PV/_/-}"
-fi
-
-LICENSE="GPL-3+ Boost-1.0"
-SLOT="0"
-IUSE="curl ffmpeg heif jpeg openmp png raw tiff wcs"
-
-DEPEND="
- >=dev-libs/glib-2.56.0:2
- >=dev-libs/json-glib-1.2.6
- >=dev-libs/libconfig-1.4[cxx]
- >=media-gfx/exiv2-0.25
- media-libs/librtprocess:=
- >=media-libs/opencv-4.4.0:=
- sci-libs/cfitsio
- sci-libs/fftw:3.0=
- sci-libs/gsl:=
- x11-libs/cairo
- >=x11-libs/gtk+-3.20.0:3
- curl? ( net-misc/curl )
- ffmpeg? ( media-video/ffmpeg:= )
- heif? ( media-libs/libheif )
- jpeg? ( media-libs/libjpeg-turbo:= )
- png? ( >=media-libs/libpng-1.6.0 )
- raw? ( media-libs/libraw )
- tiff? ( media-libs/tiff:= )
- wcs? ( >=sci-astronomy/wcslib-7.7 )
-"
-RDEPEND="
- ${DEPEND}
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-docfiles.patch"
- "${FILESDIR}/${PN}-$(ver_cut 1-2)-dependencies.patch"
- "${FILESDIR}/${PN}-$(ver_cut 1-2)-execinfo-r1.patch"
-)
-
-DOCS=( README.md NEWS ChangeLog AUTHORS )
-
-pkg_pretend() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_configure() {
- local emesonargs=(
- -Dffms2=false
- -Dcriterion=false
- $(meson_use ffmpeg)
- $(meson_use heif libheif)
- $(meson_use jpeg libjpeg)
- $(meson_use openmp)
- $(meson_use png libpng)
- $(meson_use raw libraw)
- $(meson_use tiff libtiff)
- $(meson_use wcs wcslib)
- $(usex curl -Denable-libcurl=yes -Denable-libcurl=no)
- )
- meson_src_configure
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- optfeature "gnuplot support" sci-visualization/gnuplot
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/files/, sci-astronomy/siril/
@ 2023-03-25 4:08 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2023-03-25 4:08 UTC (permalink / raw
To: gentoo-commits
commit: 5721e7de2e4933b397da2c74b20f599575f6c763
Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Mon Feb 27 17:20:56 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 25 04:06:10 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5721e7de
sci-astronomy/siril: fix build with MUSL
Closes: https://bugs.gentoo.org/898108
Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/29837
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../siril/files/siril-1.0-execinfo-r2.patch | 46 ++++++++++++++++++++++
.../siril/files/siril-1.0-prototypes.patch | 41 +++++++++++++++++++
sci-astronomy/siril/siril-1.0.6-r2.ebuild | 1 +
3 files changed, 88 insertions(+)
diff --git a/sci-astronomy/siril/files/siril-1.0-execinfo-r2.patch b/sci-astronomy/siril/files/siril-1.0-execinfo-r2.patch
index ffef786d0d8e..55ce90558b64 100644
--- a/sci-astronomy/siril/files/siril-1.0-execinfo-r2.patch
+++ b/sci-astronomy/siril/files/siril-1.0-execinfo-r2.patch
@@ -6,6 +6,8 @@ Date: Thu Aug 4 00:27:08 2022 +0200
Bug: https://bugs.gentoo.org/873016
Upstream: https://gitlab.com/free-astro/siril/-/merge_requests/284
+Bug: https://bugs.gentoo.org/898108
+Upstream: https://gitlab.com/free-astro/siril/-/merge_requests/442
diff --git a/src/core/signals.c b/src/core/signals.c
index 74100b3a..0eefd460 100644
@@ -43,3 +45,47 @@ index 0eefd460..bbce5fa7 100644
#include <signal.h>
#ifdef _WIN32
#include <windows.h>
+From 6f959a02d27fb507cda1898a3aa785766e77d404 Mon Sep 17 00:00:00 2001
+From: Mario Haustein <mario.haustein@hrz.tu-chemnitz.de>
+Date: Mon, 27 Feb 2023 17:34:43 +0100
+Subject: [PATCH] fix HAVE_EXECINFO_H logic
+
+---
+ src/core/signals.c | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/src/core/signals.c b/src/core/signals.c
+index 42b369d6..d4745909 100644
+--- a/src/core/signals.c
++++ b/src/core/signals.c
+@@ -55,13 +55,7 @@ static void signal_handled(int s) {
+ g_printf(ANSI_COLOR_RED"%s"ANSI_COLOR_RESET"\n", visit);
+ }
+
+-#if (!defined _WIN32 && defined HAVE_EXECINFO_H)
+- void *stack[STACK_DEPTH];
+-
+- size_t size = backtrace(stack, sizeof(stack) / sizeof(void*));
+-
+- backtrace_symbols_fd(stack, size, fileno((FILE*) stdout));
+-#else
++#ifdef _WIN32
+ unsigned int i;
+ void *stack[STACK_DEPTH];
+ unsigned short size;
+@@ -84,6 +78,12 @@ static void signal_handled(int s) {
+ }
+
+ free(symbol);
++#elif HAVE_EXECINFO_H
++ void *stack[STACK_DEPTH];
++
++ size_t size = backtrace(stack, sizeof(stack) / sizeof(void*));
++
++ backtrace_symbols_fd(stack, size, fileno((FILE*) stdout));
+ #endif
+ }
+ undo_flush();
+--
+2.39.2
+
diff --git a/sci-astronomy/siril/files/siril-1.0-prototypes.patch b/sci-astronomy/siril/files/siril-1.0-prototypes.patch
new file mode 100644
index 000000000000..8b72fef41b49
--- /dev/null
+++ b/sci-astronomy/siril/files/siril-1.0-prototypes.patch
@@ -0,0 +1,41 @@
+From 6c06d62579234e1d0030bad985a9cfcf7249b5d7 Mon Sep 17 00:00:00 2001
+From: Mario Haustein <mario.haustein@hrz.tu-chemnitz.de>
+Date: Mon, 27 Feb 2023 17:49:41 +0100
+Subject: [PATCH 1/2] fix prototypes for functions with parameters
+Bug: https://bugs.gentoo.org/898108
+Upstream: https://gitlab.com/free-astro/siril/-/merge_requests/443
+
+---
+ src/core/processing.h | 2 +-
+ src/gui/save_dialog.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/core/processing.h b/src/core/processing.h
+index 1eba970b..89f24bd3 100644
+--- a/src/core/processing.h
++++ b/src/core/processing.h
+@@ -162,7 +162,7 @@ void wait_for_script_thread();
+ gboolean end_generic(gpointer arg);
+ guint siril_add_idle(GSourceFunc idle_function, gpointer data);
+
+-struct generic_seq_args *create_default_seqargs();
++struct generic_seq_args *create_default_seqargs(sequence *seq);
+
+ int check_threading(threading_type *threads);
+ int limit_threading(threading_type *threads, int min_iterations_per_thread, size_t total_iterations);
+diff --git a/src/gui/save_dialog.h b/src/gui/save_dialog.h
+index c724abb1..586a2ca3 100644
+--- a/src/gui/save_dialog.h
++++ b/src/gui/save_dialog.h
+@@ -20,7 +20,7 @@ enum {
+ };
+
+ void on_header_save_as_button_clicked();
+-void on_header_snapshot_button_clicked();
++void on_header_snapshot_button_clicked(gboolean clipboard);
+ void on_header_save_button_clicked();
+
+ #endif /* SRC_GUI_SAVE_DIALOG_H_ */
+--
+2.39.2
+
diff --git a/sci-astronomy/siril/siril-1.0.6-r2.ebuild b/sci-astronomy/siril/siril-1.0.6-r2.ebuild
index 5de589b0f985..81e303d7c5dd 100644
--- a/sci-astronomy/siril/siril-1.0.6-r2.ebuild
+++ b/sci-astronomy/siril/siril-1.0.6-r2.ebuild
@@ -51,6 +51,7 @@ PATCHES=(
"${FILESDIR}/${PN}-docfiles.patch"
"${FILESDIR}/${PN}-$(ver_cut 1-2)-dependencies.patch"
"${FILESDIR}/${PN}-$(ver_cut 1-2)-execinfo-r2.patch"
+ "${FILESDIR}/${PN}-$(ver_cut 1-2)-prototypes.patch"
)
DOCS=( README.md NEWS ChangeLog AUTHORS )
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/files/, sci-astronomy/siril/
@ 2023-06-13 6:32 Viorel Munteanu
0 siblings, 0 replies; 11+ messages in thread
From: Viorel Munteanu @ 2023-06-13 6:32 UTC (permalink / raw
To: gentoo-commits
commit: f9b5c50da7e9a058f601ec273ab745ab6db38cc5
Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Thu Jun 1 20:05:13 2023 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Tue Jun 13 06:27:18 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9b5c50d
sci-astronomy/siril: add 1.2.0_rc1
Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de>
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>
sci-astronomy/siril/Manifest | 1 +
sci-astronomy/siril/files/siril-1.2-stdint.patch | 33 +++++++++
sci-astronomy/siril/files/siril-1.2-tiff.patch | 56 +++++++++++++++
sci-astronomy/siril/siril-1.2.0_rc1.ebuild | 92 ++++++++++++++++++++++++
4 files changed, 182 insertions(+)
diff --git a/sci-astronomy/siril/Manifest b/sci-astronomy/siril/Manifest
index 3b4007fb5011..21fb2bfbef3a 100644
--- a/sci-astronomy/siril/Manifest
+++ b/sci-astronomy/siril/Manifest
@@ -1,2 +1,3 @@
DIST siril-1.0.6.tar.bz2 2893872 BLAKE2B 1f254dcb774c4bfb14fee4626d40e6eeedf866a7a96dca98502cd84e66b973c2201b1f88e2efcb89ce3401b13bd87a319b2ff11e7ba100d0689c9df429d01957 SHA512 afb5f1768a5884adcc13f2afd6fa386d836df5a1385b916df9df8da1fb464e0c8738123fb485ed92c749e596c744d5252a66444b840223488a0860e9324c4e9d
DIST siril-1.2.0-beta1.tar.bz2 3869827 BLAKE2B 4ba624e917234f389f3ac1f2baf7519aacf4da6494ff437491103491dcac60ff146665faf0daf700a4d2e375d098b3b9af75c60975b882600ab96700a4dff166 SHA512 e259f46e2792d59f53d1e9e5fd3b33c6a912a9c19b53c4d84a803f153e1c5c4395f2fb413a21887330f41e06b7d62996162e65e73774faadb47ff7edc9f4150d
+DIST siril-1.2.0-rc1.tar.bz2 4353720 BLAKE2B 38c7b1585508ac9697847648f2d718899a296a4061b34fcf71424136daa50c68737f811fd9063aa80274708d085d8089dceff7d1fd25277b60f0482c17fa5cd1 SHA512 41d685c0aca79da8a9c17d729c710bdd51d3f8cd13b976fb4aad4750e74b600783b988246f008cf41246e7e5f05b8b42368d975cbd79f42e9121b39e367eb22f
diff --git a/sci-astronomy/siril/files/siril-1.2-stdint.patch b/sci-astronomy/siril/files/siril-1.2-stdint.patch
new file mode 100644
index 000000000000..a8fb39c2bd5d
--- /dev/null
+++ b/sci-astronomy/siril/files/siril-1.2-stdint.patch
@@ -0,0 +1,33 @@
+Upstream: https://gitlab.com/free-astro/siril/-/merge_requests/525
+--- a/src/core/exif.h
++++ b/src/core/exif.h
+@@ -20,6 +20,8 @@
+ #ifndef SRC_CORE_EXIF_H_
+ #define SRC_CORE_EXIF_H_
+
++#include <stdint.h>
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+--- a/src/io/avi_pipp/pipp_avi_write_dib.h
++++ b/src/io/avi_pipp/pipp_avi_write_dib.h
+@@ -1,6 +1,8 @@
+ #ifndef PIPP_AVI_WRITE_DIB_H
+ #define PIPP_AVI_WRITE_DIB_H
+
++#include <cstdint>
++
+ #include "pipp_video_write.h"
+ #include "pipp_avi_write.h"
+
+--- a/src/io/avi_pipp/pipp_buffer.h
++++ b/src/io/avi_pipp/pipp_buffer.h
+@@ -19,7 +19,6 @@
+ #ifndef PIPP_BUFFER_H
+ #define PIPP_BUFFER_H
+
+-#include <cstdint>
+ #include <cstdint>
+ #include <cstddef>
+
diff --git a/sci-astronomy/siril/files/siril-1.2-tiff.patch b/sci-astronomy/siril/files/siril-1.2-tiff.patch
new file mode 100644
index 000000000000..9e84f12c645b
--- /dev/null
+++ b/sci-astronomy/siril/files/siril-1.2-tiff.patch
@@ -0,0 +1,56 @@
+https://gitlab.com/free-astro/siril/-/commit/de5030991caa9490c510651868783faae2530089
+From: Cyril Richard <cyril.richard42@gmail.com>
+Date: Sun, 11 Jun 2023 23:40:10 +0200
+Subject: [PATCH] Fixing compiler error with no libtiff
+Upstream: https://gitlab.com/free-astro/siril/-/issues/1129
+
+--- a/src/gui/preferences.c
++++ b/src/gui/preferences.c
+@@ -299,6 +299,7 @@ void initialize_path_directory(const gchar *path) {
+ }
+
+ void initialize_starnet_executable(const gchar *path) {
++#ifdef HAVE_LIBTIFF
+ GtkFileChooser *starnet_exe = GTK_FILE_CHOOSER(lookup_widget("filechooser_starnet"));
+ GtkWidget *starnet_weights_reset = GTK_WIDGET(lookup_widget("starnet_weights_clear"));
+ GtkWidget *starnet_weights = GTK_WIDGET(lookup_widget("filechooser_starnet_weights"));
+@@ -315,6 +316,7 @@ void initialize_starnet_executable(const gchar *path) {
+ gtk_widget_set_sensitive(starnet_weights, FALSE);
+ gtk_widget_set_sensitive(starnet_weights_reset, FALSE);
+ }
++#endif
+ }
+
+ void initialize_starnet_weights(const gchar *path) {
+@@ -404,6 +406,7 @@ void on_filechooser_swap_file_set(GtkFileChooserButton *fileChooser, gpointer us
+ }
+
+ void on_filechooser_starnet_file_set(GtkFileChooserButton *fileChooser, gpointer user_data) {
++#ifdef HAVE_LIBTIFF
+ GtkFileChooser *starnet_exe = GTK_FILE_CHOOSER(fileChooser);
+ gchar *path;
+
+@@ -429,7 +432,7 @@ void on_filechooser_starnet_file_set(GtkFileChooserButton *fileChooser, gpointer
+ gtk_widget_set_sensitive(starnet_weights, FALSE);
+ gtk_widget_set_sensitive(starnet_weights_reset, FALSE);
+ }
+-
++#endif
+ }
+
+ void on_starnet_weights_clear_clicked(GtkButton *button, gpointer user_data) {
+--- a/src/io/sequence_export.c
++++ b/src/io/sequence_export.c
+@@ -650,7 +650,9 @@ void on_buttonExportSeq_clicked(GtkButton *button, gpointer user_data) {
+ // add a trailing '_' for multiple-files sequences
+ args->basename = format_basename(args->basename, TRUE);
+ if (args->output == EXPORT_TIFF) {
++#ifdef HAVE_LIBTIFF
+ args->tiff_compression = get_tiff_compression();
++#endif
+ }
+ }
+ // Display a useful warning because I always forget to remove selection
+--
+GitLab
+
diff --git a/sci-astronomy/siril/siril-1.2.0_rc1.ebuild b/sci-astronomy/siril/siril-1.2.0_rc1.ebuild
new file mode 100644
index 000000000000..93988e8161cb
--- /dev/null
+++ b/sci-astronomy/siril/siril-1.2.0_rc1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson optfeature toolchain-funcs xdg
+
+DESCRIPTION="A free astronomical image processing software"
+HOMEPAGE="https://www.siril.org/"
+
+if [[ ${PV} == "9999" ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://gitlab.com/free-astro/${PN}.git"
+else
+ SRC_URI="https://gitlab.com/free-astro/siril/-/archive/${PV/_/-}/${PN}-${PV/_/-}.tar.bz2"
+ KEYWORDS="~amd64 ~x86"
+ S="${WORKDIR}/${PN}-${PV/_/-}"
+fi
+
+LICENSE="GPL-3+ Boost-1.0"
+SLOT="0"
+IUSE="curl exif ffmpeg heif jpeg libconfig openmp png raw tiff wcs"
+
+DEPEND="
+ >=dev-libs/glib-2.56.0:2
+ >=dev-libs/json-glib-1.2.6
+ dev-libs/sleef:=
+ media-libs/librtprocess:=
+ >=media-libs/opencv-4.4.0:=
+ sci-libs/cfitsio
+ sci-libs/fftw:3.0=
+ sci-libs/gsl:=
+ x11-libs/cairo
+ >=x11-libs/gtk+-3.20.0:3
+ curl? ( net-misc/curl )
+ exif? ( >=media-gfx/exiv2-0.25 )
+ ffmpeg? ( media-video/ffmpeg:= )
+ heif? ( media-libs/libheif )
+ libconfig? ( >=dev-libs/libconfig-1.4[cxx] )
+ jpeg? ( media-libs/libjpeg-turbo:= )
+ png? ( >=media-libs/libpng-1.6.0 )
+ raw? ( media-libs/libraw )
+ tiff? ( media-libs/tiff:= )
+ wcs? ( >=sci-astronomy/wcslib-7.7 )
+"
+RDEPEND="
+ ${DEPEND}
+"
+BDEPEND="dev-util/cmake
+ x11-base/xorg-proto"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-docfiles.patch"
+ "${FILESDIR}/${PN}-$(ver_cut 1-2)-stdint.patch"
+ "${FILESDIR}/${PN}-$(ver_cut 1-2)-tiff.patch"
+)
+
+DOCS=( README.md NEWS ChangeLog AUTHORS )
+
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_configure() {
+ local emesonargs=(
+ -Dffms2=false
+ -Dcriterion=false
+ $(meson_use exif exiv2)
+ $(meson_use ffmpeg)
+ $(meson_use heif libheif)
+ $(meson_use jpeg libjpeg)
+ $(meson_use libconfig)
+ $(meson_use openmp)
+ $(meson_use png libpng)
+ $(meson_use raw libraw)
+ $(meson_use tiff libtiff)
+ $(meson_use wcs wcslib)
+ $(usex curl -Denable-libcurl=yes -Denable-libcurl=no)
+ )
+ meson_src_configure
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+ xdg_icon_cache_update
+ xdg_mimeinfo_database_update
+ optfeature "gnuplot support" sci-visualization/gnuplot
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/files/, sci-astronomy/siril/
@ 2023-06-27 11:06 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2023-06-27 11:06 UTC (permalink / raw
To: gentoo-commits
commit: 8b42ac4cb82a4db6229c37a39b8ef6134bb0fc35
Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Sat Jun 17 08:33:29 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 27 11:06:31 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b42ac4c
sci-astronomy/siril: drop 1.2.0_beta1
Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/31501
Signed-off-by: Sam James <sam <AT> gentoo.org>
sci-astronomy/siril/Manifest | 1 -
sci-astronomy/siril/files/siril-1.2-execinfo.patch | 46 -----------
sci-astronomy/siril/files/siril-1.2-htmesh.patch | 57 -------------
sci-astronomy/siril/files/siril-1.2-openmp.patch | 49 ------------
sci-astronomy/siril/siril-1.2.0_beta1.ebuild | 93 ----------------------
5 files changed, 246 deletions(-)
diff --git a/sci-astronomy/siril/Manifest b/sci-astronomy/siril/Manifest
index 21fb2bfbef3a..afa8aea46959 100644
--- a/sci-astronomy/siril/Manifest
+++ b/sci-astronomy/siril/Manifest
@@ -1,3 +1,2 @@
DIST siril-1.0.6.tar.bz2 2893872 BLAKE2B 1f254dcb774c4bfb14fee4626d40e6eeedf866a7a96dca98502cd84e66b973c2201b1f88e2efcb89ce3401b13bd87a319b2ff11e7ba100d0689c9df429d01957 SHA512 afb5f1768a5884adcc13f2afd6fa386d836df5a1385b916df9df8da1fb464e0c8738123fb485ed92c749e596c744d5252a66444b840223488a0860e9324c4e9d
-DIST siril-1.2.0-beta1.tar.bz2 3869827 BLAKE2B 4ba624e917234f389f3ac1f2baf7519aacf4da6494ff437491103491dcac60ff146665faf0daf700a4d2e375d098b3b9af75c60975b882600ab96700a4dff166 SHA512 e259f46e2792d59f53d1e9e5fd3b33c6a912a9c19b53c4d84a803f153e1c5c4395f2fb413a21887330f41e06b7d62996162e65e73774faadb47ff7edc9f4150d
DIST siril-1.2.0-rc1.tar.bz2 4353720 BLAKE2B 38c7b1585508ac9697847648f2d718899a296a4061b34fcf71424136daa50c68737f811fd9063aa80274708d085d8089dceff7d1fd25277b60f0482c17fa5cd1 SHA512 41d685c0aca79da8a9c17d729c710bdd51d3f8cd13b976fb4aad4750e74b600783b988246f008cf41246e7e5f05b8b42368d975cbd79f42e9121b39e367eb22f
diff --git a/sci-astronomy/siril/files/siril-1.2-execinfo.patch b/sci-astronomy/siril/files/siril-1.2-execinfo.patch
deleted file mode 100644
index 82f29b290f63..000000000000
--- a/sci-astronomy/siril/files/siril-1.2-execinfo.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 6f959a02d27fb507cda1898a3aa785766e77d404 Mon Sep 17 00:00:00 2001
-From: Mario Haustein <mario.haustein@hrz.tu-chemnitz.de>
-Date: Mon, 27 Feb 2023 17:34:43 +0100
-Subject: [PATCH] fix HAVE_EXECINFO_H logic
-Bug: https://bugs.gentoo.org/898108
-Upstream: https://gitlab.com/free-astro/siril/-/merge_requests/442
-
----
- src/core/signals.c | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/src/core/signals.c b/src/core/signals.c
-index 42b369d6..d4745909 100644
---- a/src/core/signals.c
-+++ b/src/core/signals.c
-@@ -55,13 +55,7 @@ static void signal_handled(int s) {
- g_printf(ANSI_COLOR_RED"%s"ANSI_COLOR_RESET"\n", visit);
- }
-
--#if (!defined _WIN32 && defined HAVE_EXECINFO_H)
-- void *stack[STACK_DEPTH];
--
-- size_t size = backtrace(stack, sizeof(stack) / sizeof(void*));
--
-- backtrace_symbols_fd(stack, size, fileno((FILE*) stdout));
--#else
-+#ifdef _WIN32
- unsigned int i;
- void *stack[STACK_DEPTH];
- unsigned short size;
-@@ -84,6 +78,12 @@ static void signal_handled(int s) {
- }
-
- free(symbol);
-+#elif HAVE_EXECINFO_H
-+ void *stack[STACK_DEPTH];
-+
-+ size_t size = backtrace(stack, sizeof(stack) / sizeof(void*));
-+
-+ backtrace_symbols_fd(stack, size, fileno((FILE*) stdout));
- #endif
- }
- undo_flush();
---
-2.39.2
-
diff --git a/sci-astronomy/siril/files/siril-1.2-htmesh.patch b/sci-astronomy/siril/files/siril-1.2-htmesh.patch
deleted file mode 100644
index 83f389267c40..000000000000
--- a/sci-astronomy/siril/files/siril-1.2-htmesh.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 915d01b7e94ff0a597685976838ab707917428db Mon Sep 17 00:00:00 2001
-From: Mario Haustein <mario.haustein@hrz.tu-chemnitz.de>
-Date: Fri, 24 Feb 2023 19:00:52 +0100
-Subject: [PATCH] Don't install bundled htmesh static library system wide.
-Upstream: https://gitlab.com/free-astro/siril/-/merge_requests/438
-
----
- subprojects/htmesh/CMakeLists.txt | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/subprojects/htmesh/CMakeLists.txt b/subprojects/htmesh/CMakeLists.txt
-index 5c197a9e..189acd3e 100644
---- a/subprojects/htmesh/CMakeLists.txt
-+++ b/subprojects/htmesh/CMakeLists.txt
-@@ -49,9 +49,10 @@ set_target_properties(htmesh PROPERTIES
- VERSION 1.0.0
- SOVERSION 1)
-
--if (NOT ANDROID)
-- install(TARGETS htmesh ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
--endif ()
-+# It is not necessary to install the static library as we just link against it.
-+#if (NOT ANDROID)
-+# install(TARGETS htmesh ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
-+#endif ()
-
- # If you wish to compile the HTMesh perl wrapper, uncomment this, rebuild and copy the library into /usr/lib/, because we will use it as a shared object. See README in the perl wrapper directory (kstars/kstars/data/tools/HTMesh-*) for more details.
- #set_property(TARGET htmesh PROPERTY POSITION_INDEPENDENT_CODE YES)
---
-2.39.2
-
-From 42a12b852f4146aa104350587c456a35501a9707 Mon Sep 17 00:00:00 2001
-From: Mario Haustein <mario.haustein@hrz.tu-chemnitz.de>
-Date: Fri, 24 Feb 2023 18:40:26 +0100
-Subject: [PATCH] Fix typo in htmesh build configuration
-Upstream: https://gitlab.com/free-astro/siril/-/merge_requests/437
-
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 886f3697..1ed39a98 100644
---- a/meson.build
-+++ b/meson.build
-@@ -270,7 +270,7 @@ endif
- htmesh_dep = sub_proj.dependency('htmesh')
- htmesh_inc = sub_proj.include_directories('htmesh')
- else
-- siril_cpp_flag += '-DHAVE_LIBRTPROCESS'
-+ siril_cpp_flag += '-DHAVE_HTMESH'
- endif
-
- ## Optional dependencies
---
-2.39.2
-
diff --git a/sci-astronomy/siril/files/siril-1.2-openmp.patch b/sci-astronomy/siril/files/siril-1.2-openmp.patch
deleted file mode 100644
index 358bfaa79934..000000000000
--- a/sci-astronomy/siril/files/siril-1.2-openmp.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From: Mario Haustein <mario.haustein@hrz.tu-chemnitz.de>
-Date: Fri, 24 Mar 2023 18:24:26 +0100
-Subject: [PATCH] Add ifdef around openmp function
-Bug: https://bugs.gentoo.org/902833
-Upstream: https://gitlab.com/free-astro/siril/-/merge_requests/482
-
---- a/src/algos/quantize.c
-+++ b/src/algos/quantize.c
-@@ -1396,8 +1396,10 @@ row of the image.
- #pragma omp parallel num_threads(threads) if (threads>1)
- #endif
- {
-+#ifdef _OPENMP
- if (threads > 1 && omp_get_num_threads() != threads)
- siril_debug_print("actual number of threads: %d of %d requested (level %d)\n", omp_get_num_threads(), threads, omp_get_level());
-+#endif
- float *rowpix, v1;
- double mean, stdev;
- float *differences;
-From 59272d18d67dc342b1a040b7574b6b71b28310e6 Mon Sep 17 00:00:00 2001
-From: Mario Haustein <mario.haustein@hrz.tu-chemnitz.de>
-Date: Mon, 10 Apr 2023 22:17:54 +0200
-Subject: [PATCH] Remove uneeded openmp headers
-Bug: https://bugs.gentoo.org/903021
-Upstream: https://gitlab.com/free-astro/siril/-/merge_requests/494
-
---- a/src/filters/nlbayes/LibImages.cpp
-+++ b/src/filters/nlbayes/LibImages.cpp
-@@ -26,7 +26,6 @@
- #include <unistd.h>
- #include <stdlib.h>
- #include <math.h>
--#include <omp.h>
-
- using namespace std;
-
---- a/src/filters/nlbayes/Utilities.cpp
-+++ b/src/filters/nlbayes/Utilities.cpp
-@@ -20,7 +20,6 @@
- #include "Utilities.h"
-
- #include <math.h>
--#include <omp.h>
- #include <iostream>
- #include <stdlib.h>
- #include <fstream>
---
-2.39.2
-
diff --git a/sci-astronomy/siril/siril-1.2.0_beta1.ebuild b/sci-astronomy/siril/siril-1.2.0_beta1.ebuild
deleted file mode 100644
index 0c2bb48012a9..000000000000
--- a/sci-astronomy/siril/siril-1.2.0_beta1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson optfeature toolchain-funcs xdg
-
-DESCRIPTION="A free astronomical image processing software"
-HOMEPAGE="https://www.siril.org/"
-
-if [[ ${PV} == "9999" ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://gitlab.com/free-astro/${PN}.git"
-else
- SRC_URI="https://gitlab.com/free-astro/siril/-/archive/${PV/_/-}/${PN}-${PV/_/-}.tar.bz2"
- KEYWORDS="~amd64 ~x86"
- S="${WORKDIR}/${PN}-${PV/_/-}"
-fi
-
-LICENSE="GPL-3+ Boost-1.0"
-SLOT="0"
-IUSE="curl ffmpeg heif jpeg libconfig openmp png raw tiff wcs"
-
-DEPEND="
- >=dev-libs/glib-2.56.0:2
- >=dev-libs/json-glib-1.2.6
- dev-libs/sleef:=
- >=media-gfx/exiv2-0.25
- media-libs/librtprocess:=
- >=media-libs/opencv-4.4.0:=
- sci-libs/cfitsio
- sci-libs/fftw:3.0=
- sci-libs/gsl:=
- x11-libs/cairo
- >=x11-libs/gtk+-3.20.0:3
- curl? ( net-misc/curl )
- ffmpeg? ( media-video/ffmpeg:= )
- heif? ( media-libs/libheif )
- libconfig? ( >=dev-libs/libconfig-1.4[cxx] )
- jpeg? ( media-libs/libjpeg-turbo:= )
- png? ( >=media-libs/libpng-1.6.0 )
- raw? ( media-libs/libraw )
- tiff? ( media-libs/tiff:= )
- wcs? ( >=sci-astronomy/wcslib-7.7 )
-"
-RDEPEND="
- ${DEPEND}
-"
-BDEPEND="dev-util/cmake
- x11-base/xorg-proto"
-
-PATCHES=(
- "${FILESDIR}/${PN}-docfiles.patch"
- "${FILESDIR}/${PN}-$(ver_cut 1-2)-htmesh.patch"
- "${FILESDIR}/${PN}-$(ver_cut 1-2)-execinfo.patch"
- "${FILESDIR}/${PN}-prototypes.patch"
- "${FILESDIR}/${PN}-$(ver_cut 1-2)-openmp.patch"
-)
-
-DOCS=( README.md NEWS ChangeLog AUTHORS )
-
-pkg_pretend() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_configure() {
- local emesonargs=(
- -Dffms2=false
- -Dcriterion=false
- $(meson_use ffmpeg)
- $(meson_use heif libheif)
- $(meson_use jpeg libjpeg)
- $(meson_use libconfig)
- $(meson_use openmp)
- $(meson_use png libpng)
- $(meson_use raw libraw)
- $(meson_use tiff libtiff)
- $(meson_use wcs wcslib)
- $(usex curl -Denable-libcurl=yes -Denable-libcurl=no)
- )
- meson_src_configure
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
- optfeature "gnuplot support" sci-visualization/gnuplot
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/files/, sci-astronomy/siril/
@ 2023-08-20 17:37 Andreas Sturmlechner
0 siblings, 0 replies; 11+ messages in thread
From: Andreas Sturmlechner @ 2023-08-20 17:37 UTC (permalink / raw
To: gentoo-commits
commit: ec80058fdeb087d2ccdc5526ef3dc6d7c842e5a1
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 20 17:32:54 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 20 17:37:41 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec80058f
sci-astronomy/siril: Fix build with >=exiv2-0.28
Closes: https://bugs.gentoo.org/906499
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../siril/files/siril-1.2-exiv2-0.28.patch | 39 ++++++++++++++++++++++
sci-astronomy/siril/siril-1.2.0_rc1-r1.ebuild | 5 +--
2 files changed, 42 insertions(+), 2 deletions(-)
diff --git a/sci-astronomy/siril/files/siril-1.2-exiv2-0.28.patch b/sci-astronomy/siril/files/siril-1.2-exiv2-0.28.patch
new file mode 100644
index 000000000000..8678316bfc87
--- /dev/null
+++ b/sci-astronomy/siril/files/siril-1.2-exiv2-0.28.patch
@@ -0,0 +1,39 @@
+* asturm 2023-08-20: Combination of two commits from upstream git master
+ 3c2579cd: Pick the only hunk relevant for exiv2-0.28...
+ 64583490: Blend with that to fix build w/o exiv2 and fix indendation...
+
+
+From 3c2579cd171314f7e408c00bc8e793330dcc07ba Mon Sep 17 00:00:00 2001
+From: Cyril Richard <cyril.richard42@gmail.com>
+Date: Sun, 4 Jun 2023 22:10:55 +0000
+Subject: [PATCH] XISF image import
+
+From 64583490214302f4057cf223d7591be9d2172a4f Mon Sep 17 00:00:00 2001
+From: Vincent Hourdin <vh@free-astro.org>
+Date: Mon, 5 Jun 2023 00:27:56 +0200
+Subject: [PATCH] fixing exiv2 as optional
+
+--- a/src/core/exif.cpp
++++ b/src/core/exif.cpp
+@@ -121,10 +121,18 @@
+ #endif
+ }
+
++#ifdef HAVE_EXIV2
++#if EXIV2_TEST_VERSION(0,28,0)
++typedef Exiv2::Image::UniquePtr ImagePtr;
++#else
++typedef Exiv2::Image::AutoPtr ImagePtr;
++#endif
++#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;
+--
+GitLab
diff --git a/sci-astronomy/siril/siril-1.2.0_rc1-r1.ebuild b/sci-astronomy/siril/siril-1.2.0_rc1-r1.ebuild
index 54a8e916b5fc..c5cbbe1bd8e2 100644
--- a/sci-astronomy/siril/siril-1.2.0_rc1-r1.ebuild
+++ b/sci-astronomy/siril/siril-1.2.0_rc1-r1.ebuild
@@ -52,8 +52,9 @@ BDEPEND="dev-util/cmake
PATCHES=(
"${FILESDIR}/${PN}-docfiles.patch"
- "${FILESDIR}/${PN}-$(ver_cut 1-2)-stdint.patch"
- "${FILESDIR}/${PN}-$(ver_cut 1-2)-tiff.patch"
+ "${FILESDIR}/${PN}-1.2-stdint.patch"
+ "${FILESDIR}/${PN}-1.2-tiff.patch"
+ "${FILESDIR}/${PN}-1.2-exiv2-0.28.patch" # bug 906499
)
DOCS=( README.md NEWS ChangeLog AUTHORS )
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/files/, sci-astronomy/siril/
@ 2024-06-02 8:28 Joonas Niilola
0 siblings, 0 replies; 11+ messages in thread
From: Joonas Niilola @ 2024-06-02 8:28 UTC (permalink / raw
To: gentoo-commits
commit: 15f91123ccce8cb1dd2953c18d13edf22c034164
Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Sun Apr 28 12:31:39 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Jun 2 08:28:03 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15f91123
sci-astronomy/siril: fix one definition rule violation
Closes: https://bugs.gentoo.org/927345
Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/36467
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
.../siril/files/siril-1.2.1-options.patch | 101 +++++++++++++++++++++
sci-astronomy/siril/siril-1.2.1-r1.ebuild | 93 +++++++++++++++++++
2 files changed, 194 insertions(+)
diff --git a/sci-astronomy/siril/files/siril-1.2.1-options.patch b/sci-astronomy/siril/files/siril-1.2.1-options.patch
new file mode 100644
index 000000000000..11a8bdeeef0c
--- /dev/null
+++ b/sci-astronomy/siril/files/siril-1.2.1-options.patch
@@ -0,0 +1,101 @@
+From 241b4b17d83285eb4bf4151dd77198427ac9fde4 Mon Sep 17 00:00:00 2001
+From: Mario Haustein <mario.haustein@hrz.tu-chemnitz.de>
+Date: Sun, 28 Apr 2024 14:09:19 +0200
+Subject: [PATCH] Fix multiple definition of struct options
+Upstream: https://gitlab.com/free-astro/siril/-/merge_requests/668
+Bug: https://bugs.gentoo.org/927345
+
+--- a/src/filters/deconvolution/estimate_kernel.cpp
++++ b/src/filters/deconvolution/estimate_kernel.cpp
+@@ -33,7 +33,7 @@ extern "C" float *estimate_kernel(estk_data *args, int max_threads) {
+ if (!cppfftwmultithreaded)
+ max_threads = 1;
+ img_t<float>::use_threading(max_threads);
+- options opts;
++ estimate_kernel_options opts;
+ opts.ks = args->ks;
+ opts.lambda = args->lambda;
+ opts.lambda_ratio = args->lambda_ratio;
+--- a/src/filters/deconvolution/estimate_kernel.hpp
++++ b/src/filters/deconvolution/estimate_kernel.hpp
+@@ -56,7 +56,7 @@ void gaussian_downsample(img_t<float>& out, const img_t<float>& _in, float facto
+ }
+ }
+
+-struct options {
++struct estimate_kernel_options {
+ bool verbose;
+ int ks;
+ float lambda;
+@@ -81,7 +81,7 @@ template <typename T>
+ class ImagePredictor {
+ public:
+ virtual void solve(img_t<T>& u, const img_t<T>& K, T lambda, T beta_init, T beta_rate, T beta_max,
+- const options& opts) = 0;
++ const estimate_kernel_options& opts) = 0;
+ virtual ~ImagePredictor() {}
+ };
+
+@@ -114,7 +114,7 @@ public:
+ }
+
+ void solve(img_t<T>& u, const img_t<T>& K,
+- T lambda, T beta_init, T beta_rate, T beta_max, const options& opts) {
++ T lambda, T beta_init, T beta_rate, T beta_max, const estimate_kernel_options& opts) {
+ assert(K.w % 2);
+ assert(K.h % 2);
+
+@@ -177,7 +177,7 @@ public:
+ template <typename T>
+ class KernelEstimator {
+ public:
+- virtual void solve(img_t<T>& k, const img_t<T>& u, const struct options& opts) = 0;
++ virtual void solve(img_t<T>& k, const img_t<T>& u, const struct estimate_kernel_options& opts) = 0;
+ virtual ~KernelEstimator() {}
+ };
+
+@@ -198,7 +198,7 @@ public:
+ }
+
+ // implements Algorithm 3
+- void solve(img_t<T>& k, const img_t<T>& u, const struct options& opts) {
++ void solve(img_t<T>& k, const img_t<T>& u, const struct estimate_kernel_options& opts) {
+ k.resize(ks, ks);
+
+ // solves the Equation (28)
+@@ -313,7 +313,7 @@ public:
+ fv = fft::r2c(v);
+ }
+
+- void solve(img_t<T>& k, const img_t<T>& u, const struct options& opts) {
++ void solve(img_t<T>& k, const img_t<T>& u, const struct estimate_kernel_options& opts) {
+ if (k.w != ks || k.h != ks)
+ k.resize(ks, ks);
+
+@@ -407,7 +407,7 @@ public:
+ // estimates the sharp image and the kernel from a blurry image and an initialization of u
+ template <typename T>
+ void l0_kernel_estimation(img_t<T>& k, img_t<T>& u, const img_t<T>& v,
+- const img_t<T>& initu, struct options& opts) {
++ const img_t<T>& initu, struct estimate_kernel_options& opts) {
+ // static int it = 0;
+ ImagePredictor<T>* sharp_predictor = nullptr;
+ sharp_predictor = new L0ImagePredictor<T>(v);
+@@ -463,7 +463,7 @@ void l0_kernel_estimation(img_t<T>& k, img_t<T>& u, const img_t<T>& v,
+ // it assumes that the image was previously processed by preprocess_image
+ // the inner loop is implemented in l0_kernel_estimation
+ template <typename T>
+-void multiscale_l0_kernel_estimation(img_t<T>& k, img_t<T>& u, const img_t<T>& v, struct options& opts) {
++void multiscale_l0_kernel_estimation(img_t<T>& k, img_t<T>& u, const img_t<T>& v, struct estimate_kernel_options& opts) {
+ std::vector<img_t<T>> vs;
+ std::vector<int> kernelSizes;
+ printf("Multiscale kernel estimation...\n");
+@@ -511,7 +511,7 @@ void multiscale_l0_kernel_estimation(img_t<T>& k, img_t<T>& u, const img_t<T>& v
+
+ // preprocess the input blurry image as describe in Section 2.1
+ template <typename T>
+-void preprocess_image(img_t<T>& out, const img_t<T>& _v, struct options& opts) {
++void preprocess_image(img_t<T>& out, const img_t<T>& _v, struct estimate_kernel_options& opts) {
+ img_t<T> v(_v.w, _v.h);
+
+ // convert to grayscale
diff --git a/sci-astronomy/siril/siril-1.2.1-r1.ebuild b/sci-astronomy/siril/siril-1.2.1-r1.ebuild
new file mode 100644
index 000000000000..8b3fc3865d24
--- /dev/null
+++ b/sci-astronomy/siril/siril-1.2.1-r1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson optfeature toolchain-funcs xdg
+
+DESCRIPTION="A free astronomical image processing software"
+HOMEPAGE="https://siril.org/"
+
+if [[ ${PV} == "9999" ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://gitlab.com/free-astro/${PN}.git"
+else
+ SRC_URI="https://gitlab.com/free-astro/siril/-/archive/${PV/_/-}/${PN}-${PV/_/-}.tar.bz2"
+ KEYWORDS="~amd64 ~x86"
+ S="${WORKDIR}/${PN}-${PV/_/-}"
+fi
+
+LICENSE="GPL-3+ Boost-1.0"
+SLOT="0"
+IUSE="curl exif ffmpeg heif jpeg libconfig openmp png raw tiff wcs"
+
+DEPEND="
+ >=dev-libs/glib-2.56.0:2
+ >=dev-libs/json-glib-1.2.6
+ media-libs/librtprocess
+ >=media-libs/opencv-4.4.0:=
+ sci-libs/cfitsio:=
+ sci-libs/fftw:3.0=
+ sci-libs/gsl:=
+ x11-libs/gdk-pixbuf:2
+ x11-libs/cairo
+ x11-libs/pango
+ >=x11-libs/gtk+-3.20.0:3
+ curl? ( net-misc/curl )
+ exif? ( >=media-gfx/exiv2-0.25:= )
+ ffmpeg? ( media-video/ffmpeg:= )
+ heif? ( media-libs/libheif:= )
+ jpeg? ( media-libs/libjpeg-turbo:= )
+ libconfig? ( >=dev-libs/libconfig-1.4:=[cxx] )
+ png? ( >=media-libs/libpng-1.6.0:= )
+ raw? ( media-libs/libraw:= )
+ tiff? ( media-libs/tiff:= )
+ wcs? ( >=sci-astronomy/wcslib-7.7:= )
+"
+RDEPEND="
+ ${DEPEND}
+"
+BDEPEND="dev-build/cmake
+ x11-base/xorg-proto"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-docfiles.patch"
+ "${FILESDIR}/${PN}-1.2-fseek64-musl.patch"
+ "${FILESDIR}/${PN}-1.2.1-options.patch"
+)
+
+DOCS=( README.md NEWS ChangeLog AUTHORS )
+
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_configure() {
+ local emesonargs=(
+ -Dffms2=false
+ -Dcriterion=false
+ $(meson_use exif exiv2)
+ $(meson_use ffmpeg)
+ $(meson_use heif libheif)
+ $(meson_use jpeg libjpeg)
+ $(meson_use libconfig)
+ $(meson_use openmp)
+ $(meson_use png libpng)
+ $(meson_use raw libraw)
+ $(meson_use tiff libtiff)
+ $(meson_use wcs wcslib)
+ $(usex curl -Denable-libcurl=yes -Denable-libcurl=no)
+ )
+ meson_src_configure
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+ xdg_icon_cache_update
+ xdg_mimeinfo_database_update
+ optfeature "gnuplot support" sci-visualization/gnuplot
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/files/, sci-astronomy/siril/
@ 2024-07-05 22:37 Jason Zaman
0 siblings, 0 replies; 11+ messages in thread
From: Jason Zaman @ 2024-07-05 22:37 UTC (permalink / raw
To: gentoo-commits
commit: ebe0880735724b0da36d882d33a11f37d5f3a07d
Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Fri Jun 14 15:48:41 2024 +0000
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Fri Jul 5 22:29:20 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebe08807
sci-astronomy/siril: drop 1.2.0
Closes: https://github.com/gentoo/gentoo/pull/37158
Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de>
Signed-off-by: Jason Zaman <perfinion <AT> gentoo.org>
sci-astronomy/siril/Manifest | 1 -
.../siril/files/siril-1.2-exiv2-0.28.patch | 39 ---------
sci-astronomy/siril/siril-1.2.0.ebuild | 92 ----------------------
3 files changed, 132 deletions(-)
diff --git a/sci-astronomy/siril/Manifest b/sci-astronomy/siril/Manifest
index cb5cfbd03c0b..3dd2b5266b76 100644
--- a/sci-astronomy/siril/Manifest
+++ b/sci-astronomy/siril/Manifest
@@ -1,3 +1,2 @@
-DIST siril-1.2.0.tar.bz2 4500147 BLAKE2B 7ff4fa5bf1b578336c82bd0f67e404fe47715640edae9cb231da4a3c6a30638612e77515049d56dd1d444965ad58f12d5e2516ad13d3e726f13242b11d91b954 SHA512 7df7b17d65a2aad9e0edd4b5022c1d23688ad8884a973d2195391234151aff0824e155ce949b385a951eaef71065a811f33b54e08b865ab5fa6c1d331841663c
DIST siril-1.2.1.tar.bz2 4596163 BLAKE2B c461a397e623164ccb2310b26aede120bf587b3491a2af3fab446af5ecbfb716169120b549c496bb615d3b7ac6175629258173fe66682ef4684ef5cf01d64761 SHA512 352b3e761a2d863d4ce4e01b0bf4181d8fefa903478973b50ace76ff419dbf07775099a994e685cd83cc2210b34ca10fb98004cedfdea34fe0c1520b4892bb6d
DIST siril-1.2.3.tar.bz2 4615997 BLAKE2B f8464849fad03faca07f238b3abd08c59126dab567666d92f1a53d2cea302608fe40b5532c6544029e869c639d1fc625c8ccc98779e678457713675c43225a74 SHA512 52cfa86ce0ddede42a3572c3d422cccca72da02a6efe207231ec98de9d59cc48704edd35e8ae83e86318e6980ce80eca3b9dba639e93f8551355a1328156ed9a
diff --git a/sci-astronomy/siril/files/siril-1.2-exiv2-0.28.patch b/sci-astronomy/siril/files/siril-1.2-exiv2-0.28.patch
deleted file mode 100644
index 8678316bfc87..000000000000
--- a/sci-astronomy/siril/files/siril-1.2-exiv2-0.28.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-* asturm 2023-08-20: Combination of two commits from upstream git master
- 3c2579cd: Pick the only hunk relevant for exiv2-0.28...
- 64583490: Blend with that to fix build w/o exiv2 and fix indendation...
-
-
-From 3c2579cd171314f7e408c00bc8e793330dcc07ba Mon Sep 17 00:00:00 2001
-From: Cyril Richard <cyril.richard42@gmail.com>
-Date: Sun, 4 Jun 2023 22:10:55 +0000
-Subject: [PATCH] XISF image import
-
-From 64583490214302f4057cf223d7591be9d2172a4f Mon Sep 17 00:00:00 2001
-From: Vincent Hourdin <vh@free-astro.org>
-Date: Mon, 5 Jun 2023 00:27:56 +0200
-Subject: [PATCH] fixing exiv2 as optional
-
---- a/src/core/exif.cpp
-+++ b/src/core/exif.cpp
-@@ -121,10 +121,18 @@
- #endif
- }
-
-+#ifdef HAVE_EXIV2
-+#if EXIV2_TEST_VERSION(0,28,0)
-+typedef Exiv2::Image::UniquePtr ImagePtr;
-+#else
-+typedef Exiv2::Image::AutoPtr ImagePtr;
-+#endif
-+#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;
---
-GitLab
diff --git a/sci-astronomy/siril/siril-1.2.0.ebuild b/sci-astronomy/siril/siril-1.2.0.ebuild
deleted file mode 100644
index 70a659136663..000000000000
--- a/sci-astronomy/siril/siril-1.2.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson optfeature toolchain-funcs xdg
-
-DESCRIPTION="A free astronomical image processing software"
-HOMEPAGE="https://siril.org/"
-
-if [[ ${PV} == "9999" ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://gitlab.com/free-astro/${PN}.git"
-else
- SRC_URI="https://gitlab.com/free-astro/siril/-/archive/${PV/_/-}/${PN}-${PV/_/-}.tar.bz2"
- KEYWORDS="amd64 ~x86"
- S="${WORKDIR}/${PN}-${PV/_/-}"
-fi
-
-LICENSE="GPL-3+ Boost-1.0"
-SLOT="0"
-IUSE="curl exif ffmpeg heif jpeg libconfig openmp png raw tiff wcs"
-
-DEPEND="
- >=dev-libs/glib-2.56.0:2
- >=dev-libs/json-glib-1.2.6
- media-libs/librtprocess
- >=media-libs/opencv-4.4.0:=
- sci-libs/cfitsio:=
- sci-libs/fftw:3.0=
- sci-libs/gsl:=
- x11-libs/gdk-pixbuf:2
- x11-libs/cairo
- x11-libs/pango
- >=x11-libs/gtk+-3.20.0:3
- curl? ( net-misc/curl )
- exif? ( >=media-gfx/exiv2-0.25:= )
- ffmpeg? ( media-video/ffmpeg:= )
- heif? ( media-libs/libheif:= )
- jpeg? ( media-libs/libjpeg-turbo:= )
- libconfig? ( >=dev-libs/libconfig-1.4:=[cxx] )
- png? ( >=media-libs/libpng-1.6.0:= )
- raw? ( media-libs/libraw:= )
- tiff? ( media-libs/tiff:= )
- wcs? ( >=sci-astronomy/wcslib-7.7:= )
-"
-RDEPEND="
- ${DEPEND}
-"
-BDEPEND="dev-build/cmake
- x11-base/xorg-proto"
-
-PATCHES=(
- "${FILESDIR}/${PN}-docfiles.patch"
- "${FILESDIR}/${PN}-1.2-exiv2-0.28.patch" # bug 906499
-)
-
-DOCS=( README.md NEWS ChangeLog AUTHORS )
-
-pkg_pretend() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_configure() {
- local emesonargs=(
- -Dffms2=false
- -Dcriterion=false
- $(meson_use exif exiv2)
- $(meson_use ffmpeg)
- $(meson_use heif libheif)
- $(meson_use jpeg libjpeg)
- $(meson_use libconfig)
- $(meson_use openmp)
- $(meson_use png libpng)
- $(meson_use raw libraw)
- $(meson_use tiff libtiff)
- $(meson_use wcs wcslib)
- $(usex curl -Denable-libcurl=yes -Denable-libcurl=no)
- )
- meson_src_configure
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
- optfeature "gnuplot support" sci-visualization/gnuplot
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread
end of thread, other threads:[~2024-07-05 22:37 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-07-15 8:38 [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/files/, sci-astronomy/siril/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2022-09-13 12:21 Andrew Ammerlaan
2022-10-01 3:16 Sam James
2023-03-08 14:13 Joonas Niilola
2023-03-08 14:13 Joonas Niilola
2023-03-25 4:08 Sam James
2023-06-13 6:32 Viorel Munteanu
2023-06-27 11:06 Sam James
2023-08-20 17:37 Andreas Sturmlechner
2024-06-02 8:28 Joonas Niilola
2024-07-05 22:37 Jason Zaman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox