From 8b42ac4cb82a4db6229c37a39b8ef6134bb0fc35 Mon Sep 17 00:00:00 2001 From: Mario Haustein Date: Sat, 17 Jun 2023 10:33:29 +0200 Subject: sci-astronomy/siril: drop 1.2.0_beta1 Signed-off-by: Mario Haustein Closes: https://github.com/gentoo/gentoo/pull/31501 Signed-off-by: Sam James --- sci-astronomy/siril/Manifest | 1 - 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 ---------------------- 5 files changed, 246 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 (limited to 'sci-astronomy') diff --git a/sci-astronomy/siril/Manifest b/sci-astronomy/siril/Manifest index 21fb2bfbef3a..afa8aea46959 100644 --- a/sci-astronomy/siril/Manifest +++ b/sci-astronomy/siril/Manifest @@ -1,3 +1,2 @@ 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 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 -} -- cgit v1.2.3-65-gdbad