diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-08-20 21:42:17 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-08-20 21:42:17 +0100 |
| commit | 90a3be9d71a22834f9bc82c072f1b993f9a10e31 (patch) | |
| tree | 7f86c1f37e857df29494ec91436ca76bed49441a /sci-astronomy | |
| parent | a597364520b9291d0b2a23bb007ced022e821d95 (diff) | |
gentoo auto-resync : 20:08:2023 - 21:42:17
Diffstat (limited to 'sci-astronomy')
| -rw-r--r-- | sci-astronomy/Manifest.gz | bin | 6849 -> 6856 bytes | |||
| -rw-r--r-- | sci-astronomy/siril/Manifest | 3 | ||||
| -rw-r--r-- | sci-astronomy/siril/files/siril-1.2-exiv2-0.28.patch | 39 | ||||
| -rw-r--r-- | sci-astronomy/siril/siril-1.2.0_rc1-r1.ebuild | 5 |
4 files changed, 44 insertions, 3 deletions
diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz Binary files differindex dcd536a31bb4..a370c3651918 100644 --- a/sci-astronomy/Manifest.gz +++ b/sci-astronomy/Manifest.gz diff --git a/sci-astronomy/siril/Manifest b/sci-astronomy/siril/Manifest index 9507ed3f7a9e..1931506f5ab9 100644 --- a/sci-astronomy/siril/Manifest +++ b/sci-astronomy/siril/Manifest @@ -1,5 +1,6 @@ AUX siril-1.0-dependencies.patch 4623 BLAKE2B a6a92adfdf0f3166325516036b5b15a683456d567653cc1a08e52f4754a4b59dede1a894f32eb1fb2b92dc0b9ca729e3705927889a040608602455d648e8c5e2 SHA512 bb73384fbc4f092ffb07dc6b0e4d2edd564b9fc1ec462f54b6fc28ce933a939e8f72cd8830a36f3e1bd73cac83dad5d80af1ca3b673c39e90a5730bc56a10f0e AUX siril-1.0-execinfo-r2.patch 2493 BLAKE2B 5bd27710b0bc5eb942f40827a43ca1f8d70e48739daaf0cc16c85b7d50af46f7b08c21f8129d337099ac20beffff63c97b20a49c91b83d6131e6e161fb5531df SHA512 67d0bd524677c8700db2cf5eb2e65c774eb076b5cee0a3e24ea846c01ae63b06a5401eadfcd60d5b2b9f348312e093c679cb4a7c63db0fd316fdb533fd754143 +AUX siril-1.2-exiv2-0.28.patch 1171 BLAKE2B 5e64f52fb1b2eb7ba05dde0d0d84f910d8238eac3d58ca15137fa394b7fb2a75aff26bc01616ef6a46007c95a546403960627b64cf675aa21d0039119f3afc47 SHA512 1e339d6e1bd843146e4dd8124a4ef2177f7596cd5d9864a05886a7a055e00093a48a7341b5ad9c1bf82d9e4b2c0cc2559ef429d2c8f986951c846a0bf097da03 AUX siril-1.2-stdint.patch 696 BLAKE2B 9bc2e5f9b0a7ac00b1474372b875471f79f2fcbaa031efa7e978b47457a0bb0aac7a3f134688805259e941949ce8ed95837d164bbb5ac736f8aeebb835460948 SHA512 a9565d25bd71e1f721327dc8d68c54e52dabfcc9f1fcef92996b3373727cf8d2ded1ff6e518da4087d5e288aab970c78b381114891feea1b438f785cc9f74e56 AUX siril-1.2-tiff.patch 2121 BLAKE2B fedc3fabcec2c77fd1a740dd4d5356190cad31cc0b33ffd34bfcc4c86e35c43f476e569c685a859f7b8cbbe8878b62ea351148fc02ee0cf2d52c615096c3093c SHA512 b47f35235988cad10234b057460af115747ab798e9d6c09e36a8668bbfefed7ee839a4dc66ec58c918eaa726ba95e6d4bc212f6c857a53295a8b070db415fca9 AUX siril-docfiles.patch 433 BLAKE2B 3c781f4a0604f56ada235094eb481b4b51912921719ee198c7d2400a7dffbb4034d34505f5d7221b033efbbbe11b07332938a6dc0bc616bb6f6480e41475653e SHA512 2d770a2cb86d95c291beb6077ab01560e118bc84d838dfeef50bc9a812469fea568cdfe1c9b5d1a90b778527b65a397aac1656008739cff88ffc80ba6fd09c72 @@ -7,6 +8,6 @@ AUX siril-prototypes.patch 1436 BLAKE2B cee44f2c66cd00e29b4c1259c4be5fd6de9544fe DIST siril-1.0.6.tar.bz2 2893872 BLAKE2B 1f254dcb774c4bfb14fee4626d40e6eeedf866a7a96dca98502cd84e66b973c2201b1f88e2efcb89ce3401b13bd87a319b2ff11e7ba100d0689c9df429d01957 SHA512 afb5f1768a5884adcc13f2afd6fa386d836df5a1385b916df9df8da1fb464e0c8738123fb485ed92c749e596c744d5252a66444b840223488a0860e9324c4e9d DIST siril-1.2.0-rc1.tar.bz2 4353720 BLAKE2B 38c7b1585508ac9697847648f2d718899a296a4061b34fcf71424136daa50c68737f811fd9063aa80274708d085d8089dceff7d1fd25277b60f0482c17fa5cd1 SHA512 41d685c0aca79da8a9c17d729c710bdd51d3f8cd13b976fb4aad4750e74b600783b988246f008cf41246e7e5f05b8b42368d975cbd79f42e9121b39e367eb22f EBUILD siril-1.0.6-r2.ebuild 2109 BLAKE2B 0573ff346b01b714b82e5af8070ab3349eed1ce3cc2360d64c49794d308b44676346a05ca10fa20e354aa3e705d685f5723af939d7a33c0969306937be13361b SHA512 fd92dbcdb3a454c7f0431e48b87fde98dc64f658a3f418c23bb82ad879255ec0c1be7f9410c6d74bd95b5c1e439bfedb790e0f2a13ea238f66fc1f2bd0eae56c -EBUILD siril-1.2.0_rc1-r1.ebuild 2213 BLAKE2B 750736109f31dd69c5facfd2a3a7e25c0f06b897a5ef2242003da8a34e889e15ebdabb486086d5a115ddb514ac8e7368775d9927b46ac3afdbe0e6957a02ee1e SHA512 28a7a87388e5d1a84af3a0d9bcaad40b86001761f5096f3745662c374bccdc5bfac86f121f7894c1c09aa2635c076852cc813f1c5f8304d6f43a443e617e9eb8 +EBUILD siril-1.2.0_rc1-r1.ebuild 2246 BLAKE2B 4a79027e45b4d95735968285f296db6ef0d8b8b97f7b316c76524319b98062765cd0ad9961d88047b1fc64ebeaae8d3a4af5c5a15b3fd0c9050f74c7afa7745a SHA512 6db2edcc78b23fe2d31bcddb7830e161f01cc0c2c7c651209d64b6db8e8486080c1f54b0f5daaf00f6aec28248504891cb3e43fe6dea40740b144df4e7a9bef2 EBUILD siril-9999.ebuild 2117 BLAKE2B 32d4eb6b73a74cfe5d6afdf87bb447f4a01eb0a38ae1ddd49cb974382e001abbf13ba3277486c7a052b9ede6a460b14000fd057f0972b6050b49244ca2d1f782 SHA512 fabae83ca294461772da0b14a82cfc0c16fde764e4b78a634b31ebd6f1b7bf73d5e2c2165d4c6a4b98263c16b69b9778dbebaa9e8927328e62d669ec6b0a33fd 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 new file mode 100644 index 000000000000..8678316bfc87 --- /dev/null +++ b/sci-astronomy/siril/files/siril-1.2-exiv2-0.28.patch @@ -0,0 +1,39 @@ +* 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 <cyril.richard42@gmail.com> +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 <vh@free-astro.org> +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_rc1-r1.ebuild b/sci-astronomy/siril/siril-1.2.0_rc1-r1.ebuild index 54a8e916b5fc..c5cbbe1bd8e2 100644 --- a/sci-astronomy/siril/siril-1.2.0_rc1-r1.ebuild +++ b/sci-astronomy/siril/siril-1.2.0_rc1-r1.ebuild @@ -52,8 +52,9 @@ BDEPEND="dev-util/cmake PATCHES=( "${FILESDIR}/${PN}-docfiles.patch" - "${FILESDIR}/${PN}-$(ver_cut 1-2)-stdint.patch" - "${FILESDIR}/${PN}-$(ver_cut 1-2)-tiff.patch" + "${FILESDIR}/${PN}-1.2-stdint.patch" + "${FILESDIR}/${PN}-1.2-tiff.patch" + "${FILESDIR}/${PN}-1.2-exiv2-0.28.patch" # bug 906499 ) DOCS=( README.md NEWS ChangeLog AUTHORS ) |