[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:06 UTC 2017


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=ed9fe5a

The following commit has been merged in the master branch:
commit ed9fe5adc9172fb6846b173099a5e1ae11678e3d
Author: Robin Mills <robin at clanmills.com>
Date:   Thu Sep 29 15:25:12 2016 +0000

    #1230 updated READMEs.
---
 README       |  33 +++++++++++++---
 README-CMAKE |  41 ++++++++++----------
 TODO-CMAKE   | 120 ++++++-----------------------------------------------------
 3 files changed, 59 insertions(+), 135 deletions(-)

diff --git a/README b/README
index 0426c5d..8428499 100644
--- a/README
+++ b/README
@@ -1,3 +1,12 @@
+      +--- +     +  -+-  +     +    ++
+      |     \   /    |   |     |   /  \
+      |      \ /     |   \     /  +    |
+      +---    X      |    |   |       /
+      |      / \     |     \ /       /
+      |     /   \    |      |       /
+      +--- +     +  -+-     +      +----+
+           C++   Metadata   Library
+
 Exiv2
 *****
 
@@ -24,8 +33,9 @@ You can build the libraries in the following ways:
     http://dev.exiv2.org/projects/exiv2/wiki/FAQ
 
 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,2012)
+  - see msvc2003/ReadMe.txt      (32bit build           VC7.1/2003 2005,2008)
+  Caution msvc2003 is deprecated with v0.26 and will be removed
 
 3 CMake (experimental support for cmake on all platforms)
   - see README-CMAKE for more information
@@ -41,9 +51,21 @@ 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
-the section "Hacking" below.
+Users of Cygwin and MinGW can omit the 'sudo' to install:
+    $ make install
+
+Caution:
+    If you downloaded the source code from the subversion repository,
+    you will have to generate the configure script:
+
+    $ make config
+    $ ./configure
+    $ make
+    $ sudo make install
+
+To build the sample applications:
+
+    $ make samples
 
 The default install locations are /usr/local/lib for the library,
 /usr/local/bin for the exiv2 utility and /usr/local/include/exiv2 for the
@@ -52,8 +74,7 @@ change the default. Run './configure --help' to see a list of all options.
 
 To uninstall Exiv2 from a UNIX-like system, run:
 
-    $ make uninstall
-
+    $ sudo make uninstall
 
 Dependencies
 ============
diff --git a/README-CMAKE b/README-CMAKE
index 5e0aef8..b93182b 100644
--- a/README-CMAKE
+++ b/README-CMAKE
@@ -1,18 +1,25 @@
+      +--- +     +  -+-  +     +    ++
+      |     \   /    |   |     |   /  \
+      |      \ /     |   \     /  +    |
+      +---    X      |    |   |       /
+      |      / \     |     \ /       /
+      |     /   \    |      |       /
+      +--- +     +  -+-     +      +----+
+           C++   Metadata   Library
+
 -------------------------------------------------------------------------------
 NOTE: 
 
-* CMake scripts are "mostly" functional.
-  Use them only if you're know how to use CMake (i.e. be prepared to fix them).
-  See TODO-CMAKE for known pending tasks. 
+* CMake scripts are functional and used to perform the daily build on the buildserver.
 
-* 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.
+* The existing automake (./configure), and msvc2005 build files will continue
+  to be supported by exiv2 for at least v0.27 (and probably longer)
+  
+  The msvc-2003 build files are deprecated and will not be supported after v0.26.
   
 Robin Mills
 robin at clanmills.com
-2015-11-30
+2016-09-23
 
 -------------------------------------------------------------------------------
 
@@ -98,13 +105,13 @@ b) Using the cmake GUI
    ccmake
 
 3 Building and installing for Visual Studio Users
-=============================================
+=================================================
 
 exiv2 provides three build environment for users of Visual Studio:
 
-msvc2003: 32 bit build environment for MSVC 2003
+cmake:    This environment
 msvc2005: 32 bit AND 64 bit build environment for MSVC 2005 and later (2008/10/12/13)
-cmake:  This environment
+msvc2003: 32 bit build environment for MSVC 2003 (deprecated after v0.26)
 
 CMake doesn't build code.  It generates build environments.
 CMake is a language for describing builds and the CMake interpreter generates
@@ -124,7 +131,7 @@ We have two contributed CMake Build Environments:
   
 2 contrib/build/msvc
 
-  For those script you will need:
+  The scripts require:
   - Cygwin (in order to download all dependencies (zlib, expat, ssl, curl, ssh), including exiv2 trunk from svn)
   - CMake
   - SVN (optional)
@@ -135,15 +142,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 then packaged in the dist directory with all the .lib, include and binary files you need.  
- 
-  If you need to compile with different options (without webready for example), simply edit the build.cmd file 
-  and adapt the options (somewhere at the end).
-
-4 Building and Installing for other users (Xcode, Eclipse, Qt)
-==============================================================
-
-To be written
+  Exiv2 should be packaged in the dist directory with all the .lib, include and binary files you need.  
 
 # That's all Folks
 ##
diff --git a/TODO-CMAKE b/TODO-CMAKE
index 875a316..596a5fa 100644
--- a/TODO-CMAKE
+++ b/TODO-CMAKE
@@ -1,114 +1,18 @@
-Current Status
+      +--- +     +  -+-  +     +    ++
+      |     \   /    |   |     |   /  \
+      |      \ /     |   \     /  +    |
+      +---    X      |    |   |       /
+      |      / \     |     \ /       /
+      |     /   \    |      |       /
+      +--- +     +  -+-     +      +----+
+           C++   Metadata   Library
 
-ToDo: * option cmakeBuild --webready is broken (Daniel to fix)
-      * look at the items listed below which we inherited from Gilles
+Current Status
 
-Done: * working well on Unix systems (Linux, Mac, Cygwin, MinGW)
-      * Visual Studio (2005/8/10/12/13/15).  See contrib/cmake/msvc/ReadMe.txt
-      * Support for out of source builds
-      * Add header files to MSVC UI for exiv2lib (and changed exiv2bin->exiv2 and exiv2->exiv2lib)
-      * Searching better for expat, zlib and iconv
-	  * write FindLibexiv2.cmake (Thank you, Gilles)
-	  * Builds and passes the test suite on 2005/32, 2008/64, Mac-Lion/64/Makefiles and Ubuntu/12.04/32bit
-      * Updated documentation (README-CMAKE)
+ToDo: * CMake/MinGW is not working.
+        See config/buildserver/dailyBuild.sh for explanation.
 
 Robin Mills
 robin at clanmills.com
-2015-11-29
-
-Inherited from Gilles Caulier <caulier dot gilles at gmail dot com>:
-
-* Review how samples are built: They should use the *installed* version
-  of libexiv2, not some temporary version in the src or build tree.
-
-* Compare the cmake-built shared library with the configure-built version. Do they differ? 
-  Ideally they are the same. If not, we should understand the differences exactly.
-
-* Added cmake target to build/install doc.
-
-* Added Cmake target to release build and packaging.
-
-* Added support for cross-compiling : add information on how to cross-compile on Linux for Windows (MinGW)
- (some applications and my own release-build process need this) to the README.CMAKE
-
-* Emacs M-c command to (re-)compile.
-
-* Migrate the whole README-CMAKE to README.
-
--------------------------------------------------------------------------------------
-
-DONE * Can the logic needed to build the doc be re-written using cmake?
-   => Yes. We manage it with digiKam Doxygen documentation as well.
-
-DONE * Is it possible to not have CMakeLists.txt file in the top dir?
-   => No. It a deprecated solution from KitWare. I read more than one questions about this subject in devel forum.
-
-DONE * Need soname versioning for shared library.
-
-DONE * Add further messages to display option settings.
-
-   ------------------------------------------------------------------
-   -- Exiv2 0.18-pre1 feature configuration summary
-   --
-   -- Build a shared library......... NO
-   -- PNG image support.............. YES
-   -- Native language support........ NO
-
-   gettext is required for native language support. Make sure the
-   gettext header files are installed. You can get gettext from
-   http://www.gnu.org/software/gettext/
-
-   -- Conversion of Windows XP tags.. YES
-   -- Nikon lens database............ YES
-   -- XMP metadata support........... YES
-   ------------------------------------------------------------------
-
-DONE * Add possibility to build xmp as a convenience library.
-
-DONE * Compilation fails if Expat (possibly also other dependencies?) is in a non-standard place.
-
-WONTFIX * This is probably not necessary in src/CMakeLists.txt / can be removed:
-   set( LIBEXIV2_SRC   ${LIBEXIV2_SRC} getopt_win32.c )
-   it is necessary as both windows compilers do not autoexport
-
-DONE * Do we need to worry about MSVC warnings like this:
-   d:\homehuggel\msys\src\exiv2\src\exif.hpp(245) : warning C4251: 'Exiv2::Exifdatum::value_' : class 'std::auto_ptr<_Ty>'
-   needs to have dll-interface to be used by clients of class 'Exiv2::Exifdatum'
-   with
-   [
-       _Ty=Exiv2::Value
-   ]
-
-DONE * Is the pkgconfig file not installed in MinGW? - it is now.
-
-DONE * Added targets to build/install man page.
-
-DONE * Need g++ specific : compiler options (warnings) and settings (visibility).
-
-DONE * Manage eviv2.pc file with CMake, like it's do with kdegraphics/libs .pc file.
-
-DONE * Manage eviv2.lsm file with CMake, like it's do with kdegraphics/libs .lsm file.
-
-DONE * Added cmake target to uninstall Exiv2, based on KDE4 cmake script.
-
-DONE * The following options of the configure script should be supported
-   --disable-shared     => -ENABLE_SHARED_EXIV2
-   --disable-xmp        => -ENABLE_XMP
-   --without-zlib       => -ENABLE_PNG
-   --enable-commercial  => -ENABLE_COMMERCIAL
-   --disable-lensdata   => -ENABLE_LENSDATA
-   --disable-printucs2  => -ENABLE_PRINTUCS2
-   --enable-nls         => -ENABLE_NLS
-
-DONE * Cmake project: in root folder, common config in config sub-dir.
-
-DONE * Manage samples sub-dir with CMake.
-
-DONE * Rename configuration settings to EXIV2_*, e.g., EXIV2_ENABLE_SHARED.
-
-DONE * Manage i18n extraction to generate .po files. (See http://www.cmake.org/pipermail/cmake/2009-July/031003.html)
-   Port extract-messages.sh to CMake
-
-DONE * Add tests to check availability of msgmerge, xgettext, msgfmt programs.
+2016-09-29
 
-INFO * Check How does cmake handle RPATH? (I'll read up on this).

-- 
exiv2 packaging



More information about the pkg-kde-commits mailing list