From cf6afb058c775238192abdeb8ead9d2563146030 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 7 Sep 2026 10:41:14 -0400 Subject: [PATCH] siril: update to 1.4.4. --- srcpkgs/siril/patches/cross.patch | 15 ++++++++++++ srcpkgs/siril/patches/musl.patch | 38 ------------------------------- srcpkgs/siril/template | 13 ++++++----- 3 files changed, 22 insertions(+), 44 deletions(-) create mode 100644 srcpkgs/siril/patches/cross.patch delete mode 100644 srcpkgs/siril/patches/musl.patch diff --git a/srcpkgs/siril/patches/cross.patch b/srcpkgs/siril/patches/cross.patch new file mode 100644 index 00000000000000..ea3bffa6131d22 --- /dev/null +++ b/srcpkgs/siril/patches/cross.patch @@ -0,0 +1,15 @@ +get_variable doesn't respect the target sysroot on cross + +--- a/meson.build ++++ b/meson.build +@@ -285,9 +285,8 @@ + opencv4_dep = dependency('opencv4', required : true, version: '>= 4.2.0') + # checking required opencv modules + opencv_symbols = ['HAVE_OPENCV_CORE', 'HAVE_OPENCV_IMGPROC', 'HAVE_OPENCV_CALIB3D', 'HAVE_OPENCV_STITCHING'] +-opencv_incdir = '-I'+opencv4_dep.get_variable(pkgconfig : 'includedir') + foreach s : opencv_symbols +- cpp.has_header_symbol('opencv2/opencv_modules.hpp', s, args: [opencv_incdir], required : true) ++ cpp.has_header_symbol('opencv2/opencv_modules.hpp', s, dependencies: opencv4_dep, required : true) + endforeach + + rtprocess_dep = dependency('rtprocess', required : false) diff --git a/srcpkgs/siril/patches/musl.patch b/srcpkgs/siril/patches/musl.patch deleted file mode 100644 index 624ffff30c4f19..00000000000000 --- a/srcpkgs/siril/patches/musl.patch +++ /dev/null @@ -1,38 +0,0 @@ -#https://gitlab.com/ncopa/siril/-/blob/7f09478f4522b65b476c788a696159e5a4974286/src/io/avi_pipp/pipp_utf8.h ---- a/src/io/avi_pipp/pipp_utf8.h -+++ b/src/io/avi_pipp/pipp_utf8.h -@@ -31,27 +31,15 @@ - #endif - - // 64-bit fseek for various platforms --#ifdef __linux__ --#define fseek64 fseeko64 // Linux --#define ftell64 ftello64 // Linux --#elif defined (OS_OSX) --#define fseek64 fseeko // OS X --#define ftell64 ftello // OS X --#elif defined(BSD) --#define fseek64 fseeko // DragonFly BSD, FreeBSD, OpenBSD, NetBSD --#define ftell64 ftello // DragonFly BSD, FreeBSD, OpenBSD, NetBSD --#elif defined (__FreeBSD_kernel__) && defined (__GLIBC__) --#define fseek64 fseeko64 // KFreeBSD --#define ftell64 ftello64 // KFreeBSD --#elif defined (__gnu_hurd__) --#define fseek64 fseeko64 // GNU/Hurd --#define ftell64 ftello64 // GNU/Hurd --#elif defined(__CYGWIN__) --#define fseek64 fseeko // CYGWIN --#define ftell64 ftello // CYGWIN --#else -+#if defined(__GLIBC__) || defined(__gnu_hurd__) -+#define fseek64 fseeko64 // GNU -+#define ftell64 ftello64 // GNU -+#elif defined(_WIN32) - #define fseek64 _fseeki64 // Windows - #define ftell64 _ftelli64 // Windows -+#else // POSIX -+#define fseek64 fseeko // OS X, DragonFly BSD, FreeBSD, OpenBSD, NetBSD, musl -+#define ftell64 ftello // OS X, DragonFly BSD, FreeBSD, OpenBSD, NetBSD, musl - #endif - - #endif // PIPP_UTF8_H diff --git a/srcpkgs/siril/template b/srcpkgs/siril/template index 0123c7ef09b0d6..c1a2fbf63397fe 100644 --- a/srcpkgs/siril/template +++ b/srcpkgs/siril/template @@ -1,20 +1,21 @@ # Template file for 'siril' pkgname=siril -version=1.2.6 -revision=2 +version=1.4.4 +revision=1 build_style=meson meson_builddir=mbuild -hostmakedepends="pkg-config cmake" +hostmakedepends="pkg-config cmake glib-devel" makedepends="fftw-devel libconfig-devel libopencv-devel libffms2-devel gsl-devel libraw-devel tiff-devel libpng-devel libcurl-devel exiv2-devel - ffmpeg6-devel gtk+3-devel cfitsio-devel gsl-devel libgomp-devel libheif-devel" + ffmpeg6-devel gtk+3-devel cfitsio-devel gsl-devel libgomp-devel libheif-devel + libjxl-devel libxisf-devel gtksourceview4-devel libgit2-1.9-devel yyjson-devel wcslib-devel" depends="gnuplot" short_desc="Free astronomical image processing software" maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://www.siril.org/" -distfiles="https://free-astro.org/download/${pkgname}-${version}.tar.bz2" -checksum=312f82e78599f796d163a6d1c90589df1ed920b9ff2bb7ab5b808e43872817fa +distfiles="https://free-astro.org/download/siril-${version}.tar.bz2" +checksum=b1682f2129d2e06b034445ed225766a06e38cfaa7451b92d606a3ee36eb077a4 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then makedepends+=" libexecinfo-devel"