subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: sci\-astronomy\/siril\/"

[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/

2024-08-05 Thread Sam James

commit: 864285754c525c9dd23c3d5f148337aa5be96dbb
Author: Sam James  gentoo  org>
AuthorDate: Tue Aug  6 01:46:07 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Aug  6 01:46:07 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86428575

sci-astronomy/siril: Stabilize 1.2.3 amd64, #937409

Signed-off-by: Sam James  gentoo.org>

 sci-astronomy/siril/siril-1.2.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-astronomy/siril/siril-1.2.3.ebuild 
b/sci-astronomy/siril/siril-1.2.3.ebuild
index 8b3fc3865d24..24b92345dc89 100644
--- a/sci-astronomy/siril/siril-1.2.3.ebuild
+++ b/sci-astronomy/siril/siril-1.2.3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "" ]]; 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 ~x86"
S="${WORKDIR}/${PN}-${PV/_/-}"
 fi

[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/files/, sci-astronomy/siril/

2024-07-05 Thread Jason Zaman

commit: ebe0880735724b0da36d882d33a11f37d5f3a07d
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Fri Jun 14 15:48:41 2024 +
Commit: Jason Zaman  gentoo  org>
CommitDate: Fri Jul  5 22:29:20 2024 +
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  hrz.tu-chemnitz.de>
Signed-off-by: Jason Zaman  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 
52cfa86ce0ddede42a3572c3d422a72da02a6efe207231ec98de9d59cc48704edd35e8ae83e86318e6980ce80eca3b9dba639e93f8551355a1328156ed9a

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..
--- 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 
-Date: Sun, 4 Jun 2023 22:10:55 +
-Subject: [PATCH] XISF image import
-
-From 64583490214302f4057cf223d7591be9d2172a4f Mon Sep 17 00:00:00 2001
-From: Vincent Hourdin 
-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..
--- 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} == "" ]]; 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-astronom

[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/

2024-07-05 Thread Jason Zaman

commit: b4ccf373e8de530244564678f6d30e9e58463b3f
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Mon Jun 24 21:49:39 2024 +
Commit: Jason Zaman  gentoo  org>
CommitDate: Fri Jul  5 22:29:19 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4ccf373

sci-astronomy/siril: add 1.2.3

Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Signed-off-by: Jason Zaman  gentoo.org>

 sci-astronomy/siril/Manifest   |  1 +
 sci-astronomy/siril/siril-1.2.3.ebuild | 93 ++
 2 files changed, 94 insertions(+)

diff --git a/sci-astronomy/siril/Manifest b/sci-astronomy/siril/Manifest
index 2840ba6a92d8..cb5cfbd03c0b 100644
--- a/sci-astronomy/siril/Manifest
+++ b/sci-astronomy/siril/Manifest
@@ -1,2 +1,3 @@
 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 
52cfa86ce0ddede42a3572c3d422a72da02a6efe207231ec98de9d59cc48704edd35e8ae83e86318e6980ce80eca3b9dba639e93f8551355a1328156ed9a

diff --git a/sci-astronomy/siril/siril-1.2.3.ebuild 
b/sci-astronomy/siril/siril-1.2.3.ebuild
new file mode 100644
index ..8b3fc3865d24
--- /dev/null
+++ b/sci-astronomy/siril/siril-1.2.3.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} == "" ]]; 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
+}

[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/

2024-07-04 Thread Jakov Smolić

commit: b56c3433126062866ed011c145265dba00238293
Author: Jakov Smolić  gentoo  org>
AuthorDate: Thu Jul  4 09:29:38 2024 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu Jul  4 09:29:38 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b56c3433

sci-astronomy/siril: Stabilize 1.2.1-r1 amd64, #935438

Signed-off-by: Jakov Smolić  gentoo.org>

 sci-astronomy/siril/siril-1.2.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-astronomy/siril/siril-1.2.1-r1.ebuild 
b/sci-astronomy/siril/siril-1.2.1-r1.ebuild
index 8b3fc3865d24..24b92345dc89 100644
--- a/sci-astronomy/siril/siril-1.2.1-r1.ebuild
+++ b/sci-astronomy/siril/siril-1.2.1-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "" ]]; 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 ~x86"
S="${WORKDIR}/${PN}-${PV/_/-}"
 fi

[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/files/, sci-astronomy/siril/

2024-06-02 Thread Joonas Niilola

commit: 15f91123ccce8cb1dd2953c18d13edf22c034164
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Sun Apr 28 12:31:39 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Jun  2 08:28:03 2024 +
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  hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/36467
Signed-off-by: Joonas Niilola  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 ..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 
+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::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& out, const 
img_t& _in, float facto
+ }
+ }
+ 
+-struct options {
++struct estimate_kernel_options {
+ bool verbose;
+ int ks;
+ float lambda;
+@@ -81,7 +81,7 @@ template 
+ class ImagePredictor {
+ public:
+ virtual void solve(img_t& u, const img_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& u, const img_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 
+ class KernelEstimator {
+ public:
+-virtual void solve(img_t& k, const img_t& u, const struct options& 
opts) = 0;
++virtual void solve(img_t& k, const img_t& u, const struct 
estimate_kernel_options& opts) = 0;
+ virtual ~KernelEstimator() {}
+ };
+ 
+@@ -198,7 +198,7 @@ public:
+ }
+ 
+ // implements Algorithm 3
+-void solve(img_t& k, const img_t& u, const struct options& opts) {
++void solve(img_t& k, const img_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& k, const img_t& u, const struct options& opts) {
++void solve(img_t& k, const img_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 
+ void l0_kernel_estimation(img_t& k, img_t& u, const img_t& v,
+-  const img_t& initu, struct options& opts) {
++  const img_t& initu, struct 
estimate_kernel_options& opts) {
+ //static int it = 0;
+ ImagePredictor* sharp_predictor = nullptr;
+ sharp_predictor = new L0ImagePredictor(v);
+@@ -463,7 +463,7 @@ void l0_kernel_estimation(img_t& k, img_t& u, const 
img_t& v,
+ // it assumes that the image was previously processed by preprocess_image
+ // the inner loop is implemented in l0_kernel_estimation
+ template 
+-void multiscale_l0_kernel_estimation(img_t& k, img_t& u, const 
img_t& v, struct options& opts) {
++void multiscale_l0_kernel_estimation(img_t& k, img_t& u, const 
img_t& v, struct estimate_kernel_options& opts) {
+ std::vector> vs;
+ std::vector kernelSizes;
+ printf("Multiscale kernel estimation...\n");
+@@ -511,7 +511,7 @@ void multiscale_l0_kernel_estimation(img_t& k, 
img_t& u, const img_t& v
+ 
+ // preprocess the input blurry image as describe in Section 2.1
+ template 
+-void preprocess_image(img_t& out, const img_t& _v, struct options& 
opts) {
++void preprocess_image(img_t& out, const img_t& _v,

[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/

2024-04-23 Thread Sam James

commit: cc91d22f81c9346468db9287469fca85455fb6b8
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 23 09:27:52 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 23 09:27:52 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc91d22f

sci-astronomy/siril: Stabilize 1.2.1 amd64, #930485

Signed-off-by: Sam James  gentoo.org>

 sci-astronomy/siril/siril-1.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-astronomy/siril/siril-1.2.1.ebuild 
b/sci-astronomy/siril/siril-1.2.1.ebuild
index 090db889b8d2..bef4fbc3421c 100644
--- a/sci-astronomy/siril/siril-1.2.1.ebuild
+++ b/sci-astronomy/siril/siril-1.2.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "" ]]; 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 ~x86"
S="${WORKDIR}/${PN}-${PV/_/-}"
 fi

[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/

2024-03-16 Thread Joonas Niilola

commit: 012e61411f333c4fbfc8032a409c0ceaf26c067d
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Wed Feb 14 21:33:05 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Mar 16 09:47:44 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=012e6141

sci-astronomy/siril: add 1.2.1

Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Signed-off-by: Joonas Niilola  gentoo.org>

 sci-astronomy/siril/Manifest   |  1 +
 sci-astronomy/siril/siril-1.2.1.ebuild | 91 ++
 2 files changed, 92 insertions(+)

diff --git a/sci-astronomy/siril/Manifest b/sci-astronomy/siril/Manifest
index 28ae3aac71ef..2840ba6a92d8 100644
--- a/sci-astronomy/siril/Manifest
+++ b/sci-astronomy/siril/Manifest
@@ -1 +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

diff --git a/sci-astronomy/siril/siril-1.2.1.ebuild 
b/sci-astronomy/siril/siril-1.2.1.ebuild
new file mode 100644
index ..f230b3469ec6
--- /dev/null
+++ b/sci-astronomy/siril/siril-1.2.1.ebuild
@@ -0,0 +1,91 @@
+# 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} == "" ]]; 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"
+)
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/, sci-astronomy/siril/files/

2024-03-16 Thread Joonas Niilola

commit: 724f0706fd7bf2f584dffbb3bb5fb71d482d0f98
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Fri Feb 16 21:05:48 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Mar 16 09:47:44 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=724f0706

sci-astronomy/siril: fix build on musl

Closes: https://bugs.gentoo.org/924664
Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/35331
Signed-off-by: Joonas Niilola  gentoo.org>

 .../siril/files/siril-1.2-fseek64-musl.patch   | 52 ++
 sci-astronomy/siril/siril-1.2.1.ebuild |  1 +
 2 files changed, 53 insertions(+)

diff --git a/sci-astronomy/siril/files/siril-1.2-fseek64-musl.patch 
b/sci-astronomy/siril/files/siril-1.2-fseek64-musl.patch
new file mode 100644
index ..310ae0cdb6d3
--- /dev/null
+++ b/sci-astronomy/siril/files/siril-1.2-fseek64-musl.patch
@@ -0,0 +1,52 @@
+From 7f09478f4522b65b476c788a696159e5a4974286 Mon Sep 17 00:00:00 2001
+From: Natanael Copa 
+Date: Wed, 13 Dec 2023 21:00:08 +0100
+Subject: [PATCH] Clean up and fix fseek64/ftell64
+Upstream: https://gitlab.com/free-astro/siril/-/merge_requests/606
+
+Test for the exception systems, GNU and Windows, and then fall back to
+standard POSIX.
+
+This fixes build with musl libc, which does not have fseeko64/ftello64.
+
+Fixes https://gitlab.com/free-astro/siril/-/issues/1241
+--- a/src/io/avi_pipp/pipp_utf8.h
 b/src/io/avi_pipp/pipp_utf8.h
+@@ -31,27 +31,15 @@
+ #endif
+ 
+ // 64-bit fseek for various platforms
+-#ifdef __linux__
+-#define fseek64 fseeko64  // Linux
+-#define ftell64 ftello64  // Linux
+-#elif defined (OS_OSX)
+-#define fseek64 fseeko  // OS X
+-#define ftell64 ftello  // OS X
+-#elif defined(BSD)
+-#define fseek64 fseeko  // DragonFly BSD, FreeBSD, OpenBSD, NetBSD
+-#define ftell64 ftello  // DragonFly BSD, FreeBSD, OpenBSD, NetBSD
+-#elif defined (__FreeBSD_kernel__) && defined (__GLIBC__)
+-#define fseek64 fseeko64  // KFreeBSD
+-#define ftell64 ftello64  // KFreeBSD
+-#elif defined (__gnu_hurd__)
+-#define fseek64 fseeko64  // GNU/Hurd
+-#define ftell64 ftello64  // GNU/Hurd
+-#elif defined(__CYGWIN__)
+-#define fseek64 fseeko  // CYGWIN
+-#define ftell64 ftello  // CYGWIN
+-#else
++#if defined(__GLIBC__) || defined(__gnu_hurd__)
++#define fseek64 fseeko64  // GNU
++#define ftell64 ftello64  // GNU
++#elif defined(_WIN32)
+ #define fseek64 _fseeki64  // Windows
+ #define ftell64 _ftelli64  // Windows
++#else // POSIX
++#define fseek64 fseeko  // OS X, DragonFly BSD, FreeBSD, OpenBSD, NetBSD, musl
++#define ftell64 ftello  // OS X, DragonFly BSD, FreeBSD, OpenBSD, NetBSD, musl
+ #endif
+ 
+ #endif  // PIPP_UTF8_H
+-- 
+GitLab
+

diff --git a/sci-astronomy/siril/siril-1.2.1.ebuild 
b/sci-astronomy/siril/siril-1.2.1.ebuild
index f230b3469ec6..090db889b8d2 100644
--- a/sci-astronomy/siril/siril-1.2.1.ebuild
+++ b/sci-astronomy/siril/siril-1.2.1.ebuild
@@ -52,6 +52,7 @@ BDEPEND="dev-build/cmake
 
 PATCHES=(
"${FILESDIR}/${PN}-docfiles.patch"
+   "${FILESDIR}/${PN}-1.2-fseek64-musl.patch"
 )
 
 DOCS=( README.md NEWS ChangeLog AUTHORS )

[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/, sci-astronomy/siril/files/

2023-10-26 Thread Sam James

commit: 8afacf3b80031c776873e4220a47fb5c62cad9f6
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Thu Oct 19 16:29:36 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct 27 03:18:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8afacf3b

sci-astronomy/siril: drop 1.0.6-r2, 1.2.0_rc1-r1

Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/33417
Signed-off-by: Sam James  gentoo.org>

 sci-astronomy/siril/Manifest   |   2 -
 .../siril/files/siril-1.0-dependencies.patch   | 177 -
 .../siril/files/siril-1.0-execinfo-r2.patch|  91 ---
 sci-astronomy/siril/files/siril-1.2-stdint.patch   |  33 
 sci-astronomy/siril/files/siril-1.2-tiff.patch |  56 ---
 sci-astronomy/siril/files/siril-prototypes.patch   |  41 -
 sci-astronomy/siril/siril-1.0.6-r2.ebuild  |  89 ---
 sci-astronomy/siril/siril-1.2.0_rc1-r1.ebuild  |  94 ---
 8 files changed, 583 deletions(-)

diff --git a/sci-astronomy/siril/Manifest b/sci-astronomy/siril/Manifest
index 456c6baaa011..28ae3aac71ef 100644
--- a/sci-astronomy/siril/Manifest
+++ b/sci-astronomy/siril/Manifest
@@ -1,3 +1 @@
-DIST siril-1.0.6.tar.bz2 2893872 BLAKE2B 
1f254dcb774c4bfb14fee4626d40e6eeedf866a7a96dca98502cd84e66b973c2201b1f88e2efcb89ce3401b13bd87a319b2ff11e7ba100d0689c9df429d01957
 SHA512 
afb5f1768a5884adcc13f2afd6fa386d836df5a1385b916df9df8da1fb464e0c8738123fb485ed92c749e596c744d5252a66444b840223488a0860e9324c4e9d
-DIST siril-1.2.0-rc1.tar.bz2 4353720 BLAKE2B 
38c7b1585508ac9697847648f2d718899a296a4061b34fcf71424136daa50c68737f811fd9063aa80274708d085d8089dceff7d1fd25277b60f0482c17fa5cd1
 SHA512 
41d685c0aca79da8a9c17d729c710bdd51d3f8cd13b976fb4aad4750e74b600783b988246f008cf41246e7e5f05b8b42368d975cbd79f42e9121b39e367eb22f
 DIST siril-1.2.0.tar.bz2 4500147 BLAKE2B 
7ff4fa5bf1b578336c82bd0f67e404fe47715640edae9cb231da4a3c6a30638612e77515049d56dd1d444965ad58f12d5e2516ad13d3e726f13242b11d91b954
 SHA512 
7df7b17d65a2aad9e0edd4b5022c1d23688ad8884a973d2195391234151aff0824e155ce949b385a951eaef71065a811f33b54e08b865ab5fa6c1d331841663c

diff --git a/sci-astronomy/siril/files/siril-1.0-dependencies.patch 
b/sci-astronomy/siril/files/siril-1.0-dependencies.patch
deleted file mode 100644
index 84595472e63f..
--- a/sci-astronomy/siril/files/siril-1.0-dependencies.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-diff --git a/meson.build b/meson.build
-index 3d8e5508..5572bf61 100644
 a/meson.build
-+++ b/meson.build
-@@ -42,7 +42,16 @@ srcInclude  = include_directories('src')
- 
- warnings = []
- 
--enable_openmp = get_option('openmp')
-+enable_openmp= get_option('openmp')
-+enable_libraw= get_option('libraw')
-+enable_libtiff   = get_option('libtiff')
-+enable_libjpeg   = get_option('libjpeg')
-+enable_libpng= get_option('libpng')
-+enable_libheif   = get_option('libheif')
-+enable_ffms2 = get_option('ffms2')
-+enable_ffmpeg= get_option('ffmpeg')
-+enable_wcslib= get_option('wcslib')
-+enable_criterion = get_option('criterion')
- 
- # General version
- siril_version = meson.project_version()
-@@ -257,32 +266,67 @@ if enable_openmp
- siril_cpp_flag += ['-Xpreprocessor', '-fopenmp']
- siril_c_flag += ['-Xpreprocessor', '-fopenmp']
-   else
--  openmp_dep = dependency('openmp', required : false)
-+  openmp_dep = dependency('openmp', required : true)
-   endif
- else
-   message('OpenMP disabled')
- endif
- 
--libraw_dep = dependency('libraw', required : false)
--libtiff_dep = dependency('libtiff-4', required : false)
--libjpeg_dep = dependency('libjpeg', required : false)
--libpng_dep = dependency('libpng', required : false, version: '>= 1.6.0')
--libheif_dep = dependency('libheif', required : false)
--ffms2_dep = dependency('ffms2', required : false)
--ffmpeg = [
--  dependency('libavformat', required : false),
--  dependency('libavcodec', required : false),
--  dependency('libavutil', version : '>= 55.20', required : false),
--  dependency('libswscale', required : false),
--  dependency('libswresample', required : false)
--]
-+libraw_dep = no_dep
-+if enable_libraw
-+  libraw_dep = dependency('libraw', required : true)
-+endif
-+
-+libtiff_dep = no_dep
-+if enable_libtiff
-+  libtiff_dep = dependency('libtiff-4', required : true)
-+endif
-+
-+libjpeg_dep = no_dep
-+if enable_libjpeg
-+  libjpeg_dep = dependency('libjpeg', required : true)
-+endif
-+
-+libpng_dep = no_dep
-+if enable_libpng
-+  libpng_dep = dependency('libpng', required : true, version: '>= 1.6.0')
-+endif
-+
-+libheif_dep = no_dep
-+if enable_libheif
-+  libheif_dep = dependency('libheif', required : true)
-+endif
-+
-+ffms2_dep = no_dep
-+if enable_ffms2
-+  ffms2_dep = dependency('ffms2', required : true)
-+endif
-+
-+ffmpeg = []
-+if enable_ffmpeg
-+  ffmpeg = [
-+dependency('libavformat', required : true),
-+dependency('libavcodec', required : true),
-+dependency(

[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/

2023-10-18 Thread Joonas Niilola

commit: 34653ebd5f4fea3ca9808c1c45d28c7dfaba62ef
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu Oct 19 06:32:00 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Oct 19 06:32:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34653ebd

sci-astronomy/siril: Stabilize 1.2.0 amd64, #915971

Signed-off-by: Joonas Niilola  gentoo.org>

 sci-astronomy/siril/siril-1.2.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-astronomy/siril/siril-1.2.0.ebuild 
b/sci-astronomy/siril/siril-1.2.0.ebuild
index d0d3368f96f5..ab0ce6b7f6d2 100644
--- a/sci-astronomy/siril/siril-1.2.0.ebuild
+++ b/sci-astronomy/siril/siril-1.2.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "" ]]; 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 ~x86"
S="${WORKDIR}/${PN}-${PV/_/-}"
 fi

[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/

2023-09-18 Thread Sam James

commit: e2645eecb8cf5ae02da5ef6643d835bca1139150
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Sun Sep 17 08:54:55 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Sep 18 07:39:08 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2645eec

sci-astronomy/siril: add 1.2.0

Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/32873
Signed-off-by: Sam James  gentoo.org>

 sci-astronomy/siril/Manifest   |  1 +
 sci-astronomy/siril/siril-1.2.0.ebuild | 92 ++
 2 files changed, 93 insertions(+)

diff --git a/sci-astronomy/siril/Manifest b/sci-astronomy/siril/Manifest
index afa8aea46959..456c6baaa011 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-rc1.tar.bz2 4353720 BLAKE2B 
38c7b1585508ac9697847648f2d718899a296a4061b34fcf71424136daa50c68737f811fd9063aa80274708d085d8089dceff7d1fd25277b60f0482c17fa5cd1
 SHA512 
41d685c0aca79da8a9c17d729c710bdd51d3f8cd13b976fb4aad4750e74b600783b988246f008cf41246e7e5f05b8b42368d975cbd79f42e9121b39e367eb22f
+DIST siril-1.2.0.tar.bz2 4500147 BLAKE2B 
7ff4fa5bf1b578336c82bd0f67e404fe47715640edae9cb231da4a3c6a30638612e77515049d56dd1d444965ad58f12d5e2516ad13d3e726f13242b11d91b954
 SHA512 
7df7b17d65a2aad9e0edd4b5022c1d23688ad8884a973d2195391234151aff0824e155ce949b385a951eaef71065a811f33b54e08b865ab5fa6c1d331841663c

diff --git a/sci-astronomy/siril/siril-1.2.0.ebuild 
b/sci-astronomy/siril/siril-1.2.0.ebuild
new file mode 100644
index ..d0d3368f96f5
--- /dev/null
+++ b/sci-astronomy/siril/siril-1.2.0.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://siril.org/";
+
+if [[ ${PV} == "" ]]; 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-util/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
+}

[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/

2023-08-21 Thread Joonas Niilola

commit: 8a9889b3e6f61269efc5dced9abe9c45b5a9
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Aug 22 06:09:57 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Aug 22 06:09:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a9889b3

sci-astronomy/siril: Stabilize 1.2.0_rc1-r1 amd64, #912688

Signed-off-by: Joonas Niilola  gentoo.org>

 sci-astronomy/siril/siril-1.2.0_rc1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 c5cbbe1bd8e2..3898b724624f 100644
--- a/sci-astronomy/siril/siril-1.2.0_rc1-r1.ebuild
+++ b/sci-astronomy/siril/siril-1.2.0_rc1-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "" ]]; 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 ~x86"
S="${WORKDIR}/${PN}-${PV/_/-}"
 fi

[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/files/, sci-astronomy/siril/

2023-08-20 Thread Andreas Sturmlechner

commit: ec80058fdeb087d2ccdc5526ef3dc6d7c842e5a1
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Aug 20 17:32:54 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Aug 20 17:37:41 2023 +
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  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 ..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 
+Date: Sun, 4 Jun 2023 22:10:55 +
+Subject: [PATCH] XISF image import
+
+From 64583490214302f4057cf223d7591be9d2172a4f Mon Sep 17 00:00:00 2001
+From: Vincent Hourdin 
+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 )

[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/files/, sci-astronomy/siril/

2023-06-27 Thread Sam James

commit: 8b42ac4cb82a4db6229c37a39b8ef6134bb0fc35
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Sat Jun 17 08:33:29 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jun 27 11:06:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b42ac4c

sci-astronomy/siril: drop 1.2.0_beta1

Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/31501
Signed-off-by: Sam James  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..
--- 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 
-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..
--- 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 
-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 w

[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/

2023-06-27 Thread Sam James

commit: d07d12e41f41b1cc97e25a25b2bc6c04b2e8939f
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Sat Jun 17 08:32:31 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jun 27 11:06:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d07d12e4

sci-astronomy/siril: updating dependencies

Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Signed-off-by: Sam James  gentoo.org>

 ...l-1.2.0_rc1.ebuild => siril-1.2.0_rc1-r1.ebuild} | 21 +++--
 sci-astronomy/siril/siril-.ebuild   | 21 +++--
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/sci-astronomy/siril/siril-1.2.0_rc1.ebuild 
b/sci-astronomy/siril/siril-1.2.0_rc1-r1.ebuild
similarity index 84%
rename from sci-astronomy/siril/siril-1.2.0_rc1.ebuild
rename to sci-astronomy/siril/siril-1.2.0_rc1-r1.ebuild
index 93988e8161cb..54a8e916b5fc 100644
--- a/sci-astronomy/siril/siril-1.2.0_rc1.ebuild
+++ b/sci-astronomy/siril/siril-1.2.0_rc1-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 inherit meson optfeature toolchain-funcs xdg
 
 DESCRIPTION="A free astronomical image processing software"
-HOMEPAGE="https://www.siril.org/";
+HOMEPAGE="https://siril.org/";
 
 if [[ ${PV} == "" ]]; then
inherit git-r3
@@ -24,24 +24,25 @@ 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/librtprocess
>=media-libs/opencv-4.4.0:=
-   sci-libs/cfitsio
+   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 )
+   exif? ( >=media-gfx/exiv2-0.25:= )
ffmpeg? ( media-video/ffmpeg:= )
-   heif? ( media-libs/libheif )
-   libconfig? ( >=dev-libs/libconfig-1.4[cxx] )
+   heif? ( media-libs/libheif:= )
jpeg? ( media-libs/libjpeg-turbo:= )
-   png? ( >=media-libs/libpng-1.6.0 )
-   raw? ( media-libs/libraw )
+   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 )
+   wcs? ( >=sci-astronomy/wcslib-7.7:= )
 "
 RDEPEND="
${DEPEND}

diff --git a/sci-astronomy/siril/siril-.ebuild 
b/sci-astronomy/siril/siril-.ebuild
index ae08398c3c70..1f9d03614a4d 100644
--- a/sci-astronomy/siril/siril-.ebuild
+++ b/sci-astronomy/siril/siril-.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 inherit meson optfeature toolchain-funcs xdg
 
 DESCRIPTION="A free astronomical image processing software"
-HOMEPAGE="https://www.siril.org/";
+HOMEPAGE="https://siril.org/";
 
 if [[ ${PV} == "" ]]; then
inherit git-r3
@@ -24,24 +24,25 @@ 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/librtprocess
>=media-libs/opencv-4.4.0:=
-   sci-libs/cfitsio
+   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 )
+   exif? ( >=media-gfx/exiv2-0.25:= )
ffmpeg? ( media-video/ffmpeg:= )
-   heif? ( media-libs/libheif )
-   libconfig? ( >=dev-libs/libconfig-1.4[cxx] )
+   heif? ( media-libs/libheif:= )
jpeg? ( media-libs/libjpeg-turbo:= )
-   png? ( >=media-libs/libpng-1.6.0 )
-   raw? ( media-libs/libraw )
+   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 )
+   wcs? ( >=sci-astronomy/wcslib-7.7:= )
 "
 RDEPEND="
${DEPEND}

[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/files/, sci-astronomy/siril/

2023-06-12 Thread Viorel Munteanu

commit: f9b5c50da7e9a058f601ec273ab745ab6db38cc5
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Thu Jun  1 20:05:13 2023 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Tue Jun 13 06:27:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9b5c50d

sci-astronomy/siril: add 1.2.0_rc1

Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Signed-off-by: Viorel Munteanu  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 ..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 
++
+ #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 
++
+ #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 
+ #include 
+ #include 
+ 

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 ..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 
+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

[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/

2023-06-12 Thread Viorel Munteanu

commit: 244dce0e6c8f39aa8d404a07de0f71da9d6b8c25
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Thu Jun  1 20:05:48 2023 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Tue Jun 13 06:27:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=244dce0e

sci-astronomy/siril: sync live

Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/31269
Signed-off-by: Viorel Munteanu  gentoo.org>

 sci-astronomy/siril/siril-.ebuild | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/sci-astronomy/siril/siril-.ebuild 
b/sci-astronomy/siril/siril-.ebuild
index eeffd9b1d7ed..ae08398c3c70 100644
--- a/sci-astronomy/siril/siril-.ebuild
+++ b/sci-astronomy/siril/siril-.ebuild
@@ -13,19 +13,18 @@ if [[ ${PV} == "" ]]; 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"
+   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"
+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-gfx/exiv2-0.25
media-libs/librtprocess:=
>=media-libs/opencv-4.4.0:=
sci-libs/cfitsio
@@ -34,6 +33,7 @@ DEPEND="
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] )
@@ -46,7 +46,8 @@ DEPEND="
 RDEPEND="
${DEPEND}
 "
-BDEPEND="x11-base/xorg-proto"
+BDEPEND="dev-util/cmake
+   x11-base/xorg-proto"
 
 PATCHES=(
"${FILESDIR}/${PN}-docfiles.patch"
@@ -66,6 +67,7 @@ src_configure() {
local emesonargs=(
-Dffms2=false
-Dcriterion=false
+   $(meson_use exif exiv2)
$(meson_use ffmpeg)
$(meson_use heif libheif)
$(meson_use jpeg libjpeg)

[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/files/

2023-04-25 Thread Sam James

commit: 7df4f2b8304e3339b32a1dbee1e96c915b2a57aa
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Mon Apr 10 20:27:56 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Apr 26 04:03:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7df4f2b8

sci-astronomy/siril: fix build without OpenMP

Closes: https://bugs.gentoo.org/903021
Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/30545
Signed-off-by: Sam James  gentoo.org>

 sci-astronomy/siril/files/siril-1.2-openmp.patch | 30 
 1 file changed, 30 insertions(+)

diff --git a/sci-astronomy/siril/files/siril-1.2-openmp.patch 
b/sci-astronomy/siril/files/siril-1.2-openmp.patch
index eba90448f422..358bfaa79934 100644
--- a/sci-astronomy/siril/files/siril-1.2-openmp.patch
+++ b/sci-astronomy/siril/files/siril-1.2-openmp.patch
@@ -17,3 +17,33 @@ Upstream: 
https://gitlab.com/free-astro/siril/-/merge_requests/482
float *rowpix, v1;
double mean, stdev;
float *differences;
+From 59272d18d67dc342b1a040b7574b6b71b28310e6 Mon Sep 17 00:00:00 2001
+From: Mario Haustein 
+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 
+ #include 
+ #include 
+-#include 
+ 
+  using namespace std;
+ 
+--- a/src/filters/nlbayes/Utilities.cpp
 b/src/filters/nlbayes/Utilities.cpp
+@@ -20,7 +20,6 @@
+ #include "Utilities.h"
+ 
+ #include 
+-#include 
+ #include 
+ #include 
+ #include 
+-- 
+2.39.2
+

[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/, sci-astronomy/siril/files/

2023-03-25 Thread Sam James

commit: d869640c70baf3d641600210646ed3bd4770c843
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Sat Mar 25 07:03:19 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar 25 07:16:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d869640c

sci-astronomy/siril: merge duplicate patches

Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/30337
Signed-off-by: Sam James  gentoo.org>

 .../siril/files/siril-1.2-prototypes.patch | 41 --
 ...1.0-prototypes.patch => siril-prototypes.patch} |  0
 sci-astronomy/siril/siril-1.0.6-r2.ebuild  |  2 +-
 sci-astronomy/siril/siril-1.2.0_beta1.ebuild   |  2 +-
 4 files changed, 2 insertions(+), 43 deletions(-)

diff --git a/sci-astronomy/siril/files/siril-1.2-prototypes.patch 
b/sci-astronomy/siril/files/siril-1.2-prototypes.patch
deleted file mode 100644
index 8b72fef41b49..
--- a/sci-astronomy/siril/files/siril-1.2-prototypes.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 6c06d62579234e1d0030bad985a9cfcf7249b5d7 Mon Sep 17 00:00:00 2001
-From: Mario Haustein 
-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/files/siril-1.0-prototypes.patch 
b/sci-astronomy/siril/files/siril-prototypes.patch
similarity index 100%
rename from sci-astronomy/siril/files/siril-1.0-prototypes.patch
rename to sci-astronomy/siril/files/siril-prototypes.patch

diff --git a/sci-astronomy/siril/siril-1.0.6-r2.ebuild 
b/sci-astronomy/siril/siril-1.0.6-r2.ebuild
index 81e303d7c5dd..bd365161a77b 100644
--- a/sci-astronomy/siril/siril-1.0.6-r2.ebuild
+++ b/sci-astronomy/siril/siril-1.0.6-r2.ebuild
@@ -51,7 +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"
+   "${FILESDIR}/${PN}-prototypes.patch"
 )
 
 DOCS=( README.md NEWS ChangeLog AUTHORS )

diff --git a/sci-astronomy/siril/siril-1.2.0_beta1.ebuild 
b/sci-astronomy/siril/siril-1.2.0_beta1.ebuild
index e02693c80ab7..0c2bb48012a9 100644
--- a/sci-astronomy/siril/siril-1.2.0_beta1.ebuild
+++ b/sci-astronomy/siril/siril-1.2.0_beta1.ebuild
@@ -53,7 +53,7 @@ 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"
+   "${FILESDIR}/${PN}-prototypes.patch"
"${FILESDIR}/${PN}-$(ver_cut 1-2)-openmp.patch"
 )

[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/files/, sci-astronomy/siril/

2023-03-24 Thread Sam James

commit: 5721e7de2e4933b397da2c74b20f599575f6c763
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Mon Feb 27 17:20:56 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar 25 04:06:10 2023 +
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  hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/29837
Signed-off-by: Sam James  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 
  #ifdef _WIN32
  #include 
+From 6f959a02d27fb507cda1898a3aa785766e77d404 Mon Sep 17 00:00:00 2001
+From: Mario Haustein 
+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 ..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 
+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"
+

[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/, sci-astronomy/siril/files/

2023-03-24 Thread Sam James

commit: e46f341c307105de27df5f04c715433d25f1d3bd
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Fri Mar 24 17:39:33 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar 25 04:05:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e46f341c

sci-astronomy/siril: fix build without OpenMP

Closes: https://bugs.gentoo.org/902833
Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/30333
Signed-off-by: Sam James  gentoo.org>

 sci-astronomy/siril/files/siril-1.2-openmp.patch | 19 +++
 sci-astronomy/siril/siril-1.2.0_beta1.ebuild |  1 +
 2 files changed, 20 insertions(+)

diff --git a/sci-astronomy/siril/files/siril-1.2-openmp.patch 
b/sci-astronomy/siril/files/siril-1.2-openmp.patch
new file mode 100644
index ..eba90448f422
--- /dev/null
+++ b/sci-astronomy/siril/files/siril-1.2-openmp.patch
@@ -0,0 +1,19 @@
+From: Mario Haustein 
+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;

diff --git a/sci-astronomy/siril/siril-1.2.0_beta1.ebuild 
b/sci-astronomy/siril/siril-1.2.0_beta1.ebuild
index 45dd80e9e5b2..e02693c80ab7 100644
--- a/sci-astronomy/siril/siril-1.2.0_beta1.ebuild
+++ b/sci-astronomy/siril/siril-1.2.0_beta1.ebuild
@@ -54,6 +54,7 @@ PATCHES=(
"${FILESDIR}/${PN}-$(ver_cut 1-2)-htmesh.patch"
"${FILESDIR}/${PN}-$(ver_cut 1-2)-execinfo.patch"
"${FILESDIR}/${PN}-$(ver_cut 1-2)-prototypes.patch"
+   "${FILESDIR}/${PN}-$(ver_cut 1-2)-openmp.patch"
 )
 
 DOCS=( README.md NEWS ChangeLog AUTHORS )

[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/

2023-03-08 Thread Joonas Niilola

commit: 9a5d50c4949669cc68beadf4224c3e4c133a5804
Author: Joonas Niilola  gentoo  org>
AuthorDate: Wed Mar  8 16:33:18 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Mar  8 16:33:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a5d50c4

sci-astronomy/siril: add cmake BDEP

Signed-off-by: Joonas Niilola  gentoo.org>

 sci-astronomy/siril/siril-1.2.0_beta1.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sci-astronomy/siril/siril-1.2.0_beta1.ebuild 
b/sci-astronomy/siril/siril-1.2.0_beta1.ebuild
index 6ff7d1f45806..45dd80e9e5b2 100644
--- a/sci-astronomy/siril/siril-1.2.0_beta1.ebuild
+++ b/sci-astronomy/siril/siril-1.2.0_beta1.ebuild
@@ -46,7 +46,8 @@ DEPEND="
 RDEPEND="
${DEPEND}
 "
-BDEPEND="x11-base/xorg-proto"
+BDEPEND="dev-util/cmake
+   x11-base/xorg-proto"
 
 PATCHES=(
"${FILESDIR}/${PN}-docfiles.patch"

[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/files/, sci-astronomy/siril/

2023-03-08 Thread Joonas Niilola

commit: 49f0961ff1ae0abc636c942f2df69160b8ee
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Fri Feb 24 18:41:48 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Mar  8 14:13:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49f0

sci-astronomy/siril: add 1.2.0beta1

Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Signed-off-by: Joonas Niilola  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-.ebuild => siril-1.2.0_beta1.ebuild} |  8 ++-
 sci-astronomy/siril/siril-.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 ..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 
+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 ..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 
+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 com

[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/files/, sci-astronomy/siril/

2023-03-08 Thread Joonas Niilola

commit: 6f2c740b93a92bd8ed15d5ef3ee27c89778fbc9d
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Fri Feb 24 18:42:57 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Mar  8 14:13:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f2c740b

sci-astronomy/siril: drop 1.0.5-r1

Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/29773
Signed-off-by: Joonas Niilola  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..
--- a/sci-astronomy/siril/files/siril-1.0-execinfo-r1.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-commit c009c4c1800086e7f4c4e80939e9ddc8964c8e12
-Author: Mario Haustein 
-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 
- #include 
--#else
-+#elif HAVE_EXECINFO_H
- #include 
- #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..
--- 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} == "" ]]; 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

[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/

2023-02-09 Thread Joonas Niilola

commit: 8c6e19f10c1ba8c0c7f992e4dcfc29c8646439f9
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu Feb  9 08:49:55 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Feb  9 08:49:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c6e19f1

sci-astronomy/siril: Stabilize 1.0.6-r2 x86, #893514

Signed-off-by: Joonas Niilola  gentoo.org>

 sci-astronomy/siril/siril-1.0.6-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-astronomy/siril/siril-1.0.6-r2.ebuild 
b/sci-astronomy/siril/siril-1.0.6-r2.ebuild
index b1160125b55d..5de589b0f985 100644
--- a/sci-astronomy/siril/siril-1.0.6-r2.ebuild
+++ b/sci-astronomy/siril/siril-1.0.6-r2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "" ]]; 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 x86"
S="${WORKDIR}/${PN}-${PV/_/-}"
 fi

[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/

2023-02-07 Thread Sam James

commit: 41bcf3e3e7ec7e0c8e32b91a410a9628468cebb8
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb  7 17:51:18 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb  7 17:51:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41bcf3e3

sci-astronomy/siril: Stabilize 1.0.6-r2 amd64, #893514

Signed-off-by: Sam James  gentoo.org>

 sci-astronomy/siril/siril-1.0.6-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-astronomy/siril/siril-1.0.6-r2.ebuild 
b/sci-astronomy/siril/siril-1.0.6-r2.ebuild
index a198b6fb965f..b1160125b55d 100644
--- a/sci-astronomy/siril/siril-1.0.6-r2.ebuild
+++ b/sci-astronomy/siril/siril-1.0.6-r2.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} == "" ]]; 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 ~x86"
S="${WORKDIR}/${PN}-${PV/_/-}"
 fi

[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/, sci-astronomy/siril/files/

2023-01-03 Thread Sam James

commit: 9e5efd3a4fb8564e7bb06e69953bd59882124bf4
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Tue Dec 27 15:27:11 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan  4 05:48:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e5efd3a

sci-astronomy/siril: fix call to undeclared function

Closes: https://bugs.gentoo.org/883121
Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/28853
Signed-off-by: Sam James  gentoo.org>

 ...-execinfo.patch => siril-1.0-execinfo-r1.patch} |  0
 .../siril/files/siril-1.0-execinfo-r2.patch| 45 ++
 sci-astronomy/siril/siril-1.0.5-r1.ebuild  |  2 +-
 ...siril-1.0.6-r1.ebuild => siril-1.0.6-r2.ebuild} |  2 +-
 4 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/sci-astronomy/siril/files/siril-1.0-execinfo.patch 
b/sci-astronomy/siril/files/siril-1.0-execinfo-r1.patch
similarity index 100%
rename from sci-astronomy/siril/files/siril-1.0-execinfo.patch
rename to sci-astronomy/siril/files/siril-1.0-execinfo-r1.patch

diff --git a/sci-astronomy/siril/files/siril-1.0-execinfo-r2.patch 
b/sci-astronomy/siril/files/siril-1.0-execinfo-r2.patch
new file mode 100644
index ..ffef786d0d8e
--- /dev/null
+++ b/sci-astronomy/siril/files/siril-1.0-execinfo-r2.patch
@@ -0,0 +1,45 @@
+commit c009c4c1800086e7f4c4e80939e9ddc8964c8e12
+Author: Mario Haustein 
+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 
+ #include 
+-#else
++#elif HAVE_EXECINFO_H
+ #include 
+ #endif
+ 
+commit 13bafd227500018bef052cad1d73e9c681be1b8a
+Author: Cyril Richard 
+Date:   Thu Aug 4 11:29:23 2022 +0200
+
+Fix for merge_requests/284
+
+Bug: https://bugs.gentoo.org/883121
+Upstream: 
https://gitlab.com/free-astro/siril/-/commit/13bafd227500018bef052cad1d73e9c681be1b8a
+
+diff --git a/src/core/signals.c b/src/core/signals.c
+index 0eefd460..bbce5fa7 100644
+--- a/src/core/signals.c
 b/src/core/signals.c
+@@ -21,6 +21,9 @@
+ #define ANSI_COLOR_RED "\e[1m\x1b[31m"
+ #define ANSI_COLOR_RESET   "\x1b[0m\e[0m"
+ 
++#ifdef HAVE_CONFIG_H
++#include 
++#endif
+ #include 
+ #ifdef _WIN32
+ #include 

diff --git a/sci-astronomy/siril/siril-1.0.5-r1.ebuild 
b/sci-astronomy/siril/siril-1.0.5-r1.ebuild
index 17294e54b727..fc3329c88116 100644
--- a/sci-astronomy/siril/siril-1.0.5-r1.ebuild
+++ b/sci-astronomy/siril/siril-1.0.5-r1.ebuild
@@ -49,7 +49,7 @@ RDEPEND="
 PATCHES=(
"${FILESDIR}/${PN}-docfiles.patch"
"${FILESDIR}/${PN}-$(ver_cut 1-2)-dependencies.patch"
-   "${FILESDIR}/${PN}-$(ver_cut 1-2)-execinfo.patch"
+   "${FILESDIR}/${PN}-$(ver_cut 1-2)-execinfo-r1.patch"
 )
 
 DOCS=( README.md NEWS ChangeLog AUTHORS )

diff --git a/sci-astronomy/siril/siril-1.0.6-r1.ebuild 
b/sci-astronomy/siril/siril-1.0.6-r2.ebuild
similarity index 97%
rename from sci-astronomy/siril/siril-1.0.6-r1.ebuild
rename to sci-astronomy/siril/siril-1.0.6-r2.ebuild
index 46032d77f26c..a198b6fb965f 100644
--- a/sci-astronomy/siril/siril-1.0.6-r1.ebuild
+++ b/sci-astronomy/siril/siril-1.0.6-r2.ebuild
@@ -50,7 +50,7 @@ BDEPEND="x11-base/xorg-proto"
 PATCHES=(
"${FILESDIR}/${PN}-docfiles.patch"
"${FILESDIR}/${PN}-$(ver_cut 1-2)-dependencies.patch"
-   "${FILESDIR}/${PN}-$(ver_cut 1-2)-execinfo.patch"
+   "${FILESDIR}/${PN}-$(ver_cut 1-2)-execinfo-r2.patch"
 )
 
 DOCS=( README.md NEWS ChangeLog AUTHORS )

[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/

2022-12-18 Thread Sam James

commit: 464cec23bc7d75da91f59471c68faf7bddba5fe2
Author: Sam James  gentoo  org>
AuthorDate: Sun Dec 18 08:08:05 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 18 08:30:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=464cec23

sci-astronomy/siril: drop 1.0.3-r1

Signed-off-by: Sam James  gentoo.org>

 sci-astronomy/siril/Manifest  |  1 -
 sci-astronomy/siril/siril-1.0.3-r1.ebuild | 85 ---
 2 files changed, 86 deletions(-)

diff --git a/sci-astronomy/siril/Manifest b/sci-astronomy/siril/Manifest
index c398922ee657..d4becddf7d18 100644
--- a/sci-astronomy/siril/Manifest
+++ b/sci-astronomy/siril/Manifest
@@ -1,3 +1,2 @@
-DIST siril-1.0.3.tar.bz2 2900334 BLAKE2B 
7ec4995ae0f2b66a8575ac6d680dd639bc6d4c429428c2b29eebf8ea1989dae4669bf81b957d4be7889616b09a3b4febb7c1f1da950d36c68bbec152d4cc0041
 SHA512 
bd8e5d1bba71b0f14f9284a5072e7524d6005c22c55bed45a8e0113456c94ea5ac2a2befbe84c1e827fa410ee9031215343183d2d49f52df681ee4f5dc1a478a
 DIST siril-1.0.5.tar.bz2 2893026 BLAKE2B 
f8a726962893e90b12c3dfef507652ab7b40ea0be2128ac29d056acb30e827ef35e6671788a8c254d9ea64cc39c8dae00c1e532ed3d6b3a1396ca92da333fe05
 SHA512 
f2bd614cf14b6b35f458dd75ba4e64db17d051fc9ac36c12e8b1ecdc4c79a19c6427464f3ebb946de80e00d66ed82451f36405c0a7d806332e1b2ce7a835891f
 DIST siril-1.0.6.tar.bz2 2893872 BLAKE2B 
1f254dcb774c4bfb14fee4626d40e6eeedf866a7a96dca98502cd84e66b973c2201b1f88e2efcb89ce3401b13bd87a319b2ff11e7ba100d0689c9df429d01957
 SHA512 
afb5f1768a5884adcc13f2afd6fa386d836df5a1385b916df9df8da1fb464e0c8738123fb485ed92c749e596c744d5252a66444b840223488a0860e9324c4e9d

diff --git a/sci-astronomy/siril/siril-1.0.3-r1.ebuild 
b/sci-astronomy/siril/siril-1.0.3-r1.ebuild
deleted file mode 100644
index 75d63bf26abb..
--- a/sci-astronomy/siril/siril-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,85 +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} == "" ]]; 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"
-)
-
-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
-}

[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/

2022-12-15 Thread Sam James

commit: dbf40f7ed7b2bf7bcfc3f6ed03300a1088402927
Author: Sam James  gentoo  org>
AuthorDate: Fri Dec 16 04:24:45 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Dec 16 04:29:17 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbf40f7e

sci-astronomy/siril: unrevbump 

Unintentional, was defect in script for libtiff revbumps (fixed already for next
time.)

Signed-off-by: Sam James  gentoo.org>

 sci-astronomy/siril/{siril--r1.ebuild => siril-.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/sci-astronomy/siril/siril--r1.ebuild 
b/sci-astronomy/siril/siril-.ebuild
similarity index 100%
rename from sci-astronomy/siril/siril--r1.ebuild
rename to sci-astronomy/siril/siril-.ebuild

[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/

2022-12-15 Thread Sam James

commit: ffbcecc73e2a35e74a866467ead2cd1978301a62
Author: Sam James  gentoo  org>
AuthorDate: Fri Dec 16 01:31:21 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Dec 16 01:38:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffbcecc7

sci-astronomy/siril: add media-libs/libtiff subslot dep

libtiff changed SONAME.

Signed-off-by: Sam James  gentoo.org>

 sci-astronomy/siril/{siril-1.0.3.ebuild => siril-1.0.3-r1.ebuild} | 2 +-
 sci-astronomy/siril/{siril-1.0.5.ebuild => siril-1.0.5-r1.ebuild} | 2 +-
 sci-astronomy/siril/{siril-1.0.6.ebuild => siril-1.0.6-r1.ebuild} | 2 +-
 sci-astronomy/siril/{siril-.ebuild => siril--r1.ebuild}   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sci-astronomy/siril/siril-1.0.3.ebuild 
b/sci-astronomy/siril/siril-1.0.3-r1.ebuild
similarity index 98%
rename from sci-astronomy/siril/siril-1.0.3.ebuild
rename to sci-astronomy/siril/siril-1.0.3-r1.ebuild
index 5f75b88a03ae..75d63bf26abb 100644
--- a/sci-astronomy/siril/siril-1.0.3.ebuild
+++ b/sci-astronomy/siril/siril-1.0.3-r1.ebuild
@@ -39,7 +39,7 @@ DEPEND="
jpeg? ( media-libs/libjpeg-turbo:= )
png? ( >=media-libs/libpng-1.6.0 )
raw? ( media-libs/libraw )
-   tiff? ( media-libs/tiff )
+   tiff? ( media-libs/tiff:= )
wcs? ( >=sci-astronomy/wcslib-7.7 )
 "
 RDEPEND="

diff --git a/sci-astronomy/siril/siril-1.0.5.ebuild 
b/sci-astronomy/siril/siril-1.0.5-r1.ebuild
similarity index 98%
rename from sci-astronomy/siril/siril-1.0.5.ebuild
rename to sci-astronomy/siril/siril-1.0.5-r1.ebuild
index b40e770ea34b..17294e54b727 100644
--- a/sci-astronomy/siril/siril-1.0.5.ebuild
+++ b/sci-astronomy/siril/siril-1.0.5-r1.ebuild
@@ -39,7 +39,7 @@ DEPEND="
jpeg? ( media-libs/libjpeg-turbo:= )
png? ( >=media-libs/libpng-1.6.0 )
raw? ( media-libs/libraw )
-   tiff? ( media-libs/tiff )
+   tiff? ( media-libs/tiff:= )
wcs? ( >=sci-astronomy/wcslib-7.7 )
 "
 RDEPEND="

diff --git a/sci-astronomy/siril/siril-1.0.6.ebuild 
b/sci-astronomy/siril/siril-1.0.6-r1.ebuild
similarity index 98%
rename from sci-astronomy/siril/siril-1.0.6.ebuild
rename to sci-astronomy/siril/siril-1.0.6-r1.ebuild
index 91eec72237c2..46032d77f26c 100644
--- a/sci-astronomy/siril/siril-1.0.6.ebuild
+++ b/sci-astronomy/siril/siril-1.0.6-r1.ebuild
@@ -39,7 +39,7 @@ DEPEND="
jpeg? ( media-libs/libjpeg-turbo:= )
png? ( >=media-libs/libpng-1.6.0 )
raw? ( media-libs/libraw )
-   tiff? ( media-libs/tiff )
+   tiff? ( media-libs/tiff:= )
wcs? ( >=sci-astronomy/wcslib-7.7 )
 "
 RDEPEND="

diff --git a/sci-astronomy/siril/siril-.ebuild 
b/sci-astronomy/siril/siril--r1.ebuild
similarity index 98%
rename from sci-astronomy/siril/siril-.ebuild
rename to sci-astronomy/siril/siril--r1.ebuild
index 7a9061a16811..40c1b926aa34 100644
--- a/sci-astronomy/siril/siril-.ebuild
+++ b/sci-astronomy/siril/siril--r1.ebuild
@@ -39,7 +39,7 @@ DEPEND="
jpeg? ( media-libs/libjpeg-turbo:= )
png? ( >=media-libs/libpng-1.6.0 )
raw? ( media-libs/libraw )
-   tiff? ( media-libs/tiff )
+   tiff? ( media-libs/tiff:= )
wcs? ( >=sci-astronomy/wcslib-7.7 )
 "
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/

2022-11-10 Thread Joonas Niilola

commit: a3adb859986a2c0086eed55051a5cc11fe5b2cff
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Thu Oct 20 15:49:36 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Nov 10 16:15:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3adb859

sci-astronomy/siril: drop 1.0.1

Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Signed-off-by: Joonas Niilola  gentoo.org>

 sci-astronomy/siril/Manifest   |  1 -
 sci-astronomy/siril/siril-1.0.1.ebuild | 70 --
 2 files changed, 71 deletions(-)

diff --git a/sci-astronomy/siril/Manifest b/sci-astronomy/siril/Manifest
index df8ffdc1a9a0..dac4f7ecbbd2 100644
--- a/sci-astronomy/siril/Manifest
+++ b/sci-astronomy/siril/Manifest
@@ -1,3 +1,2 @@
-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/siril-1.0.1.ebuild 
b/sci-astronomy/siril/siril-1.0.1.ebuild
deleted file mode 100644
index 9f673bad189f..
--- a/sci-astronomy/siril/siril-1.0.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson toolchain-funcs xdg
-
-DESCRIPTION="A free astronomical image processing software"
-HOMEPAGE="https://www.siril.org/";
-
-if [[ ${PV} == "" ]]; 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+"
-SLOT="0"
-IUSE="curl ffmpeg gnuplot 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}
-   gnuplot? ( sci-visualization/gnuplot )
-"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-docfiles.patch"
-)
-
-DOCS=( README.md NEWS ChangeLog LICENSE.md LICENSE_sleef.txt 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=(
-   $(meson_use openmp)
-   $(usex curl -Denable-libcurl=yes -Denable-libcurl=no)
-   )
-   meson_src_configure
-}

[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/

2022-11-10 Thread Joonas Niilola

commit: 4413c87ba9b9b42ed635afa5367e40f4372bd253
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu Nov 10 16:06:27 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Nov 10 16:15:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4413c87b

sci-astronomy/siril: add missing BDEPEND for xorg-proto

 - and call xdg_icon_cache_update since some USE flag installs icons.

Signed-off-by: Joonas Niilola  gentoo.org>

 sci-astronomy/siril/siril-1.0.6.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sci-astronomy/siril/siril-1.0.6.ebuild 
b/sci-astronomy/siril/siril-1.0.6.ebuild
index 816f638fd2f1..91eec72237c2 100644
--- a/sci-astronomy/siril/siril-1.0.6.ebuild
+++ b/sci-astronomy/siril/siril-1.0.6.ebuild
@@ -45,6 +45,7 @@ DEPEND="
 RDEPEND="
${DEPEND}
 "
+BDEPEND="x11-base/xorg-proto"
 
 PATCHES=(
"${FILESDIR}/${PN}-docfiles.patch"
@@ -81,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
 }

[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/

2022-11-10 Thread Joonas Niilola

commit: 60001bd5b2280ed939dce23fc9c985c2768269aa
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Thu Oct 20 15:50:31 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Nov 10 16:15:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60001bd5

sci-astronomy/siril: add 1.0.6

Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/27872
Signed-off-by: Joonas Niilola  gentoo.org>

 sci-astronomy/siril/Manifest   |  1 +
 sci-astronomy/siril/siril-1.0.6.ebuild | 86 ++
 2 files changed, 87 insertions(+)

diff --git a/sci-astronomy/siril/Manifest b/sci-astronomy/siril/Manifest
index dac4f7ecbbd2..c398922ee657 100644
--- a/sci-astronomy/siril/Manifest
+++ b/sci-astronomy/siril/Manifest
@@ -1,2 +1,3 @@
 DIST siril-1.0.3.tar.bz2 2900334 BLAKE2B 
7ec4995ae0f2b66a8575ac6d680dd639bc6d4c429428c2b29eebf8ea1989dae4669bf81b957d4be7889616b09a3b4febb7c1f1da950d36c68bbec152d4cc0041
 SHA512 
bd8e5d1bba71b0f14f9284a5072e7524d6005c22c55bed45a8e0113456c94ea5ac2a2befbe84c1e827fa410ee9031215343183d2d49f52df681ee4f5dc1a478a
 DIST siril-1.0.5.tar.bz2 2893026 BLAKE2B 
f8a726962893e90b12c3dfef507652ab7b40ea0be2128ac29d056acb30e827ef35e6671788a8c254d9ea64cc39c8dae00c1e532ed3d6b3a1396ca92da333fe05
 SHA512 
f2bd614cf14b6b35f458dd75ba4e64db17d051fc9ac36c12e8b1ecdc4c79a19c6427464f3ebb946de80e00d66ed82451f36405c0a7d806332e1b2ce7a835891f
+DIST siril-1.0.6.tar.bz2 2893872 BLAKE2B 
1f254dcb774c4bfb14fee4626d40e6eeedf866a7a96dca98502cd84e66b973c2201b1f88e2efcb89ce3401b13bd87a319b2ff11e7ba100d0689c9df429d01957
 SHA512 
afb5f1768a5884adcc13f2afd6fa386d836df5a1385b916df9df8da1fb464e0c8738123fb485ed92c749e596c744d5252a66444b840223488a0860e9324c4e9d

diff --git a/sci-astronomy/siril/siril-1.0.6.ebuild 
b/sci-astronomy/siril/siril-1.0.6.ebuild
new file mode 100644
index ..816f638fd2f1
--- /dev/null
+++ b/sci-astronomy/siril/siril-1.0.6.ebuild
@@ -0,0 +1,86 @@
+# 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} == "" ]]; 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.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
+}

[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/

2022-11-03 Thread Agostino Sarubbo

commit: 4fed7a87ab71b0109a0d339f7f2ebc42d2f5192f
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Nov  3 08:08:12 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Nov  3 08:08:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fed7a87

sci-astronomy/siril: Stabilize 1.0.5 x86, #879199

Signed-off-by: Agostino Sarubbo  gentoo.org>

 sci-astronomy/siril/siril-1.0.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-astronomy/siril/siril-1.0.5.ebuild 
b/sci-astronomy/siril/siril-1.0.5.ebuild
index 63098cf36dc4..b40e770ea34b 100644
--- a/sci-astronomy/siril/siril-1.0.5.ebuild
+++ b/sci-astronomy/siril/siril-1.0.5.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "" ]]; 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 x86"
S="${WORKDIR}/${PN}-${PV/_/-}"
 fi

[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/

2022-11-02 Thread Sam James

commit: 443754ee9e85d0d84e2fa863e941895b5f9f277e
Author: Sam James  gentoo  org>
AuthorDate: Wed Nov  2 23:13:47 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Nov  2 23:13:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=443754ee

sci-astronomy/siril: Stabilize 1.0.5 amd64, #879199

Signed-off-by: Sam James  gentoo.org>

 sci-astronomy/siril/siril-1.0.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-astronomy/siril/siril-1.0.5.ebuild 
b/sci-astronomy/siril/siril-1.0.5.ebuild
index 816f638fd2f1..63098cf36dc4 100644
--- a/sci-astronomy/siril/siril-1.0.5.ebuild
+++ b/sci-astronomy/siril/siril-1.0.5.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "" ]]; 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 ~x86"
S="${WORKDIR}/${PN}-${PV/_/-}"
 fi

[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/

2022-10-27 Thread Joonas Niilola

commit: 220575eeca8e9a8b641b58bf357a93a4d6bb6614
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu Oct 27 08:11:59 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Oct 27 08:11:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=220575ee

sci-astronomy/siril: Stabilize 1.0.3 x86, #866974

Signed-off-by: Joonas Niilola  gentoo.org>

 sci-astronomy/siril/siril-1.0.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-astronomy/siril/siril-1.0.3.ebuild 
b/sci-astronomy/siril/siril-1.0.3.ebuild
index 63aea73ff08c..5f75b88a03ae 100644
--- a/sci-astronomy/siril/siril-1.0.3.ebuild
+++ b/sci-astronomy/siril/siril-1.0.3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "" ]]; 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 x86"
S="${WORKDIR}/${PN}-${PV/_/-}"
 fi

[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/

2022-10-07 Thread Sam James

commit: 6cfd47bfadbbad862f66f788988fdbb928c48cfb
Author: Sam James  gentoo  org>
AuthorDate: Fri Oct  7 20:18:19 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct  7 20:18:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cfd47bf

sci-astronomy/siril: Stabilize 1.0.3 amd64, #866974

Signed-off-by: Sam James  gentoo.org>

 sci-astronomy/siril/siril-1.0.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-astronomy/siril/siril-1.0.3.ebuild 
b/sci-astronomy/siril/siril-1.0.3.ebuild
index d354aede9fea..63aea73ff08c 100644
--- a/sci-astronomy/siril/siril-1.0.3.ebuild
+++ b/sci-astronomy/siril/siril-1.0.3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "" ]]; 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 ~x86"
S="${WORKDIR}/${PN}-${PV/_/-}"
 fi

[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/files/, sci-astronomy/siril/

2022-09-30 Thread Sam James

commit: ddb3e71ded114d3bb1092db19badd0b58cbc4ce8
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Mon Sep 26 21:41:06 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct  1 03:15:41 2022 +
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  hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/27483
Signed-off-by: Sam James  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 ..c9c7cd81c19f
--- /dev/null
+++ b/sci-astronomy/siril/files/siril-1.0-execinfo.patch
@@ -0,0 +1,22 @@
+commit c009c4c1800086e7f4c4e80939e9ddc8964c8e12
+Author: Mario Haustein 
+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 
+ #include 
+-#else
++#elif HAVE_EXECINFO_H
+ #include 
+ #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 )

[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/files/, sci-astronomy/siril/

2022-09-13 Thread Andrew Ammerlaan

commit: 384365d11cbaddb3fab641f926b49513ce995657
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Sun Sep  4 21:21:35 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Tue Sep 13 12:20:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=384365d1

sci-astronomy/siril: version bump 1.0.5

Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/27147
Signed-off-by: Andrew Ammerlaan  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 )

[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/, sci-astronomy/siril/files/

2022-07-30 Thread Sam James

commit: 2d83cfb50f6568e774303d7237168ae08937d4b7
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Fri Jul 29 15:27:30 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul 30 08:18:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d83cfb5

sci-astronomy/siril: remove patches which are now upstream

Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/26654
Signed-off-by: Sam James  gentoo.org>

 .../siril/files/siril--dependencies.patch  | 198 -
 sci-astronomy/siril/siril-.ebuild  |   1 -
 2 files changed, 199 deletions(-)

diff --git a/sci-astronomy/siril/files/siril--dependencies.patch 
b/sci-astronomy/siril/files/siril--dependencies.patch
deleted file mode 100644
index b9ed88f98e8a..
--- a/sci-astronomy/siril/files/siril--dependencies.patch
+++ /dev/null
@@ -1,198 +0,0 @@
-diff --git a/meson.build b/meson.build
-index fdfc3745..c8823c6f 100644
 a/meson.build
-+++ b/meson.build
-@@ -42,7 +42,17 @@ srcInclude  = include_directories('src')
- 
- warnings = []
- 
--enable_openmp = get_option('openmp')
-+enable_openmp= get_option('openmp')
-+enable_libraw= get_option('libraw')
-+enable_libtiff   = get_option('libtiff')
-+enable_libjpeg   = get_option('libjpeg')
-+enable_libpng= get_option('libpng')
-+enable_libheif   = get_option('libheif')
-+enable_ffms2 = get_option('ffms2')
-+enable_ffmpeg= get_option('ffmpeg')
-+enable_libconfig = get_option('libconfig')
-+enable_criterion = get_option('criterion')
-+enable_wcslib= get_option('wcslib')
- 
- # General version
- siril_version = meson.project_version()
-@@ -256,33 +266,72 @@ if enable_openmp
- siril_cpp_flag += ['-Xpreprocessor', '-fopenmp']
- siril_c_flag += ['-Xpreprocessor', '-fopenmp']
-   else
--  openmp_dep = dependency('openmp', required : false)
-+  openmp_dep = dependency('openmp', required : true)
-   endif
- else
-   message('OpenMP disabled')
- endif
- 
--libraw_dep = dependency('libraw', required : false)
--libtiff_dep = dependency('libtiff-4', required : false)
--libjpeg_dep = dependency('libjpeg', required : false)
--libpng_dep = dependency('libpng', required : false, version: '>= 1.6.0')
--libheif_dep = dependency('libheif', required : false)
--ffms2_dep = dependency('ffms2', required : false)
--ffmpeg = [
--  dependency('libavformat', required : false),
--  dependency('libavcodec', required : false),
--  dependency('libavutil', version : '>= 55.20', required : false),
--  dependency('libswscale', required : false),
--  dependency('libswresample', required : false)
--]
-+libraw_dep = no_dep
-+if enable_libraw
-+  libraw_dep = dependency('libraw', required : true)
-+endif
-+
-+libtiff_dep = no_dep
-+if enable_libtiff
-+  libtiff_dep = dependency('libtiff-4', required : true)
-+endif
-+
-+libjpeg_dep = no_dep
-+if enable_libjpeg
-+  libjpeg_dep = dependency('libjpeg', required : true)
-+endif
-+
-+libpng_dep = no_dep
-+if enable_libpng
-+  libpng_dep = dependency('libpng', required : true, version: '>= 1.6.0')
-+endif
-+
-+libheif_dep = no_dep
-+if enable_libheif
-+  libheif_dep = dependency('libheif', required : true)
-+endif
-+
-+ffms2_dep = no_dep
-+if enable_ffms2
-+  ffms2_dep = dependency('ffms2', required : true)
-+endif
-+
-+ffmpeg = []
-+if enable_ffmpeg
-+  ffmpeg = [
-+dependency('libavformat', required : true),
-+dependency('libavcodec', required : true),
-+dependency('libavutil', version : '>= 55.20', required : true),
-+dependency('libswscale', required : true),
-+dependency('libswresample', required : true)
-+  ]
-+endif
-+
- libcurl_dep = no_dep
- if enable_libcurl
--  libcurl_dep = dependency('libcurl', required : false)
-+  libcurl_dep = dependency('libcurl', required : true)
- endif
--libconfig_dep = dependency('libconfig', required : false)
--criterion_dep = dependency('criterion', required : false)
- 
--wcslib_dep = dependency('wcslib', fallback : ['wcslib', 'wcslib_dep'], 
required : false)
-+libconfig_dep = no_dep
-+if enable_libconfig
-+  libconfig_dep = dependency('libconfig', required : true)
-+endif
-+
-+criterion_dep = no_dep
-+if enable_criterion
-+  criterion_dep = dependency('criterion', required : true)
-+endif
-+
-+wcslib_dep = no_dep
-+if enable_wcslib
-+  wcslib_dep = dependency('wcslib', fallback : ['wcslib', 'wcslib_dep'], 
required : true)
-+endif
- 
- 

- # Configuration
-@@ -546,6 +595,7 @@ summary(
- 'FFMPEG': ffmpeg_found,
- 'libcurl'   : libcurl_dep.found(),
- 'wcslib': wcslib_dep.found(),
-+'libconfig' : libconfig_dep.found(),
- 'criterion' : criterion_dep.found(),
-   }, section: 'Optional dependencies'
- )
-diff --git a/meson_options.txt b/meson_options.txt
-index cd4b9cc1..07b4b904 100644
 a/meson_options.txt
-+++ b/meson_options.txt
-@@ -12,9 +12,69 @@ option('ope

[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/

2022-07-16 Thread Joonas Niilola

commit: 016c8b04a412479a98978952d722cf7116534b4f
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Fri Jul 15 22:16:28 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Jul 16 07:16:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=016c8b04

sci-astronomy/siril: update mime and .desktop database

Closes: https://bugs.gentoo.org/858236
Closes: https://bugs.gentoo.org/858239
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/26434
Signed-off-by: Joonas Niilola  gentoo.org>

 sci-astronomy/siril/siril-1.0.3.ebuild | 2 ++
 sci-astronomy/siril/siril-.ebuild  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/sci-astronomy/siril/siril-1.0.3.ebuild 
b/sci-astronomy/siril/siril-1.0.3.ebuild
index 4954c6f5912e..de5d2c77535e 100644
--- a/sci-astronomy/siril/siril-1.0.3.ebuild
+++ b/sci-astronomy/siril/siril-1.0.3.ebuild
@@ -79,5 +79,7 @@ src_configure() {
 }
 
 pkg_postinst() {
+   xdg_desktop_database_update
+   xdg_mimeinfo_database_update
optfeature "gnuplot support" sci-visualization/gnuplot
 }

diff --git a/sci-astronomy/siril/siril-.ebuild 
b/sci-astronomy/siril/siril-.ebuild
index ebbd20b9dcf6..62ed0ef4d3f6 100644
--- a/sci-astronomy/siril/siril-.ebuild
+++ b/sci-astronomy/siril/siril-.ebuild
@@ -80,5 +80,7 @@ src_configure() {
 }
 
 pkg_postinst() {
+   xdg_desktop_database_update
+   xdg_mimeinfo_database_update
optfeature "gnuplot support" sci-visualization/gnuplot
 }

[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/files/, sci-astronomy/siril/

2022-07-15 Thread Joonas Niilola

commit: 99460bc8134e7c1ce38d9c2e7884a7019b9e6c61
Author: Joonas Niilola  gentoo  org>
AuthorDate: Fri Jul 15 08:24:11 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Jul 15 08:38:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99460bc8

sci-astronomy/siril: rename a patch file for - ebuild

Signed-off-by: Joonas Niilola  gentoo.org>

 .../files/{siril-dependencies.patch => siril--dependencies.patch}   | 0
 sci-astronomy/siril/siril-.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--dependencies.patch
similarity index 100%
rename from sci-astronomy/siril/files/siril-dependencies.patch
rename to sci-astronomy/siril/files/siril--dependencies.patch

diff --git a/sci-astronomy/siril/siril-.ebuild 
b/sci-astronomy/siril/siril-.ebuild
index aff52be8dda4..ebbd20b9dcf6 100644
--- a/sci-astronomy/siril/siril-.ebuild
+++ b/sci-astronomy/siril/siril-.ebuild
@@ -48,7 +48,7 @@ RDEPEND="
 
 PATCHES=(
"${FILESDIR}/${PN}-docfiles.patch"
-   "${FILESDIR}/${PN}-dependencies.patch"
+   "${FILESDIR}/${PN}--dependencies.patch"
 )
 
 DOCS=( README.md NEWS ChangeLog AUTHORS )

[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/, sci-astronomy/siril/files/

2022-07-15 Thread Joonas Niilola

commit: ef42ec985735ffceb7b100f433db76c76f5cce81
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Tue May 17 16:17:56 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Jul 15 08:38:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef42ec98

sci-astronomy/siril: version bump 1.0.2

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/25538
Signed-off-by: Joonas Niilola  gentoo.org>

 sci-astronomy/siril/Manifest   |   1 +
 .../siril/files/siril-1.0.3-dependencies.patch | 177 ++
 sci-astronomy/siril/files/siril-dependencies.patch | 198 +
 sci-astronomy/siril/metadata.xml   |   1 +
 .../{siril-.ebuild => siril-1.0.3.ebuild}  |  23 ++-
 sci-astronomy/siril/siril-.ebuild  |  26 ++-
 6 files changed, 415 insertions(+), 11 deletions(-)

diff --git a/sci-astronomy/siril/Manifest b/sci-astronomy/siril/Manifest
index a7e619f86e97..e88d5eda8409 100644
--- a/sci-astronomy/siril/Manifest
+++ b/sci-astronomy/siril/Manifest
@@ -1 +1,2 @@
 DIST siril-1.0.1.tar.bz2 2846127 BLAKE2B 
15c87e9d3ae175170ad67c1fc65abcca43220d8320df3ba2351cc49d495f9b9dde85d4143b2aa52950b92eb36f10e0ca6548d10e22e072e00596b8fdb535ce1c
 SHA512 
ea35940b370b35802816a90789982dd328ba20d322d092c623c244de949b08810e3ad9552ce3dcc4cc6e2d6b5bf128ac668cbe4ff6ef78d22a4e6ed94b850ffa
+DIST siril-1.0.3.tar.bz2 2900334 BLAKE2B 
7ec4995ae0f2b66a8575ac6d680dd639bc6d4c429428c2b29eebf8ea1989dae4669bf81b957d4be7889616b09a3b4febb7c1f1da950d36c68bbec152d4cc0041
 SHA512 
bd8e5d1bba71b0f14f9284a5072e7524d6005c22c55bed45a8e0113456c94ea5ac2a2befbe84c1e827fa410ee9031215343183d2d49f52df681ee4f5dc1a478a

diff --git a/sci-astronomy/siril/files/siril-1.0.3-dependencies.patch 
b/sci-astronomy/siril/files/siril-1.0.3-dependencies.patch
new file mode 100644
index ..84595472e63f
--- /dev/null
+++ b/sci-astronomy/siril/files/siril-1.0.3-dependencies.patch
@@ -0,0 +1,177 @@
+diff --git a/meson.build b/meson.build
+index 3d8e5508..5572bf61 100644
+--- a/meson.build
 b/meson.build
+@@ -42,7 +42,16 @@ srcInclude  = include_directories('src')
+ 
+ warnings = []
+ 
+-enable_openmp = get_option('openmp')
++enable_openmp= get_option('openmp')
++enable_libraw= get_option('libraw')
++enable_libtiff   = get_option('libtiff')
++enable_libjpeg   = get_option('libjpeg')
++enable_libpng= get_option('libpng')
++enable_libheif   = get_option('libheif')
++enable_ffms2 = get_option('ffms2')
++enable_ffmpeg= get_option('ffmpeg')
++enable_wcslib= get_option('wcslib')
++enable_criterion = get_option('criterion')
+ 
+ # General version
+ siril_version = meson.project_version()
+@@ -257,32 +266,67 @@ if enable_openmp
+ siril_cpp_flag += ['-Xpreprocessor', '-fopenmp']
+ siril_c_flag += ['-Xpreprocessor', '-fopenmp']
+   else
+-  openmp_dep = dependency('openmp', required : false)
++  openmp_dep = dependency('openmp', required : true)
+   endif
+ else
+   message('OpenMP disabled')
+ endif
+ 
+-libraw_dep = dependency('libraw', required : false)
+-libtiff_dep = dependency('libtiff-4', required : false)
+-libjpeg_dep = dependency('libjpeg', required : false)
+-libpng_dep = dependency('libpng', required : false, version: '>= 1.6.0')
+-libheif_dep = dependency('libheif', required : false)
+-ffms2_dep = dependency('ffms2', required : false)
+-ffmpeg = [
+-  dependency('libavformat', required : false),
+-  dependency('libavcodec', required : false),
+-  dependency('libavutil', version : '>= 55.20', required : false),
+-  dependency('libswscale', required : false),
+-  dependency('libswresample', required : false)
+-]
++libraw_dep = no_dep
++if enable_libraw
++  libraw_dep = dependency('libraw', required : true)
++endif
++
++libtiff_dep = no_dep
++if enable_libtiff
++  libtiff_dep = dependency('libtiff-4', required : true)
++endif
++
++libjpeg_dep = no_dep
++if enable_libjpeg
++  libjpeg_dep = dependency('libjpeg', required : true)
++endif
++
++libpng_dep = no_dep
++if enable_libpng
++  libpng_dep = dependency('libpng', required : true, version: '>= 1.6.0')
++endif
++
++libheif_dep = no_dep
++if enable_libheif
++  libheif_dep = dependency('libheif', required : true)
++endif
++
++ffms2_dep = no_dep
++if enable_ffms2
++  ffms2_dep = dependency('ffms2', required : true)
++endif
++
++ffmpeg = []
++if enable_ffmpeg
++  ffmpeg = [
++dependency('libavformat', required : true),
++dependency('libavcodec', required : true),
++dependency('libavutil', version : '>= 55.20', required : true),
++dependency('libswscale', required : true),
++dependency('libswresample', required : true)
++  ]
++endif
++
+ libcurl_dep = no_dep
+ if enable_libcurl
+-  libcurl_dep = dependency('libcurl', required : false)
++  libcurl_dep = dependency('libcurl', required : true)
++endif
++
++criterion_dep = no_dep
++if enable_criterion
++

[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/

2022-05-15 Thread Sam James

commit: 436c3cf55dd8a5f8522bc4fee2dd8607d0cbf244
Author: Sam James  gentoo  org>
AuthorDate: Mon May 16 05:29:20 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May 16 05:29:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=436c3cf5

sci-astronomy/siril: fix openmp check

Signed-off-by: Sam James  gentoo.org>

 sci-astronomy/siril/siril-1.0.1.ebuild | 8 ++--
 sci-astronomy/siril/siril-.ebuild  | 8 ++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/sci-astronomy/siril/siril-1.0.1.ebuild 
b/sci-astronomy/siril/siril-1.0.1.ebuild
index 822c1fba9bfd..e24c4af5709a 100644
--- a/sci-astronomy/siril/siril-1.0.1.ebuild
+++ b/sci-astronomy/siril/siril-1.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit meson xdg
+inherit meson toolchain-funcs xdg
 
 DESCRIPTION="A free astronomical image processing software"
 HOMEPAGE="https://www.siril.org/";
@@ -54,7 +54,11 @@ PATCHES=(
 DOCS=( README.md NEWS ChangeLog LICENSE.md LICENSE_sleef.txt AUTHORS )
 
 pkg_pretend() {
-   use openmp && tc-check-openmp
+   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
 
 src_configure() {

diff --git a/sci-astronomy/siril/siril-.ebuild 
b/sci-astronomy/siril/siril-.ebuild
index 822c1fba9bfd..e24c4af5709a 100644
--- a/sci-astronomy/siril/siril-.ebuild
+++ b/sci-astronomy/siril/siril-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit meson xdg
+inherit meson toolchain-funcs xdg
 
 DESCRIPTION="A free astronomical image processing software"
 HOMEPAGE="https://www.siril.org/";
@@ -54,7 +54,11 @@ PATCHES=(
 DOCS=( README.md NEWS ChangeLog LICENSE.md LICENSE_sleef.txt AUTHORS )
 
 pkg_pretend() {
-   use openmp && tc-check-openmp
+   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/

2022-05-15 Thread Sam James

commit: 506721edca8bf45983f82c38ba4041429db27c9a
Author: Sam James  gentoo  org>
AuthorDate: Mon May 16 05:30:12 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May 16 05:30:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=506721ed

sci-astronomy/siril: use libjpeg-turbo

Signed-off-by: Sam James  gentoo.org>

 sci-astronomy/siril/siril-1.0.1.ebuild | 2 +-
 sci-astronomy/siril/siril-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-astronomy/siril/siril-1.0.1.ebuild 
b/sci-astronomy/siril/siril-1.0.1.ebuild
index e24c4af5709a..9f673bad189f 100644
--- a/sci-astronomy/siril/siril-1.0.1.ebuild
+++ b/sci-astronomy/siril/siril-1.0.1.ebuild
@@ -36,7 +36,7 @@ DEPEND="
curl? ( net-misc/curl )
ffmpeg? ( media-video/ffmpeg:= )
heif? ( media-libs/libheif )
-   jpeg? ( virtual/jpeg )
+   jpeg? ( media-libs/libjpeg-turbo:= )
png? ( >=media-libs/libpng-1.6.0 )
raw? ( media-libs/libraw )
tiff? ( media-libs/tiff )

diff --git a/sci-astronomy/siril/siril-.ebuild 
b/sci-astronomy/siril/siril-.ebuild
index e24c4af5709a..9f673bad189f 100644
--- a/sci-astronomy/siril/siril-.ebuild
+++ b/sci-astronomy/siril/siril-.ebuild
@@ -36,7 +36,7 @@ DEPEND="
curl? ( net-misc/curl )
ffmpeg? ( media-video/ffmpeg:= )
heif? ( media-libs/libheif )
-   jpeg? ( virtual/jpeg )
+   jpeg? ( media-libs/libjpeg-turbo:= )
png? ( >=media-libs/libpng-1.6.0 )
raw? ( media-libs/libraw )
tiff? ( media-libs/tiff )

[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/, sci-astronomy/siril/files/

2022-05-15 Thread Sam James

commit: 479f2008aaad0c97c277c420934fff5fc8e6c2fd
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Fri Mar 25 20:13:12 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May 16 05:26:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=479f2008

sci-astronomy/siril: new package

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Closes: https://bugs.gentoo.org/575932
Signed-off-by: Sam James  gentoo.org>

 sci-astronomy/siril/Manifest   |  1 +
 sci-astronomy/siril/files/siril-docfiles.patch | 16 +++
 sci-astronomy/siril/metadata.xml   | 30 
 sci-astronomy/siril/siril-1.0.0.ebuild | 66 ++
 sci-astronomy/siril/siril-.ebuild  | 66 ++
 5 files changed, 179 insertions(+)

diff --git a/sci-astronomy/siril/Manifest b/sci-astronomy/siril/Manifest
new file mode 100644
index ..4290e92f9877
--- /dev/null
+++ b/sci-astronomy/siril/Manifest
@@ -0,0 +1 @@
+DIST siril-1.0.0.tar.bz2 2830447 BLAKE2B 
0c7b52682a71db6ec618357ce5ee5e88f144b0d00b0649a00755fe81fe49a90cfa5283aabbe0648670e39210ff2cb94cd0b6223f17f70458056b693d3d77eccf
 SHA512 
b31fa0df0ae447130b20bc07a597d52e0e50991f1faebd990c5890001a46a704b1a3fe4915db118b53b3661a5888f031d5ab29e562bb8018060aea0a83cad5d3

diff --git a/sci-astronomy/siril/files/siril-docfiles.patch 
b/sci-astronomy/siril/files/siril-docfiles.patch
new file mode 100644
index ..f98e0210d7e6
--- /dev/null
+++ b/sci-astronomy/siril/files/siril-docfiles.patch
@@ -0,0 +1,16 @@
+--- siril-1.0.0/meson.build
 siril-1.0.0/meson.build
+@@ -497,13 +497,6 @@
+ ]
+ 
+ install_man(man_files)
+-install_data(['AUTHORS', 'LICENSE.md', 'LICENSE_sleef.txt'],
+- rename : [
+- 'doc/siril/AUTHORS',
+- 'doc/siril/LICENSE.md',
+- 'doc/siril/LICENSE_sleef.txt',
+-   ],
+- install_dir : siril_share)
+ 
+ 
+ 


diff --git a/sci-astronomy/siril/metadata.xml b/sci-astronomy/siril/metadata.xml
new file mode 100644
index ..580487d37ad5
--- /dev/null
+++ b/sci-astronomy/siril/metadata.xml
@@ -0,0 +1,30 @@
+
+https://www.gentoo.org/dtd/metadata.dtd";>
+
+   
+   mario.haust...@hrz.tu-chemnitz.de
+   Mario Haustein
+   
+   
+   proxy-ma...@gentoo.org
+   Proxy Maintainers
+   
+   
+   SIRIL is an astronomical image processing tool.
+
+   It is specially tailored for noise reduction and improving the
+   signal/noise ratio of an image from multiple captures, as 
required in
+   astronomy. SIRIL can align automatically or manually, stack and 
enhance
+   pictures from various file formats, even image sequence files 
(films
+   and SER files). It works well with limited system resources, 
like in
+   embedded platforms, but is also very fast when run on more 
powerful
+   computers.
+   
+   
+   Add support for the HEIF image format
+   Add supprt astrometry features using 
sci-astronomy/wcslib
+   
+   
+   free-astro/siril
+   
+

diff --git a/sci-astronomy/siril/siril-1.0.0.ebuild 
b/sci-astronomy/siril/siril-1.0.0.ebuild
new file mode 100644
index ..822c1fba9bfd
--- /dev/null
+++ b/sci-astronomy/siril/siril-1.0.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson xdg
+
+DESCRIPTION="A free astronomical image processing software"
+HOMEPAGE="https://www.siril.org/";
+
+if [[ ${PV} == "" ]]; 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+"
+SLOT="0"
+IUSE="curl ffmpeg gnuplot 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? ( virtual/jpeg )
+   png? ( >=media-libs/libpng-1.6.0 )
+   raw? ( media-libs/libraw )
+   tiff? ( media-libs/tiff )
+   wcs? ( >=sci-astronomy/wcslib-7.7 )
+"
+RDEPEND="
+   ${DEPEND}
+   gnuplot? ( sci-visualization/gnuplot )
+"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-

[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/

2022-05-15 Thread Sam James

commit: 2df1942dd559828089ebf3560a8a6a7931d3b508
Author: Mario Haustein  hrz  tu-chemnitz  de>
AuthorDate: Mon May  9 17:48:45 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May 16 05:26:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2df1942d

sci-astronomy/siril: version bump 1.0.1

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Mario Haustein  hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/24754
Signed-off-by: Sam James  gentoo.org>

 sci-astronomy/siril/Manifest   | 2 +-
 sci-astronomy/siril/{siril-1.0.0.ebuild => siril-1.0.1.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-astronomy/siril/Manifest b/sci-astronomy/siril/Manifest
index 4290e92f9877..a7e619f86e97 100644
--- a/sci-astronomy/siril/Manifest
+++ b/sci-astronomy/siril/Manifest
@@ -1 +1 @@
-DIST siril-1.0.0.tar.bz2 2830447 BLAKE2B 
0c7b52682a71db6ec618357ce5ee5e88f144b0d00b0649a00755fe81fe49a90cfa5283aabbe0648670e39210ff2cb94cd0b6223f17f70458056b693d3d77eccf
 SHA512 
b31fa0df0ae447130b20bc07a597d52e0e50991f1faebd990c5890001a46a704b1a3fe4915db118b53b3661a5888f031d5ab29e562bb8018060aea0a83cad5d3
+DIST siril-1.0.1.tar.bz2 2846127 BLAKE2B 
15c87e9d3ae175170ad67c1fc65abcca43220d8320df3ba2351cc49d495f9b9dde85d4143b2aa52950b92eb36f10e0ca6548d10e22e072e00596b8fdb535ce1c
 SHA512 
ea35940b370b35802816a90789982dd328ba20d322d092c623c244de949b08810e3ad9552ce3dcc4cc6e2d6b5bf128ac668cbe4ff6ef78d22a4e6ed94b850ffa

diff --git a/sci-astronomy/siril/siril-1.0.0.ebuild 
b/sci-astronomy/siril/siril-1.0.1.ebuild
similarity index 100%
rename from sci-astronomy/siril/siril-1.0.0.ebuild
rename to sci-astronomy/siril/siril-1.0.1.ebuild

47 matches

Mail list logo