1 |
commit: 610fd2a54f84a8131e3323b0bf43423eb89b99ea |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jul 29 18:52:15 2019 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jul 29 18:55:40 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=610fd2a5 |
7 |
|
8 |
media-gfx/exiv2: Drop 0.27.1-r1 and 0.27.2_rc3 |
9 |
|
10 |
Package-Manager: Portage-2.3.69, Repoman-2.3.16 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
media-gfx/exiv2/Manifest | 2 - |
14 |
media-gfx/exiv2/exiv2-0.27.1-r1.ebuild | 108 ------------------- |
15 |
media-gfx/exiv2/exiv2-0.27.2_rc3.ebuild | 103 ------------------ |
16 |
.../exiv2/files/exiv2-0.27.1-private-libs.patch | 59 ---------- |
17 |
.../exiv2-0.27.1-restore-0.25-behaviour.patch | 119 --------------------- |
18 |
.../exiv2-0.27.1-system-cmakemoduledir1.patch | 41 ------- |
19 |
.../exiv2-0.27.1-system-cmakemoduledir2.patch | 28 ----- |
20 |
.../files/exiv2-0.27.1-system-libssh-config.patch | 93 ---------------- |
21 |
8 files changed, 553 deletions(-) |
22 |
|
23 |
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest |
24 |
index 68142c104ee..b4bb2f2a157 100644 |
25 |
--- a/media-gfx/exiv2/Manifest |
26 |
+++ b/media-gfx/exiv2/Manifest |
27 |
@@ -1,4 +1,2 @@ |
28 |
DIST exiv2-0.27.0a-Source.tar.gz 27168207 BLAKE2B 3f5c4fbe4f41c1114c0a54433c810ed0fb28ae3fbe8258eb7a02da716b833d62a94725f839accf22600c420ace5cdbead599440d335ff694a4f123820613ecd9 SHA512 9873d6815c2a87b7cdc49e8863f72c713fe1054f2f46d2c9aaa7ca2cd42096a36c2970e6a396af9000faba32fa9ff054b9d2c5e22f3e2624669440e553239f9c |
29 |
-DIST exiv2-0.27.1-Source.tar.gz 27210365 BLAKE2B 1ce9a0b26c0908b876e35b5488fc5680789eb864376b379d9bd57977d456a5c6dc5983c4a8ef3e3558ffc061c0b7cda1d1f89a1629af920de1747fd4afbdbb39 SHA512 038b51241f5bfb323eb298695b5397a7d88d5c7d7303828e5e20b3f82c3df2615cee3e7e3426ea17438ca05d5abea10984cfd41f0649ddab72df1d1415bf3529 |
30 |
DIST exiv2-0.27.2-Source.tar.gz 27591236 BLAKE2B bd10d71356e4c8a465b71f8ceac07fbf2fd6cfb287cb22774568ad35eb38200be504e297224920af50a15ab4e9da98384ff4da7c33713f5346b33738380698b0 SHA512 39eb7d920dce18b275ac66f4766c7c73f7c72ee10e3e1e43d84c611b24f48ce20a70eac6d53948914e93242a25b8b52cc4bc760ee611ddcd77481306c1f9e721 |
31 |
-DIST exiv2-0.27.2_rc3.tar.gz 27291247 BLAKE2B 72825a50fbafe4eed4ab4a12e135b22bc8a4ef66736dd22794d73e6b1789a3a4da3037dc292948561b7affc33ac1c577ba259b6d4173aa5bd5a640bb7b3dcaef SHA512 3af8ee5f6bc9fcd5e1451ef8750861a79da4aa7c31ceb00d3a659000fc0c939c5adc809b8e37936587212707a8b2b529d30cafce55d35f8baf8eedb1a017e2e6 |
32 |
|
33 |
diff --git a/media-gfx/exiv2/exiv2-0.27.1-r1.ebuild b/media-gfx/exiv2/exiv2-0.27.1-r1.ebuild |
34 |
deleted file mode 100644 |
35 |
index 8ffcb2c29e9..00000000000 |
36 |
--- a/media-gfx/exiv2/exiv2-0.27.1-r1.ebuild |
37 |
+++ /dev/null |
38 |
@@ -1,108 +0,0 @@ |
39 |
-# Copyright 1999-2019 Gentoo Authors |
40 |
-# Distributed under the terms of the GNU General Public License v2 |
41 |
- |
42 |
-EAPI=7 |
43 |
- |
44 |
-if [[ ${PV} = *9999 ]]; then |
45 |
- EGIT_REPO_URI="https://github.com/Exiv2/exiv2.git" |
46 |
- inherit git-r3 |
47 |
-else |
48 |
- SRC_URI="https://exiv2.org/builds/${P}-Source.tar.gz" |
49 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" |
50 |
-fi |
51 |
- |
52 |
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) |
53 |
-inherit cmake-multilib python-any-r1 |
54 |
- |
55 |
-DESCRIPTION="EXIF, IPTC and XMP metadata C++ library and command line utility" |
56 |
-HOMEPAGE="https://www.exiv2.org/" |
57 |
- |
58 |
-LICENSE="GPL-2" |
59 |
-SLOT="0/27" |
60 |
-IUSE="doc examples nls +png webready +xmp" |
61 |
- |
62 |
-BDEPEND=" |
63 |
- doc? ( |
64 |
- ${PYTHON_DEPS} |
65 |
- app-doc/doxygen |
66 |
- dev-libs/libxslt |
67 |
- media-gfx/graphviz |
68 |
- virtual/pkgconfig |
69 |
- ) |
70 |
- nls? ( sys-devel/gettext ) |
71 |
-" |
72 |
-DEPEND=" |
73 |
- >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] |
74 |
- nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] ) |
75 |
- png? ( sys-libs/zlib[${MULTILIB_USEDEP}] ) |
76 |
- webready? ( |
77 |
- net-libs/libssh[${MULTILIB_USEDEP}] |
78 |
- net-misc/curl[${MULTILIB_USEDEP}] |
79 |
- ) |
80 |
- xmp? ( dev-libs/expat[${MULTILIB_USEDEP}] ) |
81 |
-" |
82 |
-RDEPEND="${DEPEND}" |
83 |
- |
84 |
-DOCS=( README.md doc/ChangeLog doc/cmd.txt ) |
85 |
- |
86 |
-S="${S}-Source" |
87 |
- |
88 |
-PATCHES=( |
89 |
- "${FILESDIR}"/${P}-system-cmakemoduledir{1,2}.patch |
90 |
- "${FILESDIR}"/${P}-private-libs.patch |
91 |
- "${FILESDIR}"/${P}-restore-0.25-behaviour.patch |
92 |
- "${FILESDIR}"/${P}-system-libssh-config.patch |
93 |
-) |
94 |
- |
95 |
-pkg_setup() { |
96 |
- use doc && python-any-r1_pkg_setup |
97 |
-} |
98 |
- |
99 |
-src_prepare() { |
100 |
- # FIXME @upstream: |
101 |
- einfo "Converting doc/cmd.txt to UTF-8" |
102 |
- iconv -f LATIN1 -t UTF-8 doc/cmd.txt > doc/cmd.txt.tmp || die |
103 |
- mv -f doc/cmd.txt.tmp doc/cmd.txt || die |
104 |
- |
105 |
- cmake-utils_src_prepare |
106 |
- |
107 |
- sed -e "/^include.*compilerFlags/s/^/#DONT /" -i CMakeLists.txt || die |
108 |
-} |
109 |
- |
110 |
-multilib_src_configure() { |
111 |
- local mycmakeargs=( |
112 |
- -DEXIV2_BUILD_SAMPLES=NO |
113 |
- -DEXIV2_BUILD_PO=$(usex nls) |
114 |
- -DEXIV2_ENABLE_NLS=$(usex nls) |
115 |
- -DEXIV2_ENABLE_PNG=$(usex png) |
116 |
- -DEXIV2_ENABLE_CURL=$(usex webready) |
117 |
- -DEXIV2_ENABLE_SSH=$(usex webready) |
118 |
- -DEXIV2_ENABLE_WEBREADY=$(usex webready) |
119 |
- -DEXIV2_ENABLE_XMP=$(usex xmp) |
120 |
- $(multilib_is_native_abi || echo -DEXIV2_BUILD_EXIV2_COMMAND=NO) |
121 |
- $(multilib_is_native_abi && echo -DEXIV2_BUILD_DOC=$(usex doc)) |
122 |
- -DCMAKE_INSTALL_DOCDIR="${EPREFIX}"/usr/share/doc/${PF}/html |
123 |
- ) |
124 |
- |
125 |
- cmake-utils_src_configure |
126 |
-} |
127 |
- |
128 |
-multilib_src_compile() { |
129 |
- cmake-utils_src_compile |
130 |
- |
131 |
- if multilib_is_native_abi; then |
132 |
- use doc && eninja doc |
133 |
- fi |
134 |
-} |
135 |
- |
136 |
-multilib_src_install_all() { |
137 |
- use xmp && DOCS+=( doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt} ) |
138 |
- |
139 |
- einstalldocs |
140 |
- find "${D}" -name '*.la' -delete || die |
141 |
- |
142 |
- if use examples; then |
143 |
- docinto examples |
144 |
- dodoc samples/*.cpp |
145 |
- fi |
146 |
-} |
147 |
|
148 |
diff --git a/media-gfx/exiv2/exiv2-0.27.2_rc3.ebuild b/media-gfx/exiv2/exiv2-0.27.2_rc3.ebuild |
149 |
deleted file mode 100644 |
150 |
index 2adb54834e7..00000000000 |
151 |
--- a/media-gfx/exiv2/exiv2-0.27.2_rc3.ebuild |
152 |
+++ /dev/null |
153 |
@@ -1,103 +0,0 @@ |
154 |
-# Copyright 1999-2019 Gentoo Authors |
155 |
-# Distributed under the terms of the GNU General Public License v2 |
156 |
- |
157 |
-EAPI=7 |
158 |
- |
159 |
-if [[ ${PV} = *9999 ]]; then |
160 |
- EGIT_REPO_URI="https://github.com/Exiv2/exiv2.git" |
161 |
- inherit git-r3 |
162 |
-else |
163 |
-# SRC_URI="https://exiv2.org/builds/${P}-Source.tar.gz" |
164 |
- SRC_URI="https://github.com/Exiv2/${PN}/archive/v${PV/_rc/-RC}.tar.gz -> ${P}.tar.gz" |
165 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" |
166 |
-fi |
167 |
- |
168 |
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) |
169 |
-inherit cmake-multilib python-any-r1 |
170 |
- |
171 |
-DESCRIPTION="EXIF, IPTC and XMP metadata C++ library and command line utility" |
172 |
-HOMEPAGE="https://www.exiv2.org/" |
173 |
- |
174 |
-LICENSE="GPL-2" |
175 |
-SLOT="0/27" |
176 |
-IUSE="doc examples nls +png webready +xmp" |
177 |
- |
178 |
-BDEPEND=" |
179 |
- doc? ( |
180 |
- ${PYTHON_DEPS} |
181 |
- app-doc/doxygen |
182 |
- dev-libs/libxslt |
183 |
- media-gfx/graphviz |
184 |
- virtual/pkgconfig |
185 |
- ) |
186 |
- nls? ( sys-devel/gettext ) |
187 |
-" |
188 |
-DEPEND=" |
189 |
- >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] |
190 |
- nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] ) |
191 |
- png? ( sys-libs/zlib[${MULTILIB_USEDEP}] ) |
192 |
- webready? ( |
193 |
- net-libs/libssh[${MULTILIB_USEDEP}] |
194 |
- net-misc/curl[${MULTILIB_USEDEP}] |
195 |
- ) |
196 |
- xmp? ( dev-libs/expat[${MULTILIB_USEDEP}] ) |
197 |
-" |
198 |
-RDEPEND="${DEPEND}" |
199 |
- |
200 |
-DOCS=( README.md doc/ChangeLog doc/cmd.txt ) |
201 |
- |
202 |
-# S="${S}-Source" |
203 |
-S="${WORKDIR}/${P/_rc/-RC}" |
204 |
- |
205 |
-pkg_setup() { |
206 |
- use doc && python-any-r1_pkg_setup |
207 |
-} |
208 |
- |
209 |
-src_prepare() { |
210 |
- # FIXME @upstream: |
211 |
- einfo "Converting doc/cmd.txt to UTF-8" |
212 |
- iconv -f LATIN1 -t UTF-8 doc/cmd.txt > doc/cmd.txt.tmp || die |
213 |
- mv -f doc/cmd.txt.tmp doc/cmd.txt || die |
214 |
- |
215 |
- cmake-utils_src_prepare |
216 |
- |
217 |
- sed -e "/^include.*compilerFlags/s/^/#DONT /" -i CMakeLists.txt || die |
218 |
-} |
219 |
- |
220 |
-multilib_src_configure() { |
221 |
- local mycmakeargs=( |
222 |
- -DEXIV2_BUILD_SAMPLES=NO |
223 |
- -DEXIV2_BUILD_PO=$(usex nls) |
224 |
- -DEXIV2_ENABLE_NLS=$(usex nls) |
225 |
- -DEXIV2_ENABLE_PNG=$(usex png) |
226 |
- -DEXIV2_ENABLE_CURL=$(usex webready) |
227 |
- -DEXIV2_ENABLE_SSH=$(usex webready) |
228 |
- -DEXIV2_ENABLE_WEBREADY=$(usex webready) |
229 |
- -DEXIV2_ENABLE_XMP=$(usex xmp) |
230 |
- $(multilib_is_native_abi || echo -DEXIV2_BUILD_EXIV2_COMMAND=NO) |
231 |
- $(multilib_is_native_abi && echo -DEXIV2_BUILD_DOC=$(usex doc)) |
232 |
- -DCMAKE_INSTALL_DOCDIR="${EPREFIX}"/usr/share/doc/${PF}/html |
233 |
- ) |
234 |
- |
235 |
- cmake-utils_src_configure |
236 |
-} |
237 |
- |
238 |
-multilib_src_compile() { |
239 |
- cmake-utils_src_compile |
240 |
- |
241 |
- if multilib_is_native_abi; then |
242 |
- use doc && eninja doc |
243 |
- fi |
244 |
-} |
245 |
- |
246 |
-multilib_src_install_all() { |
247 |
- use xmp && DOCS+=( doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt} ) |
248 |
- |
249 |
- einstalldocs |
250 |
- find "${D}" -name '*.la' -delete || die |
251 |
- |
252 |
- if use examples; then |
253 |
- docinto examples |
254 |
- dodoc samples/*.cpp |
255 |
- fi |
256 |
-} |
257 |
|
258 |
diff --git a/media-gfx/exiv2/files/exiv2-0.27.1-private-libs.patch b/media-gfx/exiv2/files/exiv2-0.27.1-private-libs.patch |
259 |
deleted file mode 100644 |
260 |
index c99a19098ae..00000000000 |
261 |
--- a/media-gfx/exiv2/files/exiv2-0.27.1-private-libs.patch |
262 |
+++ /dev/null |
263 |
@@ -1,59 +0,0 @@ |
264 |
-From f05d100579effd7459fd0715b26239d4cd2c9bcc Mon Sep 17 00:00:00 2001 |
265 |
-From: =?UTF-8?q?Luis=20D=C3=ADaz=20M=C3=A1s?= <piponazo@×××××.com> |
266 |
-Date: Sat, 4 May 2019 16:14:15 +0200 |
267 |
-Subject: [PATCH] CURL lib and include directories private for exiv2lib |
268 |
- |
269 |
-(cherry picked from commit 5d64a0b11c5a45dd9d58c56e946301f3f98942a7) |
270 |
---- |
271 |
- samples/CMakeLists.txt | 14 ++++++++++++++ |
272 |
- src/CMakeLists.txt | 10 +++++----- |
273 |
- 2 files changed, 19 insertions(+), 5 deletions(-) |
274 |
- |
275 |
-diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt |
276 |
-index a82403e3b..c3f4722df 100644 |
277 |
---- a/samples/CMakeLists.txt |
278 |
-+++ b/samples/CMakeLists.txt |
279 |
-@@ -96,6 +96,20 @@ endif() |
280 |
- add_executable(conntest conntest.cpp) |
281 |
- list(APPEND APPLICATIONS conntest) |
282 |
- |
283 |
-+if (EXIV2_ENABLE_WEBREADY) |
284 |
-+ if( EXIV2_ENABLE_CURL ) |
285 |
-+ target_include_directories(conntest SYSTEM PRIVATE ${CURL_INCLUDE_DIR} ) |
286 |
-+ target_link_libraries(conntest PRIVATE ${CURL_LIBRARIES}) |
287 |
-+ if (USING_CONAN) |
288 |
-+ target_compile_definitions(conntest PRIVATE ${CONAN_COMPILE_DEFINITIONS_LIBCURL}) |
289 |
-+ target_link_libraries(conntest PRIVATE ${CONAN_EXE_LINKER_FLAGS_LIBCURL}) |
290 |
-+ if (NOT APPLE) |
291 |
-+ target_link_libraries(conntest PRIVATE CONAN_PKG::OpenSSL) |
292 |
-+ endif() |
293 |
-+ endif() |
294 |
-+ endif() |
295 |
-+endif() |
296 |
-+ |
297 |
- # ****************************************************************************** |
298 |
- # remotetest application |
299 |
- add_executable(remotetest remotetest.cpp) |
300 |
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt |
301 |
-index 976327775..d0e989d26 100644 |
302 |
---- a/src/CMakeLists.txt |
303 |
-+++ b/src/CMakeLists.txt |
304 |
-@@ -179,13 +179,13 @@ if (EXIV2_ENABLE_WEBREADY) |
305 |
- endif() |
306 |
- |
307 |
- if( EXIV2_ENABLE_CURL ) |
308 |
-- target_include_directories(exiv2lib SYSTEM PUBLIC ${CURL_INCLUDE_DIR} ) |
309 |
-- target_link_libraries(exiv2lib PUBLIC ${CURL_LIBRARIES}) |
310 |
-+ target_include_directories(exiv2lib SYSTEM PRIVATE ${CURL_INCLUDE_DIR} ) |
311 |
-+ target_link_libraries(exiv2lib PRIVATE ${CURL_LIBRARIES}) |
312 |
- if (USING_CONAN) |
313 |
-- target_compile_definitions(exiv2lib PUBLIC ${CONAN_COMPILE_DEFINITIONS_LIBCURL}) |
314 |
-- target_link_libraries(exiv2lib PUBLIC ${CONAN_EXE_LINKER_FLAGS_LIBCURL}) |
315 |
-+ target_compile_definitions(exiv2lib PRIVATE ${CONAN_COMPILE_DEFINITIONS_LIBCURL}) |
316 |
-+ target_link_libraries(exiv2lib PRIVATE ${CONAN_EXE_LINKER_FLAGS_LIBCURL}) |
317 |
- if (NOT APPLE) |
318 |
-- target_link_libraries(exiv2lib PUBLIC CONAN_PKG::OpenSSL) |
319 |
-+ target_link_libraries(exiv2lib PRIVATE CONAN_PKG::OpenSSL) |
320 |
- endif() |
321 |
- endif() |
322 |
- endif() |
323 |
|
324 |
diff --git a/media-gfx/exiv2/files/exiv2-0.27.1-restore-0.25-behaviour.patch b/media-gfx/exiv2/files/exiv2-0.27.1-restore-0.25-behaviour.patch |
325 |
deleted file mode 100644 |
326 |
index 2aa4d3a826f..00000000000 |
327 |
--- a/media-gfx/exiv2/files/exiv2-0.27.1-restore-0.25-behaviour.patch |
328 |
+++ /dev/null |
329 |
@@ -1,119 +0,0 @@ |
330 |
-From db870755b928cca7411a092ce12292afe9c4fa36 Mon Sep 17 00:00:00 2001 |
331 |
-From: clanmills <robin@×××××××××.com> |
332 |
-Date: Thu, 9 May 2019 11:26:29 +0100 |
333 |
-Subject: [PATCH] fix #818. Restore 0.25 behaviour of `$ exiv2 -g image ...` |
334 |
- to apply grep to keys. |
335 |
- |
336 |
---- |
337 |
- src/actions.cpp | 2 +- |
338 |
- src/exiv2.1 | 50 +++++++++++++++++-------- |
339 |
- tests/bugfixes/github/test_issue_818.py | 32 ++++++++++++++++ |
340 |
- 3 files changed, 67 insertions(+), 17 deletions(-) |
341 |
- create mode 100644 tests/bugfixes/github/test_issue_818.py |
342 |
- |
343 |
-diff --git a/src/actions.cpp b/src/actions.cpp |
344 |
-index 34a7a80d5..68260186d 100644 |
345 |
---- a/src/actions.cpp |
346 |
-+++ b/src/actions.cpp |
347 |
-@@ -243,7 +243,7 @@ namespace Action { |
348 |
- int rc = 0; |
349 |
- Exiv2::PrintStructureOption option = Exiv2::kpsNone ; |
350 |
- switch (Params::instance().printMode_) { |
351 |
-- case Params::pmSummary: rc = printSummary(); break; |
352 |
-+ case Params::pmSummary: rc = Params::instance().greps_.empty() ? printSummary() : printList(); break; |
353 |
- case Params::pmList: rc = printList(); break; |
354 |
- case Params::pmComment: rc = printComment(); break; |
355 |
- case Params::pmPreview: rc = printPreviewList(); break; |
356 |
-diff --git a/src/exiv2.1 b/src/exiv2.1 |
357 |
-index 4f6f3b51b..048f09af7 100644 |
358 |
---- a/src/exiv2.1 |
359 |
-+++ b/src/exiv2.1 |
360 |
-@@ -2,7 +2,7 @@ |
361 |
- .\" First parameter, NAME, should be all caps |
362 |
- .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection |
363 |
- .\" other parameters are allowed: see man(7), man(1) |
364 |
--.TH EXIV2 1 "Apr 25, 2019" |
365 |
-+.TH EXIV2 1 "May 8, 2019" |
366 |
- .\" Please adjust this date whenever revising the manpage. |
367 |
- .\" |
368 |
- .\" Some roff macros, for reference: |
369 |
-@@ -222,19 +222,30 @@ Show unknown tags (default is to suppress tags which don't have a name). |
370 |
- Only keys which match the given key (grep). |
371 |
- .br |
372 |
- Multiple \fB\-g\fP options |
373 |
--can be used to grep info for several keys. Example: |
374 |
-+can be used to filter info to less keys. Example: |
375 |
- exiv2 -v -V -g webready -g time. |
376 |
-+The default exiv2 command prints a "summary report" which is quite short. When you use -g without a -pmod option, you do not get a summary report and in effect you get -g pattern -pa image ... |
377 |
- |
378 |
- .nf |
379 |
--exiv2 \-g Date \-pt R.jpg |
380 |
--Exif.Image.DateTime Ascii 20 2012:08:07 16:01:05 |
381 |
--Exif.Photo.DateTimeOriginal Ascii 20 2011:09:18 16:25:48 |
382 |
--Exif.Photo.DateTimeDigitized Ascii 20 2011:09:18 16:25:48 |
383 |
-+$ bin/exiv2 -g Date http://clanmills.com/Stonehenge.jpg |
384 |
-+Exif.Image.DateTime Ascii 20 2015:07:16 20:25:28 |
385 |
-+Exif.Photo.DateTimeOriginal Ascii 20 2015:07:16 15:38:54 |
386 |
-+Exif.Photo.DateTimeDigitized Ascii 20 2015:07:16 15:38:54 |
387 |
-+Exif.NikonWt.DateDisplayFormat Byte 1 Y/M/D |
388 |
-+Exif.GPSInfo.GPSDateStamp Ascii 11 2015:07:16 |
389 |
-+Xmp.xmp.ModifyDate XmpText 25 2015-07-16T20:25:28+01:00 |
390 |
- |
391 |
- .fi |
392 |
---g (--grep) is only applied to keys. It is not generally applied to all output such as the default -ps report. |
393 |
-+You may use -pmod filters to further filter output. For example: |
394 |
-+.nf |
395 |
-+ |
396 |
-+$ bin/exiv2 -px -g Date http://clanmills.com/Stonehenge.jpg |
397 |
-+Xmp.xmp.ModifyDate XmpText 25 2015-07-16T20:25:28+01:00 |
398 |
- |
399 |
--The key may finish with the optional modifier /i to indicated case insensitive. |
400 |
-+.fi |
401 |
-+The option -g (--grep) applies to keys and not values. |
402 |
-+ |
403 |
-+The key may finish with the optional modifier /i to indicate case insensitive. |
404 |
- .TP |
405 |
- .B \-K \fIkey\fP |
406 |
- Only report data for given key. |
407 |
-@@ -243,8 +254,8 @@ Multiple \fB\-K\fP options can be used to report more than a single key. |
408 |
- |
409 |
- .nf |
410 |
- exiv2 \-K Exif.Photo.DateTimeDigitized -K Exif.Photo.DateTimeOriginal \-pt R.jpg |
411 |
--Exif.Photo.DateTimeOriginal Ascii 20 2011:09:18 16:25:48 |
412 |
--Exif.Photo.DateTimeDigitized Ascii 20 2011:09:18 16:25:48 |
413 |
-+Exif.Photo.DateTimeOriginal Ascii 20 2011:09:18 16:25:48 |
414 |
-+Exif.Photo.DateTimeDigitized Ascii 20 2011:09:18 16:25:48 |
415 |
- .fi |
416 |
- .TP |
417 |
- .B \-n \fIenc\fP |
418 |
-@@ -594,17 +605,24 @@ You obtain the lensID for your camera with the command: |
419 |
- .nf |
420 |
- .sp 1 |
421 |
- $ exiv2 -pv --grep lens/i http://clanmills.com/Stonehenge.jpg |
422 |
--0x0083 Nikon3 LensType Byte 1 14 |
423 |
--0x0084 Nikon3 Lens Rational 4 180/10 2500/10 35/10 63/10 |
424 |
--0x008b Nikon3 LensFStops Undefined 4 55 1 12 0 |
425 |
--0x000c NikonLd3 LensIDNumber Byte 1 146 <--- This number |
426 |
--0x000d NikonLd3 LensFStops Byte 1 55 |
427 |
-+0x0083 Nikon3 LensType Byte 1 14 |
428 |
-+0x0084 Nikon3 Lens Rational 4 180/10 2500/10 35/10 63/10 |
429 |
-+0x008b Nikon3 LensFStops Undefined 4 55 1 12 0 |
430 |
-+0x000c NikonLd3 LensIDNumber Byte 1 146 <--- This number |
431 |
-+0x000d NikonLd3 LensFStops Byte 1 55 |
432 |
- .br |
433 |
- .ne 40 |
434 |
- .SH EXAMPLES |
435 |
- .TP |
436 |
- exiv2 *.jpg |
437 |
--Prints a summary of the Exif information for all JPEG files in the directory. |
438 |
-+Prints a summary of the Exif information for all JPEG files in the directory. The summary report is rather brief and presentation does not use the Family.Group.Tag convention. |
439 |
-+ |
440 |
-+If you use --grep pattern, the default becomes -pa. See -g/grep above. |
441 |
-+ |
442 |
-+.nf |
443 |
-+$ exiv2 -g Date http://clanmills.com/Stonehenge.jpg |
444 |
-+ |
445 |
-+.fi |
446 |
- .TP |
447 |
- exiv2 \-pi image.jpg |
448 |
- Prints the IPTC metadata of the image. |
449 |
|
450 |
diff --git a/media-gfx/exiv2/files/exiv2-0.27.1-system-cmakemoduledir1.patch b/media-gfx/exiv2/files/exiv2-0.27.1-system-cmakemoduledir1.patch |
451 |
deleted file mode 100644 |
452 |
index 77a68437502..00000000000 |
453 |
--- a/media-gfx/exiv2/files/exiv2-0.27.1-system-cmakemoduledir1.patch |
454 |
+++ /dev/null |
455 |
@@ -1,41 +0,0 @@ |
456 |
-From 78676b2a025023ab3de2d094e0798ed64ef7df97 Mon Sep 17 00:00:00 2001 |
457 |
-From: Robin Mills <robin@×××××××××.com> |
458 |
-Date: Sat, 27 Apr 2019 11:18:22 +0100 |
459 |
-Subject: [PATCH] Fix #798 |
460 |
- |
461 |
---- |
462 |
- README.md | 2 +- |
463 |
- releasenotes/CYGWIN/ReadMe.txt | 17 +---------------- |
464 |
- releasenotes/Darwin/ReadMe.txt | 6 ++---- |
465 |
- releasenotes/Linux/ReadMe.txt | 2 +- |
466 |
- releasenotes/MinGW/ReadMe.txt | 2 +- |
467 |
- releasenotes/msvc/ReadMe.txt | 2 +- |
468 |
- src/CMakeLists.txt | 2 +- |
469 |
- 7 files changed, 8 insertions(+), 25 deletions(-) |
470 |
- |
471 |
-diff --git a/README.md b/README.md |
472 |
-index 6e9f50a94..92cca39e6 100644 |
473 |
---- a/README.md |
474 |
-+++ b/README.md |
475 |
-@@ -189,7 +189,7 @@ project(exifprint VERSION 0.0.1 LANGUAGES CXX) |
476 |
- set(CMAKE_CXX_STANDARD 11) |
477 |
- set(CMAKE_CXX_EXTENSIONS OFF) |
478 |
- |
479 |
--find_package(exiv2 REQUIRED CONFIG NAMES exiv2) # search ${CMAKE_INSTALL_PREFIX}/lib/exiv2/cmake/ |
480 |
-+find_package(exiv2 REQUIRED CONFIG NAMES exiv2) # search ${CMAKE_INSTALL_PREFIX}/lib/cmake/exiv2 |
481 |
- add_executable(exifprint ../samples/exifprint.cpp) # compile this |
482 |
- target_link_libraries(exifprint exiv2lib) # link exiv2lib |
483 |
- |
484 |
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt |
485 |
-index 340870048..976327775 100644 |
486 |
---- a/src/CMakeLists.txt |
487 |
-+++ b/src/CMakeLists.txt |
488 |
-@@ -239,7 +239,7 @@ install(FILES |
489 |
- ${CMAKE_BINARY_DIR}/exiv2lib_export.h |
490 |
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/exiv2) |
491 |
- |
492 |
--install(EXPORT exiv2Config DESTINATION "${CMAKE_INSTALL_LIBDIR}/exiv2/cmake") |
493 |
-+install(EXPORT exiv2Config DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/exiv2") |
494 |
- |
495 |
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2ConfigVersion.cmake DESTINATION "${CMAKE_INSTALL_LIBDIR}/exiv2/cmake") |
496 |
- |
497 |
|
498 |
diff --git a/media-gfx/exiv2/files/exiv2-0.27.1-system-cmakemoduledir2.patch b/media-gfx/exiv2/files/exiv2-0.27.1-system-cmakemoduledir2.patch |
499 |
deleted file mode 100644 |
500 |
index 1770449564a..00000000000 |
501 |
--- a/media-gfx/exiv2/files/exiv2-0.27.1-system-cmakemoduledir2.patch |
502 |
+++ /dev/null |
503 |
@@ -1,28 +0,0 @@ |
504 |
-From 6819f2ac456c57291f94cc1f4db13ce134eed468 Mon Sep 17 00:00:00 2001 |
505 |
-From: Andreas Sturmlechner <asturm@g.o> |
506 |
-Date: Sun, 23 Jun 2019 19:32:29 +0200 |
507 |
-Subject: [PATCH] Fix install path of exiv2ConfigVersion.cmake |
508 |
- |
509 |
-This seems to have been caused by duplicate work between master branch |
510 |
-and 0.27-maintenance branch, as commit 3b48249eeb350301dfb3efa3ba6f7d7b162455be |
511 |
-had already got that right. |
512 |
---- |
513 |
- src/CMakeLists.txt | 2 +- |
514 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
515 |
- |
516 |
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt |
517 |
-index 1d0ccee4..05ce4e14 100644 |
518 |
---- a/src/CMakeLists.txt |
519 |
-+++ b/src/CMakeLists.txt |
520 |
-@@ -245,7 +245,7 @@ install(FILES |
521 |
- |
522 |
- install(EXPORT exiv2Config DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/exiv2") |
523 |
- |
524 |
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2ConfigVersion.cmake DESTINATION "${CMAKE_INSTALL_LIBDIR}/exiv2/cmake") |
525 |
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2ConfigVersion.cmake DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/exiv2") |
526 |
- |
527 |
- # ****************************************************************************** |
528 |
- # exiv2 application |
529 |
--- |
530 |
-2.22.0 |
531 |
- |
532 |
|
533 |
diff --git a/media-gfx/exiv2/files/exiv2-0.27.1-system-libssh-config.patch b/media-gfx/exiv2/files/exiv2-0.27.1-system-libssh-config.patch |
534 |
deleted file mode 100644 |
535 |
index 555314ae932..00000000000 |
536 |
--- a/media-gfx/exiv2/files/exiv2-0.27.1-system-libssh-config.patch |
537 |
+++ /dev/null |
538 |
@@ -1,93 +0,0 @@ |
539 |
-From e85ce17fc91e11eff26c6f5a89125505b7db5fd3 Mon Sep 17 00:00:00 2001 |
540 |
-From: Andreas Sturmlechner <asturm@g.o> |
541 |
-Date: Sun, 23 Jun 2019 19:50:01 +0200 |
542 |
-Subject: [PATCH 1/2] Switch to libssh's own libssh-config.cmake |
543 |
- |
544 |
-This is provided by libssh since 2013. |
545 |
---- |
546 |
- cmake/findDependencies.cmake | 2 +- |
547 |
- src/CMakeLists.txt | 4 ++-- |
548 |
- 2 files changed, 3 insertions(+), 3 deletions(-) |
549 |
- |
550 |
-diff --git a/cmake/findDependencies.cmake b/cmake/findDependencies.cmake |
551 |
-index 12d47525..52760185 100644 |
552 |
---- a/cmake/findDependencies.cmake |
553 |
-+++ b/cmake/findDependencies.cmake |
554 |
-@@ -20,7 +20,7 @@ if( EXIV2_ENABLE_WEBREADY ) |
555 |
- endif() |
556 |
- |
557 |
- if( EXIV2_ENABLE_SSH ) |
558 |
-- find_package( SSH REQUIRED) |
559 |
-+ find_package(libssh CONFIG REQUIRED) |
560 |
- endif( ) |
561 |
- endif( ) |
562 |
- |
563 |
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt |
564 |
-index 1d0ccee4..b532fc7b 100644 |
565 |
---- a/src/CMakeLists.txt |
566 |
-+++ b/src/CMakeLists.txt |
567 |
-@@ -174,8 +174,8 @@ target_include_directories(exiv2lib_int PUBLIC |
568 |
- if (EXIV2_ENABLE_WEBREADY) |
569 |
- |
570 |
- if( EXIV2_ENABLE_SSH ) |
571 |
-- target_include_directories(exiv2lib SYSTEM PUBLIC ${SSH_INCLUDE_DIR} ) |
572 |
-- target_link_libraries( exiv2lib PUBLIC ${SSH_LIBRARIES}) |
573 |
-+ target_include_directories(exiv2lib SYSTEM PUBLIC ${LIBSSH_INCLUDE_DIR}) |
574 |
-+ target_link_libraries(exiv2lib PUBLIC ${LIBSSH_LIBRARIES}) |
575 |
- endif() |
576 |
- |
577 |
- if( EXIV2_ENABLE_CURL ) |
578 |
--- |
579 |
-2.22.0 |
580 |
- |
581 |
- |
582 |
-From 89d8160a410c2c526ad021fd456accc709cae520 Mon Sep 17 00:00:00 2001 |
583 |
-From: Andreas Sturmlechner <asturm@g.o> |
584 |
-Date: Sun, 23 Jun 2019 19:50:44 +0200 |
585 |
-Subject: [PATCH 2/2] Drop now obsolete FindSSH.cmake |
586 |
- |
587 |
---- |
588 |
- cmake/FindSSH.cmake | 31 ------------------------------- |
589 |
- 1 file changed, 31 deletions(-) |
590 |
- delete mode 100644 cmake/FindSSH.cmake |
591 |
- |
592 |
-diff --git a/cmake/FindSSH.cmake b/cmake/FindSSH.cmake |
593 |
-deleted file mode 100644 |
594 |
-index 2a6fa378..00000000 |
595 |
---- a/cmake/FindSSH.cmake |
596 |
-+++ /dev/null |
597 |
-@@ -1,31 +0,0 @@ |
598 |
--# - Find libssh |
599 |
--# Find the native SSH headers and libraries. |
600 |
--# |
601 |
--# SSH_INCLUDE_DIRS - where to find libssh.h, etc. |
602 |
--# SSH_LIBRARIES - List of libraries when using libssh. |
603 |
--# SSH_FOUND - True if libssh found. |
604 |
--# |
605 |
--# Redistribution and use is allowed according to the terms of the BSD license. |
606 |
--# For details see the accompanying COPYING-CMAKE-SCRIPTS file. |
607 |
-- |
608 |
--# Look for the header file. |
609 |
--FIND_PATH(SSH_INCLUDE_DIR NAMES libssh/libssh.h) |
610 |
-- |
611 |
--# Look for the library. |
612 |
--FIND_LIBRARY(SSH_LIBRARY NAMES ssh libssh) |
613 |
-- |
614 |
--# handle the QUIETLY and REQUIRED arguments and set SSH_FOUND to TRUE if |
615 |
--# all listed variables are TRUE |
616 |
--INCLUDE(FindPackageHandleStandardArgs) |
617 |
--FIND_PACKAGE_HANDLE_STANDARD_ARGS(SSH DEFAULT_MSG SSH_LIBRARY SSH_INCLUDE_DIR) |
618 |
-- |
619 |
--# Copy the results to the output variables. |
620 |
--IF(SSH_FOUND) |
621 |
-- SET(SSH_LIBRARIES ${SSH_LIBRARY}) |
622 |
-- SET(SSH_INCLUDE_DIRS ${SSH_INCLUDE_DIR}) |
623 |
--ELSE(SSH_FOUND) |
624 |
-- SET(SSH_LIBRARIES) |
625 |
-- SET(SSH_INCLUDE_DIRS) |
626 |
--ENDIF(SSH_FOUND) |
627 |
-- |
628 |
--MARK_AS_ADVANCED(SSH_INCLUDE_DIR SSH_LIBRARY) |
629 |
--- |
630 |
-2.22.0 |
631 |
- |