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

["Joonas Niilola" <juippis@gentoo.org>]

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