Adding metadata

4 files changed, 131 insertions, 11 deletions

diff --git a/sci-astronomy/siril/files/siril-1.2.6-linkage.patch b/sci-astronomy/siril/files/siril-1.2.6-linkage.patch
new file mode 100644
index 000000000000..0dc528970bea
--- /dev/null
+++ b/sci-astronomy/siril/files/siril-1.2.6-linkage.patch
@@ -0,0 +1,96 @@
+Upstream: https://gitlab.com/free-astro/siril/-/issues/1516
+Upstream: https://gitlab.com/free-astro/siril/-/issues/1202
+Bug: https://bugs.gentoo.org/957668
+--- a/src/core/processing.h
++++ b/src/core/processing.h
+@@ -136,6 +136,10 @@ struct generic_seq_args {
+ #endif
+ };
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ gpointer generic_sequence_worker(gpointer p);
+ gboolean end_generic_sequence(gpointer p);
+ 
+@@ -184,4 +188,8 @@ gpointer generic_sequence_metadata_worker(gpointer args);
+ 
+ void kill_child_process(gboolean on_exit);
+ 
++#ifdef __cplusplus
++}
++#endif
++
+ #endif
+--- a/src/filters/da3d/DA3D.cpp
++++ b/src/filters/da3d/DA3D.cpp
+@@ -15,10 +15,8 @@
+ #include "WeightMap.hpp"
+ #include "Utils.hpp"
+ #include "DftPatch.hpp"
+-extern "C" {
+ #include "core/processing.h"
+ #include "gui/progress_and_log.h"
+-}
+ 
+ #ifdef _OPENMP
+ #include <omp.h>
+--- a/src/filters/nlbayes/NlBayes.cpp
++++ b/src/filters/nlbayes/NlBayes.cpp
+@@ -27,11 +27,9 @@
+ #include "LibMatrix.h"
+ #include "LibImages.h"
+ #include "Utilities.h"
+-extern "C" {
+ #include "algos/anscombe.h"
+ #include "core/processing.h"
+ #include "gui/progress_and_log.h"
+-}
+ 
+ #ifdef _OPENMP
+ #include <omp.h>
+--- a/src/gui/progress_and_log.h
++++ b/src/gui/progress_and_log.h
+@@ -10,6 +10,10 @@
+ #define PROGRESS_DONE 1.0		// fill the progress bar
+ #define PROGRESS_TEXT_RESET ""		// reset the progress bar's text
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ void initialize_log_tags();
+ void gui_log_message(const char* msg, const char* color);
+ 
+@@ -17,4 +21,8 @@ void set_progress_bar_data(const char *text, double percent);
+ void set_cursor_waiting(gboolean waiting);
+ void set_cursor(const gchar* cursor_name);
+ 
++#ifdef __cplusplus
++}
++#endif
++
+ #endif
+--- a/src/opencv/opencv.h
++++ b/src/opencv/opencv.h
+@@ -5,14 +5,15 @@
+ #  include <config.h>
+ #endif
+ 
+-#ifdef __cplusplus
+-extern "C" {
+-#endif
+-
+ #include <stdint.h>
+ #include "registration/registration.h"
+ #include "registration/matching/misc.h"
+ #include "registration/matching/atpmatch.h"
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ #include "gui/progress_and_log.h"
+ 
+ WORD *fits_to_bgrbgr_ushort(fits *image);
diff --git a/sci-astronomy/siril/files/siril-9999-docfiles.patch b/sci-astronomy/siril/files/siril-9999-docfiles.patch
new file mode 100644
index 000000000000..19a063e3d645
--- /dev/null
+++ b/sci-astronomy/siril/files/siril-9999-docfiles.patch
@@ -0,0 +1,17 @@
+diff --git a/meson.build b/meson.build
+index 0bc3f0d8e..e08989aa9 100644
+--- a/meson.build
++++ b/meson.build
+@@ -710,12 +710,6 @@ man_files = [
+ ]
+ 
+ install_man(man_files)
+-install_data(['AUTHORS', 'LICENSE.md'],
+-             rename : [
+-	       'doc/siril/AUTHORS',
+-	       'doc/siril/LICENSE.md',
+-	     ],
+-             install_dir : siril_share)
+ 
+ 
+ ################################################################################
diff --git a/sci-astronomy/siril/siril-1.2.6.ebuild b/sci-astronomy/siril/siril-1.2.6.ebuild
index f08acf469ee0..6927da3ef67c 100644
--- a/sci-astronomy/siril/siril-1.2.6.ebuild
+++ b/sci-astronomy/siril/siril-1.2.6.ebuild
@@ -54,6 +54,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-docfiles.patch"
 	"${FILESDIR}/${PN}-1.2-fseek64-musl.patch"
 	"${FILESDIR}/${PN}-1.2.1-options.patch"
+	"${FILESDIR}/${PN}-1.2.6-linkage.patch"
 )
 
 DOCS=( README.md NEWS ChangeLog AUTHORS )
diff --git a/sci-astronomy/siril/siril-9999.ebuild b/sci-astronomy/siril/siril-9999.ebuild
index f230b3469ec6..45a33620fe6d 100644
--- a/sci-astronomy/siril/siril-9999.ebuild
+++ b/sci-astronomy/siril/siril-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,30 +19,35 @@ fi
 
 LICENSE="GPL-3+ Boost-1.0"
 SLOT="0"
-IUSE="curl exif ffmpeg heif jpeg libconfig openmp png raw tiff wcs"
+IUSE="curl exif ffmpeg git heif jpeg jpegxl openmp png raw tiff"
 
+# TODO: Siril depends optionally on gtksourceview-4, which is deprecated. Add
+#   gui-libs/gtksourceview if version 5 is supported by upstream.
 DEPEND="
 	>=dev-libs/glib-2.56.0:2
 	>=dev-libs/json-glib-1.2.6
+	>=dev-libs/yyjson-0.10.0:=
+	media-libs/lcms:=
 	media-libs/librtprocess
-	>=media-libs/opencv-4.4.0:=
+	>=media-libs/opencv-4.2.0:=
+	>=sci-astronomy/wcslib-7.12:=
 	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
+	>=x11-libs/gtk+-3.22.0:3
 	curl? ( net-misc/curl )
 	exif? ( >=media-gfx/exiv2-0.25:= )
 	ffmpeg? ( media-video/ffmpeg:= )
+	git? ( dev-libs/libgit2:= )
 	heif? ( media-libs/libheif:= )
 	jpeg? ( media-libs/libjpeg-turbo:= )
-	libconfig? ( >=dev-libs/libconfig-1.4:=[cxx] )
+	jpegxl? ( media-libs/libjxl:= )
 	png? ( >=media-libs/libpng-1.6.0:= )
 	raw? ( media-libs/libraw:= )
 	tiff? ( media-libs/tiff:= )
-	wcs? ( >=sci-astronomy/wcslib-7.7:= )
 "
 RDEPEND="
 	${DEPEND}
@@ -51,10 +56,10 @@ BDEPEND="dev-build/cmake
 	x11-base/xorg-proto"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-docfiles.patch"
+	"${FILESDIR}/${P}-docfiles.patch"
 )
 
-DOCS=( README.md NEWS ChangeLog AUTHORS )
+DOCS=( README.md ChangeLog AUTHORS )
 
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
@@ -66,19 +71,20 @@ pkg_setup() {
 
 src_configure() {
 	local emesonargs=(
+		-DlibXISF=false
 		-Dffms2=false
 		-Dcriterion=false
+		$(meson_use curl libcurl)
 		$(meson_use exif exiv2)
 		$(meson_use ffmpeg)
+		$(meson_use git libgit2)
 		$(meson_use heif libheif)
 		$(meson_use jpeg libjpeg)
-		$(meson_use libconfig)
+		$(meson_use jpegxl libjxl)
 		$(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
 }