From ea0ea4ac84f7efb388b62438395a21713356271b 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.12.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 15d027bf9c20..15eb72fbe899 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4165,3 +4165,4 @@ 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 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..6dc4ecffbea5 --- /dev/null +++ b/srcpkgs/librtprocess/template @@ -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 " +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 + } +} From 1d0507703fbb0a10553659ed3a80189bf62af834 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.11 cross-compile-fix.patch replaces calls to AC_CHECK_FILE with using the test utility since it, by design, does not work when cross-compiling. --- common/shlibs | 1 + srcpkgs/wcslib-devel | 1 + .../wcslib/patches/cross-compile-fix.patch | 49 +++++++++++++++++++ srcpkgs/wcslib/template | 38 ++++++++++++++ 4 files changed, 89 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 15eb72fbe899..926141bb1250 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4166,3 +4166,4 @@ 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 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..f3e04413d652 --- /dev/null +++ b/srcpkgs/wcslib/patches/cross-compile-fix.patch @@ -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 diff --git a/srcpkgs/wcslib/template b/srcpkgs/wcslib/template new file mode 100644 index 000000000000..e570cac45657 --- /dev/null +++ b/srcpkgs/wcslib/template @@ -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 " +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 + } +} From e1698c60bf0d1bdb99e4dbf40e6bff9c38020ed3 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 1.0.2. --- srcpkgs/siril/template | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/srcpkgs/siril/template b/srcpkgs/siril/template index a06f3352243d..4d507c2e453d 100644 --- a/srcpkgs/siril/template +++ b/srcpkgs/siril/template @@ -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 " 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 -}