gentoo auto-resync : 11:03:2025 - 01:49:36HEADmaster

4 files changed, 38 insertions, 4 deletions

diff --git a/media-gfx/exact-image/Manifest b/media-gfx/exact-image/Manifest
index d0724b6bf51f..db68b3d77532 100644
--- a/media-gfx/exact-image/Manifest
+++ b/media-gfx/exact-image/Manifest
@@ -1,10 +1,11 @@
-AUX exact-image-1.0.2-dcraw.patch 496 BLAKE2B d9d86facb3b0f9721d3f5791d4744bbf71d3802c094e4d1f20de44898d817a8319b78c0cd011670d53beec35bbf9efb477c9b3e20ac2724a48017c5d0746c634 SHA512 409cf7ad9963b5e6f4997ad5b466a86c5c3179bbfe63f14311a1297c9e87423f7d838b2b037109029a8dfa6125d7bbacd53f069d8634c1ffdd2c946d40e70b99
+AUX exact-image-1.0.2-dcraw.patch 732 BLAKE2B 24c9be6e30b507c2762b74a9596deb25bbe8e625c8b380e5b7a23b16141b01e18321e758304c5d44aa8b8d52517017268598fd970b2a7ca8c4dfab1b302cb989 SHA512 72ba5efda0e090a399438620128a2934251a5708b891c5b9b0b5037a1ce93f16ae42bca36cdea23d2482a38698bcd4bacf8570c31b85927db79c956546d3652d
 AUX exact-image-1.0.2-g++.patch 936 BLAKE2B 6ab787c1393228bb1671c8a2d7b76969fcd11d26f0c14ca08a95cee7241422205d8cb398f2a6b711e884c476cba662718705848a818b1944428b2a207133fede SHA512 44fafd62c713bc59c1cb774924394ad32a13c33b79696a4762e3730108650ccd3033f554fc8b0d7cf9b71126367bce5b90074f2c954ca57c8389975b57eac5e1
 AUX exact-image-1.0.2-gcc6.patch 2795 BLAKE2B 17282b91baa020b94654c92d87611001584f82360303a56e70cb8f081caf400394a367982e115bff094dfe11a0798503a606de106f1bf6427b57a9ede1cd6ed5 SHA512 ef42fccab6d0958df2dcf86578f9df1f84254515c2bea611f256e23227b9d6dc917467f2d8f54230f9386e9726152c6bbe4ab4f3d117e0da5a3e99b00e93e348
+AUX exact-image-1.2.1-dcraw.patch 350 BLAKE2B a7c5697fdd077dbe9a1ca090904b3c4e2bf0835e8f0f5ad987b7ca631b980372e11b5068bd5125d5139249970ab01536d9f6b132d22ca47d8a8afe2513784e76 SHA512 5a9bf4de0181fbbc90e9e03fb9cb753b5f3e5485c6a49427b852fcca582075969a98238f063657199395d4b04acde1cc474b3641e05882cf77105585009b19fb
 AUX exact-image-1.2.1-gcc6.patch 1874 BLAKE2B 46b1dbaad49a1588c1957f48fef6e9a3abd7859b715a71dfbc3ef85356c5c9ae7d6ef01c3455b6c08d4d2e07434ddf387fec80ba51ba5d11d0200e5b5f2d5e96 SHA512 14a3209ffb091ee53eb0c0f4c4a41333ddeb8953f36ccc64b5ef2c653efd4f60191b3ffce628eb20aacf2bbf9fb18f5be42298fb0d58d9813ba47d522d1dfcd1
 AUX exact-image-1.2.1-libjxl-9.patch 522 BLAKE2B 96f1967d0fb0cab93f3b55c9b185f9ba4c55ce00a51cbebaa97e082393795bc2d80a36d98f293b538eb818dcceff7caae7e2947b138c17cea54ffbc270954482 SHA512 a37916cf971bfc48038adeb347723cef230ba79c618398690a009631aea7af4ab908fce7efd9be09e803507454e5c340df204c03cd1079964e4467d19db04c77
 DIST exact-image-1.0.2.tar.bz2 322174 BLAKE2B 67afefb4c5a52416459cd4ac6198012eb6d7895a73ea8363fae05286c7e7f62aa1a02166985f53b5638c7dc7b23b4dc1fb1c7b2272a9dc595ce329a7083ee1b9 SHA512 8ba5a198a236ddf5fa58f40c80f32ba9d300376c637a13a7acf3d2db7906fced373b33a7ecff9cff4d09d8b21de9ce1fb9f5bfb1f4522557bd01af0e3d6dcc65
 DIST exact-image-1.2.1.tar.bz2 320849 BLAKE2B 615884f2501b3e9ff00410d3569c8aa7d0131610f990591eb77a11cf6d7249342b4a2ece0f2dd62ea7a1cdd213ae1a98bf6da0817b74d8c8e78cbca5b8e67e33 SHA512 34af0575d8564dd5942f0e3ec5b6fe7fb234a96e621a737359406a2571ed8ac2c15ef2e7655a7d260b37b68138e071342583f47ad7ef0e3b3511e5ebc1a873a8
 EBUILD exact-image-1.0.2-r8.ebuild 2529 BLAKE2B ba0ee3fadcf7c780b20847064f993ce5c9fec51953488b92f3fe5677ac9f0e924ed809bf5a5d6877c9a5167ea29ccb70fdc0ee6e962387a69a31e73c926e4ff9 SHA512 b2a37c8a265078a5ee42434b467434c6347720eb95b6ac8f40c6838776ec8d7ad24ae407c64eae04a56ed04ae775e3f93e69b1cf047564d3d4b6bfa54a818a2e
-EBUILD exact-image-1.2.1-r2.ebuild 2278 BLAKE2B 268b084a7d5ee2b63fcd13c648e531e2da954db35c0e8b32b963a25936d96e4d9e5adfb905ba5e14d708720c95506f83ece01afd76b44a234de8afa32104d632 SHA512 f3794e63aa515a9978a120e9cb2a7021f430abb257dfe6765919e8911364e845e8e56f0a8c0c67b7eb45079c22a0b8174a8a3d7da5cd14dbe310b7936ef9774f
+EBUILD exact-image-1.2.1-r2.ebuild 2308 BLAKE2B 73abe31b6c0accc828397fd4de0f568ec626636f1f2dccd4c517755ab1b54554c2d70f7b3ccf1d0f7bdeaffb391c856e0e2bbd03c005a59d1d40bf4953b8952e SHA512 af529d52cbe08aab98d9f763075dd891906d0ccea03cf191d46927422b5dccfc300f9a6c3033f7cc1652d479c6466403b6aca9b853d84eedf7c63ddef9631bdd
 MISC metadata.xml 330 BLAKE2B 468dfd9c9bc2687f285c5a7496aa989843c32929b4c410253f1d046df2e2416604f6ff8b1cb4622e85e27f13f26cede91825d04b7748cb4f74fdff13478046c1 SHA512 01bc80b3dc7ed3ff2f3402ecd3214793d18267be1e1e4c4b42718b6f6a4982404e243771917fbbae7a1bd6b12a1cd80534d9738149ec9b2a88bbc1ad62fcdf14
diff --git a/media-gfx/exact-image/exact-image-1.2.1-r2.ebuild b/media-gfx/exact-image/exact-image-1.2.1-r2.ebuild
index 7b43fc7fce68..2f2a92e0f59f 100644
--- a/media-gfx/exact-image/exact-image-1.2.1-r2.ebuild
+++ b/media-gfx/exact-image/exact-image-1.2.1-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://dl.exactcode.de/oss/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="expat jpeg jpegxl lua openexr perl png swig tiff truetype X"
 REQUIRED_USE="lua? ( swig ) perl? ( swig )"
 # Tests are broken; 'make check' fails and referenced testsuite dir not found
@@ -48,6 +48,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-gcc6.patch
 	"${FILESDIR}"/${PN}-1.0.2-g++.patch
 	"${FILESDIR}"/${P}-libjxl-9.patch
+	"${FILESDIR}"/${P}-dcraw.patch
 )
 
 src_prepare() {
diff --git a/media-gfx/exact-image/files/exact-image-1.0.2-dcraw.patch b/media-gfx/exact-image/files/exact-image-1.0.2-dcraw.patch
index ba609c294b17..f617087de6a9 100644
--- a/media-gfx/exact-image/files/exact-image-1.0.2-dcraw.patch
+++ b/media-gfx/exact-image/files/exact-image-1.0.2-dcraw.patch
@@ -1,6 +1,21 @@
 --- a/codecs/dcraw.h	2020-09-10 08:42:19.905105346 +0200
 +++ b/codecs/dcraw.h	2020-09-10 08:47:50.826316874 +0200
-@@ -9956,7 +9956,7 @@
+@@ -96,6 +96,14 @@
+ #define ushort unsigned short
+ #endif
+ 
++#undef SEEK_SET
++#undef SEEK_CUR
++#undef SEEK_END
++
++#define SEEK_SET std::ios::beg
++#define SEEK_CUR std::ios::cur
++#define SEEK_END std::ios::end
++
+ namespace dcraw {
+ 
+ /*
+@@ -9964,7 +9956,7 @@
    strncpy (th->desc, desc, 512);
    strncpy (th->make, make, 64);
    strncpy (th->model, model, 64);
diff --git a/media-gfx/exact-image/files/exact-image-1.2.1-dcraw.patch b/media-gfx/exact-image/files/exact-image-1.2.1-dcraw.patch
new file mode 100644
index 000000000000..41a0b0dfef9f
--- /dev/null
+++ b/media-gfx/exact-image/files/exact-image-1.2.1-dcraw.patch
@@ -0,0 +1,17 @@
+--- a/codecs/dcraw.h	2020-09-10 08:42:19.905105346 +0200
++++ b/codecs/dcraw.h	2020-09-10 08:47:50.826316874 +0200
+@@ -96,6 +96,14 @@
+ #define ushort unsigned short
+ #endif
+ 
++#undef SEEK_SET
++#undef SEEK_CUR
++#undef SEEK_END
++
++#define SEEK_SET std::ios::beg
++#define SEEK_CUR std::ios::cur
++#define SEEK_END std::ios::end
++
+ namespace dcraw {
+ 
+ /*