aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Meier <maekke@gentoo.org>2019-11-07 03:56:08 +0700
committerMarkus Meier <maekke@gentoo.org>2019-11-07 03:56:08 +0700
commit81f5bfa35efbdc8d59b261e723f184b14835e437 (patch)
tree4ea907d98cf9052a3fe2c0aec2412a20b4d3d3f1
parentmedia-gfx/darktable: version bump (diff)
downloadmaekke-81f5bfa35efbdc8d59b261e723f184b14835e437.tar.gz
maekke-81f5bfa35efbdc8d59b261e723f184b14835e437.tar.bz2
maekke-81f5bfa35efbdc8d59b261e723f184b14835e437.zip
media-gfx/nufraw: version bump
Signed-off-by: Markus Meier <maekke@gentoo.org>
-rw-r--r--media-gfx/nufraw/Manifest29
-rw-r--r--media-gfx/nufraw/files/nufraw-0.42-exiv2-0.27.patch27
-rw-r--r--media-gfx/nufraw/nufraw-0.42.ebuild (renamed from media-gfx/nufraw/nufraw-0.41.ebuild)1
3 files changed, 33 insertions, 24 deletions
diff --git a/media-gfx/nufraw/Manifest b/media-gfx/nufraw/Manifest
index 78b9f43..43f05d8 100644
--- a/media-gfx/nufraw/Manifest
+++ b/media-gfx/nufraw/Manifest
@@ -1,28 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
+AUX nufraw-0.42-exiv2-0.27.patch 855 BLAKE2B 3b0de953de637813a7f2c2aaa85dab259b465721c1b8f41a5318a59ad9849d24eb3f72347910a33655867e96ee2319bedcfebdeb1e441397b2cc5f1db2546bf1 SHA512 a44ff7aaf24632479211788fe18ea04085b21480a1d7b72d5de4891c8d503af614ae4e941649acfe6b35fa93ecc566342622be8dbde2802eb7b68e34b41d346f
AUX ufraw-0.17-cfitsio-automagic.patch 933 BLAKE2B 06de9b807a9a491af2db83bfc07e3727409494a0925f01c0493e7cc5ce7b4a326f9c041d11dc30a38c6c71b42cc07e83017ffb01873a2d4f44d78a65a5c7c3ed SHA512 84aadb7dc41927a26ac37a801e136628380e79f032f87a925e737ec76c349c96c410750234f4870fe2fa61680085472a028e47c13cf01b2bd7fc7a55dad6de1b
+AUX ufraw-0.22-exiv2-0.27.patch 738 BLAKE2B 5392f37396074b1188b4c9f3bac06eb4168d68f53d367cc5107dbf71a66d5aab56a62489a826ac8fc0a4add74666bf232fde96f41f0ffc9604f5e6fd09d5d4fd SHA512 d37a132dc06ce186f177d6720ad23bc5f1e8ce84743b6e506242efee20cf628a4192d2bdaf1718260dba7bdef82d78bae2eb366df44e3dd3de13e318f812b76d
AUX ufraw-0.22-fix-unsigned-char.patch 748 BLAKE2B 30a8dfcfb71f78449838ade5f77074d667fc1e71ca079f8042869a9e82ff8b9422ddbdc892c7458e05ad411d552352b5f530ae2da4a629d449857a1e62be0c78 SHA512 0ea99fe69adeeae1e6c07bcf9d583f6b8247ad0f01ddf3435edb605618b0c24d80c5662442250020b92352ebba12757bb69ad7b107ab8a8f464d5cf2b642664b
+AUX ufraw-0.22-gcc9.patch 3569 BLAKE2B ce417eb79994190666b842f6017f18eadead284bb763f1248ab4c0dd6132977fc56c79c11e3782a33d507aceec193e9ab2be423bea4335521e4308cb617b04d7 SHA512 aaf902c4a96ba1d9f21ff31e5499fd9d9216ff17812b41276e15a7150a4a90aa8a7a9e4aec70a006e68930e0e05c4a1da38abc78175de521752f1c6152e77b5a
AUX ufraw-0.22-jasper-automagic.patch 613 BLAKE2B 100e6b31540030a20c8cff8e99329a738378788b2ab11665c0c8ab2f3246c821a176dba8b26cea354e8b0d127d2c601c21b0ac94f5264327916d0f8779618165 SHA512 855337bf109ebc0ea7b9bd429bcc429bd9caa561e2a815352c51e860a6e405d500913b70414ded7f47e053332c89b964d1817c8f22627504cf157f1565f3c7a4
-DIST nufraw-0.41.tar.gz 995104 BLAKE2B 7cd30b3cecfd6d2fca8a674cf40a701a8729258a9ce5fc2f440ad70c99e20d011a0ee7db40b0b5b5eff7d7ee2aaebdf7837d3cd0567c5b4b556921dd29064434 SHA512 08383697f4781406cebef57f2e70a1fd8e20967e189102388074c0d60b8735953a42794bcea36510162bf640b52537709175ae6481087125fb364d4217b5c9a6
-EBUILD nufraw-0.41.ebuild 2008 BLAKE2B fbc50b2da1dbb5ab8028d4ea0c7d90f75d5ffe8267b4bbf74206e6c9db0822fc4dcb3755a67dd7d04f0ab377caf40e3cfa6b36d3ee01aa4c1e1d12dca4a735ca SHA512 3e0a9e124b0b5d791e3a933392fc619e55c9b200ae5566a8405d4ba3ef0ff5b38a0307d755409b7e5177d7ade7730d1d351e69d2ce4bac17053b5cfd8cb77fae
+DIST nufraw-0.42.tar.gz 3355661 BLAKE2B 88cbef7829fa81591246f6e357748288495674ad384f40f4f11b3d28d560e10bea9af5be016fb349bfd9a5ed8c98d6df9f4ee07748a8e7bd881cf959c7f923ad SHA512 43c864e41e30e80b7d6bab68810646a6a5cee070cf0941321b35213bdfc68fd8ec41694de1add294163c1f6753f6afc12e11be25b1124d4cd7acd5b7c0de13a9
+EBUILD nufraw-0.42.ebuild 2045 BLAKE2B 03bbb426fa960649e20cf5c40e002b53872d5dc700424c21f51b6a1364e6d9460029a7e62dbf3a4b7d3403e941dc0337347f1f95d6e291c9e5ec3e4c1243112a SHA512 1d2708c44c3156aba48b16c10c2007c9bc3625ab88300a33bebbb588ae6621418e09e86a1ed0607032d508309a8ce81a5ed927ef36120448eda46dea7d512c3e
MISC metadata.xml 589 BLAKE2B e7ca34bb660d42d0b907bc574c8f5e7345350905b1d8f3a2d1b351c2059358907f844c909e62c0ea12357c20264925160ec18e755063e67f3f2a739cb15eec2a SHA512 824ac3872bfb11ddfc766120278dd794f4670d4a365631e071e76202bfb2eff95fcdeb8bf86624b92a193ed127bfce6d7e7e357ddd4bfe789aa044293bb790fa
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQKTBAEBCAB9FiEEII6LnI7JmhU7S7c3e+duwlV7RDwFAlq/t0dfFIAAAAAALgAo
-aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDIw
-OEU4QjlDOEVDOTlBMTUzQjRCQjczNzdCRTc2RUMyNTU3QjQ0M0MACgkQe+duwlV7
-RDyFuw//c+vereLBCqsCoBbBBWWJITlgXAQy0Z1d1ZlUTFlUHLoyJXhwXGeAWG7m
-udfIK1qwrko8HAZVnMVJCX7e53h9c2tRoJOP+v25T7SjtSkehe8o8qBsGLXiTu0K
-tRtjSemeWy+w4mIDYbM0TuqjsuNNuoSApVHtVgqcgXsC0lbmyclVbThdVqbz1avZ
-jiTD8DrVmTu9kmjGoe+H3sdB98c8Z6NLN1ls7QZoMoJelJ7ydfiRuYVG4HO5atya
-kBbp/WS0Up6IW0/xtUC8wYIoFbUpt2l57cb0mxNC4S1q4EIu12g+1xjtTDEsQFDV
-/llzcyM2GKrdyfy0WX+3HLW+OBn8VOBo47cFhZFnFP4Kx8qYO88Agc5rDfkgnEZi
-QEfL5RBCLEY36Kk/XDWEWwMneEsIiNxT0adUKFl2EWPNntKeEmB/GPAm94Twcrwq
-TC95Yom3fwqz6SDt5Dst44qg55idPeQ1rA/8981mCIFmFBWxDiQf/5BLnO9fCUkC
-8kE/x3eQq9oCO3hQhX2EjbkBqRbUew9vVbnJrw1R4JLpeAlhXBFMxDulSJKuvesM
-+o02Ll7NaiF/Z1jh5OuounI6jY1wqbvTpUu+A0U2T0NxASCDWZd/dZYN1Q77pUwR
-DcwD8+QJxPkzGrXUlg8WpGZ6pg4aEI1Fhd9OXP7kb9hfMdYbVNI=
-=DE3D
------END PGP SIGNATURE-----
diff --git a/media-gfx/nufraw/files/nufraw-0.42-exiv2-0.27.patch b/media-gfx/nufraw/files/nufraw-0.42-exiv2-0.27.patch
new file mode 100644
index 0000000..fe748a8
--- /dev/null
+++ b/media-gfx/nufraw/files/nufraw-0.42-exiv2-0.27.patch
@@ -0,0 +1,27 @@
+diff -ru nufraw-0.42.orig/nufraw_exiv2.cc nufraw-0.42/nufraw_exiv2.cc
+--- nufraw-0.42.orig/nufraw_exiv2.cc 2019-11-07 03:53:25.969939652 +0700
++++ nufraw-0.42/nufraw_exiv2.cc 2019-11-07 03:54:15.020942603 +0700
+@@ -15,9 +15,8 @@
+ #include "nufraw.h"
+
+ #ifdef HAVE_EXIV2
+-#include <exiv2/image.hpp>
+-#include <exiv2/easyaccess.hpp>
+-#include <exiv2/exif.hpp>
++#include <exiv2/exiv2.hpp>
++#include <iostream>
+ #include <sstream>
+ #include <cassert>
+
+@@ -67,7 +66,11 @@
+ if (exifData.empty()) {
+ std::string error(uf->filename);
+ error += ": No Exif data found in the file";
++#if EXIV2_TEST_VERSION(0,27,0)
++ throw Exiv2::Error(Exiv2::kerErrorMessage, error);
++#else
+ throw Exiv2::Error(1, error);
++#endif
+ }
+
+ /* List of tag names taken from exiv2's printSummary() in actions.cpp */
diff --git a/media-gfx/nufraw/nufraw-0.41.ebuild b/media-gfx/nufraw/nufraw-0.42.ebuild
index 30e8dda..aa9711e 100644
--- a/media-gfx/nufraw/nufraw-0.41.ebuild
+++ b/media-gfx/nufraw/nufraw-0.42.ebuild
@@ -40,6 +40,7 @@ PATCHES=(
"${FILESDIR}"/ufraw-0.17-cfitsio-automagic.patch
"${FILESDIR}"/ufraw-0.22-jasper-automagic.patch
"${FILESDIR}"/ufraw-0.22-fix-unsigned-char.patch
+ "${FILESDIR}"/${P}-exiv2-0.27.patch
)
src_unpack() {