[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:09 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=b8a8862
The following commit has been merged in the master branch:
commit b8a8862fe7e2391201caac12e3e45415a0dc63a5
Author: Robin Mills <robin at clanmills.com>
Date: Fri Oct 7 08:00:54 2016 +0000
#1230 Polished ascii-art in documentation.
---
README | 20 ++++++++++++--------
README-CMAKE | 26 +++++++++++++++-----------
TODO-CMAKE | 36 ++++++++++++++++++++----------------
3 files changed, 47 insertions(+), 35 deletions(-)
diff --git a/README b/README
index 8428499..fc7febc 100644
--- a/README
+++ b/README
@@ -1,11 +1,15 @@
- +--- + + -+- + + ++
- | \ / | | | / \
- | \ / | \ / + |
- +--- X | | | /
- | / \ | \ / /
- | / \ | | /
- +--- + + -+- + +----+
- C++ Metadata Library
+ @@@@@@@@@@@@@b ;mm ;#@@@@@@m,
+ j@@@#"777%@@" ]@@@@ ]@@@#%*%@@@@Q
+ @@@# %##\ @@@b |@@@b
+ @@@# .;;;;, ,;;;, ,;;;; ,;;;p .;;; 7@@ ]@@@C
+ @@@# j@@@@, ]@@#\ '@@@# j@@@# ]@@^ ;@@@"
+ @@@@@@@@@@@C "@@@p @@@" @@@b j@@@p @@b @@@#\
+ @@@#^7"7%#\ ^@@@@@#~ @@@b 1@@@ {@# s@@@#
+ @@@# @@@@o @@@b @@@Q ]@# ;@@@#\
+ @@@# ,@@##@@m @@@b @@@p @@C #@@#C
+ @@@# ,s# s@@#` @@@@ @@@b j@@@@@b s@@@#
+ ]@@@@@@@@@@@@#b ,@@@L \@@@Q @@@Q %@@@# ;@@@@@@@@@@@@@@#
+ 7777777777777> 77777 77777 ^7777 777` ^777777777777777^
Exiv2
*****
diff --git a/README-CMAKE b/README-CMAKE
index 9aa58b3..4829e83 100644
--- a/README-CMAKE
+++ b/README-CMAKE
@@ -1,14 +1,18 @@
- +--- + + -+- + + ++
- | \ / | | | / \
- | \ / | \ / + |
- +--- X | | | /
- | / \ | \ / /
- | / \ | | /
- +--- + + -+- + +----+
- C++ Metadata Library
+ @@@@@@@@@@@@@b ;mm ;#@@@@@@m,
+ j@@@#"777%@@" ]@@@@ ]@@@#%*%@@@@Q
+ @@@# %##\ @@@b |@@@b
+ @@@# .;;;;, ,;;;, ,;;;; ,;;;p .;;; 7@@ ]@@@C
+ @@@# j@@@@, ]@@#\ '@@@# j@@@# ]@@^ ;@@@"
+ @@@@@@@@@@@C "@@@p @@@" @@@b j@@@p @@b @@@#\
+ @@@#^7"7%#\ ^@@@@@#~ @@@b 1@@@ {@# s@@@#
+ @@@# @@@@o @@@b @@@Q ]@# ;@@@#\
+ @@@# ,@@##@@m @@@b @@@p @@C #@@#C
+ @@@# ,s# s@@#` @@@@ @@@b j@@@@@b s@@@#
+ ]@@@@@@@@@@@@#b ,@@@L \@@@Q @@@Q %@@@# ;@@@@@@@@@@@@@@#
+ 7777777777777> 77777 77777 ^7777 777` ^777777777777777^
-------------------------------------------------------------------------------
-NOTE:
+NOTE:
* CMake scripts are functional and used to perform the daily build on the buildserver.
@@ -53,7 +57,7 @@ FAQ: http://www.cmake.org/Wiki/CMake_FAQ
This process also covers MacOS-X Terminal, Cygwin and MinGW users.
-a) From the command line
+a) From the command line
Run the following commands from the top directory (containing this
file) to configure, build and install the library and utility:
@@ -145,7 +149,7 @@ We have two contributed CMake Build Environments:
- open the VS command line shell
- execute build.cmd (if there are any errors, the script should tell you)
- Exiv2 should be packaged in the dist directory with all the .lib, include and binary files you need.
+ Exiv2 should be packaged in the dist directory with all the .lib, include and binary files you need.
4 Building and installing for MinGW Users
=========================================
diff --git a/TODO-CMAKE b/TODO-CMAKE
index 45babff..a7297ae 100644
--- a/TODO-CMAKE
+++ b/TODO-CMAKE
@@ -1,11 +1,15 @@
- +--- + + -+- + + ++
- | \ / | | | / \
- | \ / | \ / + |
- +--- X | | | /
- | / \ | \ / /
- | / \ | | /
- +--- + + -+- + +----+
- C++ Metadata Library
+ @@@@@@@@@@@@@b ;mm ;#@@@@@@m,
+ j@@@#"777%@@" ]@@@@ ]@@@#%*%@@@@Q
+ @@@# %##\ @@@b |@@@b
+ @@@# .;;;;, ,;;;, ,;;;; ,;;;p .;;; 7@@ ]@@@C
+ @@@# j@@@@, ]@@#\ '@@@# j@@@# ]@@^ ;@@@"
+ @@@@@@@@@@@C "@@@p @@@" @@@b j@@@p @@b @@@#\
+ @@@#^7"7%#\ ^@@@@@#~ @@@b 1@@@ {@# s@@@#
+ @@@# @@@@o @@@b @@@Q ]@# ;@@@#\
+ @@@# ,@@##@@m @@@b @@@p @@C #@@#C
+ @@@# ,s# s@@#` @@@@ @@@b j@@@@@b s@@@#
+ ]@@@@@@@@@@@@#b ,@@@L \@@@Q @@@Q %@@@# ;@@@@@@@@@@@@@@#
+ 7777777777777> 77777 77777 ^7777 777` ^777777777777777^
Current Status
@@ -21,9 +25,9 @@ ToDo: * CMake/MinGW builds executables that do not work properly for v0.26
The known issues with CMake/MinGW will be reported to Kitware.
We hope CMake/MinGW will be in a working state for Exiv2 v0.27
-Here are notes concerning CMake/MinGW
+Here are notes concerning CMake/MinGW
- 1 Running a MinGW bash shell
+ 1 Running a MinGW bash shell
I installed MinGW using the installer on the web site.
I installed two copies c:\MinGW and c:\MinGW64
@@ -132,8 +136,8 @@ Here are notes concerning CMake/MinGW
.... cmake will rattle and roll ....
CMake generates the wrong include response files.
- I put the correct include code in contrib/cmake/mingw/includes.rsp
- Propagate the correct includes to the generated files.
+ I put the correct include code in contrib/cmake/mingw/includes.rsp
+ Propagate the correct includes to the generated files.
$ find . -name "includes_*.rsp" -exec cp ../contrib/cmake/mingw/includes.rsp {} \;
$ make
@@ -147,16 +151,16 @@ Here are notes concerning CMake/MinGW
-IC:/MinGW/msys/1.0/home/rmills/gnu/exiv2/trunk/xmpsdk/src
-IC:/Qt/Qt5.6.0/Tools/mingw492_32/i686-w64-mingw32/include
-IC:/Qt/Qt5.6.0/Tools/mingw492_32/lib/gcc/i686-w64-mingw32/4.9.2/include
- -IC:/MinGW/msys/1.0/local/include
-
+ -IC:/MinGW/msys/1.0/local/include
+
Gotcha
------
Even have done all of this, some of the sample applications are not correctly linked.
Samples affected are path-test, geotag, metacopy, exiv2json (possibly others).
-
+
The exiv2dll (libexiv2-14.dll) is linked to /bin/msys-expat.dll
and foo.exe is linked to /usr/local/bin/libexpat-1.dll
-
+
I have been able to get this fixed. I'll deal with it in v0.27.
two copies of the expat dlls. /usr/local/bin/libexpat-1.dll and /bin/msys-expat.dll
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list