From 4551b41523452c0d743a71cca34e4dca2ca7538c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 4 Jan 2023 12:06:28 +0000 Subject: gentoo auto-resync : 04:01:2023 - 12:06:28 --- sci-astronomy/siril/Manifest | 7 +- .../siril/files/siril-1.0-execinfo-r1.patch | 22 ++++++ .../siril/files/siril-1.0-execinfo-r2.patch | 45 +++++++++++ sci-astronomy/siril/files/siril-1.0-execinfo.patch | 22 ------ sci-astronomy/siril/siril-1.0.5-r1.ebuild | 2 +- sci-astronomy/siril/siril-1.0.6-r1.ebuild | 88 ---------------------- sci-astronomy/siril/siril-1.0.6-r2.ebuild | 88 ++++++++++++++++++++++ 7 files changed, 160 insertions(+), 114 deletions(-) create mode 100644 sci-astronomy/siril/files/siril-1.0-execinfo-r1.patch create mode 100644 sci-astronomy/siril/files/siril-1.0-execinfo-r2.patch delete mode 100644 sci-astronomy/siril/files/siril-1.0-execinfo.patch delete mode 100644 sci-astronomy/siril/siril-1.0.6-r1.ebuild create mode 100644 sci-astronomy/siril/siril-1.0.6-r2.ebuild (limited to 'sci-astronomy/siril') diff --git a/sci-astronomy/siril/Manifest b/sci-astronomy/siril/Manifest index 4955700ef54f..c205a576250e 100644 --- a/sci-astronomy/siril/Manifest +++ b/sci-astronomy/siril/Manifest @@ -1,9 +1,10 @@ AUX siril-1.0-dependencies.patch 4623 BLAKE2B a6a92adfdf0f3166325516036b5b15a683456d567653cc1a08e52f4754a4b59dede1a894f32eb1fb2b92dc0b9ca729e3705927889a040608602455d648e8c5e2 SHA512 bb73384fbc4f092ffb07dc6b0e4d2edd564b9fc1ec462f54b6fc28ce933a939e8f72cd8830a36f3e1bd73cac83dad5d80af1ca3b673c39e90a5730bc56a10f0e -AUX siril-1.0-execinfo.patch 567 BLAKE2B 852e3491139a6ab38d0490c57b5c90f553fba76319048cf2c3dd395bc403c10bff15ebc302904b4275b5956e38eb10dbc598dfba24bea656777540db12755d51 SHA512 2e2cc76a2a95f5d3e9bad8c710900344cd10534b70f9c36a5c1232b69adda937efac2eb7f8e0c3f86314ca11a95196e734ae114c18c47d8aaae7707968f412f8 +AUX siril-1.0-execinfo-r1.patch 567 BLAKE2B 852e3491139a6ab38d0490c57b5c90f553fba76319048cf2c3dd395bc403c10bff15ebc302904b4275b5956e38eb10dbc598dfba24bea656777540db12755d51 SHA512 2e2cc76a2a95f5d3e9bad8c710900344cd10534b70f9c36a5c1232b69adda937efac2eb7f8e0c3f86314ca11a95196e734ae114c18c47d8aaae7707968f412f8 +AUX siril-1.0-execinfo-r2.patch 1220 BLAKE2B 7e253e3ad1dd32bfcc1f5ba294617b18f06c51b8f37d9965fc9fdd46f5a227853858b8f9a1795081599d27a0718ba0f7bb574025fbb076a81610811c014cfdd1 SHA512 5f05502f089897f58cd08f7bb2ee8a272ef8bd799dae168f9072e21789989d0c002f6ceb341471aa3d71a44d13807a2b893ec2f7299ea5080be9bad5387f46f1 AUX siril-docfiles.patch 433 BLAKE2B 3c781f4a0604f56ada235094eb481b4b51912921719ee198c7d2400a7dffbb4034d34505f5d7221b033efbbbe11b07332938a6dc0bc616bb6f6480e41475653e SHA512 2d770a2cb86d95c291beb6077ab01560e118bc84d838dfeef50bc9a812469fea568cdfe1c9b5d1a90b778527b65a397aac1656008739cff88ffc80ba6fd09c72 DIST siril-1.0.5.tar.bz2 2893026 BLAKE2B f8a726962893e90b12c3dfef507652ab7b40ea0be2128ac29d056acb30e827ef35e6671788a8c254d9ea64cc39c8dae00c1e532ed3d6b3a1396ca92da333fe05 SHA512 f2bd614cf14b6b35f458dd75ba4e64db17d051fc9ac36c12e8b1ecdc4c79a19c6427464f3ebb946de80e00d66ed82451f36405c0a7d806332e1b2ce7a835891f DIST siril-1.0.6.tar.bz2 2893872 BLAKE2B 1f254dcb774c4bfb14fee4626d40e6eeedf866a7a96dca98502cd84e66b973c2201b1f88e2efcb89ce3401b13bd87a319b2ff11e7ba100d0689c9df429d01957 SHA512 afb5f1768a5884adcc13f2afd6fa386d836df5a1385b916df9df8da1fb464e0c8738123fb485ed92c749e596c744d5252a66444b840223488a0860e9324c4e9d -EBUILD siril-1.0.5-r1.ebuild 2014 BLAKE2B d15f64c98393545937fa25c0553c03986779cc001aedf01368eebbe508cb1f6b49a36888fb2d9fb939f5cd4d94bafd3bb1c1836f97b268b402d75280aeb6711d SHA512 8932b3ba78c9908fd9fedd2ecdf237a03d238fb3b90424ca2535a0a6e15ef1fbc05a2d62dc76dc112af1b13c9fa29ae25e379305425e8c5b80881972388bf051 -EBUILD siril-1.0.6-r1.ebuild 2069 BLAKE2B 6d0d6e9f9d17b3de1f0d0c716d9840026b5a5a1750bdbc2a3185847e549240acbe3b2dedf43ac4a9ffe3e978f7c9deb86e90ac0297dda3b202de6ef70042f3f0 SHA512 2cb6a745eced1abc79e9c5913d5c4e8b622cec901148414c844326359101219b52c20ac370d8a68348150385092f426d1010180fee67baccceeb4818664c6aaf +EBUILD siril-1.0.5-r1.ebuild 2017 BLAKE2B 490e2aec30486ae9059443088ed9af21c4265b79731ac4c0e891255d34a6c0d280383329e4cb6f7b2659b5130e378af249005666981ef00abd9486f6f99f7718 SHA512 d5cfc1385fa8c4295247075da10333dbb1cec2bb71e001b14366feae12035aa2888f982391b8ff4705cf4784da1d4080bb86476616befc807d167d458d72c4b1 +EBUILD siril-1.0.6-r2.ebuild 2072 BLAKE2B 12ac9a9355305abf1e48fbd645eb164bb6b04ca56fc0825408a6cf603aee76af0c845b1ad57170c32be61460b5684735770d77012de602c4d5240a52e29e2b4a SHA512 0b8d946afb58e335a3f2b2ce32cba49ba65eb0f963e101c7563f40729007bc86fe0f0010e86db68b30ee8d732106f444ab2f65561f855226151acc5b75d82e7c EBUILD siril-9999.ebuild 1960 BLAKE2B fbb8be0a40cf3d416dd52fc5e5273b00bd63b312043ddd22c7747517faa1a64d74c6036d853ce72174c33ff5dcaea4d8242aec834e46737d04796ef8ab512e86 SHA512 f9a5f7e79f151400da38d433d4802ec621cb2224925df91a73a24201a10741ee2d8ec4bd43963901d8949609d7061d139c864a9cf3c595c7af336232e8a3798f MISC metadata.xml 1230 BLAKE2B a06f55d651e08bc453b4fcf214125668da4bfcd1b612ce00624329de275a28245ccfa842aaab294e043e06c057a0b92725ecc76f4d415d40451bdd2c05b9c462 SHA512 81480de0f4080e61c2d3528f8dfdfd3562f341680acd0084986849a16552970c219c01c2599a5e7e47dc4bc77f5fb3e51ac6e478f1d0bb78a029cb0f0b5d63e1 diff --git a/sci-astronomy/siril/files/siril-1.0-execinfo-r1.patch b/sci-astronomy/siril/files/siril-1.0-execinfo-r1.patch new file mode 100644 index 000000000000..c9c7cd81c19f --- /dev/null +++ b/sci-astronomy/siril/files/siril-1.0-execinfo-r1.patch @@ -0,0 +1,22 @@ +commit c009c4c1800086e7f4c4e80939e9ddc8964c8e12 +Author: Mario Haustein +Date: Thu Aug 4 00:27:08 2022 +0200 + + Include execinfo.h only if available + +Bug: https://bugs.gentoo.org/873016 +Upstream: https://gitlab.com/free-astro/siril/-/merge_requests/284 + +diff --git a/src/core/signals.c b/src/core/signals.c +index 74100b3a..0eefd460 100644 +--- a/src/core/signals.c ++++ b/src/core/signals.c +@@ -25,7 +25,7 @@ + #ifdef _WIN32 + #include + #include +-#else ++#elif HAVE_EXECINFO_H + #include + #endif + diff --git a/sci-astronomy/siril/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 +Date: Thu Aug 4 00:27:08 2022 +0200 + + Include execinfo.h only if available + +Bug: https://bugs.gentoo.org/873016 +Upstream: https://gitlab.com/free-astro/siril/-/merge_requests/284 + +diff --git a/src/core/signals.c b/src/core/signals.c +index 74100b3a..0eefd460 100644 +--- a/src/core/signals.c ++++ b/src/core/signals.c +@@ -25,7 +25,7 @@ + #ifdef _WIN32 + #include + #include +-#else ++#elif HAVE_EXECINFO_H + #include + #endif + +commit 13bafd227500018bef052cad1d73e9c681be1b8a +Author: Cyril Richard +Date: Thu Aug 4 11:29:23 2022 +0200 + + Fix for merge_requests/284 + +Bug: https://bugs.gentoo.org/883121 +Upstream: https://gitlab.com/free-astro/siril/-/commit/13bafd227500018bef052cad1d73e9c681be1b8a + +diff --git a/src/core/signals.c b/src/core/signals.c +index 0eefd460..bbce5fa7 100644 +--- a/src/core/signals.c ++++ b/src/core/signals.c +@@ -21,6 +21,9 @@ + #define ANSI_COLOR_RED "\e[1m\x1b[31m" + #define ANSI_COLOR_RESET "\x1b[0m\e[0m" + ++#ifdef HAVE_CONFIG_H ++#include ++#endif + #include + #ifdef _WIN32 + #include diff --git a/sci-astronomy/siril/files/siril-1.0-execinfo.patch b/sci-astronomy/siril/files/siril-1.0-execinfo.patch deleted file mode 100644 index c9c7cd81c19f..000000000000 --- a/sci-astronomy/siril/files/siril-1.0-execinfo.patch +++ /dev/null @@ -1,22 +0,0 @@ -commit c009c4c1800086e7f4c4e80939e9ddc8964c8e12 -Author: Mario Haustein -Date: Thu Aug 4 00:27:08 2022 +0200 - - Include execinfo.h only if available - -Bug: https://bugs.gentoo.org/873016 -Upstream: https://gitlab.com/free-astro/siril/-/merge_requests/284 - -diff --git a/src/core/signals.c b/src/core/signals.c -index 74100b3a..0eefd460 100644 ---- a/src/core/signals.c -+++ b/src/core/signals.c -@@ -25,7 +25,7 @@ - #ifdef _WIN32 - #include - #include --#else -+#elif HAVE_EXECINFO_H - #include - #endif - diff --git a/sci-astronomy/siril/siril-1.0.5-r1.ebuild b/sci-astronomy/siril/siril-1.0.5-r1.ebuild 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-r1.ebuild deleted file mode 100644 index 46032d77f26c..000000000000 --- a/sci-astronomy/siril/siril-1.0.6-r1.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit meson optfeature toolchain-funcs xdg - -DESCRIPTION="A free astronomical image processing software" -HOMEPAGE="https://www.siril.org/" - -if [[ ${PV} == "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.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.0.6-r2.ebuild b/sci-astronomy/siril/siril-1.0.6-r2.ebuild new file mode 100644 index 000000000000..a198b6fb965f --- /dev/null +++ b/sci-astronomy/siril/siril-1.0.6-r2.ebuild @@ -0,0 +1,88 @@ +# 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} +" +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" +) + +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 +} -- cgit v1.2.3