Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (09def6b50a12af5e788156dabeb24f45fe6cee21)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (09def6b50a12af5e788156dabeb24f45fe6cee21)
  • Date: Wed, 16 Jan 2019 00:59:15 +0000

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

video/kodi/HISTORY | 4 ++--
video/kodi/PRE_BUILD | 6 ++++--
video/kodi/crossguid-ac.patch | 20 ++++++++++++++++++++
video/kodi/crossguid.patch | 20 --------------------
4 files changed, 26 insertions(+), 24 deletions(-)

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

video/kodi: brought back some patches

diff --git a/video/kodi/HISTORY b/video/kodi/HISTORY
index c7b87dd..302b548 100644
--- a/video/kodi/HISTORY
+++ b/video/kodi/HISTORY
@@ -5,11 +5,11 @@
* DEPENDS: split options for stable and rc branches, added fmt,
fstrcmp and rapidjson for rc branch
* CONFIGURE: added standard cmake queries
- * PRE_BUILD: adapted
+ * PRE_BUILD: adapted, some patches are shareable
* 0001-ffmpeg-Update-AVPixelFormat-and-AV_PIX_FMT_-to-compi.patch,
0007-lib-cximage-6.0-fix-compilation-with-gcc6.patch: dropped unused
patches
-
+ * crossguid{,-ac}.patch: split the patch for both branches

2018-02-01 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: use MESA
diff --git a/video/kodi/PRE_BUILD b/video/kodi/PRE_BUILD
index 5a3ee5f..11b60b8 100755
--- a/video/kodi/PRE_BUILD
+++ b/video/kodi/PRE_BUILD
@@ -1,12 +1,14 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&

+patch -Np1 < "${SPELL_DIRECTORY}/crossguid.patch" &&
+patch -Np1 < "${SPELL_DIRECTORY}/0001-std-isnan-isnan.patch" &&
+
if [[ "${KODI_BRANCH}" == "stable" ]]; then
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" &&
- patch -Np1 < "${SPELL_DIRECTORY}/0001-std-isnan-isnan.patch" &&
+ patch -Np1 < "${SPELL_DIRECTORY}/crossguid-ac.patch" &&

if ! is_depends_enabled JAVA; then
patch -p1 < "$SPELL_DIRECTORY/kodi-cmake-no-java.patch"
diff --git a/video/kodi/crossguid-ac.patch b/video/kodi/crossguid-ac.patch
new file mode 100644
index 0000000..e60643c
--- /dev/null
+++ b/video/kodi/crossguid-ac.patch
@@ -0,0 +1,20 @@
+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 --git a/video/kodi/crossguid.patch b/video/kodi/crossguid.patch
index 23308c3..5269be0 100644
--- a/video/kodi/crossguid.patch
+++ b/video/kodi/crossguid.patch
@@ -1,23 +1,3 @@
-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



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (09def6b50a12af5e788156dabeb24f45fe6cee21), Pavel Vinogradov, 01/15/2019

Archive powered by MHonArc 2.6.24.

Top of Page