[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:43:50 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=4aebd96
The following commit has been merged in the master branch:
commit 4aebd96cca56cd5745ce8b2f473f939dc4164f65
Author: Robin Mills <robin at clanmills.com>
Date: Fri Jul 26 20:04:25 2013 +0000
Very close to 0.24. Passed the test-suite on MinGW.
---
README | 27 ++++++++++++++++-----------
samples/geotag.cpp | 15 +++++++++++++++
test/data/exiv2-test.out | 2 +-
website/master/download.html.in | 9 ++++-----
website/master/index.html.in | 6 +++---
5 files changed, 39 insertions(+), 20 deletions(-)
diff --git a/README b/README
index 25ad3c3..c8ca8d9 100644
--- a/README
+++ b/README
@@ -13,7 +13,6 @@ or you can build it and point your browser to doc/index.html.
For more information on XMP support in Exiv2, see doc/README-XMP.
-
Building and Installing
=======================
@@ -25,8 +24,9 @@ You can build the libraries in the following ways:
http://dev.exiv2.org/projects/exiv2/wiki/FAQ
2 Microsoft Visual C++
- - see msvc/README-MSVC.txt (32bit build VC7.1/2003 and up)
- - see msvc64/ReadMe.txt (32bit and 64bit build VC8/2005 and up)
+ - 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 )
3 CMake (experimental support for cmake on all platforms)
- see README-CMAKE for more information
@@ -97,7 +97,7 @@ doxygen http://www.doxygen.org/
graphviz http://www.graphviz.org/
python http://www.python.org/
xsltproc http://xmlsoft.org/XSLT/
-
+md5sum http://www.microbrew.org/tools/md5sha1sum/
Troubleshooting
===============
@@ -118,8 +118,8 @@ Please send feedback or queries to the Exiv2 forum. For new bug reports
and feature requests, please open an issue.
-Hacking
-=======
+Linking your own code with Exiv2
+================================
A pkg-config .pc file is installed together with the library.
Application developers can use pkg-config(1) to obtain correct compile
@@ -141,11 +141,10 @@ be a pain when trying to debug a program. For that reason, compilation
of shared libraries can be turned off by specifying the
--disable-shared option to the configure script.
-
License
=======
-Copyright (C) 2004-2012 Andreas Huggel <ahuggel at gmx.net>
+Copyright (C) 2004-2013 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
@@ -166,7 +165,6 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, 5th Floor, Boston,
MA 02110-1301 USA.
-
Commercial version
==================
@@ -175,7 +173,14 @@ the conversion of Nikon lens data to readable lens names to build a
commercial version of the Exiv2 library.
To do this on Windows, compile the library with the preprocessor
-symbol EXV_COMMERCIAL_VERSION defined in msvc\include\exv_msvc.h or
-msvc64\include\exv_msvc.h. On UNIX-like systems, run the configure
+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
--disable-lensdata.
+
+# That's all Folks
+##
diff --git a/samples/geotag.cpp b/samples/geotag.cpp
index 4381fcc..427bf0e 100644
--- a/samples/geotag.cpp
+++ b/samples/geotag.cpp
@@ -22,6 +22,20 @@
#include <vector>
#include <string>
+#if defined(__MINGW32__) || defined(__MINGW64__)
+# ifndef __MINGW__
+# define __MINGW__
+# endif
+#endif
+
+#ifdef __MINGW__
+// rmills: dummy off for MinGW. I don't have time to fix this for 0.24
+int main(int,const char**)
+{
+ return 0;
+}
+#else
+
using namespace std;
#ifndef lengthof
@@ -943,3 +957,4 @@ int main(int argc,const char* argv[])
return result ;
}
+#endif
diff --git a/test/data/exiv2-test.out b/test/data/exiv2-test.out
index 6f4df20..98a2ae2 100644
--- a/test/data/exiv2-test.out
+++ b/test/data/exiv2-test.out
@@ -3,7 +3,7 @@ tmp/
Exiv2 version ------------------------------------------------------------
exiv2 0.24 001800 (__ bit build)
-Copyright (C) 2004-2012 Andreas Huggel.
+Copyright (C) 2004-2013 Andreas Huggel.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/website/master/download.html.in b/website/master/download.html.in
index 00bbb23..74f1b3f 100644
--- a/website/master/download.html.in
+++ b/website/master/download.html.in
@@ -16,7 +16,7 @@ __maintitle__
tool and a number of simple example and test applications. With a
few additional third party tools you can also generate the complete
API documentation. The package includes standard build files for
- UNIX-like systems (including GNU/Linux, Mac OS X and MinGW) as well
+ UNIX-like systems (including GNU/Linux, Mac OS X, MinGW and Cygwin) as well
as Visual Studio project files for Visual C++ .NET 2003 (MSVC 7.1)
and later. After downloading and unpacking the distribution, please
see the <em>README</em> file in the top directory for build and
@@ -28,10 +28,9 @@ __maintitle__
parameter from a cmd shell:
<code><a title="Exiv2 usage" href="sample.html#usage">exiv2 -h</a></code>.
For details, read the <a href="manpage.html" title="Exiv2 man page">man page</a>.
- The Windows executable was compiled with the
- <a title="MinGW homepage" href="http://www.mingw.org">MinGW</a> cross compiler
- on an Intel 32 bit machine running
- <a title="Debian homepage" href="http://www.debian.org">Debian</a>.
+ The Windows executable was compiled using 32bit MinGW tools
+ <a title="MinGW homepage" href="http://www.mingw.org">MinGW</a>
+ on an Intel 64 bit machine running Windows 7.
</p>
<p>As an alternative to the packages here, many Linux distributions,
diff --git a/website/master/index.html.in b/website/master/index.html.in
index dad333c..8f317a5 100644
--- a/website/master/index.html.in
+++ b/website/master/index.html.in
@@ -75,9 +75,9 @@ Exiv2 is available as <a href="download.html#license">free software</a> and with
<li>a unified metadata container</li>
<li>support for additional image formats</li>
<li>more Makernotes</li>
- <li>To support CMake on all platforms</li>
- <li>Video Write Support</li>
- <li>Remote IO - support for http/ftp/ssh and other protocols</li>
+ <li>to support CMake on all platforms</li>
+ <li>video write wupport</li>
+ <li>remote io - support for http/ftp/ssh and other protocols</li>
</ul>
<p>The <a href="http://dev.exiv2.org/projects/roadmap/exiv2">roadmap</a> has details for the upcoming version.</p>
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list