1 |
commit: 05678d1ba2496b9692b4df34b7dffc75220a678b |
2 |
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
3 |
AuthorDate: Fri Oct 13 19:04:24 2017 +0000 |
4 |
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
5 |
CommitDate: Fri Oct 13 19:04:24 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=05678d1b |
7 |
|
8 |
media-gfx/exiv2: remove 0.26 |
9 |
|
10 |
Close #51 |
11 |
|
12 |
media-gfx/exiv2/Manifest | 12 -- |
13 |
media-gfx/exiv2/exiv2-0.26.ebuild | 134 --------------------- |
14 |
.../exiv2/files/exiv2-0.26-CVE-2017-9239.patch | 22 ---- |
15 |
media-gfx/exiv2/files/exiv2-0.26-cmake1.patch | 22 ---- |
16 |
media-gfx/exiv2/files/exiv2-0.26-cmake2.patch | 65 ---------- |
17 |
media-gfx/exiv2/files/exiv2-0.26-cmake3.patch | 53 -------- |
18 |
media-gfx/exiv2/files/exiv2-0.26-cmake4.patch | 24 ---- |
19 |
media-gfx/exiv2/files/exiv2-0.26-cmake5.patch | 33 ----- |
20 |
media-gfx/exiv2/files/exiv2-0.26-cmake6.patch | 27 ----- |
21 |
media-gfx/exiv2/files/exiv2-0.26-cmake7.patch | 38 ------ |
22 |
media-gfx/exiv2/files/exiv2-0.26-fix-docs.patch | 70 ----------- |
23 |
.../exiv2/files/exiv2-0.26-tools-optional.patch | 27 ----- |
24 |
12 files changed, 527 deletions(-) |
25 |
|
26 |
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest |
27 |
index 0920aea..54fa081 100644 |
28 |
--- a/media-gfx/exiv2/Manifest |
29 |
+++ b/media-gfx/exiv2/Manifest |
30 |
@@ -5,18 +5,6 @@ AUX exiv2-0.25-fvisibility-hidden.patch 700 SHA256 2d0eb374e3df7dd58a513b616786e |
31 |
AUX exiv2-0.25-hide-symbols.patch 4098 SHA256 b6fe63951717360caad547275c3810c42803ef2d8dea25c75e02b45b9d7add9e SHA512 aed6746329b12769d8084ca79a99eccd6b52449b80c0b3d1c1d6b22294c2b62398366f0715efa207e2ace0ed52740a8eb81af58d17322d42a4674336fd24e725 WHIRLPOOL ac8e900303ac0b19f24b5eff13791dd42459395763d4c8795ff978c1f2c05431b3f3586dedd2b7df375452d3826d7356fc190c4ba3bc8fc4713792bc9d31d033 |
32 |
AUX exiv2-0.25-musl.patch 464 SHA256 c32333fa1d157bd2b14aaf18e19c2a67511baad89a9b526d6f984bb955dbf9ee SHA512 25e7d53fd2840d1166795a0a27c07de9370f493b1c8a047a020b73fe9330303d97a48414937c25e5aa5961fa7d416b10e4e3ea6b35008e4d9705ed19d71bb85d WHIRLPOOL 0e71a59b5fa87633c98e46385260835077e3a93c7a9aad9022c58060efbfecba295c37726d248580b9a79ee7cecdc8f0e23f24cfcaa1085ab33e44f33bbc5d49 |
33 |
AUX exiv2-0.25-tools-optional.patch 1332 SHA256 6c9a3ed5c2b9acff10c3b2f2dd2ca639936beaf6263526b9d85ede579a1d67e1 SHA512 14a8703b86dc4a7a1f210e26bd6532c529f850dd1b25ef116c703a576c389a120e3f8b1087e289cd8b44073071ac88a97503dc2c0cf72f21d32094b2cabbc58c WHIRLPOOL dc7efa7ddcaf1be665cd79aff0b36a0f2b135a87a3a93f9cb6091105b965b4b009e569c447d54d602482410ec59d674d99a71bee2699e8007575b8e2cc727998 |
34 |
-AUX exiv2-0.26-CVE-2017-9239.patch 738 SHA256 014407dc03154c12675d66368b9e5674bc761bd77102665bb4ccbbc1561b8098 SHA512 f6d3c081ca145bc9614fff83d59512329bb30b19010be16484c0d341c6c7167195c98131458b9427ef0afd9cf0bd1f1cdd10b0cfd689322327bd685759bd125f WHIRLPOOL 724b65d05228677d6d9493489d0e9882308e1a5fdef502528c80676767c582fe9ff828d50b67b447ba57b0c114926143c5ca9864e04e3b4dcfd6118a2e06daf9 |
35 |
-AUX exiv2-0.26-cmake1.patch 805 SHA256 ce6797ef659aad6ad0687ea7236d193a22552c4c91855f486216371de0608f2e SHA512 5b99674cdf01ab712df2f743487be1afd5a5751133222d13eaab36ce9e0b86c9c89eb8a09244eb521a60bce12081dbefb6b867aab75158df193d80965a0f0681 WHIRLPOOL 734fcdb96037486a7ec834ecf1f90d3e63e35ef22efd832e787e2e6efa8a9d59923311e46ff6486acd96668c0245f2ac0de620ea35e75665fce9a34c9caa401e |
36 |
-AUX exiv2-0.26-cmake2.patch 2781 SHA256 f5b4404a124e2fb11e2c363973c25bbc91c1da9787822f9f1a3252ef2bf0224b SHA512 2ff6baad558ff79ec514a9bd78adb01d1c894d51713a5f98573c7e60356b90ed5f9ad462c43f6454874e2e775f61edf38a5881eb9526c5c9cd5543af0777e543 WHIRLPOOL 297cb349e63e9fb9a696c3e60de6e8d1c547b7f163abff6aeabe7687d6bc1c643b0a0166438f544ba33c02b285029244b339b0963afe894cd736175c9b7c1f87 |
37 |
-AUX exiv2-0.26-cmake3.patch 2040 SHA256 14c67fe154053c72d41696546b998c320129190dc3b43471b25731d71c9e7c19 SHA512 98c63cbe51126090835b2422433af625cea683d89d3d4e822191bfa19633ff1e4b98b41356dd9f2326c4e30c34faa80b9408ed488644575ab5cbf8f5477f6d8f WHIRLPOOL 9065ff20231c6dc36a8314e0cbf36237d2b6acaceea69cfe16ec616a3e53b99fd756305e1fd771c4e2c1349a051ea2d875374f8bea67ef9049e677803fcc390d |
38 |
-AUX exiv2-0.26-cmake4.patch 783 SHA256 fee765278dc3bdc11b0d140e2e082ef29209aa78d591808ecf608434be87deda SHA512 e2a197fcf1255e02d1ce35a3d9428f40533fad8dcbac39f17b8b5d3f2b365479e202c9fca3b969b6f16ab3e58ff2d8654b85308536e5acec3ba8d7af38fc17a0 WHIRLPOOL 8b28f0bd49bd4af64a8638bffbe977aa9feb257f9cf8c2075493b4e56aa6065c8e475ce33f988575e1b2b90030abd179902682537f00576cddb7069f0aa32607 |
39 |
-AUX exiv2-0.26-cmake5.patch 1066 SHA256 aa7fcff3eace01ac2faf9a901fa2ebd3949d1ae4836bcfc884a119b394c083b5 SHA512 6ac55cd0d73b484357b84b07f0e059f239e717a32d0cb4acec23522ac23546374f13edbb5306fe1acf7d75049ee642f4c6e851fb1dc0b38bec5feecfd4efbb0f WHIRLPOOL 11118cc7bc6a753700b6a1dd381c67ef883fab4c64ee1f5248b641bf265081994b99d88147d4fdaf208ebe4dab91f8488e4fa105919d3f0ab984ead146cdc3f7 |
40 |
-AUX exiv2-0.26-cmake6.patch 973 SHA256 4a167f386a87f261481b5544844aa26c61386bb77e702407f21490b052b866aa SHA512 d32b2d8856651ec168732367c5d7c65131e9301fb899bf7ce018b68d783d66120b99fff624ce3c37b36c5aa1682d5cdde74adf232c11807f496cff987bf478a7 WHIRLPOOL 6060e8c85a6f953a4853bbdedfd85c2dbd3c9943c972d9b0612239017886d78bf2db50fc1a2474aad949d03079e9adc8254307598e3dd734af015b7133d2c004 |
41 |
-AUX exiv2-0.26-cmake7.patch 1328 SHA256 a882283ea89183c4a415b9816cf03daa80683ea5a85c5a78c7b430f1b602f293 SHA512 f500dd7cf0520d5cdb177a33554329d7da0f9895a1d04e1fd2d91e37814df61901b13f7e9c33b245fa4ad9cd6b7361cf289af868363187f9917691366a6672a3 WHIRLPOOL 661b44e517138b93c2633f13507c3ec67ac1308b7b794731996bde75cf83fce3ef315287fdff4dc2a418253c94ecfb38f73ea96e9599bc124e80a7a0e89d15c7 |
42 |
-AUX exiv2-0.26-fix-docs.patch 2147 SHA256 6cdab606c6fb6ddc7913fd311d9051946f97c1de5dabac614e934e704ea4c7ca SHA512 fa2f35d00df2fd1d958e1139e7b8fe0dd0c0f7f6fe5295b2ac5b0a156ae68af9e275e23c943929c90315a99e3116376a4e21e384c1bb219b3d5b657ac12165ec WHIRLPOOL 5e70a648303cab83e6265c064e94144d65421bc9cf514744b624a6af466cce1827c983664ee71f78431919d47370f2f9d17931aa96941c2079826232687ab78c |
43 |
-AUX exiv2-0.26-tools-optional.patch 1276 SHA256 5df66e4cbf15b911b4c05bb9240452f64f9e4c84bd04e7e516ef34bd43c3e849 SHA512 23e797e76cedf6c4a2025e0d6d2f7301d8e13adcbb836660fe2568eeb94348c6cac649284789551f97a69790271936b6412ff7d1416ee95a87851624b317e4c9 WHIRLPOOL c7f32aa72c9051c69cb54176335ab05258aca72f9cd658fd323873bd7d3f8db5fd0b10f9940b5ee5bb3d1c84902a59a73087f510db37542b100c5fd9d8f755fb |
44 |
DIST exiv2-0.25.tar.gz 5434325 SHA256 c80bfc778a15fdb06f71265db2c3d49d8493c382e516cb99b8c9f9cbde36efa4 SHA512 08d4e655ffdde715e0214f4bef01d55aba9b8ba517456a60e254a0f8541c20479e407545db28ca90a69dee8def6941fdd88f9a557fb382ebebe49e363aca8e8e WHIRLPOOL f9e7a6947dac5870e0574253b8c1cb1e7d31a916a9e1c4417c73168046c0b4bed90b9c77253444604163bcf6dca204dab92a52cb03bdcb0f85c807327623f8ac |
45 |
-DIST exiv2-0.26-trunk.tar.gz 5699163 SHA256 0c625cbeb494aa1b9221280a5b053b54d0c9720d48fa9120cef7c6f93efd4dc3 SHA512 d9f354f8458d7803140b442b2a8de3c8904b1e20916cf62d7176f51524e6ff7def26d3b6fa016abc49f8140295eea624151c54dbae0676a61529c2cf33335b0c WHIRLPOOL 0d36063ee659d0a798957e9a2478337f5e8061b467df8fb86b194830ac6ec751a75e1492ad7cbf4ed31c836b9c320f037af3708920b28b07c8970840e255d711 |
46 |
EBUILD exiv2-0.25-r2.ebuild 3104 SHA256 790f4ad93ca7799eba393f76a30e3dcdf5148834ce85b2a2e8f095da8ca9c0b9 SHA512 7ef6da58f714555f7065891a984e83e19e14c22e71a45d4ec4f1aff7a49404628b07f8b371efb26ad06f53e452a8ee61cb556df20c8c0706be3990716a823402 WHIRLPOOL cf3f43c404d456bfd989fb0bb620db4fc12d7297adf68f6e90b10fd1b59a43b34dc8fe14483e03a2983bc9df704e6963505ce693bbdb42b3b1b111bd81d6961e |
47 |
-EBUILD exiv2-0.26.ebuild 3393 SHA256 f47eeee789c29be290a6b1e203098a9a3c4f6de68897a1ae916066fe38aa7115 SHA512 0e1d1e5266b0399d61ce2e8640bab6f41a049e5de3f16a232df3a5ad811e56f3b659722f459ca2a8d5aa217c58bb5edd340d88db4603a837f16b97ed2fb6bfa5 WHIRLPOOL c9e99dfc5949c02305ccaf0292c086324c9b32d611ab0cd10bbc1f89560049560a715c1a618fa3d36ba59a6fe27c1b4fa73e66223834ef462f5db35d1149483b |
48 |
MISC metadata.xml 612 SHA256 2700f3a6eb0fea03635790e9e55611f58a19dace74c70d0e0106bd70ef825c60 SHA512 9b4926ba8420a125dc4cefd351ee1ec10a4df2fc4306a56720f6e8de7c5fd9f36a8646c8583958fca9a45ebe1b65b19c053c7da37176546bc19ae64afa87e4f5 WHIRLPOOL 0996d01f595fe4ab40a65fcc19d2eced4dc31a1c8efddddca353828447ff3ca974499dcc81482d47a3470d9530a1886abde9acfaa2ac75df0e845f1a70402056 |
49 |
|
50 |
diff --git a/media-gfx/exiv2/exiv2-0.26.ebuild b/media-gfx/exiv2/exiv2-0.26.ebuild |
51 |
deleted file mode 100644 |
52 |
index 3926c66..0000000 |
53 |
--- a/media-gfx/exiv2/exiv2-0.26.ebuild |
54 |
+++ /dev/null |
55 |
@@ -1,134 +0,0 @@ |
56 |
-# Copyright 1999-2017 Gentoo Foundation |
57 |
-# Distributed under the terms of the GNU General Public License v2 |
58 |
- |
59 |
-EAPI=6 |
60 |
- |
61 |
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) |
62 |
- |
63 |
-inherit cmake-multilib python-any-r1 |
64 |
- |
65 |
-DESCRIPTION="EXIF, IPTC and XMP metadata C++ library and command line utility" |
66 |
-HOMEPAGE="http://www.exiv2.org/" |
67 |
-SRC_URI="http://www.exiv2.org/builds/${P}-trunk.tar.gz" |
68 |
- |
69 |
-LICENSE="GPL-2" |
70 |
-SLOT="0/26" |
71 |
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" |
72 |
-IUSE_LINGUAS="bs de es fi fr gl ms pl pt ru sk sv ug uk vi" |
73 |
-IUSE="doc examples nls png webready xmp $(printf 'linguas_%s ' ${IUSE_LINGUAS})" |
74 |
- |
75 |
-RDEPEND=" |
76 |
- >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] |
77 |
- nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] ) |
78 |
- png? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) |
79 |
- webready? ( |
80 |
- net-libs/libssh[${MULTILIB_USEDEP}] |
81 |
- net-misc/curl[${MULTILIB_USEDEP}] |
82 |
- ) |
83 |
- xmp? ( >=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}] ) |
84 |
-" |
85 |
- |
86 |
-DEPEND="${RDEPEND} |
87 |
- doc? ( |
88 |
- app-doc/doxygen |
89 |
- dev-libs/libxslt |
90 |
- media-gfx/graphviz |
91 |
- virtual/pkgconfig |
92 |
- ${PYTHON_DEPS} |
93 |
- ) |
94 |
- nls? ( sys-devel/gettext ) |
95 |
-" |
96 |
- |
97 |
-DOCS=( README doc/ChangeLog doc/cmd.txt ) |
98 |
- |
99 |
-PATCHES=( |
100 |
- "${FILESDIR}"/${P}-cmake{1,2,3,4,5,6,7}.patch |
101 |
- "${FILESDIR}"/${P}-CVE-2017-9239.patch |
102 |
- "${FILESDIR}"/${PN}-0.25-musl.patch |
103 |
- # TODO: Take to upstream |
104 |
- "${FILESDIR}"/${P}-fix-docs.patch |
105 |
- "${FILESDIR}"/${P}-tools-optional.patch |
106 |
-) |
107 |
- |
108 |
-pkg_setup() { |
109 |
- use doc && python-any-r1_pkg_setup |
110 |
-} |
111 |
- |
112 |
-src_unpack() { |
113 |
- # FIXME @upstream: MacOS cruft is breaking the buildsystem, so don't let it in... |
114 |
- tar -C "${WORKDIR}" --exclude=.* -xpf "${DISTDIR}/${A}" --gz 2> /dev/null || |
115 |
- elog "${my_tar}: tar extract command failed at least partially - continuing" |
116 |
- mv "${PN}-trunk" "${S}" || die "Failed to create source dir ${S}" |
117 |
-} |
118 |
- |
119 |
-src_prepare() { |
120 |
- if [[ ${PV} != *9999 ]] ; then |
121 |
- if [[ -d po ]] ; then |
122 |
- pushd po > /dev/null || die |
123 |
- local lang |
124 |
- for lang in *.po; do |
125 |
- if [[ -e ${lang} ]] && ! has ${lang/.po/} ${LINGUAS} ; then |
126 |
- case ${lang} in |
127 |
- CMakeLists.txt | \ |
128 |
- ${PN}.pot) ;; |
129 |
- *) rm -r ${lang} || die ;; |
130 |
- esac |
131 |
- fi |
132 |
- done |
133 |
- popd > /dev/null || die |
134 |
- else |
135 |
- die "Failed to prepare LINGUAS - po directory moved?" |
136 |
- fi |
137 |
- fi |
138 |
- |
139 |
- # FIXME @upstream: |
140 |
- einfo "Converting doc/cmd.txt to UTF-8" |
141 |
- iconv -f LATIN1 -t UTF-8 doc/cmd.txt > doc/cmd.txt.tmp || die |
142 |
- mv -f doc/cmd.txt.tmp doc/cmd.txt || die |
143 |
- |
144 |
- if use doc; then |
145 |
- einfo "Updating doxygen config" |
146 |
- doxygen &>/dev/null -u config/Doxyfile || die |
147 |
- fi |
148 |
- |
149 |
- cmake-utils_src_prepare |
150 |
-} |
151 |
- |
152 |
-multilib_src_configure() { |
153 |
- local mycmakeargs=( |
154 |
- -DEXIV2_ENABLE_BUILD_PO=YES |
155 |
- -DEXIV2_ENABLE_BUILD_SAMPLES=NO |
156 |
- -DEXIV2_ENABLE_NLS=$(usex nls) |
157 |
- -DEXIV2_ENABLE_PNG=$(usex png) |
158 |
- -DEXIV2_ENABLE_CURL=$(usex webready) |
159 |
- -DEXIV2_ENABLE_SSH=$(usex webready) |
160 |
- -DEXIV2_ENABLE_WEBREADY=$(usex webready) |
161 |
- -DEXIV2_ENABLE_XMP=$(usex xmp) |
162 |
- -DEXIV2_ENABLE_LIBXMP=NO |
163 |
- $(multilib_is_native_abi || \ |
164 |
- echo -DEXIV2_ENABLE_TOOLS=NO) |
165 |
- ) |
166 |
- |
167 |
- cmake-utils_src_configure |
168 |
-} |
169 |
- |
170 |
-multilib_src_compile() { |
171 |
- cmake-utils_src_compile |
172 |
- |
173 |
- if multilib_is_native_abi; then |
174 |
- use doc && emake -j1 doc |
175 |
- fi |
176 |
-} |
177 |
- |
178 |
-multilib_src_install_all() { |
179 |
- use xmp && DOCS+=( doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt} ) |
180 |
- use doc && HTML_DOCS=( "${S}"/doc/html/. ) |
181 |
- |
182 |
- einstalldocs |
183 |
- find "${D}" -name '*.la' -delete || die |
184 |
- |
185 |
- if use examples; then |
186 |
- docinto examples |
187 |
- dodoc samples/*.cpp |
188 |
- fi |
189 |
-} |
190 |
|
191 |
diff --git a/media-gfx/exiv2/files/exiv2-0.26-CVE-2017-9239.patch b/media-gfx/exiv2/files/exiv2-0.26-CVE-2017-9239.patch |
192 |
deleted file mode 100644 |
193 |
index 2a3e20c..0000000 |
194 |
--- a/media-gfx/exiv2/files/exiv2-0.26-CVE-2017-9239.patch |
195 |
+++ /dev/null |
196 |
@@ -1,22 +0,0 @@ |
197 |
-From 2f8681e120d277e418941c4361c83b5028f67fd8 Mon Sep 17 00:00:00 2001 |
198 |
-From: clanmills <robin@×××××××××.com> |
199 |
-Date: Sat, 27 May 2017 10:18:17 +0100 |
200 |
-Subject: [PATCH] #1296 Fix submitted. |
201 |
- |
202 |
---- |
203 |
- src/tiffcomposite.cpp | 2 ++ |
204 |
- 1 file changed, 2 insertions(+) |
205 |
- |
206 |
-diff --git a/src/tiffcomposite.cpp b/src/tiffcomposite.cpp |
207 |
-index c6b860d8..0c9b9c4a 100644 |
208 |
---- a/src/tiffcomposite.cpp |
209 |
-+++ b/src/tiffcomposite.cpp |
210 |
-@@ -1611,6 +1611,8 @@ namespace Exiv2 { |
211 |
- uint32_t TiffImageEntry::doWriteImage(IoWrapper& ioWrapper, |
212 |
- ByteOrder /*byteOrder*/) const |
213 |
- { |
214 |
-+ if ( !pValue() ) throw Error(21); // #1296 |
215 |
-+ |
216 |
- uint32_t len = pValue()->sizeDataArea(); |
217 |
- if (len > 0) { |
218 |
- #ifdef DEBUG |
219 |
|
220 |
diff --git a/media-gfx/exiv2/files/exiv2-0.26-cmake1.patch b/media-gfx/exiv2/files/exiv2-0.26-cmake1.patch |
221 |
deleted file mode 100644 |
222 |
index 672017e..0000000 |
223 |
--- a/media-gfx/exiv2/files/exiv2-0.26-cmake1.patch |
224 |
+++ /dev/null |
225 |
@@ -1,22 +0,0 @@ |
226 |
-From d5ae1a7502cc3a19f2ca45f5f17f1ee8fc6ad979 Mon Sep 17 00:00:00 2001 |
227 |
-From: Timo Gurr <timo.gurr@×××××.com> |
228 |
-Date: Tue, 30 May 2017 20:25:28 +0200 |
229 |
-Subject: [PATCH] Use CMAKE_INSTALL_LOCALEDIR |
230 |
- |
231 |
---- |
232 |
- config/CMakeChecks.txt | 2 +- |
233 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
234 |
- |
235 |
-diff --git a/config/CMakeChecks.txt b/config/CMakeChecks.txt |
236 |
-index 77922930..b3a888f2 100644 |
237 |
---- a/config/CMakeChecks.txt |
238 |
-+++ b/config/CMakeChecks.txt |
239 |
-@@ -98,7 +98,7 @@ IF( EXIV2_ENABLE_NLS ) |
240 |
- #FIND_PACKAGE(Intl REQUIRED) |
241 |
- #INCLUDE_DIRECTORIES(${Intl_INCLUDE_DIRS}) |
242 |
- IF( NOT LOCALEDIR ) |
243 |
-- SET( LOCALEDIR "${CMAKE_INSTALL_PREFIX}/share/locale" ) |
244 |
-+ SET( LOCALEDIR "${CMAKE_INSTALL_LOCALEDIR}" ) |
245 |
- IF( WIN32 ) |
246 |
- STRING( REPLACE "/" "\\\\" LOCALEDIR ${LOCALEDIR} ) |
247 |
- ENDIF( WIN32 ) |
248 |
|
249 |
diff --git a/media-gfx/exiv2/files/exiv2-0.26-cmake2.patch b/media-gfx/exiv2/files/exiv2-0.26-cmake2.patch |
250 |
deleted file mode 100644 |
251 |
index 76a1944..0000000 |
252 |
--- a/media-gfx/exiv2/files/exiv2-0.26-cmake2.patch |
253 |
+++ /dev/null |
254 |
@@ -1,65 +0,0 @@ |
255 |
-From 3af0d1a6b2c12b7f62a293d19bdf235db75d6b07 Mon Sep 17 00:00:00 2001 |
256 |
-From: Bernd Kuhls <bernd.kuhls@××××××××.de> |
257 |
-Date: Sat, 3 Jun 2017 17:18:24 +0200 |
258 |
-Subject: [PATCH] cmake: fix gettext support |
259 |
- |
260 |
-Building exiv2 with uclibc and gettext fails currently as detected |
261 |
-by the buildroot autobuilders: |
262 |
-http://autobuild.buildroot.net/results/def/defcdd3dd57b031c31bb16c0075f079a482bf52d/build-end.log |
263 |
---- |
264 |
- config/CMakeChecks.txt | 12 ++++++++++-- |
265 |
- src/CMakeLists.txt | 6 +++--- |
266 |
- 2 files changed, 13 insertions(+), 5 deletions(-) |
267 |
- |
268 |
-diff --git a/config/CMakeChecks.txt b/config/CMakeChecks.txt |
269 |
-index b3a888f2..f7621a92 100644 |
270 |
---- a/config/CMakeChecks.txt |
271 |
-+++ b/config/CMakeChecks.txt |
272 |
-@@ -95,8 +95,16 @@ ELSE( EXIV2_ENABLE_SHARED ) |
273 |
- ENDIF( EXIV2_ENABLE_SHARED ) |
274 |
- |
275 |
- IF( EXIV2_ENABLE_NLS ) |
276 |
-- #FIND_PACKAGE(Intl REQUIRED) |
277 |
-- #INCLUDE_DIRECTORIES(${Intl_INCLUDE_DIRS}) |
278 |
-+ FIND_PACKAGE(Intl) |
279 |
-+ if(Intl_FOUND) |
280 |
-+ INCLUDE_DIRECTORIES(${Intl_INCLUDE_DIRS}) |
281 |
-+ find_library(LIBINTL_LIBRARY NAMES intl libintl) |
282 |
-+ if(libintl_FOUND) |
283 |
-+ SET(LIBINTL_LIBRARIES ${LIBINTL_LIBRARY}) |
284 |
-+ else(libintl_FOUND) |
285 |
-+ SET(LIBINTL_LIBRARIES) |
286 |
-+ endif() |
287 |
-+ endif() |
288 |
- IF( NOT LOCALEDIR ) |
289 |
- SET( LOCALEDIR "${CMAKE_INSTALL_LOCALEDIR}" ) |
290 |
- IF( WIN32 ) |
291 |
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt |
292 |
-index aecd6215..e2904c6f 100644 |
293 |
---- a/src/CMakeLists.txt |
294 |
-+++ b/src/CMakeLists.txt |
295 |
-@@ -316,13 +316,13 @@ msvc_runtime_configure(${EXIV2_ENABLE_SHARED} ${EXIV2_ENABLE_DYNAMIC_RUNTIME}) |
296 |
- # ****************************************************************************** |
297 |
- # exiv2 application |
298 |
- ADD_EXECUTABLE( exiv2 ${EXIV2_SRC} ${EXIV2_HDR} ) |
299 |
--TARGET_LINK_LIBRARIES( exiv2 exiv2lib ) |
300 |
-+TARGET_LINK_LIBRARIES( exiv2 exiv2lib ${LIBINTL_LIBRARIES} ) |
301 |
- INSTALL( TARGETS exiv2 ${INSTALL_TARGET_STANDARD_ARGS} ) |
302 |
- |
303 |
- # ****************************************************************************** |
304 |
- # connection test application |
305 |
- ADD_EXECUTABLE( conntest ${CONNTEST} ) |
306 |
--TARGET_LINK_LIBRARIES( conntest ${PRIVATE_VAR} exiv2lib ${CURL_LIBRARIES} ${SSH_LIBRARIES}) |
307 |
-+TARGET_LINK_LIBRARIES( conntest ${PRIVATE_VAR} exiv2lib ${CURL_LIBRARIES} ${SSH_LIBRARIES} ${LIBINTL_LIBRARIES} ) |
308 |
- |
309 |
- # ****************************************************************************** |
310 |
- # exifprint application |
311 |
-@@ -332,7 +332,7 @@ TARGET_LINK_LIBRARIES( conntest ${PRIVATE_VAR} exiv2lib ${CURL_LIBRARIES} ${SSH |
312 |
- # ****************************************************************************** |
313 |
- # remotetest application |
314 |
- ADD_EXECUTABLE( remotetest ${REMOTETEST} ) |
315 |
--TARGET_LINK_LIBRARIES( remotetest exiv2lib ) |
316 |
-+TARGET_LINK_LIBRARIES( remotetest exiv2lib ${LIBINTL_LIBRARIES} ) |
317 |
- |
318 |
- # ****************************************************************************** |
319 |
- # Headers |
320 |
|
321 |
diff --git a/media-gfx/exiv2/files/exiv2-0.26-cmake3.patch b/media-gfx/exiv2/files/exiv2-0.26-cmake3.patch |
322 |
deleted file mode 100644 |
323 |
index 7a78d1c..0000000 |
324 |
--- a/media-gfx/exiv2/files/exiv2-0.26-cmake3.patch |
325 |
+++ /dev/null |
326 |
@@ -1,53 +0,0 @@ |
327 |
-From 8af901ce05aeeaa4f5033da99670091f857d5931 Mon Sep 17 00:00:00 2001 |
328 |
-From: Bernd Kuhls <bernd.kuhls@××××××××.de> |
329 |
-Date: Sat, 3 Jun 2017 18:25:05 +0200 |
330 |
-Subject: [PATCH] cmake: always depend on threads, not only in the xmp case |
331 |
- |
332 |
---- |
333 |
- CMakeLists.txt | 1 - |
334 |
- config/CMakeChecks.txt | 2 ++ |
335 |
- src/CMakeLists.txt | 2 ++ |
336 |
- 3 files changed, 4 insertions(+), 1 deletion(-) |
337 |
- |
338 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
339 |
-index 7034bb67..64604c6f 100644 |
340 |
---- a/CMakeLists.txt |
341 |
-+++ b/CMakeLists.txt |
342 |
-@@ -120,7 +120,6 @@ IF( EXIV2_ENABLE_XMP ) |
343 |
- IF (NOT MINGW) |
344 |
- set(THREADS_PREFER_PTHREAD_FLAG ON) |
345 |
- ENDIF() |
346 |
-- find_package(Threads REQUIRED) |
347 |
- ENDIF( EXIV2_ENABLE_XMP ) |
348 |
- |
349 |
- INCLUDE( config/CMakeChecks.txt ) |
350 |
-diff --git a/config/CMakeChecks.txt b/config/CMakeChecks.txt |
351 |
-index f7621a92..0dfe96b7 100644 |
352 |
---- a/config/CMakeChecks.txt |
353 |
-+++ b/config/CMakeChecks.txt |
354 |
-@@ -51,6 +51,8 @@ INCLUDE_DIRECTORIES( ${CMAKE_INCLUDE_PATH} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_C |
355 |
- LINK_DIRECTORIES( ${CMAKE_LIBRARY_PATH} ) |
356 |
- SET( CMAKE_REQUIRED_INCLUDES ${CMAKE_INCLUDE_PATH} ) |
357 |
- |
358 |
-+find_package(Threads REQUIRED) |
359 |
-+ |
360 |
- IF( EXIV2_ENABLE_PNG ) |
361 |
- FIND_PACKAGE( ZLIB REQUIRED ) |
362 |
- INCLUDE_DIRECTORIES( ${ZLIB_INCLUDE_DIR} ) |
363 |
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt |
364 |
-index e2904c6f..dcfb37e1 100644 |
365 |
---- a/src/CMakeLists.txt |
366 |
-+++ b/src/CMakeLists.txt |
367 |
-@@ -268,10 +268,12 @@ else() |
368 |
- TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} dl ${EXPAT_LIBRARIES} ) |
369 |
- TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} dl ${CURL_LIBRARIES} ) |
370 |
- TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} dl ${SSH_LIBRARIES} ) |
371 |
-+ TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} dl ${CMAKE_THREAD_LIBS_INIT} ) |
372 |
- else() |
373 |
- TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${EXPAT_LIBRARIES} ) |
374 |
- TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${CURL_LIBRARIES} ) |
375 |
- TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${SSH_LIBRARIES} ) |
376 |
-+ TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${CMAKE_THREAD_LIBS_INIT} ) |
377 |
- endif() |
378 |
- endif() |
379 |
- |
380 |
|
381 |
diff --git a/media-gfx/exiv2/files/exiv2-0.26-cmake4.patch b/media-gfx/exiv2/files/exiv2-0.26-cmake4.patch |
382 |
deleted file mode 100644 |
383 |
index 3824a57..0000000 |
384 |
--- a/media-gfx/exiv2/files/exiv2-0.26-cmake4.patch |
385 |
+++ /dev/null |
386 |
@@ -1,24 +0,0 @@ |
387 |
-From 23ac3eeced6a4de0d34ae162ac7784ab9b7e4310 Mon Sep 17 00:00:00 2001 |
388 |
-From: clanmills <robin@×××××××××.com> |
389 |
-Date: Sat, 3 Jun 2017 20:58:08 +0100 |
390 |
-Subject: [PATCH] #7 Fix for libintl |
391 |
- |
392 |
---- |
393 |
- config/CMakeChecks.txt | 4 ++-- |
394 |
- 1 file changed, 2 insertions(+), 2 deletions(-) |
395 |
- |
396 |
-diff --git a/config/CMakeChecks.txt b/config/CMakeChecks.txt |
397 |
-index 0dfe96b7..8c88aa27 100644 |
398 |
---- a/config/CMakeChecks.txt |
399 |
-+++ b/config/CMakeChecks.txt |
400 |
-@@ -103,8 +103,8 @@ IF( EXIV2_ENABLE_NLS ) |
401 |
- find_library(LIBINTL_LIBRARY NAMES intl libintl) |
402 |
- if(libintl_FOUND) |
403 |
- SET(LIBINTL_LIBRARIES ${LIBINTL_LIBRARY}) |
404 |
-- else(libintl_FOUND) |
405 |
-- SET(LIBINTL_LIBRARIES) |
406 |
-+ else() |
407 |
-+ SET(LIBINTL_LIBRARIES -lintl) |
408 |
- endif() |
409 |
- endif() |
410 |
- IF( NOT LOCALEDIR ) |
411 |
|
412 |
diff --git a/media-gfx/exiv2/files/exiv2-0.26-cmake5.patch b/media-gfx/exiv2/files/exiv2-0.26-cmake5.patch |
413 |
deleted file mode 100644 |
414 |
index 0df4a19..0000000 |
415 |
--- a/media-gfx/exiv2/files/exiv2-0.26-cmake5.patch |
416 |
+++ /dev/null |
417 |
@@ -1,33 +0,0 @@ |
418 |
-From 4e86c1d61c4b8ab2cbbb31db0031b8e1d1872231 Mon Sep 17 00:00:00 2001 |
419 |
-From: clanmills <robin@×××××××××.com> |
420 |
-Date: Sun, 4 Jun 2017 07:41:03 +0100 |
421 |
-Subject: [PATCH] Fix https://github.com/Exiv2/exiv2/pull/6 for |
422 |
- Linux/Cygwin/MacOSX |
423 |
- |
424 |
---- |
425 |
- config/CMakeChecks.txt | 7 +++++-- |
426 |
- 1 file changed, 5 insertions(+), 2 deletions(-) |
427 |
- |
428 |
-diff --git a/config/CMakeChecks.txt b/config/CMakeChecks.txt |
429 |
-index 8c88aa27..e6100c0f 100644 |
430 |
---- a/config/CMakeChecks.txt |
431 |
-+++ b/config/CMakeChecks.txt |
432 |
-@@ -98,13 +98,16 @@ ENDIF( EXIV2_ENABLE_SHARED ) |
433 |
- |
434 |
- IF( EXIV2_ENABLE_NLS ) |
435 |
- FIND_PACKAGE(Intl) |
436 |
-- if(Intl_FOUND) |
437 |
-+ if(Intl_FOUND AND NOT MSVC) |
438 |
- INCLUDE_DIRECTORIES(${Intl_INCLUDE_DIRS}) |
439 |
- find_library(LIBINTL_LIBRARY NAMES intl libintl) |
440 |
- if(libintl_FOUND) |
441 |
- SET(LIBINTL_LIBRARIES ${LIBINTL_LIBRARY}) |
442 |
- else() |
443 |
-- SET(LIBINTL_LIBRARIES -lintl) |
444 |
-+ SET(LIBINTL_LIBRARIES) |
445 |
-+ if ( APPLE OR CYGWIN ) |
446 |
-+ SET(LIBINTL_LIBRARIES -lintl) |
447 |
-+ endif() |
448 |
- endif() |
449 |
- endif() |
450 |
- IF( NOT LOCALEDIR ) |
451 |
|
452 |
diff --git a/media-gfx/exiv2/files/exiv2-0.26-cmake6.patch b/media-gfx/exiv2/files/exiv2-0.26-cmake6.patch |
453 |
deleted file mode 100644 |
454 |
index 105b588..0000000 |
455 |
--- a/media-gfx/exiv2/files/exiv2-0.26-cmake6.patch |
456 |
+++ /dev/null |
457 |
@@ -1,27 +0,0 @@ |
458 |
-From 88cf58613ffde4c907011bea82f61daae6006c3c Mon Sep 17 00:00:00 2001 |
459 |
-From: clanmills <robin@×××××××××.com> |
460 |
-Date: Sun, 4 Jun 2017 09:07:14 +0100 |
461 |
-Subject: [PATCH] #8 Adding INCLUDE_DIRECTORIES(${Intl_INCLUDE_DIRS}) |
462 |
- |
463 |
---- |
464 |
- config/CMakeChecks.txt | 3 ++- |
465 |
- 1 file changed, 2 insertions(+), 1 deletion(-) |
466 |
- |
467 |
-diff --git a/config/CMakeChecks.txt b/config/CMakeChecks.txt |
468 |
-index e6100c0f..b90d4fde 100644 |
469 |
---- a/config/CMakeChecks.txt |
470 |
-+++ b/config/CMakeChecks.txt |
471 |
-@@ -102,11 +102,12 @@ IF( EXIV2_ENABLE_NLS ) |
472 |
- INCLUDE_DIRECTORIES(${Intl_INCLUDE_DIRS}) |
473 |
- find_library(LIBINTL_LIBRARY NAMES intl libintl) |
474 |
- if(libintl_FOUND) |
475 |
-+ INCLUDE_DIRECTORIES(${Intl_INCLUDE_DIRS}) |
476 |
- SET(LIBINTL_LIBRARIES ${LIBINTL_LIBRARY}) |
477 |
- else() |
478 |
- SET(LIBINTL_LIBRARIES) |
479 |
- if ( APPLE OR CYGWIN ) |
480 |
-- SET(LIBINTL_LIBRARIES -lintl) |
481 |
-+ SET(LIBINTL_LIBRARIES -lintl) |
482 |
- endif() |
483 |
- endif() |
484 |
- endif() |
485 |
|
486 |
diff --git a/media-gfx/exiv2/files/exiv2-0.26-cmake7.patch b/media-gfx/exiv2/files/exiv2-0.26-cmake7.patch |
487 |
deleted file mode 100644 |
488 |
index 0eff32a..0000000 |
489 |
--- a/media-gfx/exiv2/files/exiv2-0.26-cmake7.patch |
490 |
+++ /dev/null |
491 |
@@ -1,38 +0,0 @@ |
492 |
-From 15e0b9052eacd3438c8b39bf3fdda5da69ec068a Mon Sep 17 00:00:00 2001 |
493 |
-From: Bernd Kuhls <bernd.kuhls@××××××××.de> |
494 |
-Date: Sun, 4 Jun 2017 10:13:14 +0200 |
495 |
-Subject: [PATCH] cmake: simplify libintl check |
496 |
- |
497 |
-According to https://cmake.org/cmake/help/v3.4/module/FindIntl.html |
498 |
-the FindIntl module already checks for libintl.so. |
499 |
---- |
500 |
- config/CMakeChecks.txt | 15 ++++----------- |
501 |
- 1 file changed, 4 insertions(+), 11 deletions(-) |
502 |
- |
503 |
-diff --git a/config/CMakeChecks.txt b/config/CMakeChecks.txt |
504 |
-index b90d4fde..0cd28ec7 100644 |
505 |
---- a/config/CMakeChecks.txt |
506 |
-+++ b/config/CMakeChecks.txt |
507 |
-@@ -98,18 +98,11 @@ ENDIF( EXIV2_ENABLE_SHARED ) |
508 |
- |
509 |
- IF( EXIV2_ENABLE_NLS ) |
510 |
- FIND_PACKAGE(Intl) |
511 |
-- if(Intl_FOUND AND NOT MSVC) |
512 |
-+ if(Intl_FOUND) |
513 |
- INCLUDE_DIRECTORIES(${Intl_INCLUDE_DIRS}) |
514 |
-- find_library(LIBINTL_LIBRARY NAMES intl libintl) |
515 |
-- if(libintl_FOUND) |
516 |
-- INCLUDE_DIRECTORIES(${Intl_INCLUDE_DIRS}) |
517 |
-- SET(LIBINTL_LIBRARIES ${LIBINTL_LIBRARY}) |
518 |
-- else() |
519 |
-- SET(LIBINTL_LIBRARIES) |
520 |
-- if ( APPLE OR CYGWIN ) |
521 |
-- SET(LIBINTL_LIBRARIES -lintl) |
522 |
-- endif() |
523 |
-- endif() |
524 |
-+ SET(LIBINTL_LIBRARIES ${Intl_LIBRARIES}) |
525 |
-+ else() |
526 |
-+ SET(LIBINTL_LIBRARIES) |
527 |
- endif() |
528 |
- IF( NOT LOCALEDIR ) |
529 |
- SET( LOCALEDIR "${CMAKE_INSTALL_LOCALEDIR}" ) |
530 |
|
531 |
diff --git a/media-gfx/exiv2/files/exiv2-0.26-fix-docs.patch b/media-gfx/exiv2/files/exiv2-0.26-fix-docs.patch |
532 |
deleted file mode 100644 |
533 |
index a888671..0000000 |
534 |
--- a/media-gfx/exiv2/files/exiv2-0.26-fix-docs.patch |
535 |
+++ /dev/null |
536 |
@@ -1,70 +0,0 @@ |
537 |
---- a/CMakeLists.txt 2015-07-19 16:04:35.363628707 +0200 |
538 |
-+++ b/CMakeLists.txt 2015-07-19 16:28:31.051680136 +0200 |
539 |
-@@ -216,9 +216,7 @@ |
540 |
- ADD_SUBDIRECTORY( xmpsdk ) |
541 |
- ADD_SUBDIRECTORY( src ) |
542 |
- |
543 |
--IF( EXIV2_ENABLE_BUILD_SAMPLES ) |
544 |
-- ADD_SUBDIRECTORY( samples ) |
545 |
--ENDIF( EXIV2_ENABLE_BUILD_SAMPLES ) |
546 |
-+ADD_SUBDIRECTORY( samples ) |
547 |
- |
548 |
- IF( EXIV2_ENABLE_BUILD_PO ) |
549 |
- ADD_SUBDIRECTORY( po ) |
550 |
---- a/samples/CMakeLists.txt 2015-07-19 16:04:35.360628744 +0200 |
551 |
-+++ b/samples/CMakeLists.txt 2015-07-19 16:30:46.415987850 +0200 |
552 |
-@@ -21,6 +21,10 @@ |
553 |
- include_directories("${CMAKE_SOURCE_DIR}/include" "${CMAKE_SOURCE_DIR}/src") |
554 |
- |
555 |
--SET( SAMPLES addmoddel.cpp |
556 |
-+SET( SAMPLES taglist.cpp ) |
557 |
-+ |
558 |
-+IF( EXIV2_ENABLE_BUILD_SAMPLES ) |
559 |
-+ SET( SAMPLES ${SAMPLES} |
560 |
-+ addmoddel.cpp |
561 |
- convert-test.cpp |
562 |
- easyaccess-test.cpp |
563 |
- exifcomment.cpp |
564 |
-@@ -38,7 +42,6 @@ |
565 |
- mmap-test.cpp |
566 |
- prevtest.cpp |
567 |
- stringto-test.cpp |
568 |
-- taglist.cpp |
569 |
- tiff-test.cpp |
570 |
- werror-test.cpp |
571 |
- write-test.cpp |
572 |
-@@ -47,6 +50,7 @@ |
573 |
- xmpparser-test.cpp |
574 |
- xmpsample.cpp |
575 |
- ) |
576 |
-+ENDIF() |
577 |
- |
578 |
- FOREACH(entry ${SAMPLES}) |
579 |
- STRING( REPLACE ".cpp" "" target ${entry}) |
580 |
-@@ -63,6 +67,7 @@ |
581 |
- SET( MC_SRC ${MC_SRC} ../src/getopt_win32.c ) |
582 |
- ENDIF( MSVC ) |
583 |
- |
584 |
-+IF( EXIV2_ENABLE_BUILD_SAMPLES ) |
585 |
- SET( MC_SRC ${MC_SRC} metacopy.cpp ../src/utils.cpp ) |
586 |
- ADD_EXECUTABLE( metacopy ${MC_SRC} ) |
587 |
- TARGET_LINK_LIBRARIES( metacopy exiv2lib ) |
588 |
-@@ -79,6 +84,7 @@ |
589 |
- # ****************************************************************************** |
590 |
- # Man page |
591 |
- INSTALL( FILES exiv2samples.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 ) |
592 |
-+ENDIF() |
593 |
- |
594 |
- # That's all Folks! |
595 |
- ## |
596 |
---- a/doc/templates/Makefile 2015-07-19 16:50:50.589933604 +0200 |
597 |
-+++ b/doc/templates/Makefile 2015-07-19 16:51:07.686719864 +0200 |
598 |
-@@ -143,7 +143,7 @@ |
599 |
- xmp_mwg-rs \ |
600 |
- xmp_mwg-kw |
601 |
- |
602 |
--TAGLIST = ../../bin/taglist |
603 |
-+TAGLIST = ../../src/bin/taglist |
604 |
- |
605 |
- # ********************************************************************** |
606 |
- # ====================================================================== |
607 |
|
608 |
diff --git a/media-gfx/exiv2/files/exiv2-0.26-tools-optional.patch b/media-gfx/exiv2/files/exiv2-0.26-tools-optional.patch |
609 |
deleted file mode 100644 |
610 |
index 045e9dc..0000000 |
611 |
--- a/media-gfx/exiv2/files/exiv2-0.26-tools-optional.patch |
612 |
+++ /dev/null |
613 |
@@ -1,27 +0,0 @@ |
614 |
---- a/CMakeLists.txt 2017-06-07 00:14:25.374608170 +0200 |
615 |
-+++ b/CMakeLists.txt 2017-06-07 00:17:00.680483299 +0200 |
616 |
-@@ -60,6 +60,7 @@ |
617 |
- OPTION( EXIV2_ENABLE_SSH "USE Libssh for SshIo" ON ) |
618 |
- SET ( EXIV2_ENABLE_DYNAMIC_RUNTIME OFF ) |
619 |
- ENDIF() |
620 |
-+OPTION( EXIV2_ENABLE_TOOLS "Build exiv2 executable" ON ) |
621 |
- |
622 |
- # set include path for FindXXX.cmake files |
623 |
- set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/config/") |
624 |
---- a/src/CMakeLists.txt 2017-06-07 00:14:25.368608098 +0200 |
625 |
-+++ b/src/CMakeLists.txt 2017-06-07 00:16:06.710831682 +0200 |
626 |
-@@ -317,9 +317,11 @@ |
627 |
- |
628 |
- # ****************************************************************************** |
629 |
- # exiv2 application |
630 |
--ADD_EXECUTABLE( exiv2 ${EXIV2_SRC} ${EXIV2_HDR} ) |
631 |
--TARGET_LINK_LIBRARIES( exiv2 exiv2lib ${LIBINTL_LIBRARIES} ) |
632 |
--INSTALL( TARGETS exiv2 ${INSTALL_TARGET_STANDARD_ARGS} ) |
633 |
-+IF(EXIV2_ENABLE_TOOLS) |
634 |
-+ ADD_EXECUTABLE( exiv2 ${EXIV2_SRC} ${EXIV2_HDR} ) |
635 |
-+ TARGET_LINK_LIBRARIES( exiv2 exiv2lib ${LIBINTL_LIBRARIES} ) |
636 |
-+ INSTALL( TARGETS exiv2 ${INSTALL_TARGET_STANDARD_ARGS} ) |
637 |
-+ENDIF( EXIV2_ENABLE_TOOLS ) |
638 |
- |
639 |
- # ****************************************************************************** |
640 |
- # connection test application |