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

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 221315d2bb7899fc937eaf9aaab44a75877dff62
Author: HumanDynamo <caulier.gilles at gmail.com>
Date:   Thu Dec 1 20:23:30 2016 +0000

    add support of MXE xrosscompiling for Windows, based on MinGW.
---
 CMakeLists.txt |  4 +++-
 bootstrap.mxe  | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 10c28ee..86475a8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -116,7 +116,9 @@ endif( MSVC )
 IF( EXIV2_ENABLE_XMP )
     SET( HAVE_XMP_TOOLKIT ON )
     SET( XMPLIB "do" )
-    set(THREADS_PREFER_PTHREAD_FLAG ON)
+    IF (NOT MINGW)
+        set(THREADS_PREFER_PTHREAD_FLAG ON)
+    ENDIF()
     find_package(Threads REQUIRED)
 ENDIF( EXIV2_ENABLE_XMP )
 
diff --git a/bootstrap.mxe b/bootstrap.mxe
new file mode 100755
index 0000000..e50a35f
--- /dev/null
+++ b/bootstrap.mxe
@@ -0,0 +1,67 @@
+#!/bin/bash
+
+# Copyright (c) 2008-2016, 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 : MXE build root path to MXE bundle dir (dir must be suffixed by .win32 or .win64 depending of MXE target).
+#             $2 : build type : 'debugfull' to hack (default), 'release' for production, relwithdebinfo for packaging.
+#             $3 : Cmake extra configure options.
+
+MXE_BUILDROOT=$1
+
+if [[ $MXE_BUILDROOT == *.win32 ]]; then
+
+    echo "MXE target : 32 bits shared"
+    MXE_BUILD_TARGETS="i686-w64-mingw32.shared"
+
+elif [[ $MXE_BUILDROOT == *.win64 ]]; then
+
+    echo "MXE target : 64 bits shared"
+    MXE_BUILD_TARGETS="x86_64-w64-mingw32.shared"
+
+else
+
+    echo "Invalid MXE target!"
+    exit -1
+
+fi
+
+BUILD_TYPE=$2
+
+if [ "$BUILD_TYPE" = "" ]; then
+    BUILD_TYPE=relwithdebinfo
+fi
+
+MXE_INSTALL_PREFIX=${MXE_BUILDROOT}/usr/${MXE_BUILD_TARGETS}/
+MXE_TOOLCHAIN=${MXE_INSTALL_PREFIX}/share/cmake/mxe-conf.cmake
+
+OPTIONS=$3
+
+echo "Installing to $MXE_BUILDROOT for target $MXE_BUILD_TARGETS with build mode $BUILD_TYPE and configure options $OPTIONS"
+
+# Pathes rules
+ORIG_PATH="$PATH"
+export PATH=$MXE_BUILDROOT/usr/bin:$MXE_INSTALL_PREFIX/qt5/bin:$PATH
+
+if [ ! -d "build" ]; then
+    mkdir build
+fi
+
+cd build
+
+${MXE_BUILD_TARGETS}-cmake -G "Unix Makefiles" . \
+                           -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
+                           -DCMAKE_COLOR_MAKEFILE=ON \
+                           -DCMAKE_INSTALL_PREFIX=${MXE_INSTALL_PREFIX} \
+                           -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \
+                           -DCMAKE_TOOLCHAIN_FILE=${MXE_TOOLCHAIN} \
+                           ${OPTIONS} \
+                           ..
+
+CMAKE_VAL_RET=$?
+
+export PATH=$ORIG_PATH
+
+exit $CMAKE_VAL_RET

-- 
exiv2 packaging