diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-05-29 00:07:15 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-05-29 00:07:15 +0100 |
| commit | 5c4786a868bad6e3f46aecf32ad6c6dc5de98408 (patch) | |
| tree | 1a1792815761a5b6f645c8d55b6b698e102dca48 /media-gfx/hugin | |
| parent | 3c1648a0749c1d66b300d857e6b417c1162890da (diff) | |
gentoo auto-resync : 29:05:2024 - 00:07:15
Diffstat (limited to 'media-gfx/hugin')
| -rw-r--r-- | media-gfx/hugin/Manifest | 3 | ||||
| -rw-r--r-- | media-gfx/hugin/files/boost-1.85-932315.patch | 25 | ||||
| -rw-r--r-- | media-gfx/hugin/hugin-2023.0.0-r1.ebuild | 3 |
3 files changed, 30 insertions, 1 deletions
diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest index 24e4596d6c03..fa85394de34a 100644 --- a/media-gfx/hugin/Manifest +++ b/media-gfx/hugin/Manifest @@ -1,4 +1,5 @@ +AUX boost-1.85-932315.patch 1078 BLAKE2B 3a721b7350c843d3ff3757dd0f9e3d2e384ba11f053a7e6f4238b4db50046241781921593886b809240d38f3d5e0e913d39601b6ffaa53f29a56422c9ff3e3b9 SHA512 d8f2b17318f5223929e19f40e1a834a8ccb6b5e7f792b5762c81d2084ea62f06ef1b1bf2d38dbf5b5ad613db5ef195229a3b8401ea8e66773925070c1cd6b085 DIST hugin-2023.0.0.tar.bz2 10336322 BLAKE2B 5c35f67160d76f961e812a309a0c50bb012beac74dc888ce716e8d0e3da35dbb053ab4e5d5d043b3d3fee9885f2fc1afa962a73e794cd4df920527456d477e89 SHA512 f950afec9020972baa20931d5001cd479a9169a4eec0d459d830612f40177eea6a25e059047054b8e9679017687e4c2db9fb27f755a3d0b749e5055e2ff0adc8 -EBUILD hugin-2023.0.0-r1.ebuild 2115 BLAKE2B fc20ea33349976ef525f6f292d6980c7663db986a3a1b580bb44533e2dc41b5bf4c3fc5b8ea5921891495b54dc1be6981e5dcaa28cab73799a5930dc6fe42c06 SHA512 b94c7b35a787bceac7b68540162a3ee8fd8e8a6383e9f0ca7ccca74b836073663283183934cc019e2130ef87721da88d982391082e4ec410c03921ef76f91dd9 +EBUILD hugin-2023.0.0-r1.ebuild 2193 BLAKE2B acc220e65485eba96191ed6459acda962b66eadb8010d543664fb151a0f56ada5fb8aab96584ab517405f8105b307813c60e0d82f7344a5b3d43b5de7acae201 SHA512 fd18cbc43f50dca29b9574ffa7d4d8dd5c513327269602810acafac34c4b1c48630d308c28538e6cfe73bbaff019c056cd2fc7ece1030e51a8f70ad1b46d9eaf EBUILD hugin-9999.ebuild 2210 BLAKE2B 9961fb69cdbb3e4fd63e567ad6cc96dc8a81e608b3742733ad3cc0c19be059e591ae41f2f64751dfbb4482863b97546696ac7088f5b3d74c88ec434ee50bdc7e SHA512 900b2d13e4e756b57830af1c0c6f39b7cf9dd26afeaf5d8f3ceb06be567843f8ba30ae15af032a3a7486eb6be03b6838d96d2a90f0c70e2dfe4e52044dbfbb4f MISC metadata.xml 547 BLAKE2B ea55ca44dac1ccf74d4af96d42af1d4efac2f9823304b529b96aea364ec4a6f8430fd130f54c064766f0c34f9060ca076aa43de664e37177b41cc2deed0207bc SHA512 5012cb4a58bdc374f89d1a2e81e8321ff25f2de2f5682a2f8859137aa3339ce059e7823e26642f58b939e6c1d7f428356a4df5311fca1105320ebcb417129cba diff --git a/media-gfx/hugin/files/boost-1.85-932315.patch b/media-gfx/hugin/files/boost-1.85-932315.patch new file mode 100644 index 000000000000..e8fc5c2daa1f --- /dev/null +++ b/media-gfx/hugin/files/boost-1.85-932315.patch @@ -0,0 +1,25 @@ +# HG changeset patch +# User tmodes +# Date 1710260877 -3600 +# Tue Mar 12 17:27:57 2024 +0100 +# Node ID 4d081490b48aaff820cee7601b8624b37b652c06 +# Parent 4b55f17c4e72d6c2f8b4930e3367ff52e1741b45 +Fixed deprecated boost::filesystem::copy_option enum + +diff -r 4b55f17c4e72 -r 4d081490b48a src/hugin_base/hugin_utils/filesystem.h +--- a/src/hugin_base/hugin_utils/filesystem.h Tue Mar 12 17:27:29 2024 +0100 ++++ b/src/hugin_base/hugin_utils/filesystem.h Tue Mar 12 17:27:57 2024 +0100 +@@ -64,6 +64,12 @@ + #endif
+ #include <boost/filesystem.hpp>
+ namespace fs = boost::filesystem;
+- #define OVERWRITE_EXISTING boost::filesystem::copy_option::overwrite_if_exists
++ #if BOOST_VERSION>=107400
++ // in Boost 1.74 and later filesystem::copy_option is deprecated
++ // use filesystem::copy_options instead
++ #define OVERWRITE_EXISTING boost::filesystem::copy_options::overwrite_existing
++ #else
++ #define OVERWRITE_EXISTING boost::filesystem::copy_option::overwrite_if_exists
++ #endif
+ #endif
+ #endif // _HUGIN_UTILS_FILESYSTEM_H
diff --git a/media-gfx/hugin/hugin-2023.0.0-r1.ebuild b/media-gfx/hugin/hugin-2023.0.0-r1.ebuild index 4587f91ae7d5..40c4d46a93f6 100644 --- a/media-gfx/hugin/hugin-2023.0.0-r1.ebuild +++ b/media-gfx/hugin/hugin-2023.0.0-r1.ebuild @@ -62,6 +62,9 @@ pkg_setup() { } src_prepare() { + # Fix build with boost >=1.85 + eapply "${FILESDIR}/boost-1.85-932315.patch" + sed -i \ -e "/COMMAND.*GZIP/d" \ -e "s/\.gz//g" \ |