[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

Thu Jul 13 17:47:07 UTC 2017

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

The following commit has been merged in the master branch:
commit 0abf56f71b1d233acc5c22998e49f9d5e5345f18
Author: Robin Mills <robin at clanmills.com>
Date:   Fri Sep 30 16:45:54 2016 +0000

    #1236  CMake build on MinGW.
---
 CMakeLists.txt                   |  6 +---
 config/config.h.cmake            |  6 ++++
 contrib/cmake/mingw/ReadMe.txt   |  1 +
 contrib/cmake/mingw/includes.rsp |  8 +++++
 src/CMakeLists.txt               |  2 +-
 src/exiv2app.hpp                 |  4 +--
 src/utils.cpp                    |  5 ++-
 src/version.cpp                  | 72 ++++++++++++++++++++--------------------
 xmpsdk/CMakeLists.txt            |  4 +--
 xmpsdk/include/MD5.h             |  2 +-
 10 files changed, 62 insertions(+), 48 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 92c2efa..79cfc7c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -195,11 +195,7 @@ 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(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/" )
+ADD_CUSTOM_TARGET(tests COMMAND make tests WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" )
 
 ##
 # http://dev.exiv2.org/boards/3/topics/1364
diff --git a/config/config.h.cmake b/config/config.h.cmake
index 6551265..0a578dd 100644
--- a/config/config.h.cmake
+++ b/config/config.h.cmake
@@ -88,6 +88,12 @@
 /* Define to 1 if you have the <stdint.h> header file. */
 #cmakedefine EXV_HAVE_STDINT_H 1
 
+#ifndef      EXV_HAVE_STDINT_H
+#if defined(__MINGW32__) || defined(__MINGW64__)
+#define      EXV_HAVE_STDINT_H
+#endif
+#endif
+
 /* Define to 1 if you have the <stdlib.h> header file. */
 #cmakedefine EXV_HAVE_STDLIB_H 1
 
diff --git a/contrib/cmake/mingw/ReadMe.txt b/contrib/cmake/mingw/ReadMe.txt
new file mode 100755
index 0000000..3bdc80d
--- /dev/null
+++ b/contrib/cmake/mingw/ReadMe.txt
@@ -0,0 +1 @@
+See <exiv2dir>/README.CMAKE for an explanation
diff --git a/contrib/cmake/mingw/includes.rsp b/contrib/cmake/mingw/includes.rsp
new file mode 100755
index 0000000..6ddc2a9
--- /dev/null
+++ b/contrib/cmake/mingw/includes.rsp
@@ -0,0 +1,8 @@
+-IC:/MinGW/msys/1.0/home/rmills/gnu/exiv2/trunk/src
+-IC:/MinGW/msys/1.0/home/rmills/gnu/exiv2/trunk/include
+-IC:/MinGW/msys/1.0/home/rmills/gnu/exiv2/trunk/include/exiv2
+-IC:/MinGW/msys/1.0/home/rmills/gnu/exiv2/trunk/build
+-IC:/MinGW/msys/1.0/home/rmills/gnu/exiv2/trunk/xmpsdk/include
+-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:/MinGW/msys/1.0/local/include 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4632007..9918329 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -297,7 +297,7 @@ IF( ICONV_FOUND )
 ENDIF( ICONV_FOUND )
 
 IF (CYGWIN OR MINGW)
-    TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR}  psapi )
+    TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR}  psapi ws2_32 )
 ENDIF(CYGWIN OR MINGW)
 
 
diff --git a/src/exiv2app.hpp b/src/exiv2app.hpp
index 02a008b..d3b5957 100644
--- a/src/exiv2app.hpp
+++ b/src/exiv2app.hpp
@@ -42,11 +42,11 @@
 #include <set>
 #include <iostream>
 
-#if EXV_HAVE_REGEX
+#ifdef EXV_HAVE_REGEX
 #include <regex.h>
 #endif
 
-#if EXV_HAVE_STDINT_H
+#ifdef EXV_HAVE_STDINT_H
 #include <unistd.h>
 #endif
 
diff --git a/src/utils.cpp b/src/utils.cpp
index 7d82fc6..d5b9fca 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -34,8 +34,11 @@ EXIV2_RCSID("@(#) $Id$")
 #include "utils.hpp"
 
 // + standard includes
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) || defined(__MINGW__)
 # include "getopt_win32.h"
+#endif
+
+#if defined(_MSC_VER)
 # define S_ISREG(m)      (((m) & S_IFMT) == S_IFREG)
 #endif
 
diff --git a/src/version.cpp b/src/version.cpp
index 08022ba..849f28d 100644
--- a/src/version.cpp
+++ b/src/version.cpp
@@ -22,7 +22,7 @@
   File:      version.cpp
   Version:   $Rev$
  */
- 
+
 // *****************************************************************************
 #include "rcsid_int.hpp"
 EXIV2_RCSID("@(#) $Id$")
@@ -330,143 +330,143 @@ void Exiv2::dumpLibraryInfo(std::ostream& os,const exv_grep_keys_t& keys)
     int enable_video     =0;
     int enable_webready  =0;
 
-#if EXV_HAVE_DECL_STRERROR_R
+#ifdef EXV_HAVE_DECL_STRERROR_R
     have_strerror_r=1;
 #endif
 
-#if EXV_HAVE_GMTIME_R
+#ifdef EXV_HAVE_GMTIME_R
     have_gmtime_r=1;
 #endif
 
-#if EXV_HAVE_INTTYPES_H
+#ifdef EXV_HAVE_INTTYPES_H
     have_inttypes=1;
 #endif
 
-#if EXV_HAVE_LIBINTL_H
+#ifdef EXV_HAVE_LIBINTL_H
     have_libintl=1;
 #endif
 
-#if EXV_HAVE_LENSDATA
+#ifdef EXV_HAVE_LENSDATA
     have_lensdata=1;
 #endif
 
-#if EXV_HAVE_ICONV
+#ifdef EXV_HAVE_ICONV
     have_iconv=1;
 #endif
 
-#if EXV_HAVE_LIBINTL_H
+#ifdef EXV_HAVE_LIBINTL_H
     have_libintl=1;
 #endif
 
-#if EXV_HAVE_REGEX
+#ifdef EXV_HAVE_REGEX
     have_regex=1;
 #endif
 
-#if EXV_HAVE_MEMORY_H
+#ifdef EXV_HAVE_MEMORY_H
     have_memory=1;
 #endif
 
-#if EXV_HAVE_MEMSET
+#ifdef EXV_HAVE_MEMSET
     have_memset=1;
 #endif
 
-#if EXV_HAVE_LSTAT
+#ifdef EXV_HAVE_LSTAT
     have_lstat=1;
 #endif
 
-#if EXV_HAVE_STDBOOL_H
+#ifdef EXV_HAVE_STDBOOL_H
     have_stdbool=1;
 #endif
 
-#if EXV_HAVE_STDINT_H
+#ifdef EXV_HAVE_STDINT_H
     have_stdint=1;
 #endif
 
-#if EXV_HAVE_STDLIB_H
+#ifdef EXV_HAVE_STDLIB_H
     have_stdlib=1;
 #endif
 
-#if EXV_HAVE_STRCHR
+#ifdef EXV_HAVE_STRCHR
     have_strchr=1;
 #endif
 
-#if EXV_HAVE_STRERROR
+#ifdef EXV_HAVE_STRERROR
     have_strerror=1;
 #endif
 
-#if EXV_HAVE_STRERROR_R
+#ifdef EXV_HAVE_STRERROR_R
     have_strerror_r=1;
 #endif
 
-#if EXV_HAVE_STRINGS_H
+#ifdef EXV_HAVE_STRINGS_H
     have_strings=1;
 #endif
 
-#if EXV_HAVE_STRTOL
+#ifdef EXV_HAVE_STRTOL
     have_strtol=1;
 #endif
 
-#if EXV_HAVE_MMAP
+#ifdef EXV_HAVE_MMAP
     have_mmap=1;
 #endif
 
-#if EXV_HAVE_MUNMAP
+#ifdef EXV_HAVE_MUNMAP
     have_munmap=1;
 #endif
 
-#if EXV_HAVE_SYS_STAT_H
+#ifdef EXV_HAVE_SYS_STAT_H
     have_sys_stat=1;
 #endif
 
-#if EXV_HAVE_SYS_TYPES_H
+#ifdef EXV_HAVE_SYS_TYPES_H
     have_sys_types=1;
 #endif
 
-#if EXV_HAVE_TIMEGM
+#ifdef EXV_HAVE_TIMEGM
     have_timegm=1;
 #endif
 
-#if EXV_HAVE_UNISTD_H
+#ifdef EXV_HAVE_UNISTD_H
     have_unistd=1;
 #endif
 
-#if EXV_HAVE_SYS_MMAN_H
+#ifdef EXV_HAVE_SYS_MMAN_H
     have_sys_mman=1;
 #endif
 
-#if EXV_HAVE_LIBZ
+#ifdef EXV_HAVE_LIBZ
     have_libz=1;
 #endif
 
-#if EXV_HAVE_XMP_TOOLKIT
+#ifdef EXV_HAVE_XMP_TOOLKIT
     have_xmptoolkit=1;
 #endif
 
-#if EXV_HAVE__BOOL
+#ifdef EXV_HAVE_BOOL
     have_bool=1;
 #endif
 
-#if  EXV_HAVE_STRINGS
+#ifdef EXV_HAVE_STRINGS
      have_strings=1;
 #endif
 
-#if  EXV_SYS_TYPES
+#ifdef EXV_SYS_TYPES
      have_sys_types=1;
 #endif
 
-#if  EXV_HAVE_UNISTD
+#ifdef EXV_HAVE_UNISTD
      have_unistd=1;
 #endif
 
-#if  EXV_UNICODE_PATH
+#ifdef EXV_UNICODE_PATH
      have_unicode_path=1;
 #endif
 
-#if  EXV_ENABLE_VIDEO
+#ifdef EXV_ENABLE_VIDEO
      enable_video=1;
 #endif
 
-#if  EXV_ENABLE_WEBREADY
+#ifdef EXV_ENABLE_WEBREADY
      enable_webready=1;
 #endif
 
diff --git a/xmpsdk/CMakeLists.txt b/xmpsdk/CMakeLists.txt
index 8fe4a48..767438c 100644
--- a/xmpsdk/CMakeLists.txt
+++ b/xmpsdk/CMakeLists.txt
@@ -15,9 +15,9 @@ endif()
 
 FOREACH(_currentfile ${XMPSRC})
     # http://www.openguru.com/2009/04/cmake-detecting-platformoperating.html
-    IF(NOT MSVC AND NOT CYGWIN AND NOT MSYS)
+    IF(NOT MSVC AND NOT CYGWIN AND NOT MSYS AND NOT MINGW)
         SET_SOURCE_FILES_PROPERTIES(${_currentfile} PROPERTIES COMPILE_FLAGS "-fPIC")
-    ENDIF(NOT MSVC AND NOT CYGWIN AND NOT MSYS)
+    ENDIF()
 ENDFOREACH()
 
 if(NOT MSVC)
diff --git a/xmpsdk/include/MD5.h b/xmpsdk/include/MD5.h
index c0152bc..f6c5e78 100644
--- a/xmpsdk/include/MD5.h
+++ b/xmpsdk/include/MD5.h
@@ -34,7 +34,7 @@
 # endif
 #endif
 
-#ifdef EXV_HAVE_STDINT_H
+#if defined(EXV_HAVE_STDINT_H) || defined(__MINGW32__) || defined(__MING64__)
 # include <stdint.h>
 #endif
 

-- 
exiv2 packaging

