Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

siril: update to 1.0.2. #24678

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions common/shlibs
Original file line number Diff line number Diff line change
Expand Up @@ -4165,3 +4165,5 @@ libTMVA.so root-6.24.06_1
libMathCore.so root-6.24.06_1
liblowdown.so lowdown-0.11.2_1
libjaylink.so.0 libjaylink-0.2.0_1
librtprocess.so.0 librtprocess-0.12.0_1
libwcs.so.7 wcslib-7.11_1
1 change: 1 addition & 0 deletions srcpkgs/librtprocess-devel
26 changes: 26 additions & 0 deletions srcpkgs/librtprocess/template
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# Template file for 'librtprocess'
pkgname=librtprocess
version=0.12.0
revision=1
build_style=cmake
hostmakedepends="pkg-config"
makedepends="libgomp-devel"
short_desc="Image processing algorithms from RawTherapee"
maintainer="Andreas Kempe <kempe@lysator.liu.se>"
license="GPL-3.0-or-later"
homepage="https://github.com/CarVac/librtprocess"
distfiles="https://github.com/CarVac/${pkgname}/archive/${version}.tar.gz"
checksum=ed6862b1491559e71dbebe8cbb299008fb16e230acf3bb9d42bd52942644c4d9

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
}
}
36 changes: 17 additions & 19 deletions srcpkgs/siril/template
Original file line number Diff line number Diff line change
@@ -1,31 +1,29 @@
# Template file for 'siril'
pkgname=siril
version=0.9.12
revision=5
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 libgomp-devel"
version=1.0.2
revision=1
build_style=meson
configure_args="-Drelocatable-bundle=no -Dopenmp=true -Denable-libcurl=yes"
meson_builddir="meson_build"
hostmakedepends="pkg-config intltool gettext-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 <kempe@lysator.liu.se>"
license="GPL-3.0-or-later"
homepage="https://www.siril.org/"
distfiles="https://free-astro.org/download/${pkgname}-${version}.tar.bz2"
checksum=9fb7f8a10630ea028137e8f213727519ae9916ea1d88cd8d0cc87f336d8d53b1
checksum=4973bd7ad6d3cb7ad279ef27bb5c79f37ca1f914c7b6ad8fe689e1d59189f2db

if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
fi

if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
makedepends+=" libexecinfo-devel"
LDFLAGS+="-lexecinfo"
fi

CFLAGS="-fcommon"

post_extract() {
# add missing check target in this subdir to fix do_check()
echo 'check:' >> deps/kplot/Makefile
}

pre_configure() {
NOCONFIGURE=1 ./autogen.sh
}
1 change: 1 addition & 0 deletions srcpkgs/wcslib-devel
49 changes: 49 additions & 0 deletions srcpkgs/wcslib/patches/cross-compile-fix.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
--- ./configure.ac 2022-02-10 02:11:35.306531939 +0100
+++ ./configure.ac 2022-02-10 02:23:58.867114050 +0100
@@ -428,7 +428,9 @@
/sw/lib"

for LIBDIR in $LIBDIRS ; do
- AC_CHECK_FILE([$LIBDIR], [LDFLAGS="$LDFLAGS -L$LIBDIR"], [continue])
+ if test -d $LIBDIR; then
+ LDFLAGS="$LDFLAGS -L$LIBDIR"
+ fi
done

# Generic include directories.
@@ -444,9 +446,14 @@
if test "x$with_cfitsio" != xno ; then
# Search for CFITSIO.
for INCDIR in $CFITSIO_INCDIRS $INCDIRS ; do
- AC_CHECK_FILE([$INCDIR/cfitsio/fitsio.h],
- [CFITSIOINC="-I$INCDIR/cfitsio"; break])
- AC_CHECK_FILE([$INCDIR/fitsio.h], [CFITSIOINC="-I$INCDIR"; break])
+ if test -f $INCDIR/cfitsio/fitsio.h; then
+ CFITSIOINC="-I$INCDIR/cfitsio"
+ break
+ fi
+ if test -f $INCDIR/fitsio.h; then
+ CFITSIOINC="-I$INCDIR"
+ break
+ fi
done

AC_CHECK_LIB([socket], [recv], [CFITSIOLIB="-lsocket"], [], [$LIBS])
@@ -473,9 +480,14 @@
if test "x$F77" != x -a "x$with_pgplot" != xno ; then
# Search for PGPLOT.
for INCDIR in $PGPLOT_INCDIRS $INCDIRS ; do
- AC_CHECK_FILE([$INCDIR/pgplot/cpgplot.h],
- [PGPLOTINC="-I$INCDIR/pgplot"; break])
- AC_CHECK_FILE([$INCDIR/cpgplot.h], [PGPLOTINC="-I$INCDIR"; break])
+ if test -f $INCDIR/pgplot/cpgplot.h; then
+ PGPLOTINC="-I$INCDIR/pgplot"
+ break
+ fi
+ if test -f $INCDIR/cpgplot.h; then
+ PGPLOTINC="-I$INCDIR"
+ break
+ fi
done

# FLIBS (found above via AC_F77_LIBRARY_LDFLAGS) only helps if PGPLOT was
38 changes: 38 additions & 0 deletions srcpkgs/wcslib/template
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# Template file for 'wcslib'
pkgname=wcslib
version=7.11
revision=1
build_style=gnu-configure
configure_args=" --without-pgplot "
makedepends="cfitsio-devel"
short_desc="Tools for WCS in FITS headers"
maintainer="Andreas Kempe <kempe@lysator.liu.se>"
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=46befbfdf50cd4953896676a7d570094dc7661e2ae9677b092e7fb13cee3da5f

if [ "$CROSS_BUILD" ]; then
hostmakedepends+="autoconf automake"
fi

pre_configure() {
if [ "$CROSS_BUILD" ]; then
# The supplied configuration file does not work when cross
# compiling so generate a new configuration file.
autoreconf -f -i
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
vmove usr/share/doc/wcslib-${version}/html
}
}