From 4187bba080530c5ca1c7dae9c233e88f3fc8f535 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 6 Jul 2024 08:06:16 +0100 Subject: gentoo auto-resync : 06:07:2024 - 08:06:15 --- sci-astronomy/siril/Manifest | 7 +- .../siril/files/siril-1.2-exiv2-0.28.patch | 39 --------- sci-astronomy/siril/siril-1.2.0.ebuild | 92 --------------------- sci-astronomy/siril/siril-1.2.1-r1.ebuild | 2 +- sci-astronomy/siril/siril-1.2.3.ebuild | 93 ++++++++++++++++++++++ 5 files changed, 97 insertions(+), 136 deletions(-) delete mode 100644 sci-astronomy/siril/files/siril-1.2-exiv2-0.28.patch delete mode 100644 sci-astronomy/siril/siril-1.2.0.ebuild create mode 100644 sci-astronomy/siril/siril-1.2.3.ebuild (limited to 'sci-astronomy/siril') diff --git a/sci-astronomy/siril/Manifest b/sci-astronomy/siril/Manifest index 668e7b267772..0befb582ad19 100644 --- a/sci-astronomy/siril/Manifest +++ b/sci-astronomy/siril/Manifest @@ -1,11 +1,10 @@ -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-1.2.1-options.patch 4226 BLAKE2B da57338a600f4358d572a1d3618571152cc334ed6f23162b9d1199dc6d2245247c6431646d3af02ba7752eac95cf5f82d1fa587f2de38ff9956400e68a97e590 SHA512 0988ce57f43fe06fe2e0af2152295098fd91351d28d3c6dd8174b7e8cb8dddbfa80c06ef763f25ae6d2128d2e9ca7ff4100f473d7b74871b189f49d188dd4428 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-r1.ebuild 2203 BLAKE2B f0174a4ad630c840b53adad2496d967d380e8e9ba482d5b0c7c89c73981f0de821608ca212bb8a2dfeef2f241c5531565ff8cbed0ffc925ead265546d9b1d119 SHA512 fa6944438a8a2b4100ed884c87ea891e48b798c0ab587e5554951ac762f170929de4cd7776e030b553e0d62da550095566edf53055b5ab00a3a8d3f45dfb52b5 +DIST siril-1.2.3.tar.bz2 4615997 BLAKE2B f8464849fad03faca07f238b3abd08c59126dab567666d92f1a53d2cea302608fe40b5532c6544029e869c639d1fc625c8ccc98779e678457713675c43225a74 SHA512 52cfa86ce0ddede42a3572c3d422cccca72da02a6efe207231ec98de9d59cc48704edd35e8ae83e86318e6980ce80eca3b9dba639e93f8551355a1328156ed9a +EBUILD siril-1.2.1-r1.ebuild 2202 BLAKE2B 3189e4f4ed9e662bcb11162ec5a0400daefed701a550061f9b0647de6b972f70eeec488d5cd280bd3e9b273253efccd579376a437ed97ca2e3ff0b309d371907 SHA512 9e491e221f72b1372a100bd95cbf80a6a024f012f570c9e982dcb3cbf5ef880dd093bb9efae53cc0b24ebce6653044fb6ac7a6c04a55275c0dc4a829889d830b EBUILD siril-1.2.1.ebuild 2161 BLAKE2B eebb0933a0480dee9630eae5e4366c86fd3f15c57e774171dee9e722d62cd72c9e1d906f09ea08546f42bb00cdd6aed6a1a65a8a395521f5fdd7c7a110ef327c SHA512 3fb563bcdce358272c3ea6ae6603879c24faa2b14faa224c56151b03d352e5c03981670307ecf255d16c8a1f8cb46e7ddc2da8c9d8cd2aa717634ef24d5bde5d +EBUILD siril-1.2.3.ebuild 2203 BLAKE2B f0174a4ad630c840b53adad2496d967d380e8e9ba482d5b0c7c89c73981f0de821608ca212bb8a2dfeef2f241c5531565ff8cbed0ffc925ead265546d9b1d119 SHA512 fa6944438a8a2b4100ed884c87ea891e48b798c0ab587e5554951ac762f170929de4cd7776e030b553e0d62da550095566edf53055b5ab00a3a8d3f45dfb52b5 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-exiv2-0.28.patch b/sci-astronomy/siril/files/siril-1.2-exiv2-0.28.patch deleted file mode 100644 index 8678316bfc87..000000000000 --- a/sci-astronomy/siril/files/siril-1.2-exiv2-0.28.patch +++ /dev/null @@ -1,39 +0,0 @@ -* asturm 2023-08-20: Combination of two commits from upstream git master - 3c2579cd: Pick the only hunk relevant for exiv2-0.28... - 64583490: Blend with that to fix build w/o exiv2 and fix indendation... - - -From 3c2579cd171314f7e408c00bc8e793330dcc07ba Mon Sep 17 00:00:00 2001 -From: Cyril Richard -Date: Sun, 4 Jun 2023 22:10:55 +0000 -Subject: [PATCH] XISF image import - -From 64583490214302f4057cf223d7591be9d2172a4f Mon Sep 17 00:00:00 2001 -From: Vincent Hourdin -Date: Mon, 5 Jun 2023 00:27:56 +0200 -Subject: [PATCH] fixing exiv2 as optional - ---- a/src/core/exif.cpp -+++ b/src/core/exif.cpp -@@ -121,10 +121,18 @@ - #endif - } - -+#ifdef HAVE_EXIV2 -+#if EXIV2_TEST_VERSION(0,28,0) -+typedef Exiv2::Image::UniquePtr ImagePtr; -+#else -+typedef Exiv2::Image::AutoPtr ImagePtr; -+#endif -+#endif -+ - gchar* siril_get_date_from_exif(const char *filename) { - #ifdef HAVE_EXIV2 - try { -- Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(WIDEN(filename)); -+ ImagePtr image = Exiv2::ImageFactory::open(WIDEN(filename)); - if (image.get() == 0) { - fprintf(stderr, "Error Cannot open the file.\n"); - return NULL; --- -GitLab diff --git a/sci-astronomy/siril/siril-1.2.0.ebuild b/sci-astronomy/siril/siril-1.2.0.ebuild deleted file mode 100644 index 70a659136663..000000000000 --- a/sci-astronomy/siril/siril-1.2.0.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# 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-exiv2-0.28.patch" # bug 906499 -) - -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 -} diff --git a/sci-astronomy/siril/siril-1.2.1-r1.ebuild b/sci-astronomy/siril/siril-1.2.1-r1.ebuild index 8b3fc3865d24..24b92345dc89 100644 --- a/sci-astronomy/siril/siril-1.2.1-r1.ebuild +++ b/sci-astronomy/siril/siril-1.2.1-r1.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then 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" + KEYWORDS="amd64 ~x86" S="${WORKDIR}/${PN}-${PV/_/-}" fi diff --git a/sci-astronomy/siril/siril-1.2.3.ebuild b/sci-astronomy/siril/siril-1.2.3.ebuild new file mode 100644 index 000000000000..8b3fc3865d24 --- /dev/null +++ b/sci-astronomy/siril/siril-1.2.3.ebuild @@ -0,0 +1,93 @@ +# 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" + "${FILESDIR}/${PN}-1.2.1-options.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 +} -- cgit v1.2.3