diff options
Diffstat (limited to 'sci-astronomy/siril/files')
-rw-r--r-- | sci-astronomy/siril/files/siril-1.2-execinfo.patch | 46 | ||||
-rw-r--r-- | sci-astronomy/siril/files/siril-1.2-htmesh.patch | 57 | ||||
-rw-r--r-- | sci-astronomy/siril/files/siril-1.2-openmp.patch | 49 |
3 files changed, 0 insertions, 152 deletions
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 <mario.haustein@hrz.tu-chemnitz.de> -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 <mario.haustein@hrz.tu-chemnitz.de> -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 <mario.haustein@hrz.tu-chemnitz.de> -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 <mario.haustein@hrz.tu-chemnitz.de> -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 <mario.haustein@hrz.tu-chemnitz.de> -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 <unistd.h> - #include <stdlib.h> - #include <math.h> --#include <omp.h> - - using namespace std; - ---- a/src/filters/nlbayes/Utilities.cpp -+++ b/src/filters/nlbayes/Utilities.cpp -@@ -20,7 +20,6 @@ - #include "Utilities.h" - - #include <math.h> --#include <omp.h> - #include <iostream> - #include <stdlib.h> - #include <fstream> --- -2.39.2 - |