[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:47:31 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=6f42ef9
The following commit has been merged in the master branch:
commit 6f42ef9122a706fff6aaabf10574272085e1fe18
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Wed Aug 5 10:42:06 2015 +0200
Imported Upstream version 0.25
---
CMakeLists.txt | 121 +-
doc/COPYING-CMAKE-SCRIPTS => COPYING-CMAKE-SCRIPTS | 0
README | 18 +-
doc/README-CMAKE => README-CMAKE | 24 +-
doc/TODO-CMAKE => TODO-CMAKE | 0
bootstrap.macports | 79 +
build/msvc/build.cmd | 211 +
build/msvc/setenv.cmd | 43 +
config/CMakeChecks.txt | 64 +-
config/Doxyfile | 10 +-
config/FindSSH.cmake | 31 +
config/Makefile.in | 37 +-
config/config.h.cmake | 41 +-
config/config.h.in | 44 +-
config/config.make | 4 +-
config/config.mk.in | 91 +-
config/configure.ac | 145 +-
config/exiv2.pc.in | 2 +-
configure | 351 +-
contrib/coverity.sh | 28 +-
contrib/organize/Makefile | 4 +-
contrib/organize/organize.cpp | 4 +-
doc/ChangeLog | 247 +
doc/Makefile | 4 +-
doc/templates/Makefile | 14 +-
doc/templates/__index2__ | 36 +-
doc/templates/gen.py | 8 +-
doc/templates/tags-exif.html.in | 2 +-
doc/templates/tags-iptc.html.in | 2 +-
doc/templates/tags-xmp-GPano.html.in | 42 +
doc/templates/tags-xmp-MP.html.in | 29 +-
doc/templates/tags-xmp-acdsee.html.in | 42 +
doc/templates/tags-xmp-aux.html.in | 2 +-
doc/templates/tags-xmp-crs.html.in | 2 +-
doc/templates/tags-xmp-dc.html.in | 2 +-
doc/templates/tags-xmp-dcterms.html.in | 27 +
doc/templates/tags-xmp-dwc.html.in | 29 +
doc/templates/tags-xmp-exif.html.in | 4 +-
doc/templates/tags-xmp-iptc.html.in | 5 +-
doc/templates/tags-xmp-iptcExt.html.in | 2 +-
doc/templates/tags-xmp-lr.html.in | 27 +
doc/templates/tags-xmp-mediapro.html.in | 9 +-
...-xmp-mwg-rs.html.in => tags-xmp-mwg-kw.html.in} | 12 +-
doc/templates/tags-xmp-mwg-rs.html.in | 2 +-
doc/templates/tags-xmp-pdf.html.in | 2 +-
doc/templates/tags-xmp-photoshop.html.in | 2 +-
doc/templates/tags-xmp-tiff.html.in | 2 +-
doc/templates/tags-xmp-xmp.html.in | 2 +-
doc/templates/tags-xmp-xmpBJ.html.in | 2 +-
doc/templates/tags-xmp-xmpDM.html.in | 2 +-
doc/templates/tags-xmp-xmpMM.html.in | 2 +-
doc/templates/tags-xmp-xmpRights.html.in | 2 +-
doc/templates/tags-xmp-xmpTPg.html.in | 2 +-
{src => include/exiv2}/asfvideo.hpp | 2 +-
{src => include/exiv2}/basicio.hpp | 589 +-
{src => include/exiv2}/bmpimage.hpp | 2 +-
include/exiv2/config.h | 51 +
{src => include/exiv2}/convert.hpp | 9 +-
{src => include/exiv2}/cr2image.hpp | 2 +-
{src => include/exiv2}/crwimage.hpp | 2 +-
{src => include/exiv2}/datasets.hpp | 2 +-
{src => include/exiv2}/easyaccess.hpp | 2 +-
{src => include/exiv2}/epsimage.hpp | 2 +-
{src => include/exiv2}/error.hpp | 2 +-
{src => include/exiv2}/exif.hpp | 2 +-
{src => include/exiv2}/exiv2.hpp | 6 +-
.../exiv2/exv_msvc-webready.h | 65 +-
{msvc2012/include => include/exiv2}/exv_msvc.h | 73 +-
include/exiv2/futils.hpp | 202 +
{src => include/exiv2}/gifimage.hpp | 2 +-
include/exiv2/http.hpp | 23 +
{src => include/exiv2}/image.hpp | 42 +-
{src => include/exiv2}/iptc.hpp | 2 +-
{src => include/exiv2}/jp2image.hpp | 2 +-
{src => include/exiv2}/jpgimage.hpp | 13 +-
{src => include/exiv2}/matroskavideo.hpp | 2 +-
{src => include/exiv2}/metadatum.hpp | 2 +-
{src => include/exiv2}/mrwimage.hpp | 2 +-
{src => include/exiv2}/orfimage.hpp | 2 +-
{src => include/exiv2}/pgfimage.hpp | 2 +-
{src => include/exiv2}/pngimage.hpp | 10 +-
{src => include/exiv2}/preview.hpp | 2 +-
{src => include/exiv2}/properties.hpp | 2 +-
{src => include/exiv2}/psdimage.hpp | 2 +-
{src => include/exiv2}/quicktimevideo.hpp | 2 +-
{src => include/exiv2}/rafimage.hpp | 4 +-
{src => include/exiv2}/riffvideo.hpp | 2 +-
{src => include/exiv2}/rw2image.hpp | 4 +-
include/exiv2/ssh.hpp | 109 +
include/exiv2/svn_version.h | 3 +
{src => include/exiv2}/tags.hpp | 4 +-
{src => include/exiv2}/tgaimage.hpp | 4 +-
{src => include/exiv2}/tiffimage.hpp | 17 +-
{src => include/exiv2}/types.hpp | 11 +-
.../stdafx.h => include/exiv2/utilsvideo.hpp | 36 +-
{src => include/exiv2}/value.hpp | 42 +-
{src => include/exiv2}/version.hpp | 24 +-
{src => include/exiv2}/xmp.hpp | 4 +-
{src => include/exiv2}/xmpsidecar.hpp | 4 +-
msvc2003/ReadMe.txt | 253 +-
msvc2003/addmoddel/addmoddel.vcproj | 4 +-
msvc2003/cleaner.bat | 106 -
msvc2003/convert-test/convert-test.vcproj | 4 +-
msvc2003/copylibs.bat | 13 +
msvc2003/d.bat | 3 -
msvc2003/easyaccess-test/easyaccess-test.vcproj | 4 +-
msvc2003/editor.bat | 2 -
msvc2003/exifcomment/exifcomment.vcproj | 4 +-
msvc2003/exifdata-test/exifdata-test.vcproj | 4 +-
msvc2003/exifdata/exifdata.vcproj | 1 +
msvc2003/exifprint/exifprint.vcproj | 4 +-
msvc2003/exifvalue/exifvalue.vcproj | 1 +
msvc2003/exiv2+organize.sln | 573 -
msvc2003/exiv2.sln | 40 +
msvc2003/exiv2/exiv2.vcproj | 4 +-
msvc2003/exiv2json/exiv2json.vcproj | 1 +
msvc2003/exiv2lib/exiv2lib.vcproj | 561 +-
msvc2003/exivsimple/exivsimple.cpp | 119 +-
msvc2003/exivsimple/exivsimple.h | 12 +-
msvc2003/exivsimple/exivsimple.vcproj | 4 +-
msvc2003/exivsimple/stdafx.cpp | 4 +-
msvc2003/exivsimple/stdafx.h | 4 +-
msvc2003/geotag/geotag.vcproj | 4 +-
msvc2003/httptest/httptest.vcproj | 1 +
msvc2003/iotest/iotest.vcproj | 4 +-
msvc2003/iptceasy/iptceasy.vcproj | 4 +-
msvc2003/iptcprint/iptcprint.vcproj | 4 +-
msvc2003/iptctest/iptctest.vcproj | 4 +-
msvc2003/key-test/key-test.vcproj | 4 +-
msvc2003/largeiptc-test/largeiptc-test.vcproj | 4 +-
msvc2003/metacopy/metacopy.vcproj | 4 +-
msvc2003/mmap-test/mmap-test.vcproj | 4 +-
msvc2003/organize/organize.vcproj | 4 +-
msvc2003/path-test/path-test.vcproj | 4 +-
msvc2003/prevtest/prevtest.vcproj | 4 +-
msvc2003/remotetest/remotetest.vcproj | 1 +
msvc2003/runner.bat | 332 -
msvc2003/runner.txt | 4818 ---
msvc2003/runner7.txt | 7426 ----
msvc2003/stringto-test/stringto-test.vcproj | 4 +-
msvc2003/taglist/taglist.vcproj | 4 +-
msvc2003/tiff-test/tiff-test.vcproj | 4 +-
msvc2003/updater.bat | 36 -
msvc2003/utiltest/utiltest.vcproj | 4 +-
msvc2003/werror-test/werror-test.vcproj | 4 +-
msvc2003/write-test/write-test.vcproj | 4 +-
msvc2003/write2-test/write2-test.vcproj | 4 +-
msvc2003/xmpparse/xmpparse.vcproj | 4 +-
msvc2003/xmpparser-test/xmpparser-test.vcproj | 4 +-
msvc2003/xmpsample/xmpsample.vcproj | 4 +-
msvc2003/xmpsdk/xmpsdk.vcproj | 4 +-
msvc2005/ReadMe.txt | 492 +-
msvc2005/addmoddel/addmoddel.vcproj | 17 +-
msvc2005/buildall.bat | 52 -
msvc2005/cleanup.bat | 40 -
msvc2005/configure.bat | 3 +
msvc2005/configure.py | 415 +
msvc2005/conntest/conntest.vcproj | 1 +
msvc2005/convert-test/convert-test.vcproj | 17 +-
msvc2005/copylibs.bat | 16 +
msvc2005/easyaccess-test/easyaccess-test.vcproj | 17 +-
msvc2005/exifcomment/exifcomment.vcproj | 17 +-
msvc2005/exifdata-test/exifdata-test.vcproj | 17 +-
msvc2005/exifdata/exifdata.vcproj | 1 +
msvc2005/exifprint/exifprint.vcproj | 17 +-
msvc2005/exifvalue/exifvalue.vcproj | 1 +
msvc2012/exiv2.sln => msvc2005/exiv2-webready.sln | 544 +-
msvc2005/exiv2.sln | 233 +-
msvc2005/exiv2.vsprops | 19 +
msvc2005/exiv2/exiv2.vcproj | 19 +-
msvc2005/exiv2json/exiv2json.vcproj | 1 +
msvc2005/exiv2lib/exiv2lib.vcproj | 104 +-
msvc2005/expat/expat.vcproj | 24 +-
msvc2005/expat201/expat.vcproj | 3 +-
msvc2005/expat210/expat.vcproj | 3 +-
msvc2005/geotag/geotag.vcproj | 17 +-
msvc2005/httptest/httptest.vcproj | 1 +
msvc2005/include/exv_msvc.h | 133 -
msvc2005/iotest/iotest.vcproj | 17 +-
msvc2005/iptceasy/iptceasy.vcproj | 17 +-
msvc2005/iptcprint/iptcprint.vcproj | 17 +-
msvc2005/iptctest/iptctest.vcproj | 17 +-
msvc2005/key-test/key-test.vcproj | 17 +-
msvc2005/largeiptc-test/largeiptc-test.vcproj | 17 +-
msvc2005/libcurl/libcurl.vcproj | 1 +
msvc2005/libeay32/build_libeay32.bat | 55 +
msvc2005/libeay32/libeay32.vcproj | 1 +
msvc2005/libexiv2/build_libeay32.bat | 55 +
msvc2005/libexiv2/libeay32.vcproj | 1 +
msvc2005/libexiv2/libexiv2.vcproj | 1 +
msvc2005/libexpat/libexpat.vcproj | 1 +
msvc2005/libssh/include/config.h | 144 +
msvc2005/libssh/libssh.vcproj | 1 +
msvc2005/metacopy/metacopy.vcproj | 17 +-
msvc2005/mmap-test/mmap-test.vcproj | 17 +-
msvc2005/openssl/build_openssl.bat | 80 +
msvc2005/openssl/openssl.vcproj | 1 +
msvc2005/path-test/path-test.vcproj | 17 +-
msvc2005/prevtest/prevtest.vcproj | 17 +-
msvc2005/remotetest/remotetest.vcproj | 1 +
msvc2005/runner.py | 122 -
msvc2005/runner.txt | 1060 -
msvc2005/setbuild.py | 168 -
msvc2005/ssleay32/build_ssleay32.bat | 55 +
msvc2005/ssleay32/ssleay32.vcproj | 1 +
msvc2005/stringto-test/stringto-test.vcproj | 17 +-
msvc2005/taglist/taglist.vcproj | 17 +-
msvc2005/testReport.txt | 2028 --
msvc2005/tiff-test/tiff-test.vcproj | 17 +-
msvc2005/tools/bin/rm.exe | Bin 0 -> 61440 bytes
msvc2005/tools/bin/sed.exe | Bin 0 -> 49152 bytes
msvc2005/tools/depends/depends.vcproj | 4 +-
msvc2005/tools/depends/src/depends.cpp | 2 +-
msvc2005/tools/issue984/issue984.cpp | 23 +
msvc2005/tools/issue984/issue984.exe | Bin 0 -> 53248 bytes
msvc2005/tools/python/depend.py | 84 +
msvc2005/tools/python/tee.py | 127 +
msvc2005/tools/rm/ReadMe.txt | 21 +
msvc2005/tools/rm/rm.cpp | 308 +
msvc2005/utiltest/utiltest.vcproj | 17 +-
msvc2005/werror-test/werror-test.vcproj | 17 +-
msvc2005/write-test/write-test.vcproj | 17 +-
msvc2005/write2-test/write2-test.vcproj | 17 +-
msvc2005/xmpparse/xmpparse.vcproj | 17 +-
msvc2005/xmpparser-test/xmpparser-test.vcproj | 17 +-
msvc2005/xmpsample/xmpsample.vcproj | 17 +-
msvc2005/xmpsdk/xmpsdk.vcproj | 50 +-
msvc2005/zlib/zlib.vcproj | 33 +-
msvc2005/zlib123/zlib.vcproj | 3 +-
msvc2005/zlib125/zlib.vcproj | 3 +-
msvc2005/zlib127/zlib.vcproj | 3 +-
msvc2012/ReadMe.txt | 37 -
msvc2012/addmoddel/addmoddel.vcxproj | 73 -
msvc2012/addmoddel/addmoddel.vcxproj.filters | 2 -
msvc2012/convert-test/convert-test.vcxproj | 73 -
msvc2012/convert-test/convert-test.vcxproj.filters | 2 -
msvc2012/easyaccess-test/easyaccess-test.vcxproj | 73 -
.../easyaccess-test.vcxproj.filters | 2 -
msvc2012/exifcomment/exifcomment.vcxproj | 73 -
msvc2012/exifcomment/exifcomment.vcxproj.filters | 2 -
msvc2012/exifdata-test/exifdata-test.vcxproj | 73 -
.../exifdata-test/exifdata-test.vcxproj.filters | 2 -
msvc2012/exifprint/exifprint.vcxproj | 73 -
msvc2012/exifprint/exifprint.vcxproj.filters | 2 -
msvc2012/exiv2/exiv2.vcxproj | 73 -
msvc2012/exiv2/exiv2.vcxproj.filters | 2 -
msvc2012/exiv2lib/exiv2lib.vcxproj | 118 -
msvc2012/exiv2lib/exiv2lib.vcxproj.filters | 2 -
msvc2012/expat/expat.vcxproj | 4 -
msvc2012/expat/expat.vcxproj.filters | 2 -
msvc2012/geotag/geotag.vcxproj | 46 -
msvc2012/geotag/geotag.vcxproj.filters | 2 -
msvc2012/iotest/iotest.vcxproj | 73 -
msvc2012/iotest/iotest.vcxproj.filters | 2 -
msvc2012/iptceasy/iptceasy.vcxproj | 73 -
msvc2012/iptceasy/iptceasy.vcxproj.filters | 2 -
msvc2012/iptcprint/iptcprint.vcxproj | 73 -
msvc2012/iptcprint/iptcprint.vcxproj.filters | 2 -
msvc2012/iptctest/iptctest.vcxproj | 73 -
msvc2012/iptctest/iptctest.vcxproj.filters | 2 -
msvc2012/key-test/key-test.vcxproj | 73 -
msvc2012/key-test/key-test.vcxproj.filters | 2 -
msvc2012/largeiptc-test/largeiptc-test.vcxproj | 73 -
.../largeiptc-test/largeiptc-test.vcxproj.filters | 2 -
msvc2012/metacopy/metacopy.vcxproj | 73 -
msvc2012/metacopy/metacopy.vcxproj.filters | 2 -
msvc2012/mmap-test/mmap-test.vcxproj | 73 -
msvc2012/mmap-test/mmap-test.vcxproj.filters | 2 -
msvc2012/path-test/path-test.vcxproj | 73 -
msvc2012/path-test/path-test.vcxproj.filters | 2 -
msvc2012/prevtest/prevtest.vcxproj | 73 -
msvc2012/prevtest/prevtest.vcxproj.filters | 2 -
msvc2012/stringto-test/stringto-test.vcxproj | 73 -
.../stringto-test/stringto-test.vcxproj.filters | 2 -
msvc2012/taglist/taglist.vcxproj | 73 -
msvc2012/taglist/taglist.vcxproj.filters | 2 -
msvc2012/tiff-test/tiff-test.vcxproj | 73 -
msvc2012/tiff-test/tiff-test.vcxproj.filters | 2 -
msvc2012/utiltest/utiltest.vcxproj | 73 -
msvc2012/utiltest/utiltest.vcxproj.filters | 2 -
msvc2012/werror-test/werror-test.vcxproj | 73 -
msvc2012/werror-test/werror-test.vcxproj.filters | 2 -
msvc2012/write-test/write-test.vcxproj | 73 -
msvc2012/write-test/write-test.vcxproj.filters | 2 -
msvc2012/write2-test/write2-test.vcxproj | 73 -
msvc2012/write2-test/write2-test.vcxproj.filters | 2 -
msvc2012/xmpparse/xmpparse.vcxproj | 73 -
msvc2012/xmpparse/xmpparse.vcxproj.filters | 2 -
msvc2012/xmpparser-test/xmpparser-test.vcxproj | 73 -
.../xmpparser-test/xmpparser-test.vcxproj.filters | 2 -
msvc2012/xmpsample/xmpsample.vcxproj | 73 -
msvc2012/xmpsample/xmpsample.vcxproj.filters | 2 -
msvc2012/xmpsdk/xmpsdk.vcxproj | 4 -
msvc2012/xmpsdk/xmpsdk.vcxproj.filters | 2 -
msvc2012/zlib/zlib.vcxproj | 4 -
msvc2012/zlib/zlib.vcxproj.filters | 2 -
po/LINGUAS | 2 +-
po/Makefile.in.in | 4 +-
po/bs.po | 27028 ++++++++++++++
po/de.gmo | Bin 254332 -> 0 bytes
po/de.po | 35193 +++++++++---------
po/es.gmo | Bin 60433 -> 0 bytes
po/es.po | 35108 +++++++++---------
po/exiv2.pot | 23634 ++++++------
po/fi.gmo | Bin 18132 -> 0 bytes
po/fi.po | 29967 ++++++++--------
po/fr.gmo | Bin 105570 -> 0 bytes
po/fr.po | 33595 ++++++++---------
po/gl.po | 26992 ++++++++++++++
po/ms.po | 27009 ++++++++++++++
po/pl.gmo | Bin 246226 -> 0 bytes
po/pl.po | 34405 +++++++++---------
po/pt.po | 27812 ++++++++++++++
po/ru.gmo | Bin 86791 -> 0 bytes
po/ru.po | 33272 ++++++++---------
po/sk.gmo | Bin 185052 -> 0 bytes
po/sk.po | 34652 +++++++++---------
po/stamp-po | 1 -
po/sv.po | 27186 ++++++++++++++
po/{es.po => ug.po} | 35954 +++++++++----------
po/uk.po | 26887 ++++++++++++++
po/{fi.po => vi.po} | 32146 +++++++++--------
samples/CMakeLists.txt | 24 +-
samples/Jzon.cpp | 1301 +
samples/Jzon.h | 474 +
samples/Makefile | 41 +-
samples/addmoddel.cpp | 4 +-
samples/conntest.cpp | 158 +
samples/exifdata.cpp | 201 +
samples/exifvalue.cpp | 43 +
samples/exiv2json.cpp | 316 +
samples/geotag.cpp | 56 +-
samples/httptest.cpp | 100 +
samples/iotest.cpp | 4 +-
samples/metacopy.cpp | 14 +-
samples/metacopy.hpp | 6 +-
samples/path-test.cpp | 7 +-
samples/remotetest.cpp | 105 +
samples/tiffaddpath-test.cpp | 5 +-
samples/werror-test.cpp | 5 +-
src/CMakeLists.txt | 197 +-
src/Makefile | 120 +-
src/actions.cpp | 260 +-
src/actions.hpp | 10 +-
src/asfvideo.cpp | 42 +-
src/basicio.cpp | 1411 +-
src/bmpimage.cpp | 16 +-
src/canonmn.cpp | 807 +-
src/canonmn_int.hpp | 6 +-
src/casiomn.cpp | 603 +
src/{panasonicmn_int.hpp => casiomn_int.hpp} | 62 +-
src/convert.cpp | 28 +-
src/cr2image.cpp | 13 +-
src/cr2image_int.hpp | 4 +-
src/crwimage.cpp | 52 +-
src/crwimage_int.hpp | 10 +-
src/datasets.cpp | 37 +-
src/doxygen.hpp.in | 9 +-
src/easyaccess.cpp | 48 +-
src/epsimage.cpp | 14 +-
src/error.cpp | 6 +-
src/exif.cpp | 13 +-
src/exiv2.1 | 243 +-
src/exiv2.cpp | 168 +-
src/exiv2app.hpp | 29 +-
src/fujimn.cpp | 14 +-
src/fujimn_int.hpp | 4 +-
src/futils.cpp | 349 +-
src/futils.hpp | 79 -
src/gifimage.cpp | 15 +-
src/http.cpp | 424 +
src/i18n.h | 10 +-
src/image.cpp | 133 +-
src/{rw2image_int.hpp => image_int.hpp} | 40 +-
src/iptc.cpp | 6 +-
src/jp2image.cpp | 42 +-
src/jpgimage.cpp | 163 +-
src/localtime.c | 23 +-
src/makernote.cpp | 109 +-
src/makernote_int.hpp | 53 +-
src/matroskavideo.cpp | 40 +-
src/metadatum.cpp | 6 +-
src/minoltamn.cpp | 70 +-
src/minoltamn_int.hpp | 4 +-
src/mrwimage.cpp | 13 +-
src/nikonmn.cpp | 959 +-
src/nikonmn_int.hpp | 4 +-
src/olympusmn.cpp | 393 +-
src/olympusmn_int.hpp | 4 +-
src/orfimage.cpp | 13 +-
src/orfimage_int.hpp | 4 +-
src/panasonicmn.cpp | 474 +-
src/panasonicmn_int.hpp | 20 +-
src/pentaxmn.cpp | 475 +-
src/pentaxmn_int.hpp | 6 +-
src/pgfimage.cpp | 17 +-
src/pngchunk.cpp | 22 +-
src/pngchunk_int.hpp | 4 +-
src/pngimage.cpp | 104 +-
src/preview.cpp | 19 +-
src/properties.cpp | 859 +-
src/psdimage.cpp | 22 +-
src/quicktimevideo.cpp | 61 +-
src/rafimage.cpp | 13 +-
src/rcsid_int.hpp | 6 +-
src/riffvideo.cpp | 42 +-
src/rw2image.cpp | 13 +-
src/rw2image_int.hpp | 4 +-
src/samsungmn.cpp | 55 +-
src/samsungmn_int.hpp | 4 +-
src/sigmamn.cpp | 6 +-
src/sigmamn_int.hpp | 4 +-
src/sonymn.cpp | 17 +-
src/sonymn_int.hpp | 4 +-
src/ssh.cpp | 155 +
src/svn_version.h.in | 3 +
src/svn_version.sh | 43 +
src/tags.cpp | 76 +-
src/tags_int.hpp | 8 +-
src/tgaimage.cpp | 16 +-
src/tiffcomposite.cpp | 13 +-
src/tiffcomposite_int.hpp | 4 +-
src/tifffwd_int.hpp | 4 +-
src/tiffimage.cpp | 297 +-
src/tiffimage_int.hpp | 4 +-
src/tiffvisitor.cpp | 64 +-
src/tiffvisitor_int.hpp | 30 +-
src/types.cpp | 51 +-
src/utils.cpp | 20 +-
src/utils.hpp | 8 +-
src/utilsvideo.cpp | 66 +
src/value.cpp | 41 +-
src/version.cpp | 386 +-
src/xmp.cpp | 68 +-
src/xmpsidecar.cpp | 20 +-
xmpsdk/CMakeLists.txt | 4 +
xmpsdk/include/TXMPIterator.hpp | 2 +-
xmpsdk/include/TXMPUtils.hpp | 2 +-
xmpsdk/include/XMP_Environment.h | 2 +
xmpsdk/src/MD5.cpp | 2 +-
xmpsdk/src/Makefile | 4 +-
xmpsdk/src/ParseRDF.cpp | 2 +-
xmpsdk/src/XMPCore_Impl.cpp | 4 +-
xmpsdk/src/XMPIterator.cpp | 8 +-
xmpsdk/src/XMPMeta-GetSet.cpp | 2 +-
xmpsdk/src/XMPMeta-Parse.cpp | 2 +-
xmpsdk/src/XMPMeta-Serialize.cpp | 2 +-
xmpsdk/src/XMPMeta.cpp | 10 +-
xmpsdk/src/XMPUtils-FileInfo.cpp | 4 +-
xmpsdk/src/XMPUtils.cpp | 491 +-
450 files changed, 345649 insertions(+), 186405 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e4a946d..e0c178b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,35 +7,43 @@
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
##
-# Running cmake in a tree in which we have run ./configure ; make
-# creates src/exv_conf.h which conflicts with cmake's own exv_conf.h
+# Running cmake in a tree in which we have run ./configure ; make
+# creates include/exiv2/exv_conf.h which conflicts with cmake's own exv_conf.h
# This causes incorrect compilation and linking errors.
#
# It's OK to delete this as it will be recreated on demand by <exiv2-dir>/Makefile
-if( EXISTS "${CMAKE_SOURCE_DIR}/src/exv_conf.h" )
- file(REMOVE "${CMAKE_SOURCE_DIR}/src/exv_conf.h")
+if( EXISTS "${CMAKE_SOURCE_DIR}/include/exiv2/exv_conf.h" )
+ file(REMOVE "${CMAKE_SOURCE_DIR}/include/exiv2/exv_conf.h")
endif()
##
-SET(CMAKE_LEGACY_CYGWIN_WIN32 0) # Remove when CMake >= 2.8.4 is required
-CMAKE_MINIMUM_REQUIRED( VERSION 2.6 )
+CMAKE_MINIMUM_REQUIRED( VERSION 2.8.12 )
PROJECT( exiv2 )
+if( POLICY CMP0042 )
+ cmake_policy(SET CMP0042 NEW) # enable MACOSX_RPATH support
+else()
+ SET(CMAKE_MACOSX_RPATH 1)
+endif()
+SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
+
+
SET( PACKAGE_COPYRIGHT "Andreas Huggel" )
SET( PACKAGE_BUGREPORT "ahuggel at gmx.net" )
SET( PACKAGE "exiv2" )
SET( PACKAGE_NAME "exiv2" )
-SET( PACKAGE_STRING "exiv2 0.24" )
+SET( PACKAGE_STRING "exiv2 0.25" )
SET( PACKAGE_TARNAME "exiv2" )
-SET( PACKAGE_VERSION "0.24" )
+SET( PACKAGE_VERSION "0.25" )
SET( PACKAGE_URL "http://www.exiv2.org" )
-SET( GENERIC_LIB_VERSION "13.0.0" )
-SET( GENERIC_LIB_SOVERSION "13" )
+SET( GENERIC_LIB_VERSION "14.0.0" )
+SET( GENERIC_LIB_SOVERSION "14" )
# options and their default values
OPTION( EXIV2_ENABLE_SHARED "Build exiv2 as a shared library (dll)" ON )
OPTION( EXIV2_ENABLE_XMP "Build with XMP metadata support" ON )
OPTION( EXIV2_ENABLE_LIBXMP "Build a static convenience Library for XMP" ON )
+OPTION( EXIV2_ENABLE_VIDEO "Build with video support" OFF )
OPTION( EXIV2_ENABLE_PNG "Build with png support (requires libz)" ON )
OPTION( EXIV2_ENABLE_NLS "Build native language support (requires gettext)" ON )
OPTION( EXIV2_ENABLE_PRINTUCS2 "Build with Printucs2" ON )
@@ -43,9 +51,13 @@ OPTION( EXIV2_ENABLE_LENSDATA "Build including lens data"
OPTION( EXIV2_ENABLE_COMMERCIAL "Build with the EXV_COMMERCIAL_VERSION symbol set" OFF )
OPTION( EXIV2_ENABLE_BUILD_SAMPLES "Build the unit tests" ON )
OPTION( EXIV2_ENABLE_BUILD_PO "Build translations files" OFF )
+OPTION( EXIV2_ENABLE_VIDEO "Build video support into library" OFF )
+OPTION( EXIV2_ENABLE_WEBREADY "Build webready support into library" OFF )
+OPTION( EXIV2_ENABLE_CURL "USE Libcurl for HttpIo" ON )
+OPTION( EXIV2_ENABLE_SSH "USE Libssh for SshIo" ON )
IF( MINGW OR UNIX )
- IF ( CMAKE_CXX_COMPILER STREQUAL "g++" OR CMAKE_C_COMPILER STREQUAL "gcc" )
+ IF ( CMAKE_CXX_COMPILER STREQUAL "g++" OR CMAKE_C_COMPILER STREQUAL "gcc" )
ADD_DEFINITIONS(-Wall
-Wcast-align
-Wpointer-arith
@@ -57,36 +69,57 @@ IF( MINGW OR UNIX )
ENDIF()
ENDIF( MINGW OR UNIX )
+INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/src/ ${CMAKE_SOURCE_DIR}/include/ ${CMAKE_SOURCE_DIR}/include/exiv2/)
if( MSVC )
+
+ # cmake_policy(SET CMP0008)
+
include(CMake_msvc.txt)
msvc_runtime_report()
msvc_runtime_configure(${EXIV2_ENABLE_SHARED})
msvc_runtime_report()
-
- ADD_DEFINITIONS(-DPSAPI_VERSION=1) # to be compatible with <= WinVista (#905)
-
+
+ ADD_DEFINITIONS(-DPSAPI_VERSION=1) # to be compatible with <= WinVista (#905)
+
set(E expat-2.1.0)
set(Z zlib-1.2.7)
-
+ set(C curl-7.39.0)
+ set(C libssh-0.5.5)
+
if( NOT IS_DIRECTORY ./../${E} )
set(OUT_OF_SOURCE 1)
endif()
-
+
# link dependent libraries
+ FIND_PACKAGE(EXPAT QUIET)
if ( NOT EXPAT_LIBRARY )
set(EXPAT_LIBRARY ${CMAKE_SOURCE_DIR}/../${E}/$(ConfigurationName)/expat)
set(EXPAT_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/../${E}/lib)
include_directories( ${EXPAT_INCLUDE_DIR} msvc64\include src\include)
endif()
-
+
+ FIND_PACKAGE(CURL)
+ if ( NOT CURL_FOUND )
+ set(CURL_LIBRARY ${CMAKE_SOURCE_DIR}/../${C}/$(ConfigurationName)/curl)
+ set(CURL_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/../${C})
+ include_directories( ${CURL_INCLUDE_DIR})
+ endif()
+
+ # FIND_PACKAGE(SSH)
+ if ( NOT SSH_FOUND )
+ set(SSH_LIBRARY ${CMAKE_SOURCE_DIR}/../${C}/$(ConfigurationName)/ssh)
+ set(SSH_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/../${C})
+ include_directories( ${SSH_INCLUDE_DIR})
+ endif()
+
FIND_PACKAGE(ZLIB QUIET)
if ( NOT ZLIB_FOUND )
set(ZLIB_LIBRARY ${CMAKE_SOURCE_DIR}/../${Z}/$(ConfigurationName)/zlib)
set(ZLIB_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/../${Z})
endif()
include_directories(${ZLIB_INCLUDE_DIR})
-
+
if ( EXIV2_ENABLE_SHARED )
add_library(${E} SHARED IMPORTED)
add_library(${Z} SHARED IMPORTED)
@@ -126,6 +159,7 @@ SET( INSTALL_TARGET_STANDARD_ARGS
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
)
+SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
##
# add sources from XMPSDK directory
@@ -153,21 +187,23 @@ IF( ${EXV_HAVE_STDINT_H} )
ADD_DEFINITIONS( -DEXV_HAVE_STDINT_H )
ENDIF( ${EXV_HAVE_STDINT_H} )
-ADD_SUBDIRECTORY( xmpsdk )
-ADD_SUBDIRECTORY( src )
-
-IF( EXIV2_ENABLE_BUILD_SAMPLES )
- ADD_SUBDIRECTORY( samples )
-ENDIF( EXIV2_ENABLE_BUILD_SAMPLES )
-
-IF( EXIV2_ENABLE_BUILD_PO )
- ADD_SUBDIRECTORY( po )
-ENDIF( EXIV2_ENABLE_BUILD_PO )
+FIND_PACKAGE(Subversion QUIET)
+SET(SVN_REVISION "0")
+IF(SUBVERSION_FOUND)
+ IF(EXISTS "${CMAKE_SOURCE_DIR}/.svn")
+ Subversion_WC_INFO(${PROJECT_SOURCE_DIR} svnExiv2)
+ SET(SVN_REVISION "${svnExiv2_WC_REVISION}")
+ ENDIF()
+ENDIF()
+CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/src/svn_version.h.in
+ ${CMAKE_CURRENT_SOURCE_DIR}/src/svn_version.h @ONLY)
+MESSAGE(STATUS "SVN version: ${SVN_REVISION}")
IF( NOT MSVC )
- # Issue #722: out of source builds compiled against standard include files such as /usr/local/lib/include/exiv2
- # do not use CREATE_SYMLINK or CMAKE_CAN_SYMLINK as they don't work on CYGWIN
- EXECUTE_PROCESS( WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ln -sf ${CMAKE_CURRENT_SOURCE_DIR}/src exiv2)
+ # Issue #722: out of source builds compiled against standard include files such as /usr/local/lib/include/exiv2
+ # do not use CREATE_SYMLINK or CMAKE_CAN_SYMLINK as they don't work on CYGWIN
+ EXECUTE_PROCESS( WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ln -sf ${CMAKE_CURRENT_SOURCE_DIR}/src exiv2)
+
IF( EXIV2_ENABLE_BUILD_SAMPLES )
EXECUTE_PROCESS( WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/samples COMMAND ln -sf ${CMAKE_CURRENT_SOURCE_DIR}/src exiv2)
ENDIF( EXIV2_ENABLE_BUILD_SAMPLES )
@@ -177,19 +213,32 @@ IF( NOT MSVC )
ENDIF( EXIV2_ENABLE_BUILD_PO )
ENDIF()
+ADD_SUBDIRECTORY( xmpsdk )
+ADD_SUBDIRECTORY( src )
+
+IF( EXIV2_ENABLE_BUILD_SAMPLES )
+ ADD_SUBDIRECTORY( samples )
+ENDIF( EXIV2_ENABLE_BUILD_SAMPLES )
+
+IF( EXIV2_ENABLE_BUILD_PO )
+ ADD_SUBDIRECTORY( po )
+ENDIF( EXIV2_ENABLE_BUILD_PO )
+
##
# tests
-ADD_CUSTOM_TARGET(tests COMMAND make test "EXIV2_BINDIR=${CMAKE_BINARY_DIR}/bin" WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/test/" )
-ADD_CUSTOM_TARGET(teste COMMAND make teste "EXIV2_BINDIR=${CMAKE_BINARY_DIR}/bin" WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/test/" )
-ADD_CUSTOM_TARGET(testv COMMAND make testv "EXIV2_BINDIR=${CMAKE_BINARY_DIR}/bin" WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/test/" )
+ADD_CUSTOM_TARGET(tests COMMAND make test "EXIV2_BINDIR=${CMAKE_BINARY_DIR}/bin" WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/test/" )
+ADD_CUSTOM_TARGET(teste COMMAND make teste "EXIV2_BINDIR=${CMAKE_BINARY_DIR}/bin" WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/test/" )
+ADD_CUSTOM_TARGET(testv COMMAND make testv "EXIV2_BINDIR=${CMAKE_BINARY_DIR}/bin" WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/test/" )
+ADD_CUSTOM_TARGET(testvw COMMAND make testvw "EXIV2_BINDIR=${CMAKE_BINARY_DIR}/bin" WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/test/" )
+ADD_CUSTOM_TARGET(testx COMMAND make testx "EXIV2_BINDIR=${CMAKE_BINARY_DIR}/bin" WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/test/" )
##
# http://dev.exiv2.org/boards/3/topics/1364
# effectively does a make doc on the root directory
-# has to run 'make config' and './configure'
+# has to run 'make config' and './configure'
# and copy bin/taglist to <exiv2dir>/bin/taglist for use by 'make doc'
IF( MINGW OR UNIX OR APPLE)
- ADD_CUSTOM_TARGET(doc
+ ADD_CUSTOM_TARGET(doc
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/doc"
COMMAND chmod +x ./cmake_doc.sh
COMMAND ./cmake_doc.sh "${CMAKE_BINARY_DIR}"
diff --git a/doc/COPYING-CMAKE-SCRIPTS b/COPYING-CMAKE-SCRIPTS
similarity index 100%
rename from doc/COPYING-CMAKE-SCRIPTS
rename to COPYING-CMAKE-SCRIPTS
diff --git a/README b/README
index c8ca8d9..0426c5d 100644
--- a/README
+++ b/README
@@ -25,13 +25,12 @@ You can build the libraries in the following ways:
2 Microsoft Visual C++
- see msvc2003/ReadMe.txt (32bit build VC7.1/2003 2005,2008)
- - see msvc2005/ReadMe.txt (32bit and 64bit build VC8/2005, 2008,2010)
- - see msvc2012/ReadMe.txt (32bit and 64bit build VC11/2012 )
+ - see msvc2005/ReadMe.txt (32bit and 64bit build VC8/2005, 2008,2010,2012)
3 CMake (experimental support for cmake on all platforms)
- see README-CMAKE for more information
-To build a commercial version of the Exiv2 library, see also section
+To build a commercial version of the Exiv2 library, see also section
"Commercial version" at the end of this file.
On UNIX-like systems, use the GNU configure script. Run the following
@@ -42,8 +41,8 @@ build and install the library and utility:
$ make
$ sudo make install
-If you downloaded the source code from the subversion repository, you
-won't have a configure script. Run 'make config' to generate it and see
+If you downloaded the source code from the subversion repository, you
+won't have a configure script. Run 'make config' to generate it and see
the section "Hacking" below.
The default install locations are /usr/local/lib for the library,
@@ -78,7 +77,7 @@ gettext *) http://www.gnu.org/software/gettext/
libiconv *) http://www.gnu.org/software/libiconv/
expat http://expat.sourceforge.net/
-*) Some systems have gettext and iconv in libc. The configure script
+*) Some systems have gettext and iconv in libc. The configure script
should detect this.
On Linux, it is usually best to install the dependencies through the
@@ -144,7 +143,7 @@ of shared libraries can be turned off by specifying the
License
=======
-Copyright (C) 2004-2013 Andreas Huggel <ahuggel at gmx.net>
+Copyright (C) 2004-2015 Andreas Huggel <ahuggel at gmx.net>
Exiv2 is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
@@ -162,7 +161,7 @@ for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
+Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
MA 02110-1301 USA.
Commercial version
@@ -176,10 +175,9 @@ To do this on Windows, compile the library with the preprocessor
symbol EXV_COMMERCIAL_VERSION defined in:
msvc2003\include\exv_msvc.h
or msvc2005\include\exv_msvc.h
-or msvc2012\include\exv_msvc.h
On UNIX-like systems, run the configure
-script with the options --enable-commercial --disable-nls
+script with the options --enable-commercial --disable-nls
--disable-lensdata.
# That's all Folks
diff --git a/doc/README-CMAKE b/README-CMAKE
similarity index 90%
rename from doc/README-CMAKE
rename to README-CMAKE
index d7ef9bf..70647c0 100644
--- a/doc/README-CMAKE
+++ b/README-CMAKE
@@ -3,19 +3,19 @@ NOTE:
* CMake scripts are "work in progress".
Use them only if you're prepared to fix them.
- See TODO-CMAKE for pending tasks.
+ See TODO-CMAKE for known pending tasks.
-* The existing make, msvc and msvc64 build files will continue
- to be supported by exiv2 until at least v0.25.
- We will flag them as "deprecated" for at least one release cycle (about 6 months).
+* The existing automake (./configure), msvc2003 and msvc2005 build files will continue
+ to be supported by exiv2 until at least v0.26.
+ We will flag them as "deprecated" for at least one release cycle (about 12 months).
Our plan is to only support CMake when our scripts are feature-complete, stable and documented.
- All help is appreciated - especially if you are willing to run
- builds and tests on any platform. Thanks for your help.
+ All help is appreciated. If you know and understand CMake (especially with Visual Studio)
+ please consider contributing your time and skill to help Exiv2 and CMake work well together.
Robin Mills
robin at clanmills.com
-2012-06-01
+2015-02-23
-------------------------------------------------------------------------------
@@ -27,7 +27,7 @@ TABLE OF CONTENTS
1 CMake resources
2 Building and Installing for Unix type systems
-3 Building and Installing for DevStudio Users
+3 Building and Installing for Visual Studio Users
4 Building and Installing for other users (Xcode, Eclipse, Qt)
1 CMake resources
@@ -83,6 +83,8 @@ Specific Exiv2 options :
-DEXIV2_ENABLE_COMMERCIAL : Build with the EXV_COMMERCIAL_VERSION symbol set. [default=off]
-DEXIV2_ENABLE_BUILD_SAMPLES : Build the unit tests. [default=off]
-DEXIV2_ENABLE_BUILD_PO : Build translations files. [default=off]
+-DEXIV2_ENABLE_CURL : USE Libcurl for HttpIo [default=off]
+-DEXIV2_ENABLE_SSH : USE Libssh for SshIo [default=off]
Default install locations
@@ -101,10 +103,10 @@ b) Using the cmake GUI
3 Building and installing for DevStudio Users
=============================================
-exiv2 provides three build environment for users of DevStudio:
+exiv2 provides three build environment for users of Visual Studio:
-msvc: 32 bit build environment for MSVC 2003 (and 2005 and 2008)
-msvc64: 32 bit AND 64 bit build environment for MSVC 2005 (and 2008 and 2010)
+msvc2003: 32 bit build environment for MSVC 2003
+msvc2005: 32 bit AND 64 bit build environment for MSVC 2005 and later (2008/10/12/13)
cmake: This environment
CMake doesn't build code. It generates build environments.
diff --git a/doc/TODO-CMAKE b/TODO-CMAKE
similarity index 100%
rename from doc/TODO-CMAKE
rename to TODO-CMAKE
diff --git a/bootstrap.macports b/bootstrap.macports
new file mode 100755
index 0000000..0dd2879
--- /dev/null
+++ b/bootstrap.macports
@@ -0,0 +1,79 @@
+#!/bin/sh
+
+# Copyright (c) 2008-2015, Gilles Caulier, <caulier dot gilles at gmail dot com>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+#
+# Arguments : $1 : install path '/opt/local' (default).
+# $2 : build type 'debugfull' to hack (default), 'release' for production.
+# $3 : target type 'x86_64' for OSX Lion and later (default), 'i386' for Snow Leopard.
+# $4 : extra CXX flags (empty by default)
+#
+
+INSTALL_PREFIX=$1
+if [ "$INSTALL_PREFIX" = "" ]; then
+ # Standard Macports install
+ INSTALL_PREFIX=/opt/local
+ BUNDLE_INSTALL_DIR=/Applications/
+else
+ # Specific install path as /opt/exiv2 to build bundle PKG for example
+ BUNDLE_INSTALL_DIR=${INSTALL_PREFIX}/Applications/
+fi
+
+BUILD_TYPE=$2
+if [ "$BUILD_TYPE" = "" ]; then
+ BUILD_TYPE=debugfull
+fi
+
+TARGET_TYPE=$3
+if [ "$TARGET_TYPE" = "" ]; then
+ TARGET_TYPE=x86_64
+fi
+
+EXTRA_CXX_FLAGS=$4
+
+# Set devel env from MacOS-X through MacPorts
+export QTDIR=${INSTALL_PREFIX}/lib
+export QT_INCLUDE_DIR=${INSTALL_PREFIX}/include
+export PATH=$QTDIR/bin:$PATH
+export PKG_CONFIG_PATH=${INSTALL_PREFIX}/lib/pkgconfig:$PKG_CONFIG_PATH
+
+# We will work on command line using GNU make
+export MAKEFILES_TYPE='Unix Makefiles'
+
+echo "Installing to $INSTALL_PREFIX for target $TARGET_TYPE with build mode $BUILD_TYPE and extra CXX flags $EXTRA_CXX_FLAGS"
+
+if [ ! -d "build.cmake" ]; then
+ mkdir build.cmake
+fi
+
+cd build.cmake
+
+cmake -G "$MAKEFILES_TYPE" . \
+ -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
+ -DCMAKE_INSTALL_PREFIX=${INSTALL_PREFIX} \
+ -DCMAKE_OSX_ARCHITECTURES=${TARGET_TYPE} \
+ -DCMAKE_CXX_FLAGS="${CMAKE_CXX_FLAGS} ${EXTRA_CXX_FLAGS}" \
+ -DCMAKE_COLOR_MAKEFILE=ON \
+ -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \
+ -DCMAKE_INSTALL_NAME_DIR=${INSTALL_PREFIX}/lib \
+ -DCMAKE_SYSTEM_PREFIX_PATH="${INSTALL_PREFIX};/usr" \
+ -DCMAKE_MODULE_PATH="${INSTALL_PREFIX}/share/cmake/modules" \
+ -DEXIV2_ENABLE_SHARED=ON \
+ -DEXIV2_ENABLE_XMP=ON \
+ -DEXIV2_ENABLE_LIBXMP=ON \
+ -DEXIV2_ENABLE_VIDEO=ON \
+ -DEXIV2_ENABLE_PNG=ON \
+ -DEXIV2_ENABLE_NLS=ON \
+ -DEXIV2_ENABLE_PRINTUCS2=ON \
+ -DEXIV2_ENABLE_LENSDATA=ON \
+ -DEXIV2_ENABLE_COMMERCIAL=OFF \
+ -DEXIV2_ENABLE_BUILD_SAMPLES=ON \
+ -DEXIV2_ENABLE_BUILD_PO=ON \
+ -DEXIV2_ENABLE_VIDEO=ON \
+ -DEXIV2_ENABLE_WEBREADY=ON \
+ -DEXIV2_ENABLE_CURL=ON \
+ -DEXIV2_ENABLE_SSH=ON \
+ -Wno-dev \
+ ..
diff --git a/build/msvc/build.cmd b/build/msvc/build.cmd
new file mode 100644
index 0000000..ab8d63b
--- /dev/null
+++ b/build/msvc/build.cmd
@@ -0,0 +1,211 @@
+ at echo off
+SETLOCAL
+
+REM ---------------------------------------------------
+REM -- Created by danielkaneider for the exiv2 project
+REM ---------------------------------------------------
+
+
+rem https://github.com/madler/zlib/commits
+SET ZLIB_COMMIT_LONG=50893291621658f355bc5b4d450a8d06a563053d
+
+rem https://github.com/bagder/curl
+SET CURL_COMMIT_LONG=dd39a671019d713bd077be9eed511c2dc6013598
+
+ml64.exe > NUL
+IF ERRORLEVEL 1 (
+ set Platform=Win32
+ set RawPlatform=x86
+ set CpuPlatform=ia32
+) ELSE (
+ set Platform=x64
+ set RawPlatform=x64
+ set CpuPlatform=intel64
+)
+
+IF EXIST ..\..\..\exiv2-trunk (
+ CD ..\..\..
+ call exiv2-trunkuild\msvc\setenv.cmd
+) ELSE (
+ call setenv.cmd
+)
+
+
+IF %Platform% EQU x64 (
+ set VS_CMAKE=%VS_CMAKE% Win64
+)
+
+IF NOT EXIST %CMAKE_DIR%in
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list