Source Mage code commit list

[Pavel Vinogradov <scm AT sourcemage.org>]

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

 video/kodi/HISTORY         |    4 ++++
 video/kodi/PRE_BUILD       |    2 ++
 video/kodi/crossguid.patch |   42 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 48 insertions(+)

New commits:
commit e3a4250b481d1c1c527b0f6318542940bf3c05e4
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

    video/kodi: fixed building with current crossguid

diff --git a/video/kodi/HISTORY b/video/kodi/HISTORY
index 11375c9..e64998b 100644
--- a/video/kodi/HISTORY
+++ b/video/kodi/HISTORY
@@ -1,3 +1,7 @@
+2017-08-24 Pavel Vinogradov <public AT sourcemage.org>
+       * PRE_BUILD, crossguid.patch: added patch to fix building with current
+         crossguid
+
 2017-08-23 Pavel Vinogradov <public AT sourcemage.org>
        * DEPENDS: tinyxml -> tinyxml1
 
diff --git a/video/kodi/PRE_BUILD b/video/kodi/PRE_BUILD
index 8092a54..4f2c93a 100755
--- a/video/kodi/PRE_BUILD
+++ b/video/kodi/PRE_BUILD
@@ -4,6 +4,8 @@ cd ${SOURCE_DIRECTORY} &&
 patch -Np0 < "$SPELL_DIRECTORY/kodi-15.1-texturepacker.patch" &&
 patch -Np1 < "${SPELL_DIRECTORY}/0001-add-missing-include-of-Xutil.h.patch" 
&&
 
+patch -Np1 < "${SPELL_DIRECTORY}/crossguid.patch" &&
+
 if ! is_depends_enabled JAVA; then
   patch -p1 < "$SPELL_DIRECTORY/kodi-cmake-no-java.patch"
 fi &&
diff --git a/video/kodi/crossguid.patch b/video/kodi/crossguid.patch
new file mode 100644
index 0000000..23308c3
--- /dev/null
+++ b/video/kodi/crossguid.patch
@@ -0,0 +1,42 @@
+diff -Nuar xbmc-17.4-Krypton.orig/configure.ac xbmc-17.4-Krypton/configure.ac
+--- xbmc-17.4-Krypton.orig/configure.ac        2017-08-24 12:59:10.390335315 
-0400
++++ xbmc-17.4-Krypton/configure.ac     2017-08-24 13:02:57.363693138 -0400
+@@ -1063,12 +1063,12 @@
+ AC_MSG_CHECKING("for libcrossguid")
+ AC_LANG_PUSH([C++])
+ SAVED_LIBS="$LIBS"
+-LIBS="$LIBS -lcrossguid $UUID_LIBS"
++LIBS="$LIBS -lxg $UUID_LIBS"
+ AC_LINK_IFELSE(
+   [AC_LANG_PROGRAM(
+-    [#include <guid.h>],
+-    [Guid dummy])],
+-  [AC_MSG_RESULT(yes); SAVED_LIBS="$SAVED_LIBS $LDFLAGS -lcrossguid 
$UUID_LIBS"],
++    [#include <Guid.hpp>],
++    [xg::Guid dummy])],
++  [AC_MSG_RESULT(yes); SAVED_LIBS="$SAVED_LIBS $LDFLAGS -lxg $UUID_LIBS"],
+   [AC_MSG_ERROR(crossguid not found)])
+ LIBS="$SAVED_LIBS"
+ AC_LANG_POP([C++])
+diff -Nuar xbmc-17.4-Krypton.orig/xbmc/utils/StringUtils.cpp 
xbmc-17.4-Krypton/xbmc/utils/StringUtils.cpp
+--- xbmc-17.4-Krypton.orig/xbmc/utils/StringUtils.cpp  2017-08-24 
12:59:16.508345154 -0400
++++ xbmc-17.4-Krypton/xbmc/utils/StringUtils.cpp       2017-08-24 
13:12:39.486505409 -0400
+@@ -28,7 +28,7 @@
+ //
+ //------------------------------------------------------------------------
+ 
+-#include <guid.h>
++#include <Guid.hpp>
+ 
+ #include "StringUtils.h"
+ #include "CharsetConverter.h"
+@@ -1191,8 +1191,7 @@
+ 
+ std::string StringUtils::CreateUUID()
+ {
+-  static GuidGenerator guidGenerator;
+-  auto guid = guidGenerator.newGuid();
++  auto guid = xg::newGuid();
+ 
+   std::stringstream strGuid; strGuid << guid;
+   return strGuid.str();