From de0d7d758d1727f7b9ac1221db10df9744573cfc Mon Sep 17 00:00:00 2001 From: Andreas Kempe Date: Sat, 5 Sep 2020 16:19:07 +0200 Subject: [PATCH 1/3] New package: librtprocess-0.11.0 --- common/shlibs | 1 + srcpkgs/librtprocess-devel | 1 + srcpkgs/librtprocess/template | 26 ++++++++++++++++++++++++++ 3 files changed, 28 insertions(+) create mode 120000 srcpkgs/librtprocess-devel create mode 100644 srcpkgs/librtprocess/template diff --git a/common/shlibs b/common/shlibs index 79808cb76273..07e61ca1f268 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3991,3 +3991,4 @@ libbasu.so.0 basu-0.2.0_1 libXcomp.so.3 nx-libs-3.5.99.24_1 libXcompshad.so.3 nx-libs-3.5.99.24_1 libNX_X11.so.6 nx-libs-3.5.99.24_1 +librtprocess.so.0 librtprocess-0.11.0_1 diff --git a/srcpkgs/librtprocess-devel b/srcpkgs/librtprocess-devel new file mode 120000 index 000000000000..95794d1128ce --- /dev/null +++ b/srcpkgs/librtprocess-devel @@ -0,0 +1 @@ +librtprocess \ No newline at end of file diff --git a/srcpkgs/librtprocess/template b/srcpkgs/librtprocess/template new file mode 100644 index 000000000000..8ac7ce64066f --- /dev/null +++ b/srcpkgs/librtprocess/template @@ -0,0 +1,26 @@ +# Template file for 'librtprocess' +pkgname=librtprocess +version=0.11.0 +revision=1 +build_style=cmake +hostmakedepends="pkg-config" +makedepends="libgomp-devel" +short_desc="Image processing algorithms from RawTherapee" +maintainer="Andreas Kempe " +license="GPL-3.0-or-later" +homepage="https://github.com/CarVac/librtprocess" +distfiles="https://github.com/CarVac/${pkgname}/archive/${version}.tar.gz" +checksum=0a1691e6e90742644506a1123c716cdcfc28689adf461747843ab0440a837584 + +CXXFLAGS="-DNDEBUG" + +librtprocess-devel_package() { + short_desc+=" - development files" + depends="librtprocess>=${version}_${revision}" + pkg_install() { + vmove usr/lib/librtprocess.so + vmove usr/include + vmove usr/lib/cmake + vmove usr/lib/pkgconfig + } +} From 29f3c72634052493ddf9d49630e29123a4be7fa0 Mon Sep 17 00:00:00 2001 From: Andreas Kempe Date: Sun, 14 Feb 2021 16:57:23 +0100 Subject: [PATCH 2/3] New package: wcslib-7.4 --- common/shlibs | 1 + srcpkgs/wcslib-devel | 1 + .../wcslib/patches/cross-compile-fix.patch | 47 +++++++++++++++++++ srcpkgs/wcslib/template | 29 ++++++++++++ 4 files changed, 78 insertions(+) create mode 120000 srcpkgs/wcslib-devel create mode 100644 srcpkgs/wcslib/patches/cross-compile-fix.patch create mode 100644 srcpkgs/wcslib/template diff --git a/common/shlibs b/common/shlibs index 07e61ca1f268..82c7615d9f2b 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3992,3 +3992,4 @@ libXcomp.so.3 nx-libs-3.5.99.24_1 libXcompshad.so.3 nx-libs-3.5.99.24_1 libNX_X11.so.6 nx-libs-3.5.99.24_1 librtprocess.so.0 librtprocess-0.11.0_1 +libwcs.so.7 wcslib-7.4_1 diff --git a/srcpkgs/wcslib-devel b/srcpkgs/wcslib-devel new file mode 120000 index 000000000000..f3b28efc6615 --- /dev/null +++ b/srcpkgs/wcslib-devel @@ -0,0 +1 @@ +wcslib \ No newline at end of file diff --git a/srcpkgs/wcslib/patches/cross-compile-fix.patch b/srcpkgs/wcslib/patches/cross-compile-fix.patch new file mode 100644 index 000000000000..95a7c6a25838 --- /dev/null +++ b/srcpkgs/wcslib/patches/cross-compile-fix.patch @@ -0,0 +1,47 @@ +--- configure 2021-02-14 18:05:48.318095229 +0100 ++++ configure 2021-02-14 18:06:07.293839949 +0100 +@@ -7541,8 +7541,6 @@ + if eval \${$as_ac_File+:} false; then : + $as_echo_n "(cached) " >&6 + else +- test "$cross_compiling" = yes && +- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 + if test -r "$LIBDIR"; then + eval "$as_ac_File=yes" + else +@@ -7579,8 +7577,6 @@ + if eval \${$as_ac_File+:} false; then : + $as_echo_n "(cached) " >&6 + else +- test "$cross_compiling" = yes && +- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 + if test -r "$INCDIR/cfitsio/fitsio.h"; then + eval "$as_ac_File=yes" + else +@@ -7600,8 +7596,6 @@ + if eval \${$as_ac_File+:} false; then : + $as_echo_n "(cached) " >&6 + else +- test "$cross_compiling" = yes && +- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 + if test -r "$INCDIR/fitsio.h"; then + eval "$as_ac_File=yes" + else +@@ -7794,8 +7788,6 @@ + if eval \${$as_ac_File+:} false; then : + $as_echo_n "(cached) " >&6 + else +- test "$cross_compiling" = yes && +- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 + if test -r "$INCDIR/pgplot/cpgplot.h"; then + eval "$as_ac_File=yes" + else +@@ -7815,8 +7807,6 @@ + if eval \${$as_ac_File+:} false; then : + $as_echo_n "(cached) " >&6 + else +- test "$cross_compiling" = yes && +- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 + if test -r "$INCDIR/cpgplot.h"; then + eval "$as_ac_File=yes" + else diff --git a/srcpkgs/wcslib/template b/srcpkgs/wcslib/template new file mode 100644 index 000000000000..cbec9bbafbce --- /dev/null +++ b/srcpkgs/wcslib/template @@ -0,0 +1,29 @@ +# Template file for 'wcslib' +pkgname=wcslib +version=7.4 +revision=1 +build_style=gnu-configure +configure_args=" --without-pgplot " +makedepends="cfitsio-devel" +short_desc="Tools for WCS in FITS headers" +maintainer="Andreas Kempe " +license="GPL-3.0-or-later" +homepage="https://www.atnf.csiro.au/people/mcalabre/WCS/" +distfiles="ftp://ftp.atnf.csiro.au/pub/software/${pkgname}/${pkgname}-${version}.tar.bz2" +checksum=a21c964136055ad1d68ca9d3e9714374a9dc3ff2f7072622af08cc4f5a0c511c + +if [ "$CROSS_BUILD" ]; then + configure_args+=" --with-cfitsioinc=${XBPS_CROSS_BASE}/usr/include --with-cfitsiolib=${XBPS_CROSS_BASE}/usr/lib " +fi + +wcslib-devel_package() { + short_desc+=" - development files" + depends="wcslib>=${version}_${revision}" + pkg_install() { + vmove usr/lib/libwcs.so + vmove usr/lib/libwcs.a + vmove usr/lib/libwcs-${version}.a + vmove usr/include + vmove usr/lib/pkgconfig + } +} From ec36ad57e4fc3355b9f6ef4dbc35c0b78538b6ae Mon Sep 17 00:00:00 2001 From: Andreas Kempe Date: Sat, 5 Sep 2020 03:00:04 +0200 Subject: [PATCH 3/3] siril: update to 0.99.8.1. --- ...pes-instead-of-libtiff-specific-ones.patch | 82 +++++++++++++++++++ .../0002-Use-g_memdup2-if-glib-2.68.patch | 37 +++++++++ ...-linkage-for-OpenMP-in-core-exif.cpp.patch | 41 ++++++++++ srcpkgs/siril/template | 22 +++-- 4 files changed, 176 insertions(+), 6 deletions(-) create mode 100644 srcpkgs/siril/patches/0001-Use-stdint-types-instead-of-libtiff-specific-ones.patch create mode 100644 srcpkgs/siril/patches/0002-Use-g_memdup2-if-glib-2.68.patch create mode 100644 srcpkgs/siril/patches/0003-Use-C-linkage-for-OpenMP-in-core-exif.cpp.patch diff --git a/srcpkgs/siril/patches/0001-Use-stdint-types-instead-of-libtiff-specific-ones.patch b/srcpkgs/siril/patches/0001-Use-stdint-types-instead-of-libtiff-specific-ones.patch new file mode 100644 index 000000000000..a0b7e849483a --- /dev/null +++ b/srcpkgs/siril/patches/0001-Use-stdint-types-instead-of-libtiff-specific-ones.patch @@ -0,0 +1,82 @@ +From 009434df15de6b5a8ff1eab79f3d79e91371499d Mon Sep 17 00:00:00 2001 +From: Andreas Kempe +Date: Thu, 27 May 2021 19:53:22 +0200 +Subject: [PATCH 1/3] Use stdint types instead of libtiff specific ones + +libtiff has deprecated its own fixed sized types. Switch to stdint fixed +size types instead. +--- + src/core/command.c | 3 ++- + src/core/proto.h | 2 +- + src/io/image_formats_libraries.c | 7 ++++--- + 3 files changed, 7 insertions(+), 5 deletions(-) + +diff --git a/src/core/command.c b/src/core/command.c +index ebe4359e..6330a6bd 100644 +--- a/src/core/command.c ++++ b/src/core/command.c +@@ -18,6 +18,7 @@ + * along with Siril. If not, see . + */ + ++#include + #include + #include + #include +@@ -221,7 +222,7 @@ int process_savepng(int nb){ + + #ifdef HAVE_LIBTIFF + int process_savetif(int nb){ +- uint16 bitspersample = 16; ++ uint16_t bitspersample = 16; + + if (!single_image_is_loaded()) { + PRINT_NOT_FOR_SEQUENCE; +diff --git a/src/core/proto.h b/src/core/proto.h +index efbab418..5a6cac27 100644 +--- a/src/core/proto.h ++++ b/src/core/proto.h +@@ -43,7 +43,7 @@ int readpic(const char *name, fits *fit); + /****************** image_formats_libraries.h ******************/ + #ifdef HAVE_LIBTIFF + int readtif(const char *name, fits *fit, gboolean force_float); +-int savetif(const char *name, fits *fit, uint16 bitspersample); ++int savetif(const char *name, fits *fit, uint16_t bitspersample); + #endif + + #ifdef HAVE_LIBJPEG +diff --git a/src/io/image_formats_libraries.c b/src/io/image_formats_libraries.c +index 92becc34..98b203e4 100644 +--- a/src/io/image_formats_libraries.c ++++ b/src/io/image_formats_libraries.c +@@ -21,6 +21,7 @@ + #ifdef HAVE_CONFIG_H + #include + #endif ++#include + #include + #include + #include +@@ -60,7 +61,7 @@ + + #ifdef HAVE_LIBTIFF + +-static int readtifstrip(TIFF* tif, uint32 width, uint32 height, uint16 nsamples, WORD **data) { ++static int readtifstrip(TIFF* tif, uint32_t width, uint32_t height, uint16_t nsamples, WORD **data) { + uint32_t rowsperstrip; + uint16_t config; + int retval = nsamples; +@@ -344,8 +345,8 @@ int readtif(const char *name, fits *fit, gboolean force_float) { + uint16_t nbits, nsamples, color; + WORD *data = NULL; + float *fdata = NULL; +- uint16 sampleformat = 0; +- ++ uint16_t sampleformat = 0; ++ + TIFF* tif = Siril_TIFFOpen(name, "r"); + if (!tif) { + siril_log_message(_("Could not open the TIFF file %s\n"), name); +-- +2.31.1 + diff --git a/srcpkgs/siril/patches/0002-Use-g_memdup2-if-glib-2.68.patch b/srcpkgs/siril/patches/0002-Use-g_memdup2-if-glib-2.68.patch new file mode 100644 index 000000000000..95786884ed86 --- /dev/null +++ b/srcpkgs/siril/patches/0002-Use-g_memdup2-if-glib-2.68.patch @@ -0,0 +1,37 @@ +From 1fdd1df83f793cf9878ed6e47eae4fe1f1d4f6d5 Mon Sep 17 00:00:00 2001 +From: Andreas Kempe +Date: Thu, 27 May 2021 19:59:06 +0200 +Subject: [PATCH 2/3] Use g_memdup2 if glib >= 2.68 + +g_memdup has been deprecated in favour of g_memdup2 starting with glib +2.68. Define g_memdup to g_memdup2 if glib >= 2.68. +--- + src/core/utils.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/core/utils.c b/src/core/utils.c +index aa7aea11..e88dc4ac 100644 +--- a/src/core/utils.c ++++ b/src/core/utils.c +@@ -34,6 +34,7 @@ + #ifdef _WIN32 + #include + #endif ++#include + + #include "core/siril.h" + #include "core/proto.h" +@@ -46,6 +47,10 @@ + #include "gui/progress_and_log.h" + #include "io/single_image.h" + ++#if GLIB_CHECK_VERSION(2,68,0) ++#define g_memdup g_memdup2 ++#endif ++ + /** + * Round double value to an integer + * @param x value to round +-- +2.31.1 + diff --git a/srcpkgs/siril/patches/0003-Use-C-linkage-for-OpenMP-in-core-exif.cpp.patch b/srcpkgs/siril/patches/0003-Use-C-linkage-for-OpenMP-in-core-exif.cpp.patch new file mode 100644 index 000000000000..7e201f9bf390 --- /dev/null +++ b/srcpkgs/siril/patches/0003-Use-C-linkage-for-OpenMP-in-core-exif.cpp.patch @@ -0,0 +1,41 @@ +From 450801b210f522b7b3f79a157e2b3cd5f265dcb8 Mon Sep 17 00:00:00 2001 +From: Andreas Kempe +Date: Thu, 27 May 2021 20:23:24 +0200 +Subject: [PATCH 3/3] Use C++ linkage for OpenMP in core/exif.cpp + +Including omp.h using C linkage causes compilation errors with gcc 10.2 +and llvm12. Change it to C++ linkage which is used in other places in +the code. +--- + src/core/exif.cpp | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/src/core/exif.cpp b/src/core/exif.cpp +index dd58b1dc..ad11767d 100644 +--- a/src/core/exif.cpp ++++ b/src/core/exif.cpp +@@ -18,20 +18,16 @@ + * along with Siril. If not, see . + */ + +-#ifdef __cplusplus + extern "C" { +-#endif + #ifdef HAVE_CONFIG_H + #include "config.h" + #endif ++} + + #include + #ifdef _OPENMP + #include + #endif +-#ifdef __cplusplus +-} +-#endif + + #include + #include +-- +2.31.1 + diff --git a/srcpkgs/siril/template b/srcpkgs/siril/template index 25a7a414e72c..f013f719efb9 100644 --- a/srcpkgs/siril/template +++ b/srcpkgs/siril/template @@ -1,19 +1,29 @@ # Template file for 'siril' pkgname=siril -version=0.9.12 -revision=3 +version=0.99.8.1 +revision=1 +wrksrc="${pkgname}-${version}" build_style=gnu-configure hostmakedepends="pkg-config intltool autoconf automake gettext-devel" -makedepends="fftw-devel libconfig-devel libopencv-devel libffms2-devel - gsl-devel libraw-devel tiff-devel libpng-devel libcurl-devel - ffmpeg-devel gtk+3-devel cfitsio-devel gsl-devel" +makedepends="glib-devel json-glib-devel exiv2-devel gtk+3-devel + cairo-devel fftw-devel gsl-devel cfitsio-devel libconfig-devel + libopencv4-devel librtprocess-devel libraw-devel tiff-devel + libjpeg-turbo-devel libpng-devel libheif-devel libffms2-devel + ffmpeg-devel libcurl-devel wcslib-devel libgomp-devel" depends="gnuplot" short_desc="Free astronomical image processing software" maintainer="Andreas Kempe " license="GPL-3.0-or-later" homepage="https://www.siril.org/" distfiles="https://free-astro.org/download/${pkgname}-${version}.tar.bz2" -checksum=9fb7f8a10630ea028137e8f213727519ae9916ea1d88cd8d0cc87f336d8d53b1 +checksum=45b73ee8d1e1bd7ff184478f90da59c729ca1bd5285fb2f7ac0237c6b5cdbdb2 +# make check doesn't really do anything and is broken. +make_check=no +patch_args="-p1" + +if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then + makedepends+=" libatomic-devel" +fi if [ "$XBPS_TARGET_LIBC" = "musl" ]; then makedepends+=" libexecinfo-devel"