From ef593d1ec529be89d755077eee3869006d8c18ae Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 27 Jun 2023 13:35:02 +0100 Subject: gentoo auto-resync : 27:06:2023 - 13:35:02 --- sci-astronomy/siril/Manifest | 9 +-- sci-astronomy/siril/files/siril-1.2-execinfo.patch | 46 ----------- sci-astronomy/siril/files/siril-1.2-htmesh.patch | 57 ------------- sci-astronomy/siril/files/siril-1.2-openmp.patch | 49 ------------ sci-astronomy/siril/siril-1.2.0_beta1.ebuild | 93 ---------------------- sci-astronomy/siril/siril-1.2.0_rc1-r1.ebuild | 93 ++++++++++++++++++++++ sci-astronomy/siril/siril-1.2.0_rc1.ebuild | 92 --------------------- sci-astronomy/siril/siril-9999.ebuild | 21 ++--- 8 files changed, 106 insertions(+), 354 deletions(-) delete mode 100644 sci-astronomy/siril/files/siril-1.2-execinfo.patch delete mode 100644 sci-astronomy/siril/files/siril-1.2-htmesh.patch delete mode 100644 sci-astronomy/siril/files/siril-1.2-openmp.patch delete mode 100644 sci-astronomy/siril/siril-1.2.0_beta1.ebuild create mode 100644 sci-astronomy/siril/siril-1.2.0_rc1-r1.ebuild delete mode 100644 sci-astronomy/siril/siril-1.2.0_rc1.ebuild (limited to 'sci-astronomy/siril') diff --git a/sci-astronomy/siril/Manifest b/sci-astronomy/siril/Manifest index 00ad24a88922..9507ed3f7a9e 100644 --- a/sci-astronomy/siril/Manifest +++ b/sci-astronomy/siril/Manifest @@ -1,17 +1,12 @@ AUX siril-1.0-dependencies.patch 4623 BLAKE2B a6a92adfdf0f3166325516036b5b15a683456d567653cc1a08e52f4754a4b59dede1a894f32eb1fb2b92dc0b9ca729e3705927889a040608602455d648e8c5e2 SHA512 bb73384fbc4f092ffb07dc6b0e4d2edd564b9fc1ec462f54b6fc28ce933a939e8f72cd8830a36f3e1bd73cac83dad5d80af1ca3b673c39e90a5730bc56a10f0e AUX siril-1.0-execinfo-r2.patch 2493 BLAKE2B 5bd27710b0bc5eb942f40827a43ca1f8d70e48739daaf0cc16c85b7d50af46f7b08c21f8129d337099ac20beffff63c97b20a49c91b83d6131e6e161fb5531df SHA512 67d0bd524677c8700db2cf5eb2e65c774eb076b5cee0a3e24ea846c01ae63b06a5401eadfcd60d5b2b9f348312e093c679cb4a7c63db0fd316fdb533fd754143 -AUX siril-1.2-execinfo.patch 1273 BLAKE2B a70786b6cda34092d60e3651e015c6f54faa903a8c307c40d6fbec2b80ffe8bdf2b3ded3fdfbfb3a0c6a9ff4f48cefe9e5d15655c74d53b6f43fada8a5cf27d1 SHA512 9974f82dd964b5031619277a0de51d7afb0935e46b090e5ce5e54f2bbcede2c4212cdb48fe03ea06694eb7cfb367550cf76373cd72081574bc00a34794afc1be -AUX siril-1.2-htmesh.patch 2036 BLAKE2B cc3fd4c31dcbde61976dfc9d84ce10576aeab2918bf6f7c7f24a765854f07b3a4e94cd77472d7e6f76f734aa6574b743582903de816e79e5d4808553867d4619 SHA512 eecc134f00d79e42450ec10b5ab11c2a9601a4435bd16f78d19efb93ed85e92e1e52c00a36099b8adb3c1d944a616de7155e82d3d6c9df9d0acaa349a73692a7 -AUX siril-1.2-openmp.patch 1451 BLAKE2B de7ebfd725e9d6b5eb2b9fe105224362085a3ef46f4f7e1c28522907efd2de44d2302d897a77748052ba42010b15b7053fb934befd693bf8d30c184df8f00849 SHA512 a9bec990941e0148f3b22c7e9773208c86ec04b474d3a0dba6651dab2f8e8443670a652e5235a978dbe693f08b344448a1808ffb6fcf7b0e35720df72dbf4bc0 AUX siril-1.2-stdint.patch 696 BLAKE2B 9bc2e5f9b0a7ac00b1474372b875471f79f2fcbaa031efa7e978b47457a0bb0aac7a3f134688805259e941949ce8ed95837d164bbb5ac736f8aeebb835460948 SHA512 a9565d25bd71e1f721327dc8d68c54e52dabfcc9f1fcef92996b3373727cf8d2ded1ff6e518da4087d5e288aab970c78b381114891feea1b438f785cc9f74e56 AUX siril-1.2-tiff.patch 2121 BLAKE2B fedc3fabcec2c77fd1a740dd4d5356190cad31cc0b33ffd34bfcc4c86e35c43f476e569c685a859f7b8cbbe8878b62ea351148fc02ee0cf2d52c615096c3093c SHA512 b47f35235988cad10234b057460af115747ab798e9d6c09e36a8668bbfefed7ee839a4dc66ec58c918eaa726ba95e6d4bc212f6c857a53295a8b070db415fca9 AUX siril-docfiles.patch 433 BLAKE2B 3c781f4a0604f56ada235094eb481b4b51912921719ee198c7d2400a7dffbb4034d34505f5d7221b033efbbbe11b07332938a6dc0bc616bb6f6480e41475653e SHA512 2d770a2cb86d95c291beb6077ab01560e118bc84d838dfeef50bc9a812469fea568cdfe1c9b5d1a90b778527b65a397aac1656008739cff88ffc80ba6fd09c72 AUX siril-prototypes.patch 1436 BLAKE2B cee44f2c66cd00e29b4c1259c4be5fd6de9544fecfd1c41cea8aa735d23c0aad6b30479d4bee35131f7b1a5e0c9878ea67134a4a57658a49ef3d530f7fcbea2d SHA512 8b2f1673fc39153746496a23586ce6f9d76c24dbd648db4d943307ee4d3299cef7de425d709a342d3585783d22fa2fa6268c4f38676e5eb1d31e6ca0b762b422 DIST siril-1.0.6.tar.bz2 2893872 BLAKE2B 1f254dcb774c4bfb14fee4626d40e6eeedf866a7a96dca98502cd84e66b973c2201b1f88e2efcb89ce3401b13bd87a319b2ff11e7ba100d0689c9df429d01957 SHA512 afb5f1768a5884adcc13f2afd6fa386d836df5a1385b916df9df8da1fb464e0c8738123fb485ed92c749e596c744d5252a66444b840223488a0860e9324c4e9d -DIST siril-1.2.0-beta1.tar.bz2 3869827 BLAKE2B 4ba624e917234f389f3ac1f2baf7519aacf4da6494ff437491103491dcac60ff146665faf0daf700a4d2e375d098b3b9af75c60975b882600ab96700a4dff166 SHA512 e259f46e2792d59f53d1e9e5fd3b33c6a912a9c19b53c4d84a803f153e1c5c4395f2fb413a21887330f41e06b7d62996162e65e73774faadb47ff7edc9f4150d DIST siril-1.2.0-rc1.tar.bz2 4353720 BLAKE2B 38c7b1585508ac9697847648f2d718899a296a4061b34fcf71424136daa50c68737f811fd9063aa80274708d085d8089dceff7d1fd25277b60f0482c17fa5cd1 SHA512 41d685c0aca79da8a9c17d729c710bdd51d3f8cd13b976fb4aad4750e74b600783b988246f008cf41246e7e5f05b8b42368d975cbd79f42e9121b39e367eb22f EBUILD siril-1.0.6-r2.ebuild 2109 BLAKE2B 0573ff346b01b714b82e5af8070ab3349eed1ce3cc2360d64c49794d308b44676346a05ca10fa20e354aa3e705d685f5723af939d7a33c0969306937be13361b SHA512 fd92dbcdb3a454c7f0431e48b87fde98dc64f658a3f418c23bb82ad879255ec0c1be7f9410c6d74bd95b5c1e439bfedb790e0f2a13ea238f66fc1f2bd0eae56c -EBUILD siril-1.2.0_beta1.ebuild 2234 BLAKE2B 07e826aa1c9916644cdd53e3cfb03b88175f802d18f0105c70b07e70d67444e9d369ab1d337d870afb6c2bb37ee293139769f8c9f3c558654b229cc32ec46ad0 SHA512 3244a88ab9287239e7c253ce1b345ef56c383340d0982a405d40ea4c925563c313a5103af46c6ea65a705d768e583bd735422738985960561a7ea045c1a53cec -EBUILD siril-1.2.0_rc1.ebuild 2184 BLAKE2B 66e49a52e6a695c214ffdf9062978fa72acd4743b135155d1e692d19f3687a19ecd4976a553c31ed9bee373067c4d2bf9b56bbee01cce4adc283d86c6470bd39 SHA512 cd42a98cce99d82be3fe52666110cf57908e7537dd3ee24a46dfbdad6987d197ecb30e99ff1c37299aa1fac0b5c15d2f343f0dbb96a0d654d5d3d8bd950f47d7 -EBUILD siril-9999.ebuild 2088 BLAKE2B 1fb16f167539029c7dd7bf1e62861a3b49aaf423b1ae111dcbf8c192c966a6b62d67bf69f0c6ce19206be1c274b9c3815e42534c70bf4af67568786f967eeb62 SHA512 e55283e02105593b1965db255bf5b861e66071517d9f54d6cb0dbd45e5aabe9c2084680ece7757c504054e5a6f34283abc3e2b6ef1fce71c9ab1e7eff3915d5d +EBUILD siril-1.2.0_rc1-r1.ebuild 2213 BLAKE2B 750736109f31dd69c5facfd2a3a7e25c0f06b897a5ef2242003da8a34e889e15ebdabb486086d5a115ddb514ac8e7368775d9927b46ac3afdbe0e6957a02ee1e SHA512 28a7a87388e5d1a84af3a0d9bcaad40b86001761f5096f3745662c374bccdc5bfac86f121f7894c1c09aa2635c076852cc813f1c5f8304d6f43a443e617e9eb8 +EBUILD siril-9999.ebuild 2117 BLAKE2B 32d4eb6b73a74cfe5d6afdf87bb447f4a01eb0a38ae1ddd49cb974382e001abbf13ba3277486c7a052b9ede6a460b14000fd057f0972b6050b49244ca2d1f782 SHA512 fabae83ca294461772da0b14a82cfc0c16fde764e4b78a634b31ebd6f1b7bf73d5e2c2165d4c6a4b98263c16b69b9778dbebaa9e8927328e62d669ec6b0a33fd MISC metadata.xml 1230 BLAKE2B a06f55d651e08bc453b4fcf214125668da4bfcd1b612ce00624329de275a28245ccfa842aaab294e043e06c057a0b92725ecc76f4d415d40451bdd2c05b9c462 SHA512 81480de0f4080e61c2d3528f8dfdfd3562f341680acd0084986849a16552970c219c01c2599a5e7e47dc4bc77f5fb3e51ac6e478f1d0bb78a029cb0f0b5d63e1 diff --git a/sci-astronomy/siril/files/siril-1.2-execinfo.patch b/sci-astronomy/siril/files/siril-1.2-execinfo.patch deleted file mode 100644 index 82f29b290f63..000000000000 --- a/sci-astronomy/siril/files/siril-1.2-execinfo.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 6f959a02d27fb507cda1898a3aa785766e77d404 Mon Sep 17 00:00:00 2001 -From: Mario Haustein -Date: Mon, 27 Feb 2023 17:34:43 +0100 -Subject: [PATCH] fix HAVE_EXECINFO_H logic -Bug: https://bugs.gentoo.org/898108 -Upstream: https://gitlab.com/free-astro/siril/-/merge_requests/442 - ---- - src/core/signals.c | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/src/core/signals.c b/src/core/signals.c -index 42b369d6..d4745909 100644 ---- a/src/core/signals.c -+++ b/src/core/signals.c -@@ -55,13 +55,7 @@ static void signal_handled(int s) { - g_printf(ANSI_COLOR_RED"%s"ANSI_COLOR_RESET"\n", visit); - } - --#if (!defined _WIN32 && defined HAVE_EXECINFO_H) -- void *stack[STACK_DEPTH]; -- -- size_t size = backtrace(stack, sizeof(stack) / sizeof(void*)); -- -- backtrace_symbols_fd(stack, size, fileno((FILE*) stdout)); --#else -+#ifdef _WIN32 - unsigned int i; - void *stack[STACK_DEPTH]; - unsigned short size; -@@ -84,6 +78,12 @@ static void signal_handled(int s) { - } - - free(symbol); -+#elif HAVE_EXECINFO_H -+ void *stack[STACK_DEPTH]; -+ -+ size_t size = backtrace(stack, sizeof(stack) / sizeof(void*)); -+ -+ backtrace_symbols_fd(stack, size, fileno((FILE*) stdout)); - #endif - } - undo_flush(); --- -2.39.2 - diff --git a/sci-astronomy/siril/files/siril-1.2-htmesh.patch b/sci-astronomy/siril/files/siril-1.2-htmesh.patch deleted file mode 100644 index 83f389267c40..000000000000 --- a/sci-astronomy/siril/files/siril-1.2-htmesh.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 915d01b7e94ff0a597685976838ab707917428db Mon Sep 17 00:00:00 2001 -From: Mario Haustein -Date: Fri, 24 Feb 2023 19:00:52 +0100 -Subject: [PATCH] Don't install bundled htmesh static library system wide. -Upstream: https://gitlab.com/free-astro/siril/-/merge_requests/438 - ---- - subprojects/htmesh/CMakeLists.txt | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/subprojects/htmesh/CMakeLists.txt b/subprojects/htmesh/CMakeLists.txt -index 5c197a9e..189acd3e 100644 ---- a/subprojects/htmesh/CMakeLists.txt -+++ b/subprojects/htmesh/CMakeLists.txt -@@ -49,9 +49,10 @@ set_target_properties(htmesh PROPERTIES - VERSION 1.0.0 - SOVERSION 1) - --if (NOT ANDROID) -- install(TARGETS htmesh ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} ) --endif () -+# It is not necessary to install the static library as we just link against it. -+#if (NOT ANDROID) -+# install(TARGETS htmesh ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} ) -+#endif () - - # If you wish to compile the HTMesh perl wrapper, uncomment this, rebuild and copy the library into /usr/lib/, because we will use it as a shared object. See README in the perl wrapper directory (kstars/kstars/data/tools/HTMesh-*) for more details. - #set_property(TARGET htmesh PROPERTY POSITION_INDEPENDENT_CODE YES) --- -2.39.2 - -From 42a12b852f4146aa104350587c456a35501a9707 Mon Sep 17 00:00:00 2001 -From: Mario Haustein -Date: Fri, 24 Feb 2023 18:40:26 +0100 -Subject: [PATCH] Fix typo in htmesh build configuration -Upstream: https://gitlab.com/free-astro/siril/-/merge_requests/437 - ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 886f3697..1ed39a98 100644 ---- a/meson.build -+++ b/meson.build -@@ -270,7 +270,7 @@ endif - htmesh_dep = sub_proj.dependency('htmesh') - htmesh_inc = sub_proj.include_directories('htmesh') - else -- siril_cpp_flag += '-DHAVE_LIBRTPROCESS' -+ siril_cpp_flag += '-DHAVE_HTMESH' - endif - - ## Optional dependencies --- -2.39.2 - diff --git a/sci-astronomy/siril/files/siril-1.2-openmp.patch b/sci-astronomy/siril/files/siril-1.2-openmp.patch deleted file mode 100644 index 358bfaa79934..000000000000 --- a/sci-astronomy/siril/files/siril-1.2-openmp.patch +++ /dev/null @@ -1,49 +0,0 @@ -From: Mario Haustein -Date: Fri, 24 Mar 2023 18:24:26 +0100 -Subject: [PATCH] Add ifdef around openmp function -Bug: https://bugs.gentoo.org/902833 -Upstream: https://gitlab.com/free-astro/siril/-/merge_requests/482 - ---- a/src/algos/quantize.c -+++ b/src/algos/quantize.c -@@ -1396,8 +1396,10 @@ row of the image. - #pragma omp parallel num_threads(threads) if (threads>1) - #endif - { -+#ifdef _OPENMP - if (threads > 1 && omp_get_num_threads() != threads) - siril_debug_print("actual number of threads: %d of %d requested (level %d)\n", omp_get_num_threads(), threads, omp_get_level()); -+#endif - float *rowpix, v1; - double mean, stdev; - float *differences; -From 59272d18d67dc342b1a040b7574b6b71b28310e6 Mon Sep 17 00:00:00 2001 -From: Mario Haustein -Date: Mon, 10 Apr 2023 22:17:54 +0200 -Subject: [PATCH] Remove uneeded openmp headers -Bug: https://bugs.gentoo.org/903021 -Upstream: https://gitlab.com/free-astro/siril/-/merge_requests/494 - ---- a/src/filters/nlbayes/LibImages.cpp -+++ b/src/filters/nlbayes/LibImages.cpp -@@ -26,7 +26,6 @@ - #include - #include - #include --#include - - using namespace std; - ---- a/src/filters/nlbayes/Utilities.cpp -+++ b/src/filters/nlbayes/Utilities.cpp -@@ -20,7 +20,6 @@ - #include "Utilities.h" - - #include --#include - #include - #include - #include --- -2.39.2 - diff --git a/sci-astronomy/siril/siril-1.2.0_beta1.ebuild b/sci-astronomy/siril/siril-1.2.0_beta1.ebuild deleted file mode 100644 index 0c2bb48012a9..000000000000 --- a/sci-astronomy/siril/siril-1.2.0_beta1.ebuild +++ /dev/null @@ -1,93 +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 libconfig openmp png raw tiff wcs" - -DEPEND=" - >=dev-libs/glib-2.56.0:2 - >=dev-libs/json-glib-1.2.6 - dev-libs/sleef:= - >=media-gfx/exiv2-0.25 - media-libs/librtprocess:= - >=media-libs/opencv-4.4.0:= - sci-libs/cfitsio - 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 ) - libconfig? ( >=dev-libs/libconfig-1.4[cxx] ) - 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="dev-util/cmake - x11-base/xorg-proto" - -PATCHES=( - "${FILESDIR}/${PN}-docfiles.patch" - "${FILESDIR}/${PN}-$(ver_cut 1-2)-htmesh.patch" - "${FILESDIR}/${PN}-$(ver_cut 1-2)-execinfo.patch" - "${FILESDIR}/${PN}-prototypes.patch" - "${FILESDIR}/${PN}-$(ver_cut 1-2)-openmp.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 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 -} diff --git a/sci-astronomy/siril/siril-1.2.0_rc1-r1.ebuild b/sci-astronomy/siril/siril-1.2.0_rc1-r1.ebuild new file mode 100644 index 000000000000..54a8e916b5fc --- /dev/null +++ b/sci-astronomy/siril/siril-1.2.0_rc1-r1.ebuild @@ -0,0 +1,93 @@ +# 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}-$(ver_cut 1-2)-stdint.patch" + "${FILESDIR}/${PN}-$(ver_cut 1-2)-tiff.patch" +) + +DOCS=( README.md NEWS ChangeLog AUTHORS ) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +src_configure() { + local emesonargs=( + -Dffms2=false + -Dcriterion=false + $(meson_use exif exiv2) + $(meson_use ffmpeg) + $(meson_use heif libheif) + $(meson_use jpeg libjpeg) + $(meson_use libconfig) + $(meson_use openmp) + $(meson_use png libpng) + $(meson_use raw libraw) + $(meson_use tiff libtiff) + $(meson_use wcs wcslib) + $(usex curl -Denable-libcurl=yes -Denable-libcurl=no) + ) + meson_src_configure +} + +pkg_postinst() { + xdg_desktop_database_update + xdg_icon_cache_update + xdg_mimeinfo_database_update + optfeature "gnuplot support" sci-visualization/gnuplot +} diff --git a/sci-astronomy/siril/siril-1.2.0_rc1.ebuild b/sci-astronomy/siril/siril-1.2.0_rc1.ebuild deleted file mode 100644 index 93988e8161cb..000000000000 --- a/sci-astronomy/siril/siril-1.2.0_rc1.ebuild +++ /dev/null @@ -1,92 +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 exif ffmpeg heif jpeg libconfig openmp png raw tiff wcs" - -DEPEND=" - >=dev-libs/glib-2.56.0:2 - >=dev-libs/json-glib-1.2.6 - dev-libs/sleef:= - media-libs/librtprocess:= - >=media-libs/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 ) - exif? ( >=media-gfx/exiv2-0.25 ) - 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 ) - 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}-$(ver_cut 1-2)-stdint.patch" - "${FILESDIR}/${PN}-$(ver_cut 1-2)-tiff.patch" -) - -DOCS=( README.md NEWS ChangeLog AUTHORS ) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -src_configure() { - local emesonargs=( - -Dffms2=false - -Dcriterion=false - $(meson_use exif exiv2) - $(meson_use ffmpeg) - $(meson_use heif libheif) - $(meson_use jpeg libjpeg) - $(meson_use libconfig) - $(meson_use openmp) - $(meson_use png libpng) - $(meson_use raw libraw) - $(meson_use tiff libtiff) - $(meson_use wcs wcslib) - $(usex curl -Denable-libcurl=yes -Denable-libcurl=no) - ) - meson_src_configure -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update - optfeature "gnuplot support" sci-visualization/gnuplot -} diff --git a/sci-astronomy/siril/siril-9999.ebuild b/sci-astronomy/siril/siril-9999.ebuild index ae08398c3c70..1f9d03614a4d 100644 --- a/sci-astronomy/siril/siril-9999.ebuild +++ b/sci-astronomy/siril/siril-9999.ebuild @@ -6,7 +6,7 @@ EAPI=8 inherit meson optfeature toolchain-funcs xdg DESCRIPTION="A free astronomical image processing software" -HOMEPAGE="https://www.siril.org/" +HOMEPAGE="https://siril.org/" if [[ ${PV} == "9999" ]]; then inherit git-r3 @@ -24,24 +24,25 @@ IUSE="curl exif ffmpeg heif jpeg libconfig openmp png raw tiff wcs" DEPEND=" >=dev-libs/glib-2.56.0:2 >=dev-libs/json-glib-1.2.6 - dev-libs/sleef:= - media-libs/librtprocess:= + media-libs/librtprocess >=media-libs/opencv-4.4.0:= - sci-libs/cfitsio + sci-libs/cfitsio:= sci-libs/fftw:3.0= sci-libs/gsl:= + x11-libs/gdk-pixbuf:2 x11-libs/cairo + x11-libs/pango >=x11-libs/gtk+-3.20.0:3 curl? ( net-misc/curl ) - exif? ( >=media-gfx/exiv2-0.25 ) + exif? ( >=media-gfx/exiv2-0.25:= ) ffmpeg? ( media-video/ffmpeg:= ) - heif? ( media-libs/libheif ) - libconfig? ( >=dev-libs/libconfig-1.4[cxx] ) + heif? ( media-libs/libheif:= ) jpeg? ( media-libs/libjpeg-turbo:= ) - png? ( >=media-libs/libpng-1.6.0 ) - raw? ( media-libs/libraw ) + libconfig? ( >=dev-libs/libconfig-1.4:=[cxx] ) + png? ( >=media-libs/libpng-1.6.0:= ) + raw? ( media-libs/libraw:= ) tiff? ( media-libs/tiff:= ) - wcs? ( >=sci-astronomy/wcslib-7.7 ) + wcs? ( >=sci-astronomy/wcslib-7.7:= ) " RDEPEND=" ${DEPEND} -- cgit v1.2.3