* Re: [PR PATCH] [Updated] siril: update to 0.99.4.
2020-09-05 1:02 [PR PATCH] siril: update to 0.99.4 andkem
@ 2020-09-05 1:04 ` andkem
2020-09-05 1:06 ` andkem
` (39 subsequent siblings)
40 siblings, 0 replies; 42+ messages in thread
From: andkem @ 2020-09-05 1:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 324 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 0.99.4.
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: 1831 bytes --]
From 8e4527502044a81e620133a3694146ac124e7313 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] siril: update to 0.99.4.
---
srcpkgs/siril/template | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/siril/template b/srcpkgs/siril/template
index 25a7a414e72..22250eb5ebb 100644
--- a/srcpkgs/siril/template
+++ b/srcpkgs/siril/template
@@ -1,25 +1,27 @@
# Template file for 'siril'
pkgname=siril
-version=0.9.12
-revision=3
+version=0.99.4
+revision=1
+wrksrc="siril-0.99.4"
+create_wrksrc=yes
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"
-depends="gnuplot"
+hostmakedepends="pkg-config intltool autoconf automake gettext-devel cmake"
+ makedepends="glib-devel exiv2-devel gtk+3-devel cairo-devel fftw-devel
+ gsl-devel cfitsio-devel libconfig-devel libopencv4-devel libgomp-devel
+ libraw-devel tiff-devel libjpeg-turbo-devel libpng-devel libheif-devel
+ libffms2-devel libcurl-devel"
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=80c0fcd750c034608464dfd443685ee51096df8b0b495d1743e6284d22f45f38
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
makedepends+=" libexecinfo-devel"
fi
-CFLAGS="-fcommon"
+CXXFLAGS="-fcommon -fopenmp"
pre_configure() {
NOCONFIGURE=1 ./autogen.sh
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: [PR PATCH] [Updated] siril: update to 0.99.4.
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
` (38 subsequent siblings)
40 siblings, 0 replies; 42+ messages in thread
From: andkem @ 2020-09-05 1:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 324 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 0.99.4.
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: 1840 bytes --]
From dd87ab6568bc2ca8c9df8a6326a95da90148155b 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] siril: update to 0.99.4.
---
srcpkgs/siril/template | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/siril/template b/srcpkgs/siril/template
index 25a7a414e72..bee400c7d7f 100644
--- a/srcpkgs/siril/template
+++ b/srcpkgs/siril/template
@@ -1,25 +1,27 @@
# Template file for 'siril'
pkgname=siril
-version=0.9.12
-revision=3
+version=0.99.4
+revision=1
+wrksrc="${pkgname}-${version}"
+create_wrksrc=yes
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"
-depends="gnuplot"
+hostmakedepends="pkg-config intltool autoconf automake gettext-devel cmake"
+ makedepends="glib-devel exiv2-devel gtk+3-devel cairo-devel fftw-devel
+ gsl-devel cfitsio-devel libconfig-devel libopencv4-devel libgomp-devel
+ libraw-devel tiff-devel libjpeg-turbo-devel libpng-devel libheif-devel
+ libffms2-devel libcurl-devel"
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=80c0fcd750c034608464dfd443685ee51096df8b0b495d1743e6284d22f45f38
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
makedepends+=" libexecinfo-devel"
fi
-CFLAGS="-fcommon"
+CXXFLAGS="-fcommon -fopenmp"
pre_configure() {
NOCONFIGURE=1 ./autogen.sh
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: [PR PATCH] [Updated] siril: update to 0.99.4.
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
` (37 subsequent siblings)
40 siblings, 0 replies; 42+ messages in thread
From: andkem @ 2020-09-05 1:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 324 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 0.99.4.
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: 1830 bytes --]
From 80296f838a8cb62ab65a4cd566452c3067a972a1 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] siril: update to 0.99.4.
---
srcpkgs/siril/template | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/siril/template b/srcpkgs/siril/template
index 25a7a414e72..96c7e4e57c9 100644
--- a/srcpkgs/siril/template
+++ b/srcpkgs/siril/template
@@ -1,25 +1,28 @@
# Template file for 'siril'
pkgname=siril
-version=0.9.12
-revision=3
+version=0.99.4
+revision=1
+wrksrc="${pkgname}-${version}"
+create_wrksrc=yes
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"
-depends="gnuplot"
+hostmakedepends="pkg-config intltool autoconf automake gettext-devel cmake"
+ makedepends="glib-devel exiv2-devel gtk+3-devel cairo-devel fftw-devel
+ gsl-devel cfitsio-devel libconfig-devel libopencv4-devel libgomp-devel
+ libraw-devel tiff-devel libjpeg-turbo-devel libpng-devel libheif-devel
+ libffms2-devel libcurl-devel"
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=80c0fcd750c034608464dfd443685ee51096df8b0b495d1743e6284d22f45f38
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
makedepends+=" libexecinfo-devel"
fi
CFLAGS="-fcommon"
+CXXFLAGS="-fopenmp"
pre_configure() {
NOCONFIGURE=1 ./autogen.sh
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: siril: update to 0.99.4.
2020-09-05 1:02 [PR PATCH] siril: update to 0.99.4 andkem
` (2 preceding siblings ...)
2020-09-05 1:09 ` andkem
@ 2020-09-05 1:45 ` andkem
2020-09-05 1:59 ` ericonr
` (36 subsequent siblings)
40 siblings, 0 replies; 42+ messages in thread
From: andkem @ 2020-09-05 1:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 360 bytes --]
New comment by andkem on void-packages repository
https://github.com/void-linux/void-packages/pull/24678#issuecomment-687515235
Comment:
This fails cross-compilation because you're supposed to compile the bundled librtprocess separately when you cross-compile.
Is it okay to mark this as nocross or do I need to look at packaging librtprocess separately?
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: siril: update to 0.99.4.
2020-09-05 1:02 [PR PATCH] siril: update to 0.99.4 andkem
` (3 preceding siblings ...)
2020-09-05 1:45 ` andkem
@ 2020-09-05 1:59 ` ericonr
2020-09-05 12:53 ` andkem
` (35 subsequent siblings)
40 siblings, 0 replies; 42+ messages in thread
From: ericonr @ 2020-09-05 1:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 592 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/24678#issuecomment-687519530
Comment:
I'm not sure this is stable: https://www.siril.org/2020/08/13/siril-1-0-0beta/
But it's probably worth it to get the packaging going c:
Regarding `librtprocess`, given this from the build log:
```
configure: librtprocess not found
checking for cmake... /usr/bin/cmake
configure: librtprocess will be built statically
```
I'd say to either find some way to build it for cross as well, or make a package for it, which I find preferrable.
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: siril: update to 0.99.4.
2020-09-05 1:02 [PR PATCH] siril: update to 0.99.4 andkem
` (4 preceding siblings ...)
2020-09-05 1:59 ` ericonr
@ 2020-09-05 12:53 ` andkem
2020-09-05 14:17 ` [PR PATCH] [Updated] " andkem
` (34 subsequent siblings)
40 siblings, 0 replies; 42+ messages in thread
From: andkem @ 2020-09-05 12:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 642 bytes --]
New comment by andkem on void-packages repository
https://github.com/void-linux/void-packages/pull/24678#issuecomment-687607213
Comment:
They first released 0.99.4 as a beta test for version 1.0.0, but then they decided that it was stable enough and released 0.99.4 as a proper release.
They bundle the librtprocess code with Siril and build it automatically if it isn't found when you're not cross-compiling. It lives in a subdirectory and uses cmake to build.
I'll have a look at creating a proper package for librtprocess, which I think is preferable to patching the Siril build process to allow building it for cross compilation.
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: [PR PATCH] [Updated] siril: update to 0.99.4.
2020-09-05 1:02 [PR PATCH] siril: update to 0.99.4 andkem
` (5 preceding siblings ...)
2020-09-05 12:53 ` andkem
@ 2020-09-05 14:17 ` andkem
2020-09-05 15:12 ` andkem
` (33 subsequent siblings)
40 siblings, 0 replies; 42+ messages in thread
From: andkem @ 2020-09-05 14:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 324 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 0.99.4.
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: 1770 bytes --]
From 64a4b4f5b3d1d9b1558449c356132a260f5d4429 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] siril: update to 0.99.4.
---
srcpkgs/siril/template | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/siril/template b/srcpkgs/siril/template
index 25a7a414e72..43a448c3652 100644
--- a/srcpkgs/siril/template
+++ b/srcpkgs/siril/template
@@ -1,25 +1,28 @@
# Template file for 'siril'
pkgname=siril
-version=0.9.12
-revision=3
+version=0.99.4
+revision=1
+wrksrc="${pkgname}-${version}"
+create_wrksrc=yes
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"
-depends="gnuplot"
+ makedepends="glib-devel exiv2-devel gtk+3-devel cairo-devel fftw-devel
+ gsl-devel cfitsio-devel libconfig-devel libopencv4-devel libgomp-devel
+ libraw-devel tiff-devel libjpeg-turbo-devel libpng-devel libheif-devel
+ libffms2-devel libcurl-devel librtprocess-devel"
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=80c0fcd750c034608464dfd443685ee51096df8b0b495d1743e6284d22f45f38
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
makedepends+=" libexecinfo-devel"
fi
CFLAGS="-fcommon"
+CXXFLAGS="-fopenmp"
pre_configure() {
NOCONFIGURE=1 ./autogen.sh
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: siril: update to 0.99.4.
2020-09-05 1:02 [PR PATCH] siril: update to 0.99.4 andkem
` (6 preceding siblings ...)
2020-09-05 14:17 ` [PR PATCH] [Updated] " andkem
@ 2020-09-05 15:12 ` andkem
2020-09-05 15:13 ` andkem
` (32 subsequent siblings)
40 siblings, 0 replies; 42+ messages in thread
From: andkem @ 2020-09-05 15:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 843 bytes --]
New comment by andkem on void-packages repository
https://github.com/void-linux/void-packages/pull/24678#issuecomment-687607213
Comment:
They first released 0.99.4 as a beta test for version 1.0.0, but then they decided that it was stable enough and released 0.99.4 as a proper release. (Or rather, it is still a beta version, but the initial release was for Windows, Mac and Debian for testing but has then been expanded to more platforms which makes me think this should be all right.)
They bundle the librtprocess code with Siril and build it automatically if it isn't found when you're not cross-compiling. It lives in a subdirectory and uses cmake to build.
I'll have a look at creating a proper package for librtprocess, which I think is preferable to patching the Siril build process to allow building it for cross compilation.
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: siril: update to 0.99.4.
2020-09-05 1:02 [PR PATCH] siril: update to 0.99.4 andkem
` (7 preceding siblings ...)
2020-09-05 15:12 ` andkem
@ 2020-09-05 15:13 ` andkem
2020-09-05 15:15 ` andkem
` (31 subsequent siblings)
40 siblings, 0 replies; 42+ messages in thread
From: andkem @ 2020-09-05 15:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 839 bytes --]
New comment by andkem on void-packages repository
https://github.com/void-linux/void-packages/pull/24678#issuecomment-687607213
Comment:
They first released 0.99.4 as a beta test for version 1.0.0, but then they decided that it was stable enough and released 0.99.4 as a proper release. (Or rather, it is still a beta version and initial release was for Windows, Mac and Debian for testing, but has then been expanded to more platforms which makes me think this should be all right.)
They bundle the librtprocess code with Siril and build it automatically if it isn't found when you're not cross-compiling. It lives in a subdirectory and uses cmake to build.
I'll have a look at creating a proper package for librtprocess, which I think is preferable to patching the Siril build process to allow building it for cross compilation.
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: siril: update to 0.99.4.
2020-09-05 1:02 [PR PATCH] siril: update to 0.99.4 andkem
` (8 preceding siblings ...)
2020-09-05 15:13 ` andkem
@ 2020-09-05 15:15 ` andkem
2020-09-05 16:24 ` andkem
` (30 subsequent siblings)
40 siblings, 0 replies; 42+ messages in thread
From: andkem @ 2020-09-05 15:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 843 bytes --]
New comment by andkem on void-packages repository
https://github.com/void-linux/void-packages/pull/24678#issuecomment-687607213
Comment:
They first released 0.99.4 as a beta test for version 1.0.0, but then they decided that it was stable enough and released 0.99.4 as a proper release. (Or rather, it is still a beta version and the initial release was for Windows, Mac and Debian for testing, but has then been expanded to more platforms which makes me think this should be all right.)
They bundle the librtprocess code with Siril and build it automatically if it isn't found when you're not cross-compiling. It lives in a subdirectory and uses cmake to build.
I'll have a look at creating a proper package for librtprocess, which I think is preferable to patching the Siril build process to allow building it for cross compilation.
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: siril: update to 0.99.4.
2020-09-05 1:02 [PR PATCH] siril: update to 0.99.4 andkem
` (9 preceding siblings ...)
2020-09-05 15:15 ` andkem
@ 2020-09-05 16:24 ` andkem
2020-09-05 19:38 ` [PR PATCH] [Updated] " andkem
` (29 subsequent siblings)
40 siblings, 0 replies; 42+ messages in thread
From: andkem @ 2020-09-05 16:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 370 bytes --]
New comment by andkem on void-packages repository
https://github.com/void-linux/void-packages/pull/24678#issuecomment-687632111
Comment:
I could add that I've been using this version myself since the original 0.99.4 release announcement and haven't seen any stability problems or major issues myself. In fact, it has been working a lot better than the 0.9.12 release.
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: [PR PATCH] [Updated] siril: update to 0.99.4.
2020-09-05 1:02 [PR PATCH] siril: update to 0.99.4 andkem
` (10 preceding siblings ...)
2020-09-05 16:24 ` andkem
@ 2020-09-05 19:38 ` andkem
2020-09-05 20:45 ` andkem
` (28 subsequent siblings)
40 siblings, 0 replies; 42+ messages in thread
From: andkem @ 2020-09-05 19:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 324 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 0.99.4.
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: 3835 bytes --]
From 0758a0926236ccfd4e1ee836a14e7c786d5d80c2 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/2] 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 bea5b504701..f0e12782b42 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3990,3 +3990,4 @@ libneatvnc.so.0 neatvnc-0.2.0_1
libtdjson.so.1.6.0 libtd-1.6.0_1
libJudy.so.1 judy-1.0.5_1
libsignal-protocol-c.so.2 libsignal-protocol-c-2.3.3_2
+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..871901610e9
--- /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 <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=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/rtprocess
+ vmove usr/lib/cmake/rtprocess
+ vmove usr/lib/pkgconfig/rtprocess.pc
+ }
+}
From ae5e98f1bca2369ea110021d116fcb481415ab43 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 2/2] siril: update to 0.99.4.
---
srcpkgs/siril/template | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/siril/template b/srcpkgs/siril/template
index 25a7a414e72..43a448c3652 100644
--- a/srcpkgs/siril/template
+++ b/srcpkgs/siril/template
@@ -1,25 +1,28 @@
# Template file for 'siril'
pkgname=siril
-version=0.9.12
-revision=3
+version=0.99.4
+revision=1
+wrksrc="${pkgname}-${version}"
+create_wrksrc=yes
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"
-depends="gnuplot"
+ makedepends="glib-devel exiv2-devel gtk+3-devel cairo-devel fftw-devel
+ gsl-devel cfitsio-devel libconfig-devel libopencv4-devel libgomp-devel
+ libraw-devel tiff-devel libjpeg-turbo-devel libpng-devel libheif-devel
+ libffms2-devel libcurl-devel librtprocess-devel"
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=80c0fcd750c034608464dfd443685ee51096df8b0b495d1743e6284d22f45f38
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
makedepends+=" libexecinfo-devel"
fi
CFLAGS="-fcommon"
+CXXFLAGS="-fopenmp"
pre_configure() {
NOCONFIGURE=1 ./autogen.sh
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: [PR PATCH] [Updated] siril: update to 0.99.4.
2020-09-05 1:02 [PR PATCH] siril: update to 0.99.4 andkem
` (11 preceding siblings ...)
2020-09-05 19:38 ` [PR PATCH] [Updated] " andkem
@ 2020-09-05 20:45 ` andkem
2020-09-23 21:25 ` andkem
` (27 subsequent siblings)
40 siblings, 0 replies; 42+ messages in thread
From: andkem @ 2020-09-05 20:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 324 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 0.99.4.
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: 3918 bytes --]
From 0758a0926236ccfd4e1ee836a14e7c786d5d80c2 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/2] 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 bea5b504701..f0e12782b42 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3990,3 +3990,4 @@ libneatvnc.so.0 neatvnc-0.2.0_1
libtdjson.so.1.6.0 libtd-1.6.0_1
libJudy.so.1 judy-1.0.5_1
libsignal-protocol-c.so.2 libsignal-protocol-c-2.3.3_2
+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..871901610e9
--- /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 <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=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/rtprocess
+ vmove usr/lib/cmake/rtprocess
+ vmove usr/lib/pkgconfig/rtprocess.pc
+ }
+}
From 80fcf10193e3ee57b55459c1cb4e90fdb63f2897 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 2/2] siril: update to 0.99.4.
---
srcpkgs/siril/template | 21 ++++++++++++++-------
1 file changed, 14 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/siril/template b/srcpkgs/siril/template
index 25a7a414e72..b52964745cd 100644
--- a/srcpkgs/siril/template
+++ b/srcpkgs/siril/template
@@ -1,25 +1,32 @@
# Template file for 'siril'
pkgname=siril
-version=0.9.12
-revision=3
+version=0.99.4
+revision=1
+wrksrc="${pkgname}-${version}"
+create_wrksrc=yes
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"
-depends="gnuplot"
+makedepends="glib-devel exiv2-devel gtk+3-devel cairo-devel fftw-devel
+ gsl-devel cfitsio-devel libconfig-devel libopencv4-devel libgomp-devel
+ libraw-devel tiff-devel libjpeg-turbo-devel libpng-devel libheif-devel
+ libffms2-devel libcurl-devel librtprocess-devel"
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=80c0fcd750c034608464dfd443685ee51096df8b0b495d1743e6284d22f45f38
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+ makedepends+=" libatomic-devel"
+fi
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
makedepends+=" libexecinfo-devel"
fi
CFLAGS="-fcommon"
+CXXFLAGS="-fopenmp"
pre_configure() {
NOCONFIGURE=1 ./autogen.sh
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: [PR PATCH] [Updated] siril: update to 0.99.4.
2020-09-05 1:02 [PR PATCH] siril: update to 0.99.4 andkem
` (12 preceding siblings ...)
2020-09-05 20:45 ` andkem
@ 2020-09-23 21:25 ` andkem
2020-09-23 21:26 ` siril: update to 0.99.6 andkem
` (26 subsequent siblings)
40 siblings, 0 replies; 42+ messages in thread
From: andkem @ 2020-09-23 21:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 324 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 0.99.4.
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: 3918 bytes --]
From 614dbcbbb2e0c8fccce245152f22f546c4036b40 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/2] 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 e2c43cb88af..dbe92d3ef91 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3989,3 +3989,4 @@ libneatvnc.so.0 neatvnc-0.2.0_1
libtdjson.so.1.6.0 libtd-1.6.0_1
libJudy.so.1 judy-1.0.5_1
libsignal-protocol-c.so.2 libsignal-protocol-c-2.3.3_2
+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..871901610e9
--- /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 <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=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/rtprocess
+ vmove usr/lib/cmake/rtprocess
+ vmove usr/lib/pkgconfig/rtprocess.pc
+ }
+}
From dff0d68cfda726046ef90b62f2af575e458de59a 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 2/2] siril: update to 0.99.6.
---
srcpkgs/siril/template | 21 ++++++++++++++-------
1 file changed, 14 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/siril/template b/srcpkgs/siril/template
index 25a7a414e72..bfe10cb5d17 100644
--- a/srcpkgs/siril/template
+++ b/srcpkgs/siril/template
@@ -1,25 +1,32 @@
# Template file for 'siril'
pkgname=siril
-version=0.9.12
-revision=3
+version=0.99.6
+revision=1
+wrksrc="${pkgname}-${version}"
+create_wrksrc=yes
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"
-depends="gnuplot"
+makedepends="glib-devel exiv2-devel gtk+3-devel cairo-devel fftw-devel
+ gsl-devel cfitsio-devel libconfig-devel libopencv4-devel libgomp-devel
+ libraw-devel tiff-devel libjpeg-turbo-devel libpng-devel libheif-devel
+ libffms2-devel libcurl-devel librtprocess-devel"
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=255dbffb72bb39b1d9d56ab948b4cad32d1458161b1d997cd84ada21f9a8499f
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+ makedepends+=" libatomic-devel"
+fi
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
makedepends+=" libexecinfo-devel"
fi
CFLAGS="-fcommon"
+CXXFLAGS="-fopenmp"
pre_configure() {
NOCONFIGURE=1 ./autogen.sh
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: siril: update to 0.99.6.
2020-09-05 1:02 [PR PATCH] siril: update to 0.99.4 andkem
` (13 preceding siblings ...)
2020-09-23 21:25 ` andkem
@ 2020-09-23 21:26 ` andkem
2021-02-14 16:23 ` [PR PATCH] [Updated] " andkem
` (25 subsequent siblings)
40 siblings, 0 replies; 42+ messages in thread
From: andkem @ 2020-09-23 21:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 229 bytes --]
New comment by andkem on void-packages repository
https://github.com/void-linux/void-packages/pull/24678#issuecomment-697981775
Comment:
0.99.6 was released. It is still a 1.0 beta although they consider it better than 0.9.12.
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: [PR PATCH] [Updated] siril: update to 0.99.6.
2020-09-05 1:02 [PR PATCH] siril: update to 0.99.4 andkem
` (14 preceding siblings ...)
2020-09-23 21:26 ` siril: update to 0.99.6 andkem
@ 2021-02-14 16:23 ` andkem
2021-02-14 17:14 ` [PR PATCH] [Updated] siril: update to 0.99.8.1 andkem
` (24 subsequent siblings)
40 siblings, 0 replies; 42+ messages in thread
From: andkem @ 2021-02-14 16:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 324 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 0.99.6.
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: 5814 bytes --]
From d9e50f99199594fa143d453326f74f54981ad4b1 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.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 <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=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 bab217938b5e4b72965de44435b0bec24ad2f2f9 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.4
---
common/shlibs | 1 +
srcpkgs/wcslib-devel | 1 +
srcpkgs/wcslib/template | 24 ++++++++++++++++++++++++
3 files changed, 26 insertions(+)
create mode 120000 srcpkgs/wcslib-devel
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/template b/srcpkgs/wcslib/template
new file mode 100644
index 00000000000..10404a0d0b2
--- /dev/null
+++ b/srcpkgs/wcslib/template
@@ -0,0 +1,24 @@
+# Template file for 'wcslib'
+pkgname=wcslib
+version=7.4
+revision=1
+build_style=gnu-configure
+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=a21c964136055ad1d68ca9d3e9714374a9dc3ff2f7072622af08cc4f5a0c511c
+
+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 f0c5d27e5ca63aea3970e6c9ff2616d6f32e86f7 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 0.99.8.1.
---
srcpkgs/siril/template | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/siril/template b/srcpkgs/siril/template
index 25a7a414e72..720dd92184d 100644
--- a/srcpkgs/siril/template
+++ b/srcpkgs/siril/template
@@ -1,25 +1,33 @@
# 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"
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=45b73ee8d1e1bd7ff184478f90da59c729ca1bd5285fb2f7ac0237c6b5cdbdb2
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+ makedepends+=" libatomic-devel"
+fi
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
makedepends+=" libexecinfo-devel"
fi
CFLAGS="-fcommon"
+CXXFLAGS="-fopenmp"
pre_configure() {
NOCONFIGURE=1 ./autogen.sh
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: [PR PATCH] [Updated] siril: update to 0.99.8.1.
2020-09-05 1:02 [PR PATCH] siril: update to 0.99.4 andkem
` (15 preceding siblings ...)
2021-02-14 16:23 ` [PR PATCH] [Updated] " andkem
@ 2021-02-14 17:14 ` andkem
2021-02-14 17:22 ` andkem
` (23 subsequent siblings)
40 siblings, 0 replies; 42+ messages in thread
From: andkem @ 2021-02-14 17:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 326 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 0.99.8.1.
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: 8045 bytes --]
From d9e50f99199594fa143d453326f74f54981ad4b1 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.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 <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=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 <kempe@lysator.liu.se>
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 <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=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 c7b7792a8579c6e523e51c67676a6a6c0884ba11 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 0.99.8.1.
---
srcpkgs/siril/template | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/siril/template b/srcpkgs/siril/template
index 25a7a414e72..720dd92184d 100644
--- a/srcpkgs/siril/template
+++ b/srcpkgs/siril/template
@@ -1,25 +1,33 @@
# 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"
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=45b73ee8d1e1bd7ff184478f90da59c729ca1bd5285fb2f7ac0237c6b5cdbdb2
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+ makedepends+=" libatomic-devel"
+fi
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
makedepends+=" libexecinfo-devel"
fi
CFLAGS="-fcommon"
+CXXFLAGS="-fopenmp"
pre_configure() {
NOCONFIGURE=1 ./autogen.sh
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: siril: update to 0.99.8.1.
2020-09-05 1:02 [PR PATCH] siril: update to 0.99.4 andkem
` (16 preceding siblings ...)
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
` (22 subsequent siblings)
40 siblings, 0 replies; 42+ messages in thread
From: andkem @ 2021-02-14 17:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 193 bytes --]
New comment by andkem on void-packages repository
https://github.com/void-linux/void-packages/pull/24678#issuecomment-778809142
Comment:
Version 0.99.8.1 was released. Keeping MR up to date.
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: [PR PATCH] [Updated] siril: update to 0.99.8.1.
2020-09-05 1:02 [PR PATCH] siril: update to 0.99.4 andkem
` (17 preceding siblings ...)
2021-02-14 17:22 ` andkem
@ 2021-02-14 17:53 ` andkem
2021-02-14 18:11 ` andkem
` (21 subsequent siblings)
40 siblings, 0 replies; 42+ messages in thread
From: andkem @ 2021-02-14 17:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 326 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 0.99.8.1.
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: 8059 bytes --]
From d9e50f99199594fa143d453326f74f54981ad4b1 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.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 <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=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 <kempe@lysator.liu.se>
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 <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=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 26ed287656ef5c6701b2c2dc778b1541636b96ca 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 0.99.8.1.
---
srcpkgs/siril/template | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/siril/template b/srcpkgs/siril/template
index 25a7a414e72..bef79ae853a 100644
--- a/srcpkgs/siril/template
+++ b/srcpkgs/siril/template
@@ -1,25 +1,33 @@
# 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 <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=45b73ee8d1e1bd7ff184478f90da59c729ca1bd5285fb2f7ac0237c6b5cdbdb2
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+ makedepends+=" libatomic-devel"
+fi
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
makedepends+=" libexecinfo-devel"
fi
CFLAGS="-fcommon"
+CXXFLAGS="-fopenmp"
pre_configure() {
NOCONFIGURE=1 ./autogen.sh
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: [PR PATCH] [Updated] siril: update to 0.99.8.1.
2020-09-05 1:02 [PR PATCH] siril: update to 0.99.4 andkem
` (18 preceding siblings ...)
2021-02-14 17:53 ` [PR PATCH] [Updated] " andkem
@ 2021-02-14 18:11 ` andkem
2021-02-14 19:10 ` andkem
` (20 subsequent siblings)
40 siblings, 0 replies; 42+ messages in thread
From: andkem @ 2021-02-14 18:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 326 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 0.99.8.1.
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: 8146 bytes --]
From d9e50f99199594fa143d453326f74f54981ad4b1 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.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 <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=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 <kempe@lysator.liu.se>
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 <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=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 5f5b44ab1dfc9292a04465e0b09d93efc6a33980 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 0.99.8.1.
---
srcpkgs/siril/template | 25 +++++++++++++++++++------
1 file changed, 19 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/siril/template b/srcpkgs/siril/template
index 25a7a414e72..5e9b32a8723 100644
--- a/srcpkgs/siril/template
+++ b/srcpkgs/siril/template
@@ -1,26 +1,39 @@
# 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 <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=45b73ee8d1e1bd7ff184478f90da59c729ca1bd5285fb2f7ac0237c6b5cdbdb2
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+ makedepends+=" libatomic-devel"
+fi
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
makedepends+=" libexecinfo-devel"
fi
CFLAGS="-fcommon"
+CXXFLAGS="-fopenmp"
pre_configure() {
NOCONFIGURE=1 ./autogen.sh
}
+
+# make check doesn't really do anything and is broken.
+do_check() {
+ :
+}
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: [PR PATCH] [Updated] siril: update to 0.99.8.1.
2020-09-05 1:02 [PR PATCH] siril: update to 0.99.4 andkem
` (19 preceding siblings ...)
2021-02-14 18:11 ` andkem
@ 2021-02-14 19:10 ` andkem
2021-02-14 23:15 ` [PR REVIEW] " ericonr
` (19 subsequent siblings)
40 siblings, 0 replies; 42+ messages in thread
From: andkem @ 2021-02-14 19:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 326 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 0.99.8.1.
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: 8133 bytes --]
From d9e50f99199594fa143d453326f74f54981ad4b1 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.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 <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=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 <kempe@lysator.liu.se>
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 <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=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 <kempe@lysator.liu.se>
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 <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=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() {
+ :
+}
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: [PR REVIEW] siril: update to 0.99.8.1.
2020-09-05 1:02 [PR PATCH] siril: update to 0.99.4 andkem
` (20 preceding siblings ...)
2021-02-14 19:10 ` andkem
@ 2021-02-14 23:15 ` ericonr
2021-02-14 23:15 ` ericonr
` (18 subsequent siblings)
40 siblings, 0 replies; 42+ messages in thread
From: ericonr @ 2021-02-14 23:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 194 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/24678#discussion_r575880177
Comment:
```suggestion
if [ "$CROSS_BUILD" ]; then
```
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: [PR REVIEW] siril: update to 0.99.8.1.
2020-09-05 1:02 [PR PATCH] siril: update to 0.99.4 andkem
` (21 preceding siblings ...)
2021-02-14 23:15 ` [PR REVIEW] " ericonr
@ 2021-02-14 23:15 ` ericonr
2021-02-14 23:15 ` ericonr
` (17 subsequent siblings)
40 siblings, 0 replies; 42+ messages in thread
From: ericonr @ 2021-02-14 23:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 174 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/24678#discussion_r575880236
Comment:
Use the new `make_check=no`
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: [PR REVIEW] siril: update to 0.99.8.1.
2020-09-05 1:02 [PR PATCH] siril: update to 0.99.4 andkem
` (22 preceding siblings ...)
2021-02-14 23:15 ` ericonr
@ 2021-02-14 23:15 ` ericonr
2021-02-15 18:07 ` [PR PATCH] [Updated] " andkem
` (16 subsequent siblings)
40 siblings, 0 replies; 42+ messages in thread
From: ericonr @ 2021-02-14 23:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 202 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/24678#discussion_r575880338
Comment:
```suggestion
short_desc+=" - development files"
```
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: [PR PATCH] [Updated] siril: update to 0.99.8.1.
2020-09-05 1:02 [PR PATCH] siril: update to 0.99.4 andkem
` (23 preceding siblings ...)
2021-02-14 23:15 ` ericonr
@ 2021-02-15 18:07 ` andkem
2021-02-15 18:26 ` [PR REVIEW] " andkem
` (15 subsequent siblings)
40 siblings, 0 replies; 42+ messages in thread
From: andkem @ 2021-02-15 18:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 326 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 0.99.8.1.
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: 7959 bytes --]
From 6aaa6c80f5bef0f3c89485567bddd38142432c61 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.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 fda9284996c..1ecd0227f8b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3916,3 +3916,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..43af21ce903
--- /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 <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=0a1691e6e90742644506a1123c716cdcfc28689adf461747843ab0440a837584
+
+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 c063a569ee8015a2056db83227bbc3d38de5bad7 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.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 1ecd0227f8b..1d7a2faf76f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3917,3 +3917,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..cbec9bbafbc
--- /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 <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=a21c964136055ad1d68ca9d3e9714374a9dc3ff2f7072622af08cc4f5a0c511c
+
+if [ "$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+=" - 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 ce2cc331f73cb33d263280f66135faaf8a7f5765 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 0.99.8.1.
---
srcpkgs/siril/template | 21 +++++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/siril/template b/srcpkgs/siril/template
index 25a7a414e72..beaa7415c27 100644
--- a/srcpkgs/siril/template
+++ b/srcpkgs/siril/template
@@ -1,19 +1,28 @@
# 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 <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=45b73ee8d1e1bd7ff184478f90da59c729ca1bd5285fb2f7ac0237c6b5cdbdb2
+# make check doesn't really do anything and is broken.
+make_check=no
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+ makedepends+=" libatomic-devel"
+fi
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
makedepends+=" libexecinfo-devel"
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: [PR REVIEW] siril: update to 0.99.8.1.
2020-09-05 1:02 [PR PATCH] siril: update to 0.99.4 andkem
` (24 preceding siblings ...)
2021-02-15 18:07 ` [PR PATCH] [Updated] " andkem
@ 2021-02-15 18:26 ` andkem
2021-02-15 18:26 ` andkem
` (14 subsequent siblings)
40 siblings, 0 replies; 42+ messages in thread
From: andkem @ 2021-02-15 18:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 151 bytes --]
New review comment by andkem on void-packages repository
https://github.com/void-linux/void-packages/pull/24678#discussion_r576365895
Comment:
Fixed
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: [PR REVIEW] siril: update to 0.99.8.1.
2020-09-05 1:02 [PR PATCH] siril: update to 0.99.4 andkem
` (25 preceding siblings ...)
2021-02-15 18:26 ` [PR REVIEW] " andkem
@ 2021-02-15 18:26 ` andkem
2021-02-15 18:26 ` andkem
` (13 subsequent siblings)
40 siblings, 0 replies; 42+ messages in thread
From: andkem @ 2021-02-15 18:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 151 bytes --]
New review comment by andkem on void-packages repository
https://github.com/void-linux/void-packages/pull/24678#discussion_r576365964
Comment:
Fixed
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: [PR REVIEW] siril: update to 0.99.8.1.
2020-09-05 1:02 [PR PATCH] siril: update to 0.99.4 andkem
` (26 preceding siblings ...)
2021-02-15 18:26 ` andkem
@ 2021-02-15 18:26 ` andkem
2021-05-27 18:47 ` [PR PATCH] [Updated] " andkem
` (12 subsequent siblings)
40 siblings, 0 replies; 42+ messages in thread
From: andkem @ 2021-02-15 18:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 151 bytes --]
New review comment by andkem on void-packages repository
https://github.com/void-linux/void-packages/pull/24678#discussion_r576366018
Comment:
Fixed
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: [PR PATCH] [Updated] siril: update to 0.99.8.1.
2020-09-05 1:02 [PR PATCH] siril: update to 0.99.4 andkem
` (27 preceding siblings ...)
2021-02-15 18:26 ` andkem
@ 2021-05-27 18:47 ` andkem
2021-05-27 18:51 ` andkem
` (11 subsequent siblings)
40 siblings, 0 replies; 42+ messages in thread
From: andkem @ 2021-05-27 18:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 326 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 0.99.8.1.
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: 13982 bytes --]
From de0d7d758d1727f7b9ac1221db10df9744573cfc 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.11.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 79808cb76273..07e61ca1f268 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3991,3 +3991,4 @@ libbasu.so.0 basu-0.2.0_1
libXcomp.so.3 nx-libs-3.5.99.24_1
libXcompshad.so.3 nx-libs-3.5.99.24_1
libNX_X11.so.6 nx-libs-3.5.99.24_1
+librtprocess.so.0 librtprocess-0.11.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..8ac7ce64066f
--- /dev/null
+++ b/srcpkgs/librtprocess/template
@@ -0,0 +1,26 @@
+# 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 <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=0a1691e6e90742644506a1123c716cdcfc28689adf461747843ab0440a837584
+
+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 29f3c72634052493ddf9d49630e29123a4be7fa0 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.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 07e61ca1f268..82c7615d9f2b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3992,3 +3992,4 @@ libXcomp.so.3 nx-libs-3.5.99.24_1
libXcompshad.so.3 nx-libs-3.5.99.24_1
libNX_X11.so.6 nx-libs-3.5.99.24_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 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..95a7c6a25838
--- /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 000000000000..cbec9bbafbce
--- /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 <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=a21c964136055ad1d68ca9d3e9714374a9dc3ff2f7072622af08cc4f5a0c511c
+
+if [ "$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+=" - 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 ec36ad57e4fc3355b9f6ef4dbc35c0b78538b6ae 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 0.99.8.1.
---
...pes-instead-of-libtiff-specific-ones.patch | 82 +++++++++++++++++++
.../0002-Use-g_memdup2-if-glib-2.68.patch | 37 +++++++++
...-linkage-for-OpenMP-in-core-exif.cpp.patch | 41 ++++++++++
srcpkgs/siril/template | 22 +++--
4 files changed, 176 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/siril/patches/0001-Use-stdint-types-instead-of-libtiff-specific-ones.patch
create mode 100644 srcpkgs/siril/patches/0002-Use-g_memdup2-if-glib-2.68.patch
create mode 100644 srcpkgs/siril/patches/0003-Use-C-linkage-for-OpenMP-in-core-exif.cpp.patch
diff --git a/srcpkgs/siril/patches/0001-Use-stdint-types-instead-of-libtiff-specific-ones.patch b/srcpkgs/siril/patches/0001-Use-stdint-types-instead-of-libtiff-specific-ones.patch
new file mode 100644
index 000000000000..a0b7e849483a
--- /dev/null
+++ b/srcpkgs/siril/patches/0001-Use-stdint-types-instead-of-libtiff-specific-ones.patch
@@ -0,0 +1,82 @@
+From 009434df15de6b5a8ff1eab79f3d79e91371499d Mon Sep 17 00:00:00 2001
+From: Andreas Kempe <kempe@lysator.liu.se>
+Date: Thu, 27 May 2021 19:53:22 +0200
+Subject: [PATCH 1/3] Use stdint types instead of libtiff specific ones
+
+libtiff has deprecated its own fixed sized types. Switch to stdint fixed
+size types instead.
+---
+ src/core/command.c | 3 ++-
+ src/core/proto.h | 2 +-
+ src/io/image_formats_libraries.c | 7 ++++---
+ 3 files changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/src/core/command.c b/src/core/command.c
+index ebe4359e..6330a6bd 100644
+--- a/src/core/command.c
++++ b/src/core/command.c
+@@ -18,6 +18,7 @@
+ * along with Siril. If not, see <http://www.gnu.org/licenses/>.
+ */
+
++#include <stdint.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+@@ -221,7 +222,7 @@ int process_savepng(int nb){
+
+ #ifdef HAVE_LIBTIFF
+ int process_savetif(int nb){
+- uint16 bitspersample = 16;
++ uint16_t bitspersample = 16;
+
+ if (!single_image_is_loaded()) {
+ PRINT_NOT_FOR_SEQUENCE;
+diff --git a/src/core/proto.h b/src/core/proto.h
+index efbab418..5a6cac27 100644
+--- a/src/core/proto.h
++++ b/src/core/proto.h
+@@ -43,7 +43,7 @@ int readpic(const char *name, fits *fit);
+ /****************** image_formats_libraries.h ******************/
+ #ifdef HAVE_LIBTIFF
+ int readtif(const char *name, fits *fit, gboolean force_float);
+-int savetif(const char *name, fits *fit, uint16 bitspersample);
++int savetif(const char *name, fits *fit, uint16_t bitspersample);
+ #endif
+
+ #ifdef HAVE_LIBJPEG
+diff --git a/src/io/image_formats_libraries.c b/src/io/image_formats_libraries.c
+index 92becc34..98b203e4 100644
+--- a/src/io/image_formats_libraries.c
++++ b/src/io/image_formats_libraries.c
+@@ -21,6 +21,7 @@
+ #ifdef HAVE_CONFIG_H
+ #include <config.h>
+ #endif
++#include <stdint.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <math.h>
+@@ -60,7 +61,7 @@
+
+ #ifdef HAVE_LIBTIFF
+
+-static int readtifstrip(TIFF* tif, uint32 width, uint32 height, uint16 nsamples, WORD **data) {
++static int readtifstrip(TIFF* tif, uint32_t width, uint32_t height, uint16_t nsamples, WORD **data) {
+ uint32_t rowsperstrip;
+ uint16_t config;
+ int retval = nsamples;
+@@ -344,8 +345,8 @@ int readtif(const char *name, fits *fit, gboolean force_float) {
+ uint16_t nbits, nsamples, color;
+ WORD *data = NULL;
+ float *fdata = NULL;
+- uint16 sampleformat = 0;
+-
++ uint16_t sampleformat = 0;
++
+ TIFF* tif = Siril_TIFFOpen(name, "r");
+ if (!tif) {
+ siril_log_message(_("Could not open the TIFF file %s\n"), name);
+--
+2.31.1
+
diff --git a/srcpkgs/siril/patches/0002-Use-g_memdup2-if-glib-2.68.patch b/srcpkgs/siril/patches/0002-Use-g_memdup2-if-glib-2.68.patch
new file mode 100644
index 000000000000..95786884ed86
--- /dev/null
+++ b/srcpkgs/siril/patches/0002-Use-g_memdup2-if-glib-2.68.patch
@@ -0,0 +1,37 @@
+From 1fdd1df83f793cf9878ed6e47eae4fe1f1d4f6d5 Mon Sep 17 00:00:00 2001
+From: Andreas Kempe <kempe@lysator.liu.se>
+Date: Thu, 27 May 2021 19:59:06 +0200
+Subject: [PATCH 2/3] Use g_memdup2 if glib >= 2.68
+
+g_memdup has been deprecated in favour of g_memdup2 starting with glib
+2.68. Define g_memdup to g_memdup2 if glib >= 2.68.
+---
+ src/core/utils.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/core/utils.c b/src/core/utils.c
+index aa7aea11..e88dc4ac 100644
+--- a/src/core/utils.c
++++ b/src/core/utils.c
+@@ -34,6 +34,7 @@
+ #ifdef _WIN32
+ #include <windows.h>
+ #endif
++#include <glib.h>
+
+ #include "core/siril.h"
+ #include "core/proto.h"
+@@ -46,6 +47,10 @@
+ #include "gui/progress_and_log.h"
+ #include "io/single_image.h"
+
++#if GLIB_CHECK_VERSION(2,68,0)
++#define g_memdup g_memdup2
++#endif
++
+ /**
+ * Round double value to an integer
+ * @param x value to round
+--
+2.31.1
+
diff --git a/srcpkgs/siril/patches/0003-Use-C-linkage-for-OpenMP-in-core-exif.cpp.patch b/srcpkgs/siril/patches/0003-Use-C-linkage-for-OpenMP-in-core-exif.cpp.patch
new file mode 100644
index 000000000000..7e201f9bf390
--- /dev/null
+++ b/srcpkgs/siril/patches/0003-Use-C-linkage-for-OpenMP-in-core-exif.cpp.patch
@@ -0,0 +1,41 @@
+From 450801b210f522b7b3f79a157e2b3cd5f265dcb8 Mon Sep 17 00:00:00 2001
+From: Andreas Kempe <kempe@lysator.liu.se>
+Date: Thu, 27 May 2021 20:23:24 +0200
+Subject: [PATCH 3/3] Use C++ linkage for OpenMP in core/exif.cpp
+
+Including omp.h using C linkage causes compilation errors with gcc 10.2
+and llvm12. Change it to C++ linkage which is used in other places in
+the code.
+---
+ src/core/exif.cpp | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/src/core/exif.cpp b/src/core/exif.cpp
+index dd58b1dc..ad11767d 100644
+--- a/src/core/exif.cpp
++++ b/src/core/exif.cpp
+@@ -18,20 +18,16 @@
+ * along with Siril. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+-#ifdef __cplusplus
+ extern "C" {
+-#endif
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+ #endif
++}
+
+ #include <glib.h>
+ #ifdef _OPENMP
+ #include <omp.h>
+ #endif
+-#ifdef __cplusplus
+-}
+-#endif
+
+ #include <cassert>
+ #include <fstream>
+--
+2.31.1
+
diff --git a/srcpkgs/siril/template b/srcpkgs/siril/template
index 25a7a414e72c..f013f719efb9 100644
--- a/srcpkgs/siril/template
+++ b/srcpkgs/siril/template
@@ -1,19 +1,29 @@
# 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 <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=45b73ee8d1e1bd7ff184478f90da59c729ca1bd5285fb2f7ac0237c6b5cdbdb2
+# make check doesn't really do anything and is broken.
+make_check=no
+patch_args="-p1"
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+ makedepends+=" libatomic-devel"
+fi
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
makedepends+=" libexecinfo-devel"
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: [PR PATCH] [Updated] siril: update to 0.99.8.1.
2020-09-05 1:02 [PR PATCH] siril: update to 0.99.4 andkem
` (28 preceding siblings ...)
2021-05-27 18:47 ` [PR PATCH] [Updated] " andkem
@ 2021-05-27 18:51 ` andkem
2021-05-27 18:53 ` andkem
` (10 subsequent siblings)
40 siblings, 0 replies; 42+ messages in thread
From: andkem @ 2021-05-27 18:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 326 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 0.99.8.1.
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: 13982 bytes --]
From a7e9e9a1d4b108a7ad8c7b5c15c40c030ac58159 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.11.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 666da46e0481..b9e58a0a1a9b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4006,3 +4006,4 @@ libbasu.so.0 basu-0.2.0_1
libXcomp.so.3 nx-libs-3.5.99.24_1
libXcompshad.so.3 nx-libs-3.5.99.24_1
libNX_X11.so.6 nx-libs-3.5.99.24_1
+librtprocess.so.0 librtprocess-0.11.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..8ac7ce64066f
--- /dev/null
+++ b/srcpkgs/librtprocess/template
@@ -0,0 +1,26 @@
+# 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 <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=0a1691e6e90742644506a1123c716cdcfc28689adf461747843ab0440a837584
+
+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 361e4a95927a96816189b630c088a63de13ef76a 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.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 b9e58a0a1a9b..aae10034e167 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4007,3 +4007,4 @@ libXcomp.so.3 nx-libs-3.5.99.24_1
libXcompshad.so.3 nx-libs-3.5.99.24_1
libNX_X11.so.6 nx-libs-3.5.99.24_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 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..95a7c6a25838
--- /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 000000000000..cbec9bbafbce
--- /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 <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=a21c964136055ad1d68ca9d3e9714374a9dc3ff2f7072622af08cc4f5a0c511c
+
+if [ "$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+=" - 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 d04708153901b991a38c6fd82f3e3443ad522840 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 0.99.8.1.
---
...pes-instead-of-libtiff-specific-ones.patch | 82 +++++++++++++++++++
.../0002-Use-g_memdup2-if-glib-2.68.patch | 37 +++++++++
...-linkage-for-OpenMP-in-core-exif.cpp.patch | 41 ++++++++++
srcpkgs/siril/template | 22 +++--
4 files changed, 176 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/siril/patches/0001-Use-stdint-types-instead-of-libtiff-specific-ones.patch
create mode 100644 srcpkgs/siril/patches/0002-Use-g_memdup2-if-glib-2.68.patch
create mode 100644 srcpkgs/siril/patches/0003-Use-C-linkage-for-OpenMP-in-core-exif.cpp.patch
diff --git a/srcpkgs/siril/patches/0001-Use-stdint-types-instead-of-libtiff-specific-ones.patch b/srcpkgs/siril/patches/0001-Use-stdint-types-instead-of-libtiff-specific-ones.patch
new file mode 100644
index 000000000000..a0b7e849483a
--- /dev/null
+++ b/srcpkgs/siril/patches/0001-Use-stdint-types-instead-of-libtiff-specific-ones.patch
@@ -0,0 +1,82 @@
+From 009434df15de6b5a8ff1eab79f3d79e91371499d Mon Sep 17 00:00:00 2001
+From: Andreas Kempe <kempe@lysator.liu.se>
+Date: Thu, 27 May 2021 19:53:22 +0200
+Subject: [PATCH 1/3] Use stdint types instead of libtiff specific ones
+
+libtiff has deprecated its own fixed sized types. Switch to stdint fixed
+size types instead.
+---
+ src/core/command.c | 3 ++-
+ src/core/proto.h | 2 +-
+ src/io/image_formats_libraries.c | 7 ++++---
+ 3 files changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/src/core/command.c b/src/core/command.c
+index ebe4359e..6330a6bd 100644
+--- a/src/core/command.c
++++ b/src/core/command.c
+@@ -18,6 +18,7 @@
+ * along with Siril. If not, see <http://www.gnu.org/licenses/>.
+ */
+
++#include <stdint.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+@@ -221,7 +222,7 @@ int process_savepng(int nb){
+
+ #ifdef HAVE_LIBTIFF
+ int process_savetif(int nb){
+- uint16 bitspersample = 16;
++ uint16_t bitspersample = 16;
+
+ if (!single_image_is_loaded()) {
+ PRINT_NOT_FOR_SEQUENCE;
+diff --git a/src/core/proto.h b/src/core/proto.h
+index efbab418..5a6cac27 100644
+--- a/src/core/proto.h
++++ b/src/core/proto.h
+@@ -43,7 +43,7 @@ int readpic(const char *name, fits *fit);
+ /****************** image_formats_libraries.h ******************/
+ #ifdef HAVE_LIBTIFF
+ int readtif(const char *name, fits *fit, gboolean force_float);
+-int savetif(const char *name, fits *fit, uint16 bitspersample);
++int savetif(const char *name, fits *fit, uint16_t bitspersample);
+ #endif
+
+ #ifdef HAVE_LIBJPEG
+diff --git a/src/io/image_formats_libraries.c b/src/io/image_formats_libraries.c
+index 92becc34..98b203e4 100644
+--- a/src/io/image_formats_libraries.c
++++ b/src/io/image_formats_libraries.c
+@@ -21,6 +21,7 @@
+ #ifdef HAVE_CONFIG_H
+ #include <config.h>
+ #endif
++#include <stdint.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <math.h>
+@@ -60,7 +61,7 @@
+
+ #ifdef HAVE_LIBTIFF
+
+-static int readtifstrip(TIFF* tif, uint32 width, uint32 height, uint16 nsamples, WORD **data) {
++static int readtifstrip(TIFF* tif, uint32_t width, uint32_t height, uint16_t nsamples, WORD **data) {
+ uint32_t rowsperstrip;
+ uint16_t config;
+ int retval = nsamples;
+@@ -344,8 +345,8 @@ int readtif(const char *name, fits *fit, gboolean force_float) {
+ uint16_t nbits, nsamples, color;
+ WORD *data = NULL;
+ float *fdata = NULL;
+- uint16 sampleformat = 0;
+-
++ uint16_t sampleformat = 0;
++
+ TIFF* tif = Siril_TIFFOpen(name, "r");
+ if (!tif) {
+ siril_log_message(_("Could not open the TIFF file %s\n"), name);
+--
+2.31.1
+
diff --git a/srcpkgs/siril/patches/0002-Use-g_memdup2-if-glib-2.68.patch b/srcpkgs/siril/patches/0002-Use-g_memdup2-if-glib-2.68.patch
new file mode 100644
index 000000000000..95786884ed86
--- /dev/null
+++ b/srcpkgs/siril/patches/0002-Use-g_memdup2-if-glib-2.68.patch
@@ -0,0 +1,37 @@
+From 1fdd1df83f793cf9878ed6e47eae4fe1f1d4f6d5 Mon Sep 17 00:00:00 2001
+From: Andreas Kempe <kempe@lysator.liu.se>
+Date: Thu, 27 May 2021 19:59:06 +0200
+Subject: [PATCH 2/3] Use g_memdup2 if glib >= 2.68
+
+g_memdup has been deprecated in favour of g_memdup2 starting with glib
+2.68. Define g_memdup to g_memdup2 if glib >= 2.68.
+---
+ src/core/utils.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/core/utils.c b/src/core/utils.c
+index aa7aea11..e88dc4ac 100644
+--- a/src/core/utils.c
++++ b/src/core/utils.c
+@@ -34,6 +34,7 @@
+ #ifdef _WIN32
+ #include <windows.h>
+ #endif
++#include <glib.h>
+
+ #include "core/siril.h"
+ #include "core/proto.h"
+@@ -46,6 +47,10 @@
+ #include "gui/progress_and_log.h"
+ #include "io/single_image.h"
+
++#if GLIB_CHECK_VERSION(2,68,0)
++#define g_memdup g_memdup2
++#endif
++
+ /**
+ * Round double value to an integer
+ * @param x value to round
+--
+2.31.1
+
diff --git a/srcpkgs/siril/patches/0003-Use-C-linkage-for-OpenMP-in-core-exif.cpp.patch b/srcpkgs/siril/patches/0003-Use-C-linkage-for-OpenMP-in-core-exif.cpp.patch
new file mode 100644
index 000000000000..7e201f9bf390
--- /dev/null
+++ b/srcpkgs/siril/patches/0003-Use-C-linkage-for-OpenMP-in-core-exif.cpp.patch
@@ -0,0 +1,41 @@
+From 450801b210f522b7b3f79a157e2b3cd5f265dcb8 Mon Sep 17 00:00:00 2001
+From: Andreas Kempe <kempe@lysator.liu.se>
+Date: Thu, 27 May 2021 20:23:24 +0200
+Subject: [PATCH 3/3] Use C++ linkage for OpenMP in core/exif.cpp
+
+Including omp.h using C linkage causes compilation errors with gcc 10.2
+and llvm12. Change it to C++ linkage which is used in other places in
+the code.
+---
+ src/core/exif.cpp | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/src/core/exif.cpp b/src/core/exif.cpp
+index dd58b1dc..ad11767d 100644
+--- a/src/core/exif.cpp
++++ b/src/core/exif.cpp
+@@ -18,20 +18,16 @@
+ * along with Siril. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+-#ifdef __cplusplus
+ extern "C" {
+-#endif
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+ #endif
++}
+
+ #include <glib.h>
+ #ifdef _OPENMP
+ #include <omp.h>
+ #endif
+-#ifdef __cplusplus
+-}
+-#endif
+
+ #include <cassert>
+ #include <fstream>
+--
+2.31.1
+
diff --git a/srcpkgs/siril/template b/srcpkgs/siril/template
index 5dd0cf48d12e..f013f719efb9 100644
--- a/srcpkgs/siril/template
+++ b/srcpkgs/siril/template
@@ -1,19 +1,29 @@
# Template file for 'siril'
pkgname=siril
-version=0.9.12
-revision=4
+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 <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=45b73ee8d1e1bd7ff184478f90da59c729ca1bd5285fb2f7ac0237c6b5cdbdb2
+# make check doesn't really do anything and is broken.
+make_check=no
+patch_args="-p1"
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+ makedepends+=" libatomic-devel"
+fi
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
makedepends+=" libexecinfo-devel"
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: siril: update to 0.99.8.1.
2020-09-05 1:02 [PR PATCH] siril: update to 0.99.4 andkem
` (29 preceding siblings ...)
2021-05-27 18:51 ` andkem
@ 2021-05-27 18:53 ` andkem
2021-06-17 22:10 ` [PR PATCH] [Updated] " andkem
` (9 subsequent siblings)
40 siblings, 0 replies; 42+ messages in thread
From: andkem @ 2021-05-27 18:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 261 bytes --]
New comment by andkem on void-packages repository
https://github.com/void-linux/void-packages/pull/24678#issuecomment-849862998
Comment:
Keeping this PR compiling by adding a few patches I'm looking at upstreaming and adding a missing NDEBUG to librtprocess.
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: [PR PATCH] [Updated] siril: update to 0.99.8.1.
2020-09-05 1:02 [PR PATCH] siril: update to 0.99.4 andkem
` (30 preceding siblings ...)
2021-05-27 18:53 ` andkem
@ 2021-06-17 22:10 ` andkem
2021-06-17 22:10 ` siril: update to 0.99.10 andkem
` (8 subsequent siblings)
40 siblings, 0 replies; 42+ messages in thread
From: andkem @ 2021-06-17 22:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 326 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 0.99.8.1.
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: 7990 bytes --]
From fc7b6dcf8562d4056b082a48700a536d6518e2a5 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.11.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 7b007a129e17..3612f0ab9c96 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4012,3 +4012,4 @@ libbasu.so.0 basu-0.2.0_1
libXcomp.so.3 nx-libs-3.5.99.24_1
libXcompshad.so.3 nx-libs-3.5.99.24_1
libNX_X11.so.6 nx-libs-3.5.99.24_1
+librtprocess.so.0 librtprocess-0.11.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..8ac7ce64066f
--- /dev/null
+++ b/srcpkgs/librtprocess/template
@@ -0,0 +1,26 @@
+# 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 <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=0a1691e6e90742644506a1123c716cdcfc28689adf461747843ab0440a837584
+
+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 9dcc8eeedff8962aaaf8e83d5956cef632c20562 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.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 3612f0ab9c96..b41c5b0a24d9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4013,3 +4013,4 @@ libXcomp.so.3 nx-libs-3.5.99.24_1
libXcompshad.so.3 nx-libs-3.5.99.24_1
libNX_X11.so.6 nx-libs-3.5.99.24_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 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..95a7c6a25838
--- /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 000000000000..cbec9bbafbce
--- /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 <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=a21c964136055ad1d68ca9d3e9714374a9dc3ff2f7072622af08cc4f5a0c511c
+
+if [ "$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+=" - 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 b289310bce60e17fd581cebac34876c0718764d4 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 0.99.10.
---
srcpkgs/siril/template | 22 ++++++++++++++++------
1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/siril/template b/srcpkgs/siril/template
index 5dd0cf48d12e..ae5e52dba2d4 100644
--- a/srcpkgs/siril/template
+++ b/srcpkgs/siril/template
@@ -1,19 +1,29 @@
# Template file for 'siril'
pkgname=siril
-version=0.9.12
-revision=4
+version=0.99.10
+revision=1
+wrksrc="${pkgname}"
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 <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=37e8f430499946b2543dceef08f5632d80f8302440b2b398813f617794c2e840
+# make check doesn't really do anything and is broken.
+make_check=no
+patch_args="-p1"
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+ makedepends+=" libatomic-devel"
+fi
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
makedepends+=" libexecinfo-devel"
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: siril: update to 0.99.10.
2020-09-05 1:02 [PR PATCH] siril: update to 0.99.4 andkem
` (31 preceding siblings ...)
2021-06-17 22:10 ` [PR PATCH] [Updated] " andkem
@ 2021-06-17 22:10 ` andkem
2022-03-10 23:19 ` [PR PATCH] [Updated] " andkem
` (7 subsequent siblings)
40 siblings, 0 replies; 42+ messages in thread
From: andkem @ 2021-06-17 22:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 190 bytes --]
New comment by andkem on void-packages repository
https://github.com/void-linux/void-packages/pull/24678#issuecomment-863595555
Comment:
Siril 0.99.10 was released. Keeping PR up to date.
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: [PR PATCH] [Updated] siril: update to 0.99.10.
2020-09-05 1:02 [PR PATCH] siril: update to 0.99.4 andkem
` (32 preceding siblings ...)
2021-06-17 22:10 ` siril: update to 0.99.10 andkem
@ 2022-03-10 23:19 ` andkem
2022-03-10 23:21 ` siril: update to 1.0.0 andkem
` (6 subsequent siblings)
40 siblings, 0 replies; 42+ messages in thread
From: andkem @ 2022-03-10 23:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 325 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 0.99.10.
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: 8908 bytes --]
From e7d6b879c1b71e0899c41f2bd8c3e22bffe15b73 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.11.0
---
common/shlibs | 2 ++
srcpkgs/librtprocess-devel | 1 +
srcpkgs/librtprocess/template | 26 ++++++++++++++++++++++++++
3 files changed, 29 insertions(+)
create mode 120000 srcpkgs/librtprocess-devel
create mode 100644 srcpkgs/librtprocess/template
diff --git a/common/shlibs b/common/shlibs
index d60e60a87534..2d349620e137 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4142,3 +4142,5 @@ librz_util.so.0.3.4 rizin-0.3.4_1
librz_lang.so.0.3.4 rizin-0.3.4_1
librz_search.so.0.3.4 rizin-0.3.4_1
librz_bin.so.0.3.4 rizin-0.3.4_1
+libkdumpfile.so.8 libkdumpfile-0.4.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 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..8ac7ce64066f
--- /dev/null
+++ b/srcpkgs/librtprocess/template
@@ -0,0 +1,26 @@
+# 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 <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=0a1691e6e90742644506a1123c716cdcfc28689adf461747843ab0440a837584
+
+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 6dff2356d07cd6ef9ca3a14b80d30da5bd7aa73e 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.7
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 2d349620e137..fc4d6a354ce1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4144,3 +4144,4 @@ librz_search.so.0.3.4 rizin-0.3.4_1
librz_bin.so.0.3.4 rizin-0.3.4_1
libkdumpfile.so.8 libkdumpfile-0.4.0_1
librtprocess.so.0 librtprocess-0.11.0_1
+libwcs.so.7 wcslib-7.7_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..a9c18dcf104b
--- /dev/null
+++ b/srcpkgs/wcslib/template
@@ -0,0 +1,38 @@
+# Template file for 'wcslib'
+pkgname=wcslib
+version=7.7
+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=a708e6b4e90e2cd6427434715b591bb9c3d4005c99725ec494b8e0bed2de5355
+
+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 8a24981d83880a48582723b2982c31ab7ec74fec 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.0.
---
srcpkgs/siril/template | 38 +++++++++++++++++++++-----------------
1 file changed, 21 insertions(+), 17 deletions(-)
diff --git a/srcpkgs/siril/template b/srcpkgs/siril/template
index a06f3352243d..d07f2d7083a5 100644
--- a/srcpkgs/siril/template
+++ b/srcpkgs/siril/template
@@ -1,31 +1,35 @@
# 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.0
+revision=1
+wrksrc="${pkgname}"
+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=22fec7b88b94c40c4180e6637fef8a7cd8ea95ccaf23323e403bf2296ec274bc
+
+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
+do_extract() {
+ tar -xf "${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}-${version}-rc2.tar.bz2" -C "${wrksrc}"
+ cd "${wrksrc}"
}
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: siril: update to 1.0.0.
2020-09-05 1:02 [PR PATCH] siril: update to 0.99.4 andkem
` (33 preceding siblings ...)
2022-03-10 23:19 ` [PR PATCH] [Updated] " andkem
@ 2022-03-10 23:21 ` andkem
2022-03-10 23:23 ` [PR PATCH] [Updated] " andkem
` (5 subsequent siblings)
40 siblings, 0 replies; 42+ messages in thread
From: andkem @ 2022-03-10 23:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 318 bytes --]
New comment by andkem on void-packages repository
https://github.com/void-linux/void-packages/pull/24678#issuecomment-1064614467
Comment:
Siril 1.0.0 was finally released. Since the 0.9.12 release has been considered deprecated for a few years now, I would love it if we could finally get the Siril package updated.
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: [PR PATCH] [Updated] siril: update to 1.0.0.
2020-09-05 1:02 [PR PATCH] siril: update to 0.99.4 andkem
` (34 preceding siblings ...)
2022-03-10 23:21 ` siril: update to 1.0.0 andkem
@ 2022-03-10 23:23 ` andkem
2022-03-10 23:42 ` andkem
` (4 subsequent siblings)
40 siblings, 0 replies; 42+ messages in thread
From: andkem @ 2022-03-10 23:23 UTC (permalink / raw)
To: ml
[-- 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: 8862 bytes --]
From 05c4874393aad5890b782830634f472bb352e204 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.11.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 d60e60a87534..3dfd2c96c0ba 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4142,3 +4142,4 @@ librz_util.so.0.3.4 rizin-0.3.4_1
librz_lang.so.0.3.4 rizin-0.3.4_1
librz_search.so.0.3.4 rizin-0.3.4_1
librz_bin.so.0.3.4 rizin-0.3.4_1
+librtprocess.so.0 librtprocess-0.11.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..8ac7ce64066f
--- /dev/null
+++ b/srcpkgs/librtprocess/template
@@ -0,0 +1,26 @@
+# 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 <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=0a1691e6e90742644506a1123c716cdcfc28689adf461747843ab0440a837584
+
+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 a50725d32fe5c6b49bbea70b055c8f9880897ce2 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.7
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 3dfd2c96c0ba..b58ce3d9dd2d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4143,3 +4143,4 @@ librz_lang.so.0.3.4 rizin-0.3.4_1
librz_search.so.0.3.4 rizin-0.3.4_1
librz_bin.so.0.3.4 rizin-0.3.4_1
librtprocess.so.0 librtprocess-0.11.0_1
+libwcs.so.7 wcslib-7.7_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..a9c18dcf104b
--- /dev/null
+++ b/srcpkgs/wcslib/template
@@ -0,0 +1,38 @@
+# Template file for 'wcslib'
+pkgname=wcslib
+version=7.7
+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=a708e6b4e90e2cd6427434715b591bb9c3d4005c99725ec494b8e0bed2de5355
+
+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 a11609336aa6fea73f12883be26f415280843ae1 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.0.
---
srcpkgs/siril/template | 38 +++++++++++++++++++++-----------------
1 file changed, 21 insertions(+), 17 deletions(-)
diff --git a/srcpkgs/siril/template b/srcpkgs/siril/template
index a06f3352243d..d07f2d7083a5 100644
--- a/srcpkgs/siril/template
+++ b/srcpkgs/siril/template
@@ -1,31 +1,35 @@
# 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.0
+revision=1
+wrksrc="${pkgname}"
+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=22fec7b88b94c40c4180e6637fef8a7cd8ea95ccaf23323e403bf2296ec274bc
+
+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
+do_extract() {
+ tar -xf "${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}-${version}-rc2.tar.bz2" -C "${wrksrc}"
+ cd "${wrksrc}"
}
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: [PR PATCH] [Updated] siril: update to 1.0.0.
2020-09-05 1:02 [PR PATCH] siril: update to 0.99.4 andkem
` (35 preceding siblings ...)
2022-03-10 23:23 ` [PR PATCH] [Updated] " andkem
@ 2022-03-10 23:42 ` andkem
2022-05-17 21:57 ` andkem
` (3 subsequent siblings)
40 siblings, 0 replies; 42+ messages in thread
From: andkem @ 2022-03-10 23:42 UTC (permalink / raw)
To: ml
[-- 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: 8858 bytes --]
From 05c4874393aad5890b782830634f472bb352e204 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.11.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 d60e60a87534..3dfd2c96c0ba 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4142,3 +4142,4 @@ librz_util.so.0.3.4 rizin-0.3.4_1
librz_lang.so.0.3.4 rizin-0.3.4_1
librz_search.so.0.3.4 rizin-0.3.4_1
librz_bin.so.0.3.4 rizin-0.3.4_1
+librtprocess.so.0 librtprocess-0.11.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..8ac7ce64066f
--- /dev/null
+++ b/srcpkgs/librtprocess/template
@@ -0,0 +1,26 @@
+# 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 <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=0a1691e6e90742644506a1123c716cdcfc28689adf461747843ab0440a837584
+
+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 a50725d32fe5c6b49bbea70b055c8f9880897ce2 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.7
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 3dfd2c96c0ba..b58ce3d9dd2d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4143,3 +4143,4 @@ librz_lang.so.0.3.4 rizin-0.3.4_1
librz_search.so.0.3.4 rizin-0.3.4_1
librz_bin.so.0.3.4 rizin-0.3.4_1
librtprocess.so.0 librtprocess-0.11.0_1
+libwcs.so.7 wcslib-7.7_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..a9c18dcf104b
--- /dev/null
+++ b/srcpkgs/wcslib/template
@@ -0,0 +1,38 @@
+# Template file for 'wcslib'
+pkgname=wcslib
+version=7.7
+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=a708e6b4e90e2cd6427434715b591bb9c3d4005c99725ec494b8e0bed2de5355
+
+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 475327f0ad728d696f85fca783cb0d002c3860ea 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.0.
---
srcpkgs/siril/template | 38 +++++++++++++++++++++-----------------
1 file changed, 21 insertions(+), 17 deletions(-)
diff --git a/srcpkgs/siril/template b/srcpkgs/siril/template
index a06f3352243d..3ea6a22d0b5d 100644
--- a/srcpkgs/siril/template
+++ b/srcpkgs/siril/template
@@ -1,31 +1,35 @@
# 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.0
+revision=1
+wrksrc="${pkgname}"
+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=22fec7b88b94c40c4180e6637fef8a7cd8ea95ccaf23323e403bf2296ec274bc
+
+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
+do_extract() {
+ tar -xf "${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}-${version}.tar.bz2" -C "${wrksrc}"
+ cd "${wrksrc}"
}
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: [PR PATCH] [Updated] siril: update to 1.0.0.
2020-09-05 1:02 [PR PATCH] siril: update to 0.99.4 andkem
` (36 preceding siblings ...)
2022-03-10 23:42 ` andkem
@ 2022-05-17 21:57 ` andkem
2022-05-17 22:11 ` siril: update to 1.0.2 andkem
` (2 subsequent siblings)
40 siblings, 0 replies; 42+ messages in thread
From: andkem @ 2022-05-17 21:57 UTC (permalink / raw)
To: ml
[-- 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
-}
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: siril: update to 1.0.2.
2020-09-05 1:02 [PR PATCH] siril: update to 0.99.4 andkem
` (37 preceding siblings ...)
2022-05-17 21:57 ` andkem
@ 2022-05-17 22:11 ` andkem
2022-06-04 22:07 ` [PR PATCH] [Updated] " andkem
2022-06-10 13:14 ` [PR PATCH] [Closed]: " leahneukirchen
40 siblings, 0 replies; 42+ messages in thread
From: andkem @ 2022-05-17 22:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 189 bytes --]
New comment by andkem on void-packages repository
https://github.com/void-linux/void-packages/pull/24678#issuecomment-1129365453
Comment:
Bumped Siril to 1.0.2 to keep the PR up to date.
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: [PR PATCH] [Updated] siril: update to 1.0.2.
2020-09-05 1:02 [PR PATCH] siril: update to 0.99.4 andkem
` (38 preceding siblings ...)
2022-05-17 22:11 ` siril: update to 1.0.2 andkem
@ 2022-06-04 22:07 ` andkem
2022-06-10 13:14 ` [PR PATCH] [Closed]: " leahneukirchen
40 siblings, 0 replies; 42+ messages in thread
From: andkem @ 2022-06-04 22:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 327 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.2.
None
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: 8685 bytes --]
From ea0ea4ac84f7efb388b62438395a21713356271b 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 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 <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 1d0507703fbb0a10553659ed3a80189bf62af834 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 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 <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 e1698c60bf0d1bdb99e4dbf40e6bff9c38020ed3 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
-}
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: [PR PATCH] [Closed]: siril: update to 1.0.2.
2020-09-05 1:02 [PR PATCH] siril: update to 0.99.4 andkem
` (39 preceding siblings ...)
2022-06-04 22:07 ` [PR PATCH] [Updated] " andkem
@ 2022-06-10 13:14 ` leahneukirchen
40 siblings, 0 replies; 42+ messages in thread
From: leahneukirchen @ 2022-06-10 13:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 161 bytes --]
There's a closed pull request on the void-packages repository
siril: update to 1.0.2.
https://github.com/void-linux/void-packages/pull/24678
Description:
None
^ permalink raw reply [flat|nested] 42+ messages in thread