* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/, sci-astronomy/siril/files/
@ 2022-05-16 5:26 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2022-05-16 5:26 UTC (permalink / raw
To: gentoo-commits
commit: 479f2008aaad0c97c277c420934fff5fc8e6c2fd
Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Fri Mar 25 20:13:12 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May 16 05:26:06 2022 +0000
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 <mario.haustein <AT> hrz.tu-chemnitz.de>
Closes: https://bugs.gentoo.org/575932
Signed-off-by: Sam James <sam <AT> 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-9999.ebuild | 66 ++++++++++++++++++++++++++
5 files changed, 179 insertions(+)
diff --git a/sci-astronomy/siril/Manifest b/sci-astronomy/siril/Manifest
new file mode 100644
index 000000000000..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 000000000000..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 000000000000..580487d37ad5
--- /dev/null
+++ b/sci-astronomy/siril/metadata.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person" proxied="yes">
+ <email>mario.haustein@hrz.tu-chemnitz.de</email>
+ <name>Mario Haustein</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <longdescription>
+ 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.
+ </longdescription>
+ <use>
+ <flag name="heif">Add support for the HEIF image format</flag>
+ <flag name="wcs">Add supprt astrometry features using <pkg>sci-astronomy/wcslib</pkg></flag>
+ </use>
+ <upstream>
+ <remote-id type="gitlab">free-astro/siril</remote-id>
+ </upstream>
+</pkgmetadata>
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 000000000000..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} == "9999" ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://gitlab.com/free-astro/${PN}.git"
+else
+ SRC_URI="https://gitlab.com/free-astro/siril/-/archive/${PV/_/-}/${PN}-${PV/_/-}.tar.bz2"
+ KEYWORDS="~amd64 ~x86"
+ S="${WORKDIR}/${PN}-${PV/_/-}"
+fi
+
+LICENSE="GPL-3+"
+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}-docfiles.patch"
+)
+
+DOCS=( README.md NEWS ChangeLog LICENSE.md LICENSE_sleef.txt AUTHORS )
+
+pkg_pretend() {
+ use openmp && tc-check-openmp
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_use openmp)
+ $(usex curl -Denable-libcurl=yes -Denable-libcurl=no)
+ )
+ meson_src_configure
+}
diff --git a/sci-astronomy/siril/siril-9999.ebuild b/sci-astronomy/siril/siril-9999.ebuild
new file mode 100644
index 000000000000..822c1fba9bfd
--- /dev/null
+++ b/sci-astronomy/siril/siril-9999.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} == "9999" ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://gitlab.com/free-astro/${PN}.git"
+else
+ SRC_URI="https://gitlab.com/free-astro/siril/-/archive/${PV/_/-}/${PN}-${PV/_/-}.tar.bz2"
+ KEYWORDS="~amd64 ~x86"
+ S="${WORKDIR}/${PN}-${PV/_/-}"
+fi
+
+LICENSE="GPL-3+"
+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}-docfiles.patch"
+)
+
+DOCS=( README.md NEWS ChangeLog LICENSE.md LICENSE_sleef.txt AUTHORS )
+
+pkg_pretend() {
+ use openmp && tc-check-openmp
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_use openmp)
+ $(usex curl -Denable-libcurl=yes -Denable-libcurl=no)
+ )
+ meson_src_configure
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/, sci-astronomy/siril/files/
@ 2022-07-15 8:38 Joonas Niilola
0 siblings, 0 replies; 8+ messages in thread
From: Joonas Niilola @ 2022-07-15 8:38 UTC (permalink / raw
To: gentoo-commits
commit: ef42ec985735ffceb7b100f433db76c76f5cce81
Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Tue May 17 16:17:56 2022 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Jul 15 08:38:12 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef42ec98
sci-astronomy/siril: version bump 1.0.2
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/25538
Signed-off-by: Joonas Niilola <juippis <AT> 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-9999.ebuild => siril-1.0.3.ebuild} | 23 ++-
sci-astronomy/siril/siril-9999.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 000000000000..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
++ criterion_dep = dependency('criterion', required : true)
+ endif
+-criterion_dep = dependency('criterion', required : false)
+
+-wcslib_dep = dependency('wcslib', fallback : ['wcslib', 'wcslib_dep'], required : false)
++wcslib_dep = no_dep
++if enable_wcslib
++ wcslib_dep = dependency('wcslib', fallback : ['wcslib', 'wcslib_dep'], required : true)
++endif
+
+ ################################################################################
+ # Configuration
+diff --git a/meson_options.txt b/meson_options.txt
+index cd4b9cc1..5e48ae1f 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -12,9 +12,63 @@ option('openmp',
+ description: 'build with OpenMP support'
+ )
+
++option('libraw',
++ type : 'boolean',
++ value : 'false',
++ description: 'build with LibRaw support'
++)
++
++option('libtiff',
++ type : 'boolean',
++ value : 'false',
++ description: 'build with TIFF support'
++)
++
++option('libjpeg',
++ type : 'boolean',
++ value : 'false',
++ description: 'build with JPEG support'
++)
++
++option('libpng',
++ type : 'boolean',
++ value : 'false',
++ description: 'build with PNG support'
++)
++
++option('libheif',
++ type : 'boolean',
++ value : 'false',
++ description: 'build with HEIF support'
++)
++
++option('ffms2',
++ type : 'boolean',
++ value : 'false',
++ description: 'build with FFMS2 support'
++)
++
++option('ffmpeg',
++ type : 'boolean',
++ value : 'false',
++ description: 'build with FFmpeg support'
++)
++
+ option('enable-libcurl',
+ type: 'combo',
+ value: 'platform-default',
+ description: 'Use libcurl instead of GIO',
+ choices: [ 'yes', 'no', 'platform-default' ]
+-)
+\ No newline at end of file
++)
++
++option('criterion',
++ type : 'boolean',
++ value : 'false',
++ description: 'build with criterion support'
++)
++
++option('wcslib',
++ type : 'boolean',
++ value : 'false',
++ description: 'build with WCSLIB support'
++)
diff --git a/sci-astronomy/siril/files/siril-dependencies.patch b/sci-astronomy/siril/files/siril-dependencies.patch
new file mode 100644
index 000000000000..b9ed88f98e8a
--- /dev/null
+++ b/sci-astronomy/siril/files/siril-dependencies.patch
@@ -0,0 +1,198 @@
+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('openmp',
+ description: 'build with OpenMP support'
+ )
+
++option('libraw',
++ type : 'boolean',
++ value : 'false',
++ description: 'build with LibRaw support'
++)
++
++option('libtiff',
++ type : 'boolean',
++ value : 'false',
++ description: 'build with TIFF support'
++)
++
++option('libjpeg',
++ type : 'boolean',
++ value : 'false',
++ description: 'build with JPEG support'
++)
++
++option('libpng',
++ type : 'boolean',
++ value : 'false',
++ description: 'build with PNG support'
++)
++
++option('libheif',
++ type : 'boolean',
++ value : 'false',
++ description: 'build with HEIF support'
++)
++
++option('ffms2',
++ type : 'boolean',
++ value : 'false',
++ description: 'build with FFMS2 support'
++)
++
++option('ffmpeg',
++ type : 'boolean',
++ value : 'false',
++ description: 'build with FFmpeg support'
++)
++
+ option('enable-libcurl',
+ type: 'combo',
+ value: 'platform-default',
+ description: 'Use libcurl instead of GIO',
+ choices: [ 'yes', 'no', 'platform-default' ]
+-)
+\ No newline at end of file
++)
++
++option('libconfig',
++ type : 'boolean',
++ value : 'true',
++ description: 'build with libconfig support'
++)
++
++option('criterion',
++ type : 'boolean',
++ value : 'false',
++ description: 'build with criterion support'
++)
++
++option('wcslib',
++ type : 'boolean',
++ value : 'false',
++ description: 'build with WCSLIB support'
++)
diff --git a/sci-astronomy/siril/metadata.xml b/sci-astronomy/siril/metadata.xml
index 580487d37ad5..3279b152afca 100644
--- a/sci-astronomy/siril/metadata.xml
+++ b/sci-astronomy/siril/metadata.xml
@@ -22,6 +22,7 @@
</longdescription>
<use>
<flag name="heif">Add support for the HEIF image format</flag>
+ <flag name="libconfig">Require <pkg>dev-libs/libconfig</pkg> to read old configuration files</flag>
<flag name="wcs">Add supprt astrometry features using <pkg>sci-astronomy/wcslib</pkg></flag>
</use>
<upstream>
diff --git a/sci-astronomy/siril/siril-9999.ebuild b/sci-astronomy/siril/siril-1.0.3.ebuild
similarity index 73%
copy from sci-astronomy/siril/siril-9999.ebuild
copy to sci-astronomy/siril/siril-1.0.3.ebuild
index 9f673bad189f..4954c6f5912e 100644
--- a/sci-astronomy/siril/siril-9999.ebuild
+++ b/sci-astronomy/siril/siril-1.0.3.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit meson toolchain-funcs xdg
+inherit meson optfeature toolchain-funcs xdg
DESCRIPTION="A free astronomical image processing software"
HOMEPAGE="https://www.siril.org/"
@@ -17,9 +17,9 @@ else
S="${WORKDIR}/${PN}-${PV/_/-}"
fi
-LICENSE="GPL-3+"
+LICENSE="GPL-3+ Boost-1.0"
SLOT="0"
-IUSE="curl ffmpeg gnuplot heif jpeg openmp png raw tiff wcs"
+IUSE="curl ffmpeg heif jpeg openmp png raw tiff wcs"
DEPEND="
>=dev-libs/glib-2.56.0:2
@@ -44,14 +44,14 @@ DEPEND="
"
RDEPEND="
${DEPEND}
- gnuplot? ( sci-visualization/gnuplot )
"
PATCHES=(
"${FILESDIR}/${PN}-docfiles.patch"
+ "${FILESDIR}/${P}-dependencies.patch"
)
-DOCS=( README.md NEWS ChangeLog LICENSE.md LICENSE_sleef.txt AUTHORS )
+DOCS=( README.md NEWS ChangeLog AUTHORS )
pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
@@ -63,8 +63,21 @@ pkg_setup() {
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() {
+ optfeature "gnuplot support" sci-visualization/gnuplot
+}
diff --git a/sci-astronomy/siril/siril-9999.ebuild b/sci-astronomy/siril/siril-9999.ebuild
index 9f673bad189f..aff52be8dda4 100644
--- a/sci-astronomy/siril/siril-9999.ebuild
+++ b/sci-astronomy/siril/siril-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit meson toolchain-funcs xdg
+inherit meson optfeature toolchain-funcs xdg
DESCRIPTION="A free astronomical image processing software"
HOMEPAGE="https://www.siril.org/"
@@ -17,14 +17,13 @@ else
S="${WORKDIR}/${PN}-${PV/_/-}"
fi
-LICENSE="GPL-3+"
+LICENSE="GPL-3+ Boost-1.0"
SLOT="0"
-IUSE="curl ffmpeg gnuplot heif jpeg openmp png raw tiff wcs"
+IUSE="curl ffmpeg heif jpeg libconfig openmp png raw tiff wcs"
DEPEND="
>=dev-libs/glib-2.56.0:2
>=dev-libs/json-glib-1.2.6
- >=dev-libs/libconfig-1.4[cxx]
>=media-gfx/exiv2-0.25
media-libs/librtprocess:=
>=media-libs/opencv-4.4.0:=
@@ -36,6 +35,7 @@ DEPEND="
curl? ( net-misc/curl )
ffmpeg? ( media-video/ffmpeg:= )
heif? ( media-libs/libheif )
+ libconfig? ( >=dev-libs/libconfig-1.4[cxx] )
jpeg? ( media-libs/libjpeg-turbo:= )
png? ( >=media-libs/libpng-1.6.0 )
raw? ( media-libs/libraw )
@@ -44,14 +44,14 @@ DEPEND="
"
RDEPEND="
${DEPEND}
- gnuplot? ( sci-visualization/gnuplot )
"
PATCHES=(
"${FILESDIR}/${PN}-docfiles.patch"
+ "${FILESDIR}/${PN}-dependencies.patch"
)
-DOCS=( README.md NEWS ChangeLog LICENSE.md LICENSE_sleef.txt AUTHORS )
+DOCS=( README.md NEWS ChangeLog AUTHORS )
pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
@@ -63,8 +63,22 @@ pkg_setup() {
src_configure() {
local emesonargs=(
+ -Dffms2=false
+ -Dcriterion=false
+ $(meson_use ffmpeg)
+ $(meson_use heif libheif)
+ $(meson_use jpeg libjpeg)
+ $(meson_use libconfig)
$(meson_use openmp)
+ $(meson_use png libpng)
+ $(meson_use raw libraw)
+ $(meson_use tiff libtiff)
+ $(meson_use wcs wcslib)
$(usex curl -Denable-libcurl=yes -Denable-libcurl=no)
)
meson_src_configure
}
+
+pkg_postinst() {
+ optfeature "gnuplot support" sci-visualization/gnuplot
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/, sci-astronomy/siril/files/
@ 2022-07-30 8:19 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2022-07-30 8:19 UTC (permalink / raw
To: gentoo-commits
commit: 2d83cfb50f6568e774303d7237168ae08937d4b7
Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Fri Jul 29 15:27:30 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 30 08:18:40 2022 +0000
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 <mario.haustein <AT> hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/26654
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../siril/files/siril-9999-dependencies.patch | 198 ---------------------
sci-astronomy/siril/siril-9999.ebuild | 1 -
2 files changed, 199 deletions(-)
diff --git a/sci-astronomy/siril/files/siril-9999-dependencies.patch b/sci-astronomy/siril/files/siril-9999-dependencies.patch
deleted file mode 100644
index b9ed88f98e8a..000000000000
--- a/sci-astronomy/siril/files/siril-9999-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('openmp',
- description: 'build with OpenMP support'
- )
-
-+option('libraw',
-+ type : 'boolean',
-+ value : 'false',
-+ description: 'build with LibRaw support'
-+)
-+
-+option('libtiff',
-+ type : 'boolean',
-+ value : 'false',
-+ description: 'build with TIFF support'
-+)
-+
-+option('libjpeg',
-+ type : 'boolean',
-+ value : 'false',
-+ description: 'build with JPEG support'
-+)
-+
-+option('libpng',
-+ type : 'boolean',
-+ value : 'false',
-+ description: 'build with PNG support'
-+)
-+
-+option('libheif',
-+ type : 'boolean',
-+ value : 'false',
-+ description: 'build with HEIF support'
-+)
-+
-+option('ffms2',
-+ type : 'boolean',
-+ value : 'false',
-+ description: 'build with FFMS2 support'
-+)
-+
-+option('ffmpeg',
-+ type : 'boolean',
-+ value : 'false',
-+ description: 'build with FFmpeg support'
-+)
-+
- option('enable-libcurl',
- type: 'combo',
- value: 'platform-default',
- description: 'Use libcurl instead of GIO',
- choices: [ 'yes', 'no', 'platform-default' ]
--)
-\ No newline at end of file
-+)
-+
-+option('libconfig',
-+ type : 'boolean',
-+ value : 'true',
-+ description: 'build with libconfig support'
-+)
-+
-+option('criterion',
-+ type : 'boolean',
-+ value : 'false',
-+ description: 'build with criterion support'
-+)
-+
-+option('wcslib',
-+ type : 'boolean',
-+ value : 'false',
-+ description: 'build with WCSLIB support'
-+)
diff --git a/sci-astronomy/siril/siril-9999.ebuild b/sci-astronomy/siril/siril-9999.ebuild
index 62ed0ef4d3f6..7a9061a16811 100644
--- a/sci-astronomy/siril/siril-9999.ebuild
+++ b/sci-astronomy/siril/siril-9999.ebuild
@@ -48,7 +48,6 @@ RDEPEND="
PATCHES=(
"${FILESDIR}/${PN}-docfiles.patch"
- "${FILESDIR}/${PN}-9999-dependencies.patch"
)
DOCS=( README.md NEWS ChangeLog AUTHORS )
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/, sci-astronomy/siril/files/
@ 2023-01-04 5:50 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2023-01-04 5:50 UTC (permalink / raw
To: gentoo-commits
commit: 9e5efd3a4fb8564e7bb06e69953bd59882124bf4
Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Tue Dec 27 15:27:11 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jan 4 05:48:13 2023 +0000
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 <mario.haustein <AT> hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/28853
Signed-off-by: Sam James <sam <AT> 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 000000000000..ffef786d0d8e
--- /dev/null
+++ b/sci-astronomy/siril/files/siril-1.0-execinfo-r2.patch
@@ -0,0 +1,45 @@
+commit c009c4c1800086e7f4c4e80939e9ddc8964c8e12
+Author: Mario Haustein <mario.haustein@hrz.tu-chemnitz.de>
+Date: Thu Aug 4 00:27:08 2022 +0200
+
+ Include execinfo.h only if available
+
+Bug: https://bugs.gentoo.org/873016
+Upstream: https://gitlab.com/free-astro/siril/-/merge_requests/284
+
+diff --git a/src/core/signals.c b/src/core/signals.c
+index 74100b3a..0eefd460 100644
+--- a/src/core/signals.c
++++ b/src/core/signals.c
+@@ -25,7 +25,7 @@
+ #ifdef _WIN32
+ #include <windows.h>
+ #include <dbghelp.h>
+-#else
++#elif HAVE_EXECINFO_H
+ #include <execinfo.h>
+ #endif
+
+commit 13bafd227500018bef052cad1d73e9c681be1b8a
+Author: Cyril Richard <cyril.richard42@gmail.com>
+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 <config.h>
++#endif
+ #include <signal.h>
+ #ifdef _WIN32
+ #include <windows.h>
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 )
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/, sci-astronomy/siril/files/
@ 2023-03-25 4:08 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2023-03-25 4:08 UTC (permalink / raw
To: gentoo-commits
commit: e46f341c307105de27df5f04c715433d25f1d3bd
Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Fri Mar 24 17:39:33 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 25 04:05:51 2023 +0000
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 <mario.haustein <AT> hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/30333
Signed-off-by: Sam James <sam <AT> 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 000000000000..eba90448f422
--- /dev/null
+++ b/sci-astronomy/siril/files/siril-1.2-openmp.patch
@@ -0,0 +1,19 @@
+From: Mario Haustein <mario.haustein@hrz.tu-chemnitz.de>
+Date: Fri, 24 Mar 2023 18:24:26 +0100
+Subject: [PATCH] Add ifdef around openmp function
+Bug: https://bugs.gentoo.org/902833
+Upstream: https://gitlab.com/free-astro/siril/-/merge_requests/482
+
+--- a/src/algos/quantize.c
++++ b/src/algos/quantize.c
+@@ -1396,8 +1396,10 @@ row of the image.
+ #pragma omp parallel num_threads(threads) if (threads>1)
+ #endif
+ {
++#ifdef _OPENMP
+ if (threads > 1 && omp_get_num_threads() != threads)
+ siril_debug_print("actual number of threads: %d of %d requested (level %d)\n", omp_get_num_threads(), threads, omp_get_level());
++#endif
+ float *rowpix, v1;
+ double mean, stdev;
+ float *differences;
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 )
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/, sci-astronomy/siril/files/
@ 2023-03-25 7:16 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2023-03-25 7:16 UTC (permalink / raw
To: gentoo-commits
commit: d869640c70baf3d641600210646ed3bd4770c843
Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Sat Mar 25 07:03:19 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 25 07:16:42 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d869640c
sci-astronomy/siril: merge duplicate patches
Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/30337
Signed-off-by: Sam James <sam <AT> 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..000000000000
--- 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 <mario.haustein@hrz.tu-chemnitz.de>
-Date: Mon, 27 Feb 2023 17:49:41 +0100
-Subject: [PATCH 1/2] fix prototypes for functions with parameters
-Bug: https://bugs.gentoo.org/898108
-Upstream: https://gitlab.com/free-astro/siril/-/merge_requests/443
-
----
- src/core/processing.h | 2 +-
- src/gui/save_dialog.h | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/core/processing.h b/src/core/processing.h
-index 1eba970b..89f24bd3 100644
---- a/src/core/processing.h
-+++ b/src/core/processing.h
-@@ -162,7 +162,7 @@ void wait_for_script_thread();
- gboolean end_generic(gpointer arg);
- guint siril_add_idle(GSourceFunc idle_function, gpointer data);
-
--struct generic_seq_args *create_default_seqargs();
-+struct generic_seq_args *create_default_seqargs(sequence *seq);
-
- int check_threading(threading_type *threads);
- int limit_threading(threading_type *threads, int min_iterations_per_thread, size_t total_iterations);
-diff --git a/src/gui/save_dialog.h b/src/gui/save_dialog.h
-index c724abb1..586a2ca3 100644
---- a/src/gui/save_dialog.h
-+++ b/src/gui/save_dialog.h
-@@ -20,7 +20,7 @@ enum {
- };
-
- void on_header_save_as_button_clicked();
--void on_header_snapshot_button_clicked();
-+void on_header_snapshot_button_clicked(gboolean clipboard);
- void on_header_save_button_clicked();
-
- #endif /* SRC_GUI_SAVE_DIALOG_H_ */
---
-2.39.2
-
diff --git a/sci-astronomy/siril/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"
)
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/, sci-astronomy/siril/files/
@ 2023-10-27 3:20 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2023-10-27 3:20 UTC (permalink / raw
To: gentoo-commits
commit: 8afacf3b80031c776873e4220a47fb5c62cad9f6
Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Thu Oct 19 16:29:36 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 27 03:18:37 2023 +0000
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 <mario.haustein <AT> hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/33417
Signed-off-by: Sam James <sam <AT> 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..000000000000
--- 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('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
-+ criterion_dep = dependency('criterion', required : true)
- endif
--criterion_dep = dependency('criterion', required : false)
-
--wcslib_dep = dependency('wcslib', fallback : ['wcslib', 'wcslib_dep'], required : false)
-+wcslib_dep = no_dep
-+if enable_wcslib
-+ wcslib_dep = dependency('wcslib', fallback : ['wcslib', 'wcslib_dep'], required : true)
-+endif
-
- ################################################################################
- # Configuration
-diff --git a/meson_options.txt b/meson_options.txt
-index cd4b9cc1..5e48ae1f 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -12,9 +12,63 @@ option('openmp',
- description: 'build with OpenMP support'
- )
-
-+option('libraw',
-+ type : 'boolean',
-+ value : 'false',
-+ description: 'build with LibRaw support'
-+)
-+
-+option('libtiff',
-+ type : 'boolean',
-+ value : 'false',
-+ description: 'build with TIFF support'
-+)
-+
-+option('libjpeg',
-+ type : 'boolean',
-+ value : 'false',
-+ description: 'build with JPEG support'
-+)
-+
-+option('libpng',
-+ type : 'boolean',
-+ value : 'false',
-+ description: 'build with PNG support'
-+)
-+
-+option('libheif',
-+ type : 'boolean',
-+ value : 'false',
-+ description: 'build with HEIF support'
-+)
-+
-+option('ffms2',
-+ type : 'boolean',
-+ value : 'false',
-+ description: 'build with FFMS2 support'
-+)
-+
-+option('ffmpeg',
-+ type : 'boolean',
-+ value : 'false',
-+ description: 'build with FFmpeg support'
-+)
-+
- option('enable-libcurl',
- type: 'combo',
- value: 'platform-default',
- description: 'Use libcurl instead of GIO',
- choices: [ 'yes', 'no', 'platform-default' ]
--)
-\ No newline at end of file
-+)
-+
-+option('criterion',
-+ type : 'boolean',
-+ value : 'false',
-+ description: 'build with criterion support'
-+)
-+
-+option('wcslib',
-+ type : 'boolean',
-+ value : 'false',
-+ description: 'build with WCSLIB support'
-+)
diff --git a/sci-astronomy/siril/files/siril-1.0-execinfo-r2.patch b/sci-astronomy/siril/files/siril-1.0-execinfo-r2.patch
deleted file mode 100644
index 55ce90558b64..000000000000
--- a/sci-astronomy/siril/files/siril-1.0-execinfo-r2.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-commit c009c4c1800086e7f4c4e80939e9ddc8964c8e12
-Author: Mario Haustein <mario.haustein@hrz.tu-chemnitz.de>
-Date: Thu Aug 4 00:27:08 2022 +0200
-
- Include execinfo.h only if available
-
-Bug: https://bugs.gentoo.org/873016
-Upstream: https://gitlab.com/free-astro/siril/-/merge_requests/284
-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
---- a/src/core/signals.c
-+++ b/src/core/signals.c
-@@ -25,7 +25,7 @@
- #ifdef _WIN32
- #include <windows.h>
- #include <dbghelp.h>
--#else
-+#elif HAVE_EXECINFO_H
- #include <execinfo.h>
- #endif
-
-commit 13bafd227500018bef052cad1d73e9c681be1b8a
-Author: Cyril Richard <cyril.richard42@gmail.com>
-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 <config.h>
-+#endif
- #include <signal.h>
- #ifdef _WIN32
- #include <windows.h>
-From 6f959a02d27fb507cda1898a3aa785766e77d404 Mon Sep 17 00:00:00 2001
-From: Mario Haustein <mario.haustein@hrz.tu-chemnitz.de>
-Date: Mon, 27 Feb 2023 17:34:43 +0100
-Subject: [PATCH] fix HAVE_EXECINFO_H logic
-
----
- src/core/signals.c | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/src/core/signals.c b/src/core/signals.c
-index 42b369d6..d4745909 100644
---- a/src/core/signals.c
-+++ b/src/core/signals.c
-@@ -55,13 +55,7 @@ static void signal_handled(int s) {
- g_printf(ANSI_COLOR_RED"%s"ANSI_COLOR_RESET"\n", visit);
- }
-
--#if (!defined _WIN32 && defined HAVE_EXECINFO_H)
-- void *stack[STACK_DEPTH];
--
-- size_t size = backtrace(stack, sizeof(stack) / sizeof(void*));
--
-- backtrace_symbols_fd(stack, size, fileno((FILE*) stdout));
--#else
-+#ifdef _WIN32
- unsigned int i;
- void *stack[STACK_DEPTH];
- unsigned short size;
-@@ -84,6 +78,12 @@ static void signal_handled(int s) {
- }
-
- free(symbol);
-+#elif HAVE_EXECINFO_H
-+ void *stack[STACK_DEPTH];
-+
-+ size_t size = backtrace(stack, sizeof(stack) / sizeof(void*));
-+
-+ backtrace_symbols_fd(stack, size, fileno((FILE*) stdout));
- #endif
- }
- undo_flush();
---
-2.39.2
-
diff --git a/sci-astronomy/siril/files/siril-1.2-stdint.patch b/sci-astronomy/siril/files/siril-1.2-stdint.patch
deleted file mode 100644
index a8fb39c2bd5d..000000000000
--- a/sci-astronomy/siril/files/siril-1.2-stdint.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Upstream: https://gitlab.com/free-astro/siril/-/merge_requests/525
---- a/src/core/exif.h
-+++ b/src/core/exif.h
-@@ -20,6 +20,8 @@
- #ifndef SRC_CORE_EXIF_H_
- #define SRC_CORE_EXIF_H_
-
-+#include <stdint.h>
-+
- #ifdef __cplusplus
- extern "C" {
- #endif
---- a/src/io/avi_pipp/pipp_avi_write_dib.h
-+++ b/src/io/avi_pipp/pipp_avi_write_dib.h
-@@ -1,6 +1,8 @@
- #ifndef PIPP_AVI_WRITE_DIB_H
- #define PIPP_AVI_WRITE_DIB_H
-
-+#include <cstdint>
-+
- #include "pipp_video_write.h"
- #include "pipp_avi_write.h"
-
---- a/src/io/avi_pipp/pipp_buffer.h
-+++ b/src/io/avi_pipp/pipp_buffer.h
-@@ -19,7 +19,6 @@
- #ifndef PIPP_BUFFER_H
- #define PIPP_BUFFER_H
-
--#include <cstdint>
- #include <cstdint>
- #include <cstddef>
-
diff --git a/sci-astronomy/siril/files/siril-1.2-tiff.patch b/sci-astronomy/siril/files/siril-1.2-tiff.patch
deleted file mode 100644
index 9e84f12c645b..000000000000
--- a/sci-astronomy/siril/files/siril-1.2-tiff.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-https://gitlab.com/free-astro/siril/-/commit/de5030991caa9490c510651868783faae2530089
-From: Cyril Richard <cyril.richard42@gmail.com>
-Date: Sun, 11 Jun 2023 23:40:10 +0200
-Subject: [PATCH] Fixing compiler error with no libtiff
-Upstream: https://gitlab.com/free-astro/siril/-/issues/1129
-
---- a/src/gui/preferences.c
-+++ b/src/gui/preferences.c
-@@ -299,6 +299,7 @@ void initialize_path_directory(const gchar *path) {
- }
-
- void initialize_starnet_executable(const gchar *path) {
-+#ifdef HAVE_LIBTIFF
- GtkFileChooser *starnet_exe = GTK_FILE_CHOOSER(lookup_widget("filechooser_starnet"));
- GtkWidget *starnet_weights_reset = GTK_WIDGET(lookup_widget("starnet_weights_clear"));
- GtkWidget *starnet_weights = GTK_WIDGET(lookup_widget("filechooser_starnet_weights"));
-@@ -315,6 +316,7 @@ void initialize_starnet_executable(const gchar *path) {
- gtk_widget_set_sensitive(starnet_weights, FALSE);
- gtk_widget_set_sensitive(starnet_weights_reset, FALSE);
- }
-+#endif
- }
-
- void initialize_starnet_weights(const gchar *path) {
-@@ -404,6 +406,7 @@ void on_filechooser_swap_file_set(GtkFileChooserButton *fileChooser, gpointer us
- }
-
- void on_filechooser_starnet_file_set(GtkFileChooserButton *fileChooser, gpointer user_data) {
-+#ifdef HAVE_LIBTIFF
- GtkFileChooser *starnet_exe = GTK_FILE_CHOOSER(fileChooser);
- gchar *path;
-
-@@ -429,7 +432,7 @@ void on_filechooser_starnet_file_set(GtkFileChooserButton *fileChooser, gpointer
- gtk_widget_set_sensitive(starnet_weights, FALSE);
- gtk_widget_set_sensitive(starnet_weights_reset, FALSE);
- }
--
-+#endif
- }
-
- void on_starnet_weights_clear_clicked(GtkButton *button, gpointer user_data) {
---- a/src/io/sequence_export.c
-+++ b/src/io/sequence_export.c
-@@ -650,7 +650,9 @@ void on_buttonExportSeq_clicked(GtkButton *button, gpointer user_data) {
- // add a trailing '_' for multiple-files sequences
- args->basename = format_basename(args->basename, TRUE);
- if (args->output == EXPORT_TIFF) {
-+#ifdef HAVE_LIBTIFF
- args->tiff_compression = get_tiff_compression();
-+#endif
- }
- }
- // Display a useful warning because I always forget to remove selection
---
-GitLab
-
diff --git a/sci-astronomy/siril/files/siril-prototypes.patch b/sci-astronomy/siril/files/siril-prototypes.patch
deleted file mode 100644
index 8b72fef41b49..000000000000
--- a/sci-astronomy/siril/files/siril-prototypes.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 6c06d62579234e1d0030bad985a9cfcf7249b5d7 Mon Sep 17 00:00:00 2001
-From: Mario Haustein <mario.haustein@hrz.tu-chemnitz.de>
-Date: Mon, 27 Feb 2023 17:49:41 +0100
-Subject: [PATCH 1/2] fix prototypes for functions with parameters
-Bug: https://bugs.gentoo.org/898108
-Upstream: https://gitlab.com/free-astro/siril/-/merge_requests/443
-
----
- src/core/processing.h | 2 +-
- src/gui/save_dialog.h | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/core/processing.h b/src/core/processing.h
-index 1eba970b..89f24bd3 100644
---- a/src/core/processing.h
-+++ b/src/core/processing.h
-@@ -162,7 +162,7 @@ void wait_for_script_thread();
- gboolean end_generic(gpointer arg);
- guint siril_add_idle(GSourceFunc idle_function, gpointer data);
-
--struct generic_seq_args *create_default_seqargs();
-+struct generic_seq_args *create_default_seqargs(sequence *seq);
-
- int check_threading(threading_type *threads);
- int limit_threading(threading_type *threads, int min_iterations_per_thread, size_t total_iterations);
-diff --git a/src/gui/save_dialog.h b/src/gui/save_dialog.h
-index c724abb1..586a2ca3 100644
---- a/src/gui/save_dialog.h
-+++ b/src/gui/save_dialog.h
-@@ -20,7 +20,7 @@ enum {
- };
-
- void on_header_save_as_button_clicked();
--void on_header_snapshot_button_clicked();
-+void on_header_snapshot_button_clicked(gboolean clipboard);
- void on_header_save_button_clicked();
-
- #endif /* SRC_GUI_SAVE_DIALOG_H_ */
---
-2.39.2
-
diff --git a/sci-astronomy/siril/siril-1.0.6-r2.ebuild b/sci-astronomy/siril/siril-1.0.6-r2.ebuild
deleted file mode 100644
index 293b7cbc6638..000000000000
--- a/sci-astronomy/siril/siril-1.0.6-r2.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson optfeature toolchain-funcs xdg
-
-DESCRIPTION="A free astronomical image processing software"
-HOMEPAGE="https://www.siril.org/"
-
-if [[ ${PV} == "9999" ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://gitlab.com/free-astro/${PN}.git"
-else
- SRC_URI="https://gitlab.com/free-astro/siril/-/archive/${PV/_/-}/${PN}-${PV/_/-}.tar.bz2"
- KEYWORDS="amd64 ~x86"
- S="${WORKDIR}/${PN}-${PV/_/-}"
-fi
-
-LICENSE="GPL-3+ Boost-1.0"
-SLOT="0"
-IUSE="curl ffmpeg heif jpeg 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}
-"
-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-r2.patch"
- "${FILESDIR}/${PN}-prototypes.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_icon_cache_update
- xdg_mimeinfo_database_update
- optfeature "gnuplot support" sci-visualization/gnuplot
-}
diff --git a/sci-astronomy/siril/siril-1.2.0_rc1-r1.ebuild b/sci-astronomy/siril/siril-1.2.0_rc1-r1.ebuild
deleted file mode 100644
index 3898b724624f..000000000000
--- a/sci-astronomy/siril/siril-1.2.0_rc1-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson optfeature toolchain-funcs xdg
-
-DESCRIPTION="A free astronomical image processing software"
-HOMEPAGE="https://siril.org/"
-
-if [[ ${PV} == "9999" ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://gitlab.com/free-astro/${PN}.git"
-else
- SRC_URI="https://gitlab.com/free-astro/siril/-/archive/${PV/_/-}/${PN}-${PV/_/-}.tar.bz2"
- KEYWORDS="amd64 ~x86"
- S="${WORKDIR}/${PN}-${PV/_/-}"
-fi
-
-LICENSE="GPL-3+ Boost-1.0"
-SLOT="0"
-IUSE="curl exif ffmpeg heif jpeg libconfig openmp png raw tiff wcs"
-
-DEPEND="
- >=dev-libs/glib-2.56.0:2
- >=dev-libs/json-glib-1.2.6
- media-libs/librtprocess
- >=media-libs/opencv-4.4.0:=
- sci-libs/cfitsio:=
- sci-libs/fftw:3.0=
- sci-libs/gsl:=
- x11-libs/gdk-pixbuf:2
- x11-libs/cairo
- x11-libs/pango
- >=x11-libs/gtk+-3.20.0:3
- curl? ( net-misc/curl )
- exif? ( >=media-gfx/exiv2-0.25:= )
- ffmpeg? ( media-video/ffmpeg:= )
- heif? ( media-libs/libheif:= )
- jpeg? ( media-libs/libjpeg-turbo:= )
- libconfig? ( >=dev-libs/libconfig-1.4:=[cxx] )
- png? ( >=media-libs/libpng-1.6.0:= )
- raw? ( media-libs/libraw:= )
- tiff? ( media-libs/tiff:= )
- wcs? ( >=sci-astronomy/wcslib-7.7:= )
-"
-RDEPEND="
- ${DEPEND}
-"
-BDEPEND="dev-util/cmake
- x11-base/xorg-proto"
-
-PATCHES=(
- "${FILESDIR}/${PN}-docfiles.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 )
-
-pkg_pretend() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_configure() {
- local emesonargs=(
- -Dffms2=false
- -Dcriterion=false
- $(meson_use exif exiv2)
- $(meson_use ffmpeg)
- $(meson_use heif libheif)
- $(meson_use jpeg libjpeg)
- $(meson_use libconfig)
- $(meson_use openmp)
- $(meson_use png libpng)
- $(meson_use raw libraw)
- $(meson_use tiff libtiff)
- $(meson_use wcs wcslib)
- $(usex curl -Denable-libcurl=yes -Denable-libcurl=no)
- )
- meson_src_configure
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
- optfeature "gnuplot support" sci-visualization/gnuplot
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/, sci-astronomy/siril/files/
@ 2024-03-16 9:47 Joonas Niilola
0 siblings, 0 replies; 8+ messages in thread
From: Joonas Niilola @ 2024-03-16 9:47 UTC (permalink / raw
To: gentoo-commits
commit: 724f0706fd7bf2f584dffbb3bb5fb71d482d0f98
Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Fri Feb 16 21:05:48 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Mar 16 09:47:44 2024 +0000
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 <mario.haustein <AT> hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/35331
Signed-off-by: Joonas Niilola <juippis <AT> 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 000000000000..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 <ncopa@alpinelinux.org>
+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 )
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2024-03-16 9:47 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-01-04 5:50 [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/, sci-astronomy/siril/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-03-16 9:47 Joonas Niilola
2023-10-27 3:20 Sam James
2023-03-25 7:16 Sam James
2023-03-25 4:08 Sam James
2022-07-30 8:19 Sam James
2022-07-15 8:38 Joonas Niilola
2022-05-16 5:26 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox