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/0001-std-isnan-isnan.patch         |   25 
-------------------------
 video/kodi/HISTORY                            |    6 ++++++
 video/kodi/PRE_BUILD                          |    3 +--
 video/kodi/crossguid.patch                    |   13 -------------
 video/kodi/patches/0001-std-isnan-isnan.patch |   25 
+++++++++++++++++++++++++
 video/kodi/patches/crossguid.patch            |   13 +++++++++++++
 video/kodi/patches/python.patch               |   16 ++++++++++++++++
 7 files changed, 61 insertions(+), 40 deletions(-)

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

    video/kodi: reorganized patching and added python finding fix

diff --git a/video/kodi/0001-std-isnan-isnan.patch 
b/video/kodi/0001-std-isnan-isnan.patch
deleted file mode 100644
index e75deab..0000000
--- a/video/kodi/0001-std-isnan-isnan.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From c95a758eaca3baf466da25e91ebea89b609fe227 Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <bwlf AT bandrate.org>
-Date: Fri, 25 Aug 2017 20:39:33 +0200
-Subject: [PATCH] std::isnan isnan
-
----
- xbmc/dialogs/GUIDialogExtendedProgressBar.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/xbmc/dialogs/GUIDialogExtendedProgressBar.cpp 
b/xbmc/dialogs/GUIDialogExtendedProgressBar.cpp
-index 42c2238..043a25f 100644
---- a/xbmc/dialogs/GUIDialogExtendedProgressBar.cpp
-+++ b/xbmc/dialogs/GUIDialogExtendedProgressBar.cpp
-@@ -52,7 +52,7 @@ void CGUIDialogProgressBarHandle::SetTitle(const 
std::string &strTitle)
- void CGUIDialogProgressBarHandle::SetProgress(int currentItem, int 
itemCount)
- {
-   float fPercentage = (currentItem*100.0f)/itemCount;
--  if (!std::isnan(fPercentage))
-+  if (!isnan(fPercentage))
-     m_fPercentage = std::min(100.0f, fPercentage);
- }
- 
--- 
-2.14.1
-
diff --git a/video/kodi/HISTORY b/video/kodi/HISTORY
index 3571a41..7855cb6 100644
--- a/video/kodi/HISTORY
+++ b/video/kodi/HISTORY
@@ -1,3 +1,9 @@
+2019-08-04 Pavel Vinogradov <public AT sourcemage.org>
+       * PRE_BUILD: use apply_patch_dir now
+       * crossguid.patch, 0001-std-isnan-isnan.patch: moved to patches/ 
subdir
+       * patches/python.patch: added to correctly find python executable and
+         libraries
+
 2019-07-19 Pavel Vinogradov <public AT sourcemage.org>
        * DEPENDS: dropped gnutls
 
diff --git a/video/kodi/PRE_BUILD b/video/kodi/PRE_BUILD
index 2abad81..7aa9ca6 100755
--- a/video/kodi/PRE_BUILD
+++ b/video/kodi/PRE_BUILD
@@ -1,5 +1,4 @@
 default_pre_build      &&
 cd ${SOURCE_DIRECTORY} &&
 
-patch -Np1 < "${SPELL_DIRECTORY}/crossguid.patch" &&
-patch -Np1 < "${SPELL_DIRECTORY}/0001-std-isnan-isnan.patch"
+apply_patch_dir patches
diff --git a/video/kodi/crossguid.patch b/video/kodi/crossguid.patch
deleted file mode 100644
index 9bae13d..0000000
--- a/video/kodi/crossguid.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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
-@@ -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();
diff --git a/video/kodi/patches/0001-std-isnan-isnan.patch 
b/video/kodi/patches/0001-std-isnan-isnan.patch
new file mode 100644
index 0000000..e75deab
--- /dev/null
+++ b/video/kodi/patches/0001-std-isnan-isnan.patch
@@ -0,0 +1,25 @@
+From c95a758eaca3baf466da25e91ebea89b609fe227 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <bwlf AT bandrate.org>
+Date: Fri, 25 Aug 2017 20:39:33 +0200
+Subject: [PATCH] std::isnan isnan
+
+---
+ xbmc/dialogs/GUIDialogExtendedProgressBar.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/xbmc/dialogs/GUIDialogExtendedProgressBar.cpp 
b/xbmc/dialogs/GUIDialogExtendedProgressBar.cpp
+index 42c2238..043a25f 100644
+--- a/xbmc/dialogs/GUIDialogExtendedProgressBar.cpp
++++ b/xbmc/dialogs/GUIDialogExtendedProgressBar.cpp
+@@ -52,7 +52,7 @@ void CGUIDialogProgressBarHandle::SetTitle(const 
std::string &strTitle)
+ void CGUIDialogProgressBarHandle::SetProgress(int currentItem, int 
itemCount)
+ {
+   float fPercentage = (currentItem*100.0f)/itemCount;
+-  if (!std::isnan(fPercentage))
++  if (!isnan(fPercentage))
+     m_fPercentage = std::min(100.0f, fPercentage);
+ }
+ 
+-- 
+2.14.1
+
diff --git a/video/kodi/patches/crossguid.patch 
b/video/kodi/patches/crossguid.patch
new file mode 100644
index 0000000..9bae13d
--- /dev/null
+++ b/video/kodi/patches/crossguid.patch
@@ -0,0 +1,13 @@
+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
+@@ -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();
diff --git a/video/kodi/patches/python.patch b/video/kodi/patches/python.patch
new file mode 100644
index 0000000..5dc0fcf
--- /dev/null
+++ b/video/kodi/patches/python.patch
@@ -0,0 +1,16 @@
+diff --git a/cmake/modules/FindPython.cmake b/cmake/modules/FindPython.cmake
+--- a/cmake/modules/FindPython.cmake
++++ b/cmake/modules/FindPython.cmake
+@@ -6,10 +6,10 @@
+ # PYTHON_LIBRARIES - The python libraries
+ 
+ if(PKG_CONFIG_FOUND)
+-  pkg_check_modules(PC_PYTHON python>=2.7 QUIET)
++  find_package(PythonLibs 2.7 REQUIRED)
+ endif()
+ 
+-find_program(PYTHON_EXECUTABLE python ONLY_CMAKE_FIND_ROOT_PATH)
++find_program(PYTHON_EXECUTABLE python2.7 ONLY_CMAKE_FIND_ROOT_PATH)
+ find_library(PYTHON_LIBRARY NAMES python2.7 PATHS ${PC_PYTHON_LIBDIR})
+ find_path(PYTHON_INCLUDE_DIR NAMES Python.h PATHS ${PC_PYTHON_INCLUDE_DIRS} 
${DEPENDS_PATH}/include/python2.7)
+