Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions srcpkgs/siril/patches/cross.patch
Original file line number Diff line number Diff line change
@@ -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)
38 changes: 0 additions & 38 deletions srcpkgs/siril/patches/musl.patch

This file was deleted.

13 changes: 7 additions & 6 deletions srcpkgs/siril/template
Original file line number Diff line number Diff line change
@@ -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 <orphan@voidlinux.org>"
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"
Expand Down