From 81b8f20732954c4508baf2f77472b5435e3f851f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 14 Sep 2022 11:10:11 +0100 Subject: gentoo auto-resync : 14:09:2022 - 11:10:10 --- sci-astronomy/siril/Manifest | 6 +- .../siril/files/siril-1.0-dependencies.patch | 177 +++++++++++++++++++++ .../siril/files/siril-1.0.3-dependencies.patch | 177 --------------------- sci-astronomy/siril/siril-1.0.3.ebuild | 2 +- sci-astronomy/siril/siril-1.0.5.ebuild | 85 ++++++++++ 5 files changed, 267 insertions(+), 180 deletions(-) create mode 100644 sci-astronomy/siril/files/siril-1.0-dependencies.patch delete mode 100644 sci-astronomy/siril/files/siril-1.0.3-dependencies.patch create mode 100644 sci-astronomy/siril/siril-1.0.5.ebuild (limited to 'sci-astronomy/siril') diff --git a/sci-astronomy/siril/Manifest b/sci-astronomy/siril/Manifest index 678e6c385bf5..08d5ddb7f86a 100644 --- a/sci-astronomy/siril/Manifest +++ b/sci-astronomy/siril/Manifest @@ -1,8 +1,10 @@ -AUX siril-1.0.3-dependencies.patch 4623 BLAKE2B a6a92adfdf0f3166325516036b5b15a683456d567653cc1a08e52f4754a4b59dede1a894f32eb1fb2b92dc0b9ca729e3705927889a040608602455d648e8c5e2 SHA512 bb73384fbc4f092ffb07dc6b0e4d2edd564b9fc1ec462f54b6fc28ce933a939e8f72cd8830a36f3e1bd73cac83dad5d80af1ca3b673c39e90a5730bc56a10f0e +AUX siril-1.0-dependencies.patch 4623 BLAKE2B a6a92adfdf0f3166325516036b5b15a683456d567653cc1a08e52f4754a4b59dede1a894f32eb1fb2b92dc0b9ca729e3705927889a040608602455d648e8c5e2 SHA512 bb73384fbc4f092ffb07dc6b0e4d2edd564b9fc1ec462f54b6fc28ce933a939e8f72cd8830a36f3e1bd73cac83dad5d80af1ca3b673c39e90a5730bc56a10f0e AUX siril-docfiles.patch 433 BLAKE2B 3c781f4a0604f56ada235094eb481b4b51912921719ee198c7d2400a7dffbb4034d34505f5d7221b033efbbbe11b07332938a6dc0bc616bb6f6480e41475653e SHA512 2d770a2cb86d95c291beb6077ab01560e118bc84d838dfeef50bc9a812469fea568cdfe1c9b5d1a90b778527b65a397aac1656008739cff88ffc80ba6fd09c72 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 EBUILD siril-1.0.1.ebuild 1609 BLAKE2B 933c63c2afe10cb6948bfa94e3599fc70477ff1e9ed78e4acf3fd460e8de4464c2494d055693d8d0883b723a49e8ff8aed3b2710f529affdc732b5a09b5cdd64 SHA512 e6d718dc597bf50ce8a78b6ac06c57e4986004c7fbf569e94bd819369670b8423074c9ea11fa8385b1159ad1b361c326345b8d0fe24f2580aff3ea20e8d56530 -EBUILD siril-1.0.3.ebuild 1947 BLAKE2B 6e2fe922520768a9a1d0b8531257b2fc0deecc13d68dcd224136178be6a0409cfc04d2da5d1cb6d9c5f7ad695218ed612d839e51c889e10e03fb7a5b9f07252a SHA512 54b49aaf4f6c804810f716bde3a4479bc9ca287d737c615b43df9f1c545ef972594a9dd82c9c6ba29a5b0afd11cc9cd8db658a929cd0fef28c5224fa353877b3 +EBUILD siril-1.0.3.ebuild 1963 BLAKE2B eae825df8488fe9d66238425fe7235a30f0d808d67228d6c772af1c6e2f98d140bbab04b36c1af7391d10aa4ffe36833ac4e5a0d36ed009377a2f59b1e6fd91b SHA512 0a44f95087803a3e73ab0578f04e1d586e688532ab8d4eff4858249e5e9baec1efa25620b6fa7d601e00713254ce03bbf5e9e73771cde4c17ace441a8cb00365 +EBUILD siril-1.0.5.ebuild 1963 BLAKE2B eae825df8488fe9d66238425fe7235a30f0d808d67228d6c772af1c6e2f98d140bbab04b36c1af7391d10aa4ffe36833ac4e5a0d36ed009377a2f59b1e6fd91b SHA512 0a44f95087803a3e73ab0578f04e1d586e688532ab8d4eff4858249e5e9baec1efa25620b6fa7d601e00713254ce03bbf5e9e73771cde4c17ace441a8cb00365 EBUILD siril-9999.ebuild 1958 BLAKE2B b9c561e60100361d7686e5c7ed34e3836d540d8292b46e38f5c31820ca766e9056d4b8c7f5c51f77c8620b3d3a417e17b95b96984f7f23796c7218e95b63f7cc SHA512 0c56714a1277ec80bbd0cfe807e36f47a263837786d0992cb08b3e39e3a58561dd442639a58792e5189fd4a1a28b6aaf4b2272b84efd413658594e022ddc7432 MISC metadata.xml 1295 BLAKE2B fa25ab59a14b1fcf3fefcb2d94c5b4c18d6925c6c38643db8a8ab7472d276d62a0576893540c95301d6fa9845f49be51cf9cca6593bbcb61581d7c1a0fdb404e SHA512 ba7d178394de1bc3326969647108771efe82c4b4bc3c293592840d55fa9ec5f6fafcb852f4fd0e427e445cc5984c74df436f7d95538631942a145f7f9dfd3dc3 diff --git a/sci-astronomy/siril/files/siril-1.0-dependencies.patch b/sci-astronomy/siril/files/siril-1.0-dependencies.patch new file mode 100644 index 000000000000..84595472e63f --- /dev/null +++ b/sci-astronomy/siril/files/siril-1.0-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-1.0.3-dependencies.patch b/sci-astronomy/siril/files/siril-1.0.3-dependencies.patch deleted file mode 100644 index 84595472e63f..000000000000 --- a/sci-astronomy/siril/files/siril-1.0.3-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/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.5.ebuild b/sci-astronomy/siril/siril-1.0.5.ebuild new file mode 100644 index 000000000000..d354aede9fea --- /dev/null +++ b/sci-astronomy/siril/siril-1.0.5.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson optfeature toolchain-funcs xdg + +DESCRIPTION="A free astronomical image processing software" +HOMEPAGE="https://www.siril.org/" + +if [[ ${PV} == "9999" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://gitlab.com/free-astro/${PN}.git" +else + SRC_URI="https://gitlab.com/free-astro/siril/-/archive/${PV/_/-}/${PN}-${PV/_/-}.tar.bz2" + KEYWORDS="~amd64 ~x86" + S="${WORKDIR}/${PN}-${PV/_/-}" +fi + +LICENSE="GPL-3+ Boost-1.0" +SLOT="0" +IUSE="curl ffmpeg heif jpeg openmp png raw tiff wcs" + +DEPEND=" + >=dev-libs/glib-2.56.0:2 + >=dev-libs/json-glib-1.2.6 + >=dev-libs/libconfig-1.4[cxx] + >=media-gfx/exiv2-0.25 + media-libs/librtprocess:= + >=media-libs/opencv-4.4.0:= + sci-libs/cfitsio + sci-libs/fftw:3.0= + sci-libs/gsl:= + x11-libs/cairo + >=x11-libs/gtk+-3.20.0:3 + curl? ( net-misc/curl ) + ffmpeg? ( media-video/ffmpeg:= ) + heif? ( media-libs/libheif ) + jpeg? ( media-libs/libjpeg-turbo:= ) + png? ( >=media-libs/libpng-1.6.0 ) + raw? ( media-libs/libraw ) + tiff? ( media-libs/tiff ) + wcs? ( >=sci-astronomy/wcslib-7.7 ) +" +RDEPEND=" + ${DEPEND} +" + +PATCHES=( + "${FILESDIR}/${PN}-docfiles.patch" + "${FILESDIR}/${PN}-$(ver_cut 1-2)-dependencies.patch" +) + +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 +} -- cgit v1.2.3