mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-04-19 11:18:35 +00:00
Code Issues Projects Releases Wiki Activity

kodi-17: Upgrade 17.0 release

Browse Source 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj
2016-11-21 13:34:39 -08:00
committed by Martin Jansa
parent 610e094228
commit bd28b29d9f
12 changed files with 148 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
meta-multimedia/recipes-mediacenter/kodi/kodi-17/0008-Fix-file_Emu-on-musl.patch → meta-multimedia/recipes-mediacenter/kodi/kodi-17/0001-Fix-file_Emu-on-musl.patch
View File

@@ -1,7 +1,7 @@
From 3a10d9479e7c9a77c478b8b428e4309ff22e8498 Mon Sep 17 00:00:00 2001
From 7ae4fcf290ffb0b76374efafeaee575456ac9023 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sun, 6 Nov 2016 23:08:27 -0800
Subject: [PATCH 8/8] Fix file_Emu on musl
Subject: [PATCH 01/10] Fix file_Emu on musl
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---

42
meta-multimedia/recipes-mediacenter/kodi/kodi-17/0007-Remove-FILEWRAP.patch → meta-multimedia/recipes-mediacenter/kodi/kodi-17/0002-Remove-FILEWRAP.patch
View File

@@ -1,7 +1,7 @@
From f4c5710192256e903b253353fb018ebd68d0b651 Mon Sep 17 00:00:00 2001
From ad1977a358319093b305df6d84be6db676ef1e4a Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sun, 6 Nov 2016 22:35:16 -0800
Subject: [PATCH 7/8] Remove FILEWRAP
Subject: [PATCH 02/10] Remove FILEWRAP
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
@@ -9,11 +9,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
xbmc/utils/posix/PosixInterfaceForCLog.h | 4 +---
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/xbmc/utils/posix/PosixInterfaceForCLog.cpp b/xbmc/utils/posix/PosixInterfaceForCLog.cpp
index 6614487..a91d157 100644
--- a/xbmc/utils/posix/PosixInterfaceForCLog.cpp
+++ b/xbmc/utils/posix/PosixInterfaceForCLog.cpp
@@ -28,10 +28,6 @@
Index: git/xbmc/utils/posix/PosixInterfaceForCLog.cpp
===================================================================
--- git.orig/xbmc/utils/posix/PosixInterfaceForCLog.cpp
+++ git/xbmc/utils/posix/PosixInterfaceForCLog.cpp
@@ -29,10 +29,6 @@
#include "platform/android/activity/XBMCApp.h"
#endif // TARGET_ANDROID
@@ -24,7 +24,7 @@ index 6614487..a91d157 100644
CPosixInterfaceForCLog::CPosixInterfaceForCLog() :
m_file(NULL)
{ }
@@ -51,7 +47,7 @@ bool CPosixInterfaceForCLog::OpenLogFile(const std::string &logFilename, const s
@@ -52,7 +48,7 @@ bool CPosixInterfaceForCLog::OpenLogFile
(void)remove(backupOldLogToFilename.c_str()); // if it's failed, try to continue
(void)rename(logFilename.c_str(), backupOldLogToFilename.c_str()); // if it's failed, try to continue
@@ -33,26 +33,14 @@ index 6614487..a91d157 100644
if (!m_file)
return false; // error, can't open log file
diff --git a/xbmc/utils/posix/PosixInterfaceForCLog.h b/xbmc/utils/posix/PosixInterfaceForCLog.h
index bb53442..2983e73 100644
--- a/xbmc/utils/posix/PosixInterfaceForCLog.h
+++ b/xbmc/utils/posix/PosixInterfaceForCLog.h
@@ -21,8 +21,6 @@
#include <string>
-struct FILEWRAP; // forward declaration, wrapper for FILE
-
class CPosixInterfaceForCLog
{
public:
@@ -34,5 +32,5 @@ public:
Index: git/xbmc/utils/posix/PosixInterfaceForCLog.h
===================================================================
--- git.orig/xbmc/utils/posix/PosixInterfaceForCLog.h
+++ git/xbmc/utils/posix/PosixInterfaceForCLog.h
@@ -34,5 +34,5 @@ public:
void PrintDebugString(const std::string& debugString);
static void GetCurrentLocalTime(int& hour, int& minute, int& second);
static void GetCurrentLocalTime(int& hour, int& minute, int& second, double& millisecond);
private:
- FILEWRAP* m_file;
+ FILE * m_file;
+ FILE* m_file;
};
--
2.10.2

8
meta-multimedia/recipes-mediacenter/kodi/kodi-17/0001-configure-don-t-try-to-run-stuff-to-find-tinyxml.patch → meta-multimedia/recipes-mediacenter/kodi/kodi-17/0003-configure-don-t-try-to-run-stuff-to-find-tinyxml.patch
View File

@@ -1,14 +1,14 @@
From 53c7b1667a41b25775d1dc009d8ced61f383da0b Mon Sep 17 00:00:00 2001
From a91a3ba229dc5903935f7dd98dd03bbb4fe5ac1f Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net>
Date: Sat, 6 Feb 2016 15:43:01 +0100
Subject: [PATCH 1/3] configure: don't try to run stuff to find tinyxml
Subject: [PATCH 03/10] configure: don't try to run stuff to find tinyxml
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 5a41fb4..243c7e5 100644
index 34fe643..3132dc1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1043,7 +1043,7 @@ fi
@@ -21,5 +21,5 @@ index 5a41fb4..243c7e5 100644
#include <stdlib.h>
#include <tinyxml.h>
--
2.10.1
2.10.2

22
meta-multimedia/recipes-mediacenter/kodi/kodi-17/0002-handle-SIGTERM.patch → meta-multimedia/recipes-mediacenter/kodi/kodi-17/0004-handle-SIGTERM.patch
View File

@@ -1,7 +1,7 @@
From 1c1484303a055bfde655ffae3829554aaefc2e07 Mon Sep 17 00:00:00 2001
From 49046c1685465a5486fe9e1c04b99c585aab6862 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Wed, 2 Nov 2016 11:28:34 -0700
Subject: [PATCH 2/3] handle SIGTERM
Subject: [PATCH 04/10] handle SIGTERM
0. CApplication::Stop cant be trusted. (deadlocks crashes and boo)
@@ -26,10 +26,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
5 files changed, 30 insertions(+), 5 deletions(-)
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
index 4c118e0..58b151a 100644
index 100a2f2..fda892d 100644
--- a/xbmc/Application.cpp
+++ b/xbmc/Application.cpp
@@ -2428,12 +2428,12 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg)
@@ -2426,12 +2426,12 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg)
switch (pMsg->dwMessage)
{
case TMSG_POWERDOWN:
@@ -44,7 +44,7 @@ index 4c118e0..58b151a 100644
break;
case TMSG_SHUTDOWN:
@@ -2454,12 +2454,13 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg)
@@ -2452,12 +2452,13 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg)
case TMSG_RESTART:
case TMSG_RESET:
@@ -59,7 +59,7 @@ index 4c118e0..58b151a 100644
Stop(EXITCODE_RESTARTAPP);
#endif
break;
@@ -2883,6 +2884,13 @@ bool CApplication::Cleanup()
@@ -2881,6 +2882,13 @@ bool CApplication::Cleanup()
}
}
@@ -73,7 +73,7 @@ index 4c118e0..58b151a 100644
void CApplication::Stop(int exitCode)
{
try
@@ -2890,7 +2898,7 @@ void CApplication::Stop(int exitCode)
@@ -2888,7 +2896,7 @@ void CApplication::Stop(int exitCode)
m_frameMoveGuard.unlock();
CVariant vExitCode(CVariant::VariantTypeObject);
@@ -82,7 +82,7 @@ index 4c118e0..58b151a 100644
CAnnouncementManager::GetInstance().Announce(System, "xbmc", "OnQuit", vExitCode);
// Abort any active screensaver
@@ -2924,7 +2932,6 @@ void CApplication::Stop(int exitCode)
@@ -2922,7 +2930,6 @@ void CApplication::Stop(int exitCode)
m_bStop = true;
m_AppFocused = false;
@@ -91,10 +91,10 @@ index 4c118e0..58b151a 100644
// cancel any jobs from the jobmanager
diff --git a/xbmc/Application.h b/xbmc/Application.h
index 22aca81..9992677 100644
index a9d9bf5..e536deb 100644
--- a/xbmc/Application.h
+++ b/xbmc/Application.h
@@ -160,6 +160,7 @@ public:
@@ -159,6 +159,7 @@ public:
void StopPVRManager();
void ReinitPVRManager();
bool IsCurrentThread() const;
@@ -159,5 +159,5 @@ index a8b64e5..3d80032 100644
XBMC::Context context;
--
2.10.1
2.10.2

6
meta-multimedia/recipes-mediacenter/kodi/kodi-17/0003-add-support-to-read-frequency-output-if-using-intel-.patch → meta-multimedia/recipes-mediacenter/kodi/kodi-17/0005-add-support-to-read-frequency-output-if-using-intel-.patch
View File

@@ -1,7 +1,7 @@
From 4ef1e9dab9193f1a5305d25c8eda97f8f06ea154 Mon Sep 17 00:00:00 2001
From 4d1368d20f04216aec9551d9845b305f96a21015 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 1 Sep 2014 03:16:37 +0200
Subject: [PATCH 3/3] add support to read frequency output if using intel's
Subject: [PATCH 05/10] add support to read frequency output if using intel's
pstate driver
---
@@ -22,5 +22,5 @@ index 5e2ebbd..fd04d5a 100644
{
m_cpuInfoForFreq = true;
--
2.10.1
2.10.2

10
meta-multimedia/recipes-mediacenter/kodi/kodi-17/0004-Disable-DVD-support.patch → meta-multimedia/recipes-mediacenter/kodi/kodi-17/0006-Disable-DVD-support.patch
View File

@@ -1,7 +1,7 @@
From 191cf3f084b4d34846711034a7fe3078f8243c82 Mon Sep 17 00:00:00 2001
From 3d3ec391038c6ee73897a7fab753b11b589de1ed Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 2 Nov 2016 12:39:20 -0700
Subject: [PATCH 4/4] Disable DVD support
Subject: [PATCH 06/10] Disable DVD support
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
@@ -9,7 +9,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 58b3a17..b7c3fce 100644
index 0d70e9b..050c7ca 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -10,8 +10,7 @@ EC_DIRS= \
@@ -22,7 +22,7 @@ index 58b3a17..b7c3fce 100644
VideoPlayer_ARCHIVES=xbmc/cores/VideoPlayer/VideoPlayer.a \
xbmc/cores/VideoPlayer/DVDCodecs/DVDCodecs.a \
@@ -343,7 +342,6 @@ libaddon: exports
@@ -347,7 +346,6 @@ libaddon: exports
$(MAKE) -C lib/addons/library.xbmc.pvr
$(MAKE) -C lib/addons/library.kodi.inputstream
dvdpcodecs: dllloader
@@ -31,5 +31,5 @@ index 58b3a17..b7c3fce 100644
dvdpextcodecs:
--
2.10.1
2.10.2

6
meta-multimedia/recipes-mediacenter/kodi/kodi-17/0005-Always-compile-libcpluff-as-PIC.patch → meta-multimedia/recipes-mediacenter/kodi/kodi-17/0007-Always-compile-libcpluff-as-PIC.patch
View File

@@ -1,7 +1,7 @@
From 603e8925a8b1609d483d866346a35fefbc66cfca Mon Sep 17 00:00:00 2001
From d989cbdb7686c3b95dc749967f89b93e47f955a6 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 3 Nov 2016 13:10:00 -0700
Subject: [PATCH 5/5] Always compile libcpluff as PIC
Subject: [PATCH 07/10] Always compile libcpluff as PIC
Fixes errors e.g.
@@ -13,7 +13,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index b210b73..52d5f11 100644
index 3132dc1..ab4eea3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2385,7 +2385,7 @@ XB_CONFIG_MODULE([lib/cpluff], [

43
meta-multimedia/recipes-mediacenter/kodi/kodi-17/0008-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch Normal file
View File

@@ -0,0 +1,43 @@
From 51cd8d5f084013360b29fe497193288ebde2f4f9 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 29 Jul 2015 23:13:33 +0200
Subject: [PATCH 08/10] kodi-config.cmake: use CMAKE_FIND_ROOT_PATH to fix
cross-compilation
When cross-compiling, the location at build time of the libraries is
not the same as the one at run-time. The CMAKE_FIND_ROOT_PATH variable
is here to handle this difference, so use it in kodi-config.cmake.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
project/cmake/KodiConfig.cmake.in | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/project/cmake/KodiConfig.cmake.in b/project/cmake/KodiConfig.cmake.in
index c02a680..9d6a566 100644
--- a/project/cmake/KodiConfig.cmake.in
+++ b/project/cmake/KodiConfig.cmake.in
@@ -7,10 +7,10 @@ if(NOT @APP_NAME_UC@_PREFIX)
set(@APP_NAME_UC@_PREFIX @APP_PREFIX@)
endif()
if(NOT @APP_NAME_UC@_INCLUDE_DIR)
- set(@APP_NAME_UC@_INCLUDE_DIR @APP_INCLUDE_DIR@)
+ set(@APP_NAME_UC@_INCLUDE_DIR ${CMAKE_FIND_ROOT_PATH}/@APP_INCLUDE_DIR@)
endif()
if(NOT @APP_NAME_UC@_LIB_DIR)
- set(@APP_NAME_UC@_LIB_DIR @APP_LIB_DIR@)
+ set(@APP_NAME_UC@_LIB_DIR ${CMAKE_FIND_ROOT_PATH}/@APP_LIB_DIR@)
endif()
if(NOT @APP_NAME_UC@_DATA_DIR)
set(@APP_NAME_UC@_DATA_DIR @APP_DATA_DIR@)
@@ -19,6 +19,7 @@ if(NOT WIN32)
set(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} @CXX11_SWITCH@")
endif()
list(APPEND CMAKE_MODULE_PATH @APP_LIB_DIR@ @APP_DATA_DIR@/cmake)
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_FIND_ROOT_PATH}/@APP_LIB_DIR@ ${CMAKE_FIND_ROOT_PATH}/@APP_DATA_DIR@/cmake)
string(REPLACE ";" " " ARCH_DEFINES "@ARCH_DEFINES@")
add_definitions(${ARCH_DEFINES} -DBUILD_KODI_ADDON)
--
2.10.2

8
meta-multimedia/recipes-mediacenter/kodi/kodi-17/0006-build-Add-support-for-musl-triplets.patch → meta-multimedia/recipes-mediacenter/kodi/kodi-17/0009-build-Add-support-for-musl-triplets.patch
View File

@@ -1,7 +1,7 @@
From 99769ac5653884e49d1c8c34e65d2e565cd9e314 Mon Sep 17 00:00:00 2001
From 8b2bad58585af0f829fb06e19c9bd2b6caf30808 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sun, 6 Nov 2016 11:54:41 -0800
Subject: [PATCH 6/6] build: Add support for musl triplets
Subject: [PATCH 09/10] build: Add support for musl triplets
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
@@ -11,7 +11,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
3 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/configure.ac b/configure.ac
index 52d5f11..a772973 100644
index ab4eea3..925466a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -526,7 +526,7 @@ case $host in
@@ -131,7 +131,7 @@ index d28f263..ff5dc20 100644
;;
*-*linux-android*)
diff --git a/tools/depends/configure.ac b/tools/depends/configure.ac
index a0bc386..b96d20e 100644
index f438e5d..409f4d7 100644
--- a/tools/depends/configure.ac
+++ b/tools/depends/configure.ac
@@ -120,13 +120,13 @@ platform_cc=gcc

40
meta-multimedia/recipes-mediacenter/kodi/kodi-17/0010-RssReader-Fix-compiler-warning-comparing-pointer-to-.patch Normal file
View File

@@ -0,0 +1,40 @@
From 55233024648b5673dbf223586968e71cc4c70711 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 16 Nov 2016 18:49:36 -0800
Subject: [PATCH 10/10] RssReader: Fix compiler warning comparing pointer to
zero
Clang finds this warning
RssReader.cpp:272:19: error: ordered comparison between pointer and zero ('TiXmlElement *' and 'int')
while (itemNode > 0)
~~~~~~~~ ^ ~
RssReader.cpp:276:22: error: ordered comparison between pointer and zero ('TiXmlNode *' and 'int')
while (childNode > 0)
~~~~~~~~~ ^ ~
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
xbmc/utils/RssReader.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/xbmc/utils/RssReader.cpp b/xbmc/utils/RssReader.cpp
index 9186f56..2494dc8 100644
--- a/xbmc/utils/RssReader.cpp
+++ b/xbmc/utils/RssReader.cpp
@@ -269,11 +269,11 @@ void CRssReader::GetNewsItems(TiXmlElement* channelXmlNode, int iFeed)
if (m_tagSet.empty())
AddTag("title");
- while (itemNode > 0)
+ while (itemNode != NULL)
{
TiXmlNode* childNode = itemNode->FirstChild();
mTagElements.clear();
- while (childNode > 0)
+ while (childNode != NULL)
{
std::string strName = childNode->ValueStr();
--
2.10.2

3
meta-multimedia/recipes-mediacenter/kodi/kodi-platform_git.bb
View File

@@ -8,9 +8,8 @@ DEPENDS = "libtinyxml kodi"
PV = "16.0.0"
SRCREV = "15edaf78d6307eaa5e1d17028122d8bce9d55aa2"
SRCREV = "c8188d82678fec6b784597db69a68e74ff4986b5"
SRC_URI = "git://github.com/xbmc/kodi-platform.git \
file://0001-Fix-build-after-platform-rename.patch \
file://0001-fix-cross-compile-badness.patch \
file://kodi-platform-02_no-multi-lib.patch \
"

30
meta-multimedia/recipes-mediacenter/kodi/kodi_17.bb
View File

@@ -3,8 +3,6 @@ SUMMARY = "Kodi Media Center"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=930e2a5f63425d8dd72dbd7391c43c46"
DEFAULT_PREFERENCE = "-1"
FILESPATH =. "${FILE_DIRNAME}/kodi-17:"
DEPENDS = " \
@@ -63,20 +61,22 @@ DEPENDS = " \
PROVIDES = "xbmc"
SRCREV = "7f6abd1dd6d1aefcb4303083f34aaa90a8df9fce"
SRCREV = "a10c5048f2487bd9b2dc1f35d2fee48a25945a70"
PV = "17.0+gitr${SRCPV}"
SRC_URI = "git://github.com/xbmc/xbmc.git;branch=master \
file://0001-configure-don-t-try-to-run-stuff-to-find-tinyxml.patch \
file://0002-handle-SIGTERM.patch \
file://0003-add-support-to-read-frequency-output-if-using-intel-.patch \
file://0004-Disable-DVD-support.patch \
file://0005-Always-compile-libcpluff-as-PIC.patch \
file://0006-build-Add-support-for-musl-triplets.patch \
file://0003-configure-don-t-try-to-run-stuff-to-find-tinyxml.patch \
file://0004-handle-SIGTERM.patch \
file://0005-add-support-to-read-frequency-output-if-using-intel-.patch \
file://0006-Disable-DVD-support.patch \
file://0007-Always-compile-libcpluff-as-PIC.patch \
file://0008-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch \
file://0009-build-Add-support-for-musl-triplets.patch \
file://0010-RssReader-Fix-compiler-warning-comparing-pointer-to-.patch \
"
SRC_URI_append_libc-musl = " \
file://0007-Remove-FILEWRAP.patch \
file://0008-Fix-file_Emu-on-musl.patch \
file://0001-Fix-file_Emu-on-musl.patch \
file://0002-Remove-FILEWRAP.patch \
"
inherit autotools-brokensep gettext pythonnative
@@ -116,10 +116,12 @@ EXTRA_OECONF = " \
--enable-texturepacker=no \
"
FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations -fomit-frame-pointer -O4 -ffast-math"
FULL_OPTIMIZATION_armv7ve = "-fexpensive-optimizations -fomit-frame-pointer -O4 -ffast-math"
FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations -fomit-frame-pointer -O3 -ffast-math"
FULL_OPTIMIZATION_armv7ve = "-fexpensive-optimizations -fomit-frame-pointer -O3 -ffast-math"
BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}"
EXTRA_OECONF_append = " LIBTOOL=${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool"
# for python modules
export HOST_SYS
export BUILD_SYS
@@ -185,3 +187,5 @@ RRECOMMENDS_${PN}_append_libc-glibc = " glibc-charmap-ibm850 \
RPROVIDES_${PN} += "xbmc"
TOOLCHAIN = "gcc"