From d9e50f99199594fa143d453326f74f54981ad4b1 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 | 24 ++++++++++++++++++++++++ 3 files changed, 26 insertions(+) create mode 120000 srcpkgs/librtprocess-devel create mode 100644 srcpkgs/librtprocess/template diff --git a/common/shlibs b/common/shlibs index 70596feb769..18457605ed7 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3979,3 +3979,4 @@ libwinbind-client-samba4.so samba-libs-4.13.2_1 libsixel.so.1 libsixel-1.8.6_1 libpamtest.so.0 pam_wrapper-1.1.3_1 libopenaptx.so.0 libopenaptx-0.2.0_1 +librtprocess.so.0 librtprocess-0.11.0_1 diff --git a/srcpkgs/librtprocess-devel b/srcpkgs/librtprocess-devel new file mode 120000 index 00000000000..95794d1128c --- /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 00000000000..565a2806f19 --- /dev/null +++ b/srcpkgs/librtprocess/template @@ -0,0 +1,24 @@ +# 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 + +librtprocess-devel_package() { + short_desc="Image processing algorithms from RawTherapee - 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 9d052362528a0e6caa6a13b783b619bbd31710a1 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 18457605ed7..676c0a773a4 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3980,3 +3980,4 @@ libsixel.so.1 libsixel-1.8.6_1 libpamtest.so.0 pam_wrapper-1.1.3_1 libopenaptx.so.0 libopenaptx-0.2.0_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 00000000000..f3b28efc661 --- /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 00000000000..95a7c6a2583 --- /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 00000000000..6ff99d1400f --- /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 [ "$XBPS_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="Tools for WCS in FITS headers - 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 82403a55554258197a701bf869bc89a920c9a299 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. --- srcpkgs/siril/template | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/srcpkgs/siril/template b/srcpkgs/siril/template index 25a7a414e72..9c9069041ff 100644 --- a/srcpkgs/siril/template +++ b/srcpkgs/siril/template @@ -1,19 +1,26 @@ # 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 + +if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then + makedepends+=" libatomic-devel" +fi if [ "$XBPS_TARGET_LIBC" = "musl" ]; then makedepends+=" libexecinfo-devel" @@ -24,3 +31,8 @@ CFLAGS="-fcommon" pre_configure() { NOCONFIGURE=1 ./autogen.sh } + +# make check doesn't really do anything and is broken. +do_check() { + : +}