From: andkem <andkem@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] siril: update to 1.0.0.
Date: Tue, 17 May 2022 23:57:30 +0200 [thread overview]
Message-ID: <20220517215730.VzZ-RX26NLhakt5zS_WlMjdiGnzXo8F061Uf7jzZIG8@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-24678@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 323 bytes --]
There is an updated pull request by andkem against master on the void-packages repository
https://github.com/andkem/void-packages siril-update-0.99.4
https://github.com/void-linux/void-packages/pull/24678
siril: update to 1.0.0.
A patch file from https://github.com/void-linux/void-packages/pull/24678.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-siril-update-0.99.4-24678.patch --]
[-- Type: text/x-diff, Size: 8669 bytes --]
From 452a7ddf5adab21a41c37a5f3a78731b4177f94b Mon Sep 17 00:00:00 2001
From: Andreas Kempe <kempe@lysator.liu.se>
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 7f3e1458f7a6..004998a783c3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4170,3 +4170,4 @@ libThread.so root-6.24.06_1
libTMVA.so root-6.24.06_1
libMathCore.so root-6.24.06_1
liblowdown.so lowdown-0.11.2_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 <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
+ }
+}
From 1cfd48bafb1fd5786d5fa1dc8563e6d33b13cb66 Mon Sep 17 00:00:00 2001
From: Andreas Kempe <kempe@lysator.liu.se>
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 004998a783c3..945d09b6923b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4171,3 +4171,4 @@ libTMVA.so root-6.24.06_1
libMathCore.so root-6.24.06_1
liblowdown.so lowdown-0.11.2_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 <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
+ }
+}
From 6151bcfa39443fa6d99c22d3c0d2da3184c29eb7 Mon Sep 17 00:00:00 2001
From: Andreas Kempe <kempe@lysator.liu.se>
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 <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
-}
next prev parent reply other threads:[~2022-05-17 21:57 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-05 1:02 [PR PATCH] siril: update to 0.99.4 andkem
2020-09-05 1:04 ` [PR PATCH] [Updated] " andkem
2020-09-05 1:06 ` andkem
2020-09-05 1:09 ` andkem
2020-09-05 1:45 ` andkem
2020-09-05 1:59 ` ericonr
2020-09-05 12:53 ` andkem
2020-09-05 14:17 ` [PR PATCH] [Updated] " andkem
2020-09-05 15:12 ` andkem
2020-09-05 15:13 ` andkem
2020-09-05 15:15 ` andkem
2020-09-05 16:24 ` andkem
2020-09-05 19:38 ` [PR PATCH] [Updated] " andkem
2020-09-05 20:45 ` andkem
2020-09-23 21:25 ` andkem
2020-09-23 21:26 ` siril: update to 0.99.6 andkem
2021-02-14 16:23 ` [PR PATCH] [Updated] " andkem
2021-02-14 17:14 ` [PR PATCH] [Updated] siril: update to 0.99.8.1 andkem
2021-02-14 17:22 ` andkem
2021-02-14 17:53 ` [PR PATCH] [Updated] " andkem
2021-02-14 18:11 ` andkem
2021-02-14 19:10 ` andkem
2021-02-14 23:15 ` [PR REVIEW] " ericonr
2021-02-14 23:15 ` ericonr
2021-02-14 23:15 ` ericonr
2021-02-15 18:07 ` [PR PATCH] [Updated] " andkem
2021-02-15 18:26 ` [PR REVIEW] " andkem
2021-02-15 18:26 ` andkem
2021-02-15 18:26 ` andkem
2021-05-27 18:47 ` [PR PATCH] [Updated] " andkem
2021-05-27 18:51 ` andkem
2021-05-27 18:53 ` andkem
2021-06-17 22:10 ` [PR PATCH] [Updated] " andkem
2021-06-17 22:10 ` siril: update to 0.99.10 andkem
2022-03-10 23:19 ` [PR PATCH] [Updated] " andkem
2022-03-10 23:21 ` siril: update to 1.0.0 andkem
2022-03-10 23:23 ` [PR PATCH] [Updated] " andkem
2022-03-10 23:42 ` andkem
2022-05-17 21:57 ` andkem [this message]
2022-05-17 22:11 ` siril: update to 1.0.2 andkem
2022-06-04 22:07 ` [PR PATCH] [Updated] " andkem
2022-06-10 13:14 ` [PR PATCH] [Closed]: " leahneukirchen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220517215730.VzZ-RX26NLhakt5zS_WlMjdiGnzXo8F061Uf7jzZIG8@z \
--to=andkem@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).