gentoo auto-resync : 16:03:2024 - 12:48:37

4 files changed, 147 insertions, 0 deletions

diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index 79b4c2e7055f..71d935f47275 100644
--- a/sci-astronomy/Manifest.gz
+++ b/sci-astronomy/Manifest.gz
diff --git a/sci-astronomy/siril/Manifest b/sci-astronomy/siril/Manifest
index a32cc93c5ddd..5869f579d4a3 100644
--- a/sci-astronomy/siril/Manifest
+++ b/sci-astronomy/siril/Manifest
@@ -1,6 +1,9 @@
 AUX siril-1.2-exiv2-0.28.patch 1171 BLAKE2B 5e64f52fb1b2eb7ba05dde0d0d84f910d8238eac3d58ca15137fa394b7fb2a75aff26bc01616ef6a46007c95a546403960627b64cf675aa21d0039119f3afc47 SHA512 1e339d6e1bd843146e4dd8124a4ef2177f7596cd5d9864a05886a7a055e00093a48a7341b5ad9c1bf82d9e4b2c0cc2559ef429d2c8f986951c846a0bf097da03
+AUX siril-1.2-fseek64-musl.patch 1750 BLAKE2B d0c735b72c6856f9d965e3c145116384c3cc2da92db2b5bf25c7345b3b6dd511db5853ef8c280cc37eef421713ccb1571443104427b86b963065c7bcf13d2d8d SHA512 73cc6dbc0da759a2f127af9926ca7466ad31c400c4fd349c376058d0b64e8f8f65ab1c8486d2169160af24637aa10c1cbecd0d2fb934b0d4baf22bc919dd7798
 AUX siril-docfiles.patch 433 BLAKE2B 3c781f4a0604f56ada235094eb481b4b51912921719ee198c7d2400a7dffbb4034d34505f5d7221b033efbbbe11b07332938a6dc0bc616bb6f6480e41475653e SHA512 2d770a2cb86d95c291beb6077ab01560e118bc84d838dfeef50bc9a812469fea568cdfe1c9b5d1a90b778527b65a397aac1656008739cff88ffc80ba6fd09c72
 DIST siril-1.2.0.tar.bz2 4500147 BLAKE2B 7ff4fa5bf1b578336c82bd0f67e404fe47715640edae9cb231da4a3c6a30638612e77515049d56dd1d444965ad58f12d5e2516ad13d3e726f13242b11d91b954 SHA512 7df7b17d65a2aad9e0edd4b5022c1d23688ad8884a973d2195391234151aff0824e155ce949b385a951eaef71065a811f33b54e08b865ab5fa6c1d331841663c
+DIST siril-1.2.1.tar.bz2 4596163 BLAKE2B c461a397e623164ccb2310b26aede120bf587b3491a2af3fab446af5ecbfb716169120b549c496bb615d3b7ac6175629258173fe66682ef4684ef5cf01d64761 SHA512 352b3e761a2d863d4ce4e01b0bf4181d8fefa903478973b50ace76ff419dbf07775099a994e685cd83cc2210b34ca10fb98004cedfdea34fe0c1520b4892bb6d
 EBUILD siril-1.2.0.ebuild 2172 BLAKE2B c2c1af672e50ee49f7e49011061c650a60d3507ab0bd7e2a4af76fdfc706260ef175523ae11a0072cc04e36e016c43412470cdc4c61c6368e6670558b5c7e8b5 SHA512 d30dd9d5d81e1f0c271d2613dc48ec97797675702b9f8eb3b27c85ed0ad82123bebaac89f90d4542aeaf1cdc159fc05390e23047aec8f079e51d2576529b61c6
+EBUILD siril-1.2.1.ebuild 2162 BLAKE2B 39b1348d7f0b80e352c67baedb2da19e44e9a55e217120b84a895f949a4c56dabba57a532dd2e22167416dd5fcfd4a6a11dbe4c6d5e87d907a89c772414d6324 SHA512 7e9220e5ca140792b868cda277e8530299ececa88564aa403f5408ca37e3c5379e7036b7f0f8c59449a457beff28d8b39717a46eb6bfbc5820ddf1a3b5d75dd4
 EBUILD siril-9999.ebuild 2118 BLAKE2B ece544aded06995d0f87502c68558ec749b7a7f164df9abd6a1b3bc09b13683d701c49195651155192421082fa92c19706e3751637e35b09b54e9c411933e4c6 SHA512 49e5bf7f8d406ca42e13977fdc591fce9985bb9e6f76796b9bf38d123d380f11806a9590320dd8f065737bfe2b1a12b6f8fcc8b0e727e5d89fc4c66bb5ad4118
 MISC metadata.xml 1230 BLAKE2B a06f55d651e08bc453b4fcf214125668da4bfcd1b612ce00624329de275a28245ccfa842aaab294e043e06c057a0b92725ecc76f4d415d40451bdd2c05b9c462 SHA512 81480de0f4080e61c2d3528f8dfdfd3562f341680acd0084986849a16552970c219c01c2599a5e7e47dc4bc77f5fb3e51ac6e478f1d0bb78a029cb0f0b5d63e1
diff --git a/sci-astronomy/siril/files/siril-1.2-fseek64-musl.patch b/sci-astronomy/siril/files/siril-1.2-fseek64-musl.patch
new file mode 100644
index 000000000000..310ae0cdb6d3
--- /dev/null
+++ b/sci-astronomy/siril/files/siril-1.2-fseek64-musl.patch
@@ -0,0 +1,52 @@
+From 7f09478f4522b65b476c788a696159e5a4974286 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Wed, 13 Dec 2023 21:00:08 +0100
+Subject: [PATCH] Clean up and fix fseek64/ftell64
+Upstream: https://gitlab.com/free-astro/siril/-/merge_requests/606
+
+Test for the exception systems, GNU and Windows, and then fall back to
+standard POSIX.
+
+This fixes build with musl libc, which does not have fseeko64/ftello64.
+
+Fixes https://gitlab.com/free-astro/siril/-/issues/1241
+--- a/src/io/avi_pipp/pipp_utf8.h
++++ b/src/io/avi_pipp/pipp_utf8.h
+@@ -31,27 +31,15 @@
+ #endif
+ 
+ // 64-bit fseek for various platforms
+-#ifdef __linux__
+-#define fseek64 fseeko64  // Linux
+-#define ftell64 ftello64  // Linux
+-#elif defined (OS_OSX)
+-#define fseek64 fseeko  // OS X
+-#define ftell64 ftello  // OS X
+-#elif defined(BSD)
+-#define fseek64 fseeko  // DragonFly BSD, FreeBSD, OpenBSD, NetBSD
+-#define ftell64 ftello  // DragonFly BSD, FreeBSD, OpenBSD, NetBSD
+-#elif defined (__FreeBSD_kernel__) && defined (__GLIBC__)
+-#define fseek64 fseeko64  // KFreeBSD
+-#define ftell64 ftello64  // KFreeBSD
+-#elif defined (__gnu_hurd__)
+-#define fseek64 fseeko64  // GNU/Hurd
+-#define ftell64 ftello64  // GNU/Hurd
+-#elif defined(__CYGWIN__)
+-#define fseek64 fseeko  // CYGWIN
+-#define ftell64 ftello  // CYGWIN
+-#else
++#if defined(__GLIBC__) || defined(__gnu_hurd__)
++#define fseek64 fseeko64  // GNU
++#define ftell64 ftello64  // GNU
++#elif defined(_WIN32)
+ #define fseek64 _fseeki64  // Windows
+ #define ftell64 _ftelli64  // Windows
++#else // POSIX
++#define fseek64 fseeko  // OS X, DragonFly BSD, FreeBSD, OpenBSD, NetBSD, musl
++#define ftell64 ftello  // OS X, DragonFly BSD, FreeBSD, OpenBSD, NetBSD, musl
+ #endif
+ 
+ #endif  // PIPP_UTF8_H
+-- 
+GitLab
+
diff --git a/sci-astronomy/siril/siril-1.2.1.ebuild b/sci-astronomy/siril/siril-1.2.1.ebuild
new file mode 100644
index 000000000000..090db889b8d2
--- /dev/null
+++ b/sci-astronomy/siril/siril-1.2.1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson optfeature toolchain-funcs xdg
+
+DESCRIPTION="A free astronomical image processing software"
+HOMEPAGE="https://siril.org/"
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/free-astro/${PN}.git"
+else
+	SRC_URI="https://gitlab.com/free-astro/siril/-/archive/${PV/_/-}/${PN}-${PV/_/-}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PN}-${PV/_/-}"
+fi
+
+LICENSE="GPL-3+ Boost-1.0"
+SLOT="0"
+IUSE="curl exif ffmpeg heif jpeg libconfig openmp png raw tiff wcs"
+
+DEPEND="
+	>=dev-libs/glib-2.56.0:2
+	>=dev-libs/json-glib-1.2.6
+	media-libs/librtprocess
+	>=media-libs/opencv-4.4.0:=
+	sci-libs/cfitsio:=
+	sci-libs/fftw:3.0=
+	sci-libs/gsl:=
+	x11-libs/gdk-pixbuf:2
+	x11-libs/cairo
+	x11-libs/pango
+	>=x11-libs/gtk+-3.20.0:3
+	curl? ( net-misc/curl )
+	exif? ( >=media-gfx/exiv2-0.25:= )
+	ffmpeg? ( media-video/ffmpeg:= )
+	heif? ( media-libs/libheif:= )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	libconfig? ( >=dev-libs/libconfig-1.4:=[cxx] )
+	png? ( >=media-libs/libpng-1.6.0:= )
+	raw? ( media-libs/libraw:= )
+	tiff? ( media-libs/tiff:= )
+	wcs? ( >=sci-astronomy/wcslib-7.7:= )
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="dev-build/cmake
+	x11-base/xorg-proto"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-docfiles.patch"
+	"${FILESDIR}/${PN}-1.2-fseek64-musl.patch"
+)
+
+DOCS=( README.md NEWS ChangeLog AUTHORS )
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dffms2=false
+		-Dcriterion=false
+		$(meson_use exif exiv2)
+		$(meson_use ffmpeg)
+		$(meson_use heif libheif)
+		$(meson_use jpeg libjpeg)
+		$(meson_use libconfig)
+		$(meson_use openmp)
+		$(meson_use png libpng)
+		$(meson_use raw libraw)
+		$(meson_use tiff libtiff)
+		$(meson_use wcs wcslib)
+		$(usex curl -Denable-libcurl=yes -Denable-libcurl=no)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	optfeature "gnuplot support" sci-visualization/gnuplot
+}