diff options
author | Khem Raj <raj.khem@gmail.com> | 2016-11-21 13:34:39 -0800 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-02-06 16:48:42 +0100 |
commit | bd28b29d9fb48ae50fd63fe9707cbf7cdefca7bf (patch) | |
tree | 7160ca73e39473d61417a9a2c123bd96fcb93b44 /meta-multimedia | |
parent | 610e0942289e99cbe2739ac956b9923cf55ab535 (diff) | |
download | meta-openembedded-bd28b29d9fb48ae50fd63fe9707cbf7cdefca7bf.tar.gz |
kodi-17: Upgrade 17.0 release
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-multimedia')
12 files changed, 148 insertions, 74 deletions
diff --git a/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0008-Fix-file_Emu-on-musl.patch b/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0001-Fix-file_Emu-on-musl.patch index 7598c7ac5..20b637788 100644 --- a/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0008-Fix-file_Emu-on-musl.patch +++ b/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0001-Fix-file_Emu-on-musl.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 3a10d9479e7c9a77c478b8b428e4309ff22e8498 Mon Sep 17 00:00:00 2001 | 1 | From 7ae4fcf290ffb0b76374efafeaee575456ac9023 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Sun, 6 Nov 2016 23:08:27 -0800 | 3 | Date: Sun, 6 Nov 2016 23:08:27 -0800 |
4 | Subject: [PATCH 8/8] Fix file_Emu on musl | 4 | Subject: [PATCH 01/10] Fix file_Emu on musl |
5 | 5 | ||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
7 | --- | 7 | --- |
diff --git a/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0007-Remove-FILEWRAP.patch b/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0002-Remove-FILEWRAP.patch index c2d3259e7..463a5c4f8 100644 --- a/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0007-Remove-FILEWRAP.patch +++ b/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0002-Remove-FILEWRAP.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From f4c5710192256e903b253353fb018ebd68d0b651 Mon Sep 17 00:00:00 2001 | 1 | From ad1977a358319093b305df6d84be6db676ef1e4a Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Sun, 6 Nov 2016 22:35:16 -0800 | 3 | Date: Sun, 6 Nov 2016 22:35:16 -0800 |
4 | Subject: [PATCH 7/8] Remove FILEWRAP | 4 | Subject: [PATCH 02/10] Remove FILEWRAP |
5 | 5 | ||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
7 | --- | 7 | --- |
@@ -9,11 +9,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
9 | xbmc/utils/posix/PosixInterfaceForCLog.h | 4 +--- | 9 | xbmc/utils/posix/PosixInterfaceForCLog.h | 4 +--- |
10 | 2 files changed, 2 insertions(+), 8 deletions(-) | 10 | 2 files changed, 2 insertions(+), 8 deletions(-) |
11 | 11 | ||
12 | diff --git a/xbmc/utils/posix/PosixInterfaceForCLog.cpp b/xbmc/utils/posix/PosixInterfaceForCLog.cpp | 12 | Index: git/xbmc/utils/posix/PosixInterfaceForCLog.cpp |
13 | index 6614487..a91d157 100644 | 13 | =================================================================== |
14 | --- a/xbmc/utils/posix/PosixInterfaceForCLog.cpp | 14 | --- git.orig/xbmc/utils/posix/PosixInterfaceForCLog.cpp |
15 | +++ b/xbmc/utils/posix/PosixInterfaceForCLog.cpp | 15 | +++ git/xbmc/utils/posix/PosixInterfaceForCLog.cpp |
16 | @@ -28,10 +28,6 @@ | 16 | @@ -29,10 +29,6 @@ |
17 | #include "platform/android/activity/XBMCApp.h" | 17 | #include "platform/android/activity/XBMCApp.h" |
18 | #endif // TARGET_ANDROID | 18 | #endif // TARGET_ANDROID |
19 | 19 | ||
@@ -24,7 +24,7 @@ index 6614487..a91d157 100644 | |||
24 | CPosixInterfaceForCLog::CPosixInterfaceForCLog() : | 24 | CPosixInterfaceForCLog::CPosixInterfaceForCLog() : |
25 | m_file(NULL) | 25 | m_file(NULL) |
26 | { } | 26 | { } |
27 | @@ -51,7 +47,7 @@ bool CPosixInterfaceForCLog::OpenLogFile(const std::string &logFilename, const s | 27 | @@ -52,7 +48,7 @@ bool CPosixInterfaceForCLog::OpenLogFile |
28 | (void)remove(backupOldLogToFilename.c_str()); // if it's failed, try to continue | 28 | (void)remove(backupOldLogToFilename.c_str()); // if it's failed, try to continue |
29 | (void)rename(logFilename.c_str(), backupOldLogToFilename.c_str()); // if it's failed, try to continue | 29 | (void)rename(logFilename.c_str(), backupOldLogToFilename.c_str()); // if it's failed, try to continue |
30 | 30 | ||
@@ -33,26 +33,14 @@ index 6614487..a91d157 100644 | |||
33 | if (!m_file) | 33 | if (!m_file) |
34 | return false; // error, can't open log file | 34 | return false; // error, can't open log file |
35 | 35 | ||
36 | diff --git a/xbmc/utils/posix/PosixInterfaceForCLog.h b/xbmc/utils/posix/PosixInterfaceForCLog.h | 36 | Index: git/xbmc/utils/posix/PosixInterfaceForCLog.h |
37 | index bb53442..2983e73 100644 | 37 | =================================================================== |
38 | --- a/xbmc/utils/posix/PosixInterfaceForCLog.h | 38 | --- git.orig/xbmc/utils/posix/PosixInterfaceForCLog.h |
39 | +++ b/xbmc/utils/posix/PosixInterfaceForCLog.h | 39 | +++ git/xbmc/utils/posix/PosixInterfaceForCLog.h |
40 | @@ -21,8 +21,6 @@ | 40 | @@ -34,5 +34,5 @@ public: |
41 | |||
42 | #include <string> | ||
43 | |||
44 | -struct FILEWRAP; // forward declaration, wrapper for FILE | ||
45 | - | ||
46 | class CPosixInterfaceForCLog | ||
47 | { | ||
48 | public: | ||
49 | @@ -34,5 +32,5 @@ public: | ||
50 | void PrintDebugString(const std::string& debugString); | 41 | void PrintDebugString(const std::string& debugString); |
51 | static void GetCurrentLocalTime(int& hour, int& minute, int& second); | 42 | static void GetCurrentLocalTime(int& hour, int& minute, int& second, double& millisecond); |
52 | private: | 43 | private: |
53 | - FILEWRAP* m_file; | 44 | - FILEWRAP* m_file; |
54 | + FILE * m_file; | 45 | + FILE* m_file; |
55 | }; | 46 | }; |
56 | -- | ||
57 | 2.10.2 | ||
58 | |||
diff --git a/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0001-configure-don-t-try-to-run-stuff-to-find-tinyxml.patch b/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0003-configure-don-t-try-to-run-stuff-to-find-tinyxml.patch index b3780db89..49217a4f7 100644 --- a/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0001-configure-don-t-try-to-run-stuff-to-find-tinyxml.patch +++ b/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0003-configure-don-t-try-to-run-stuff-to-find-tinyxml.patch | |||
@@ -1,14 +1,14 @@ | |||
1 | From 53c7b1667a41b25775d1dc009d8ced61f383da0b Mon Sep 17 00:00:00 2001 | 1 | From a91a3ba229dc5903935f7dd98dd03bbb4fe5ac1f Mon Sep 17 00:00:00 2001 |
2 | From: Koen Kooi <koen@dominion.thruhere.net> | 2 | From: Koen Kooi <koen@dominion.thruhere.net> |
3 | Date: Sat, 6 Feb 2016 15:43:01 +0100 | 3 | Date: Sat, 6 Feb 2016 15:43:01 +0100 |
4 | Subject: [PATCH 1/3] configure: don't try to run stuff to find tinyxml | 4 | Subject: [PATCH 03/10] configure: don't try to run stuff to find tinyxml |
5 | 5 | ||
6 | --- | 6 | --- |
7 | configure.ac | 2 +- | 7 | configure.ac | 2 +- |
8 | 1 file changed, 1 insertion(+), 1 deletion(-) | 8 | 1 file changed, 1 insertion(+), 1 deletion(-) |
9 | 9 | ||
10 | diff --git a/configure.ac b/configure.ac | 10 | diff --git a/configure.ac b/configure.ac |
11 | index 5a41fb4..243c7e5 100644 | 11 | index 34fe643..3132dc1 100644 |
12 | --- a/configure.ac | 12 | --- a/configure.ac |
13 | +++ b/configure.ac | 13 | +++ b/configure.ac |
14 | @@ -1043,7 +1043,7 @@ fi | 14 | @@ -1043,7 +1043,7 @@ fi |
@@ -21,5 +21,5 @@ index 5a41fb4..243c7e5 100644 | |||
21 | #include <stdlib.h> | 21 | #include <stdlib.h> |
22 | #include <tinyxml.h> | 22 | #include <tinyxml.h> |
23 | -- | 23 | -- |
24 | 2.10.1 | 24 | 2.10.2 |
25 | 25 | ||
diff --git a/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0002-handle-SIGTERM.patch b/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0004-handle-SIGTERM.patch index b2af5deb2..dc3743935 100644 --- a/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0002-handle-SIGTERM.patch +++ b/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0004-handle-SIGTERM.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 1c1484303a055bfde655ffae3829554aaefc2e07 Mon Sep 17 00:00:00 2001 | 1 | From 49046c1685465a5486fe9e1c04b99c585aab6862 Mon Sep 17 00:00:00 2001 |
2 | From: Stefan Saraev <stefan@saraev.ca> | 2 | From: Stefan Saraev <stefan@saraev.ca> |
3 | Date: Wed, 2 Nov 2016 11:28:34 -0700 | 3 | Date: Wed, 2 Nov 2016 11:28:34 -0700 |
4 | Subject: [PATCH 2/3] handle SIGTERM | 4 | Subject: [PATCH 04/10] handle SIGTERM |
5 | 5 | ||
6 | 0. CApplication::Stop cant be trusted. (deadlocks crashes and boo) | 6 | 0. CApplication::Stop cant be trusted. (deadlocks crashes and boo) |
7 | 7 | ||
@@ -26,10 +26,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
26 | 5 files changed, 30 insertions(+), 5 deletions(-) | 26 | 5 files changed, 30 insertions(+), 5 deletions(-) |
27 | 27 | ||
28 | diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp | 28 | diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp |
29 | index 4c118e0..58b151a 100644 | 29 | index 100a2f2..fda892d 100644 |
30 | --- a/xbmc/Application.cpp | 30 | --- a/xbmc/Application.cpp |
31 | +++ b/xbmc/Application.cpp | 31 | +++ b/xbmc/Application.cpp |
32 | @@ -2428,12 +2428,12 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg) | 32 | @@ -2426,12 +2426,12 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg) |
33 | switch (pMsg->dwMessage) | 33 | switch (pMsg->dwMessage) |
34 | { | 34 | { |
35 | case TMSG_POWERDOWN: | 35 | case TMSG_POWERDOWN: |
@@ -44,7 +44,7 @@ index 4c118e0..58b151a 100644 | |||
44 | break; | 44 | break; |
45 | 45 | ||
46 | case TMSG_SHUTDOWN: | 46 | case TMSG_SHUTDOWN: |
47 | @@ -2454,12 +2454,13 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg) | 47 | @@ -2452,12 +2452,13 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg) |
48 | 48 | ||
49 | case TMSG_RESTART: | 49 | case TMSG_RESTART: |
50 | case TMSG_RESET: | 50 | case TMSG_RESET: |
@@ -59,7 +59,7 @@ index 4c118e0..58b151a 100644 | |||
59 | Stop(EXITCODE_RESTARTAPP); | 59 | Stop(EXITCODE_RESTARTAPP); |
60 | #endif | 60 | #endif |
61 | break; | 61 | break; |
62 | @@ -2883,6 +2884,13 @@ bool CApplication::Cleanup() | 62 | @@ -2881,6 +2882,13 @@ bool CApplication::Cleanup() |
63 | } | 63 | } |
64 | } | 64 | } |
65 | 65 | ||
@@ -73,7 +73,7 @@ index 4c118e0..58b151a 100644 | |||
73 | void CApplication::Stop(int exitCode) | 73 | void CApplication::Stop(int exitCode) |
74 | { | 74 | { |
75 | try | 75 | try |
76 | @@ -2890,7 +2898,7 @@ void CApplication::Stop(int exitCode) | 76 | @@ -2888,7 +2896,7 @@ void CApplication::Stop(int exitCode) |
77 | m_frameMoveGuard.unlock(); | 77 | m_frameMoveGuard.unlock(); |
78 | 78 | ||
79 | CVariant vExitCode(CVariant::VariantTypeObject); | 79 | CVariant vExitCode(CVariant::VariantTypeObject); |
@@ -82,7 +82,7 @@ index 4c118e0..58b151a 100644 | |||
82 | CAnnouncementManager::GetInstance().Announce(System, "xbmc", "OnQuit", vExitCode); | 82 | CAnnouncementManager::GetInstance().Announce(System, "xbmc", "OnQuit", vExitCode); |
83 | 83 | ||
84 | // Abort any active screensaver | 84 | // Abort any active screensaver |
85 | @@ -2924,7 +2932,6 @@ void CApplication::Stop(int exitCode) | 85 | @@ -2922,7 +2930,6 @@ void CApplication::Stop(int exitCode) |
86 | 86 | ||
87 | m_bStop = true; | 87 | m_bStop = true; |
88 | m_AppFocused = false; | 88 | m_AppFocused = false; |
@@ -91,10 +91,10 @@ index 4c118e0..58b151a 100644 | |||
91 | 91 | ||
92 | // cancel any jobs from the jobmanager | 92 | // cancel any jobs from the jobmanager |
93 | diff --git a/xbmc/Application.h b/xbmc/Application.h | 93 | diff --git a/xbmc/Application.h b/xbmc/Application.h |
94 | index 22aca81..9992677 100644 | 94 | index a9d9bf5..e536deb 100644 |
95 | --- a/xbmc/Application.h | 95 | --- a/xbmc/Application.h |
96 | +++ b/xbmc/Application.h | 96 | +++ b/xbmc/Application.h |
97 | @@ -160,6 +160,7 @@ public: | 97 | @@ -159,6 +159,7 @@ public: |
98 | void StopPVRManager(); | 98 | void StopPVRManager(); |
99 | void ReinitPVRManager(); | 99 | void ReinitPVRManager(); |
100 | bool IsCurrentThread() const; | 100 | bool IsCurrentThread() const; |
@@ -159,5 +159,5 @@ index a8b64e5..3d80032 100644 | |||
159 | XBMC::Context context; | 159 | XBMC::Context context; |
160 | 160 | ||
161 | -- | 161 | -- |
162 | 2.10.1 | 162 | 2.10.2 |
163 | 163 | ||
diff --git a/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0003-add-support-to-read-frequency-output-if-using-intel-.patch b/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0005-add-support-to-read-frequency-output-if-using-intel-.patch index d638550e9..ee10c40ac 100644 --- a/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0003-add-support-to-read-frequency-output-if-using-intel-.patch +++ b/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0005-add-support-to-read-frequency-output-if-using-intel-.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 4ef1e9dab9193f1a5305d25c8eda97f8f06ea154 Mon Sep 17 00:00:00 2001 | 1 | From 4d1368d20f04216aec9551d9845b305f96a21015 Mon Sep 17 00:00:00 2001 |
2 | From: Stephan Raue <stephan@openelec.tv> | 2 | From: Stephan Raue <stephan@openelec.tv> |
3 | Date: Mon, 1 Sep 2014 03:16:37 +0200 | 3 | Date: Mon, 1 Sep 2014 03:16:37 +0200 |
4 | Subject: [PATCH 3/3] add support to read frequency output if using intel's | 4 | Subject: [PATCH 05/10] add support to read frequency output if using intel's |
5 | pstate driver | 5 | pstate driver |
6 | 6 | ||
7 | --- | 7 | --- |
@@ -22,5 +22,5 @@ index 5e2ebbd..fd04d5a 100644 | |||
22 | { | 22 | { |
23 | m_cpuInfoForFreq = true; | 23 | m_cpuInfoForFreq = true; |
24 | -- | 24 | -- |
25 | 2.10.1 | 25 | 2.10.2 |
26 | 26 | ||
diff --git a/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0004-Disable-DVD-support.patch b/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0006-Disable-DVD-support.patch index 6f5f9a232..08dfac324 100644 --- a/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0004-Disable-DVD-support.patch +++ b/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0006-Disable-DVD-support.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 191cf3f084b4d34846711034a7fe3078f8243c82 Mon Sep 17 00:00:00 2001 | 1 | From 3d3ec391038c6ee73897a7fab753b11b589de1ed Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Wed, 2 Nov 2016 12:39:20 -0700 | 3 | Date: Wed, 2 Nov 2016 12:39:20 -0700 |
4 | Subject: [PATCH 4/4] Disable DVD support | 4 | Subject: [PATCH 06/10] Disable DVD support |
5 | 5 | ||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
7 | --- | 7 | --- |
@@ -9,7 +9,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
9 | 1 file changed, 1 insertion(+), 3 deletions(-) | 9 | 1 file changed, 1 insertion(+), 3 deletions(-) |
10 | 10 | ||
11 | diff --git a/Makefile.in b/Makefile.in | 11 | diff --git a/Makefile.in b/Makefile.in |
12 | index 58b3a17..b7c3fce 100644 | 12 | index 0d70e9b..050c7ca 100644 |
13 | --- a/Makefile.in | 13 | --- a/Makefile.in |
14 | +++ b/Makefile.in | 14 | +++ b/Makefile.in |
15 | @@ -10,8 +10,7 @@ EC_DIRS= \ | 15 | @@ -10,8 +10,7 @@ EC_DIRS= \ |
@@ -22,7 +22,7 @@ index 58b3a17..b7c3fce 100644 | |||
22 | 22 | ||
23 | VideoPlayer_ARCHIVES=xbmc/cores/VideoPlayer/VideoPlayer.a \ | 23 | VideoPlayer_ARCHIVES=xbmc/cores/VideoPlayer/VideoPlayer.a \ |
24 | xbmc/cores/VideoPlayer/DVDCodecs/DVDCodecs.a \ | 24 | xbmc/cores/VideoPlayer/DVDCodecs/DVDCodecs.a \ |
25 | @@ -343,7 +342,6 @@ libaddon: exports | 25 | @@ -347,7 +346,6 @@ libaddon: exports |
26 | $(MAKE) -C lib/addons/library.xbmc.pvr | 26 | $(MAKE) -C lib/addons/library.xbmc.pvr |
27 | $(MAKE) -C lib/addons/library.kodi.inputstream | 27 | $(MAKE) -C lib/addons/library.kodi.inputstream |
28 | dvdpcodecs: dllloader | 28 | dvdpcodecs: dllloader |
@@ -31,5 +31,5 @@ index 58b3a17..b7c3fce 100644 | |||
31 | dvdpextcodecs: | 31 | dvdpextcodecs: |
32 | 32 | ||
33 | -- | 33 | -- |
34 | 2.10.1 | 34 | 2.10.2 |
35 | 35 | ||
diff --git a/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0005-Always-compile-libcpluff-as-PIC.patch b/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0007-Always-compile-libcpluff-as-PIC.patch index f513334bf..8fd7ece05 100644 --- a/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0005-Always-compile-libcpluff-as-PIC.patch +++ b/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0007-Always-compile-libcpluff-as-PIC.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 603e8925a8b1609d483d866346a35fefbc66cfca Mon Sep 17 00:00:00 2001 | 1 | From d989cbdb7686c3b95dc749967f89b93e47f955a6 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Thu, 3 Nov 2016 13:10:00 -0700 | 3 | Date: Thu, 3 Nov 2016 13:10:00 -0700 |
4 | Subject: [PATCH 5/5] Always compile libcpluff as PIC | 4 | Subject: [PATCH 07/10] Always compile libcpluff as PIC |
5 | 5 | ||
6 | Fixes errors e.g. | 6 | Fixes errors e.g. |
7 | 7 | ||
@@ -13,7 +13,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | 13 | 1 file changed, 1 insertion(+), 1 deletion(-) |
14 | 14 | ||
15 | diff --git a/configure.ac b/configure.ac | 15 | diff --git a/configure.ac b/configure.ac |
16 | index b210b73..52d5f11 100644 | 16 | index 3132dc1..ab4eea3 100644 |
17 | --- a/configure.ac | 17 | --- a/configure.ac |
18 | +++ b/configure.ac | 18 | +++ b/configure.ac |
19 | @@ -2385,7 +2385,7 @@ XB_CONFIG_MODULE([lib/cpluff], [ | 19 | @@ -2385,7 +2385,7 @@ XB_CONFIG_MODULE([lib/cpluff], [ |
diff --git a/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0008-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch b/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0008-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch new file mode 100644 index 000000000..9390144ce --- /dev/null +++ b/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0008-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch | |||
@@ -0,0 +1,43 @@ | |||
1 | From 51cd8d5f084013360b29fe497193288ebde2f4f9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | ||
3 | Date: Wed, 29 Jul 2015 23:13:33 +0200 | ||
4 | Subject: [PATCH 08/10] kodi-config.cmake: use CMAKE_FIND_ROOT_PATH to fix | ||
5 | cross-compilation | ||
6 | |||
7 | When cross-compiling, the location at build time of the libraries is | ||
8 | not the same as the one at run-time. The CMAKE_FIND_ROOT_PATH variable | ||
9 | is here to handle this difference, so use it in kodi-config.cmake. | ||
10 | |||
11 | Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | ||
12 | --- | ||
13 | project/cmake/KodiConfig.cmake.in | 5 +++-- | ||
14 | 1 file changed, 3 insertions(+), 2 deletions(-) | ||
15 | |||
16 | diff --git a/project/cmake/KodiConfig.cmake.in b/project/cmake/KodiConfig.cmake.in | ||
17 | index c02a680..9d6a566 100644 | ||
18 | --- a/project/cmake/KodiConfig.cmake.in | ||
19 | +++ b/project/cmake/KodiConfig.cmake.in | ||
20 | @@ -7,10 +7,10 @@ if(NOT @APP_NAME_UC@_PREFIX) | ||
21 | set(@APP_NAME_UC@_PREFIX @APP_PREFIX@) | ||
22 | endif() | ||
23 | if(NOT @APP_NAME_UC@_INCLUDE_DIR) | ||
24 | - set(@APP_NAME_UC@_INCLUDE_DIR @APP_INCLUDE_DIR@) | ||
25 | + set(@APP_NAME_UC@_INCLUDE_DIR ${CMAKE_FIND_ROOT_PATH}/@APP_INCLUDE_DIR@) | ||
26 | endif() | ||
27 | if(NOT @APP_NAME_UC@_LIB_DIR) | ||
28 | - set(@APP_NAME_UC@_LIB_DIR @APP_LIB_DIR@) | ||
29 | + set(@APP_NAME_UC@_LIB_DIR ${CMAKE_FIND_ROOT_PATH}/@APP_LIB_DIR@) | ||
30 | endif() | ||
31 | if(NOT @APP_NAME_UC@_DATA_DIR) | ||
32 | set(@APP_NAME_UC@_DATA_DIR @APP_DATA_DIR@) | ||
33 | @@ -19,6 +19,7 @@ if(NOT WIN32) | ||
34 | set(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} @CXX11_SWITCH@") | ||
35 | endif() | ||
36 | list(APPEND CMAKE_MODULE_PATH @APP_LIB_DIR@ @APP_DATA_DIR@/cmake) | ||
37 | +list(APPEND CMAKE_MODULE_PATH ${CMAKE_FIND_ROOT_PATH}/@APP_LIB_DIR@ ${CMAKE_FIND_ROOT_PATH}/@APP_DATA_DIR@/cmake) | ||
38 | |||
39 | string(REPLACE ";" " " ARCH_DEFINES "@ARCH_DEFINES@") | ||
40 | add_definitions(${ARCH_DEFINES} -DBUILD_KODI_ADDON) | ||
41 | -- | ||
42 | 2.10.2 | ||
43 | |||
diff --git a/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0006-build-Add-support-for-musl-triplets.patch b/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0009-build-Add-support-for-musl-triplets.patch index 71c5c414b..f3e739aed 100644 --- a/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0006-build-Add-support-for-musl-triplets.patch +++ b/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0009-build-Add-support-for-musl-triplets.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 99769ac5653884e49d1c8c34e65d2e565cd9e314 Mon Sep 17 00:00:00 2001 | 1 | From 8b2bad58585af0f829fb06e19c9bd2b6caf30808 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Sun, 6 Nov 2016 11:54:41 -0800 | 3 | Date: Sun, 6 Nov 2016 11:54:41 -0800 |
4 | Subject: [PATCH 6/6] build: Add support for musl triplets | 4 | Subject: [PATCH 09/10] build: Add support for musl triplets |
5 | 5 | ||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
7 | --- | 7 | --- |
@@ -11,7 +11,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
11 | 3 files changed, 23 insertions(+), 23 deletions(-) | 11 | 3 files changed, 23 insertions(+), 23 deletions(-) |
12 | 12 | ||
13 | diff --git a/configure.ac b/configure.ac | 13 | diff --git a/configure.ac b/configure.ac |
14 | index 52d5f11..a772973 100644 | 14 | index ab4eea3..925466a 100644 |
15 | --- a/configure.ac | 15 | --- a/configure.ac |
16 | +++ b/configure.ac | 16 | +++ b/configure.ac |
17 | @@ -526,7 +526,7 @@ case $host in | 17 | @@ -526,7 +526,7 @@ case $host in |
@@ -131,7 +131,7 @@ index d28f263..ff5dc20 100644 | |||
131 | ;; | 131 | ;; |
132 | *-*linux-android*) | 132 | *-*linux-android*) |
133 | diff --git a/tools/depends/configure.ac b/tools/depends/configure.ac | 133 | diff --git a/tools/depends/configure.ac b/tools/depends/configure.ac |
134 | index a0bc386..b96d20e 100644 | 134 | index f438e5d..409f4d7 100644 |
135 | --- a/tools/depends/configure.ac | 135 | --- a/tools/depends/configure.ac |
136 | +++ b/tools/depends/configure.ac | 136 | +++ b/tools/depends/configure.ac |
137 | @@ -120,13 +120,13 @@ platform_cc=gcc | 137 | @@ -120,13 +120,13 @@ platform_cc=gcc |
diff --git a/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0010-RssReader-Fix-compiler-warning-comparing-pointer-to-.patch b/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0010-RssReader-Fix-compiler-warning-comparing-pointer-to-.patch new file mode 100644 index 000000000..e34a5b71e --- /dev/null +++ b/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0010-RssReader-Fix-compiler-warning-comparing-pointer-to-.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | From 55233024648b5673dbf223586968e71cc4c70711 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 16 Nov 2016 18:49:36 -0800 | ||
4 | Subject: [PATCH 10/10] RssReader: Fix compiler warning comparing pointer to | ||
5 | zero | ||
6 | |||
7 | Clang finds this warning | ||
8 | RssReader.cpp:272:19: error: ordered comparison between pointer and zero ('TiXmlElement *' and 'int') | ||
9 | while (itemNode > 0) | ||
10 | ~~~~~~~~ ^ ~ | ||
11 | RssReader.cpp:276:22: error: ordered comparison between pointer and zero ('TiXmlNode *' and 'int') | ||
12 | while (childNode > 0) | ||
13 | ~~~~~~~~~ ^ ~ | ||
14 | |||
15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
16 | --- | ||
17 | xbmc/utils/RssReader.cpp | 4 ++-- | ||
18 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
19 | |||
20 | diff --git a/xbmc/utils/RssReader.cpp b/xbmc/utils/RssReader.cpp | ||
21 | index 9186f56..2494dc8 100644 | ||
22 | --- a/xbmc/utils/RssReader.cpp | ||
23 | +++ b/xbmc/utils/RssReader.cpp | ||
24 | @@ -269,11 +269,11 @@ void CRssReader::GetNewsItems(TiXmlElement* channelXmlNode, int iFeed) | ||
25 | if (m_tagSet.empty()) | ||
26 | AddTag("title"); | ||
27 | |||
28 | - while (itemNode > 0) | ||
29 | + while (itemNode != NULL) | ||
30 | { | ||
31 | TiXmlNode* childNode = itemNode->FirstChild(); | ||
32 | mTagElements.clear(); | ||
33 | - while (childNode > 0) | ||
34 | + while (childNode != NULL) | ||
35 | { | ||
36 | std::string strName = childNode->ValueStr(); | ||
37 | |||
38 | -- | ||
39 | 2.10.2 | ||
40 | |||
diff --git a/meta-multimedia/recipes-mediacenter/kodi/kodi-platform_git.bb b/meta-multimedia/recipes-mediacenter/kodi/kodi-platform_git.bb index 50774544b..802259de8 100644 --- a/meta-multimedia/recipes-mediacenter/kodi/kodi-platform_git.bb +++ b/meta-multimedia/recipes-mediacenter/kodi/kodi-platform_git.bb | |||
@@ -8,9 +8,8 @@ DEPENDS = "libtinyxml kodi" | |||
8 | 8 | ||
9 | PV = "16.0.0" | 9 | PV = "16.0.0" |
10 | 10 | ||
11 | SRCREV = "15edaf78d6307eaa5e1d17028122d8bce9d55aa2" | 11 | SRCREV = "c8188d82678fec6b784597db69a68e74ff4986b5" |
12 | SRC_URI = "git://github.com/xbmc/kodi-platform.git \ | 12 | SRC_URI = "git://github.com/xbmc/kodi-platform.git \ |
13 | file://0001-Fix-build-after-platform-rename.patch \ | ||
14 | file://0001-fix-cross-compile-badness.patch \ | 13 | file://0001-fix-cross-compile-badness.patch \ |
15 | file://kodi-platform-02_no-multi-lib.patch \ | 14 | file://kodi-platform-02_no-multi-lib.patch \ |
16 | " | 15 | " |
diff --git a/meta-multimedia/recipes-mediacenter/kodi/kodi_17.bb b/meta-multimedia/recipes-mediacenter/kodi/kodi_17.bb index 8cb9dacbc..3dafdd9a0 100644 --- a/meta-multimedia/recipes-mediacenter/kodi/kodi_17.bb +++ b/meta-multimedia/recipes-mediacenter/kodi/kodi_17.bb | |||
@@ -3,8 +3,6 @@ SUMMARY = "Kodi Media Center" | |||
3 | LICENSE = "GPLv2" | 3 | LICENSE = "GPLv2" |
4 | LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=930e2a5f63425d8dd72dbd7391c43c46" | 4 | LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=930e2a5f63425d8dd72dbd7391c43c46" |
5 | 5 | ||
6 | DEFAULT_PREFERENCE = "-1" | ||
7 | |||
8 | FILESPATH =. "${FILE_DIRNAME}/kodi-17:" | 6 | FILESPATH =. "${FILE_DIRNAME}/kodi-17:" |
9 | 7 | ||
10 | DEPENDS = " \ | 8 | DEPENDS = " \ |
@@ -63,20 +61,22 @@ DEPENDS = " \ | |||
63 | 61 | ||
64 | PROVIDES = "xbmc" | 62 | PROVIDES = "xbmc" |
65 | 63 | ||
66 | SRCREV = "7f6abd1dd6d1aefcb4303083f34aaa90a8df9fce" | 64 | SRCREV = "a10c5048f2487bd9b2dc1f35d2fee48a25945a70" |
67 | PV = "17.0+gitr${SRCPV}" | 65 | PV = "17.0+gitr${SRCPV}" |
68 | SRC_URI = "git://github.com/xbmc/xbmc.git;branch=master \ | 66 | SRC_URI = "git://github.com/xbmc/xbmc.git;branch=master \ |
69 | file://0001-configure-don-t-try-to-run-stuff-to-find-tinyxml.patch \ | 67 | file://0003-configure-don-t-try-to-run-stuff-to-find-tinyxml.patch \ |
70 | file://0002-handle-SIGTERM.patch \ | 68 | file://0004-handle-SIGTERM.patch \ |
71 | file://0003-add-support-to-read-frequency-output-if-using-intel-.patch \ | 69 | file://0005-add-support-to-read-frequency-output-if-using-intel-.patch \ |
72 | file://0004-Disable-DVD-support.patch \ | 70 | file://0006-Disable-DVD-support.patch \ |
73 | file://0005-Always-compile-libcpluff-as-PIC.patch \ | 71 | file://0007-Always-compile-libcpluff-as-PIC.patch \ |
74 | file://0006-build-Add-support-for-musl-triplets.patch \ | 72 | file://0008-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch \ |
73 | file://0009-build-Add-support-for-musl-triplets.patch \ | ||
74 | file://0010-RssReader-Fix-compiler-warning-comparing-pointer-to-.patch \ | ||
75 | " | 75 | " |
76 | 76 | ||
77 | SRC_URI_append_libc-musl = " \ | 77 | SRC_URI_append_libc-musl = " \ |
78 | file://0007-Remove-FILEWRAP.patch \ | 78 | file://0001-Fix-file_Emu-on-musl.patch \ |
79 | file://0008-Fix-file_Emu-on-musl.patch \ | 79 | file://0002-Remove-FILEWRAP.patch \ |
80 | " | 80 | " |
81 | 81 | ||
82 | inherit autotools-brokensep gettext pythonnative | 82 | inherit autotools-brokensep gettext pythonnative |
@@ -116,10 +116,12 @@ EXTRA_OECONF = " \ | |||
116 | --enable-texturepacker=no \ | 116 | --enable-texturepacker=no \ |
117 | " | 117 | " |
118 | 118 | ||
119 | FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations -fomit-frame-pointer -O4 -ffast-math" | 119 | FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations -fomit-frame-pointer -O3 -ffast-math" |
120 | FULL_OPTIMIZATION_armv7ve = "-fexpensive-optimizations -fomit-frame-pointer -O4 -ffast-math" | 120 | FULL_OPTIMIZATION_armv7ve = "-fexpensive-optimizations -fomit-frame-pointer -O3 -ffast-math" |
121 | BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}" | 121 | BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}" |
122 | 122 | ||
123 | EXTRA_OECONF_append = " LIBTOOL=${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool" | ||
124 | |||
123 | # for python modules | 125 | # for python modules |
124 | export HOST_SYS | 126 | export HOST_SYS |
125 | export BUILD_SYS | 127 | export BUILD_SYS |
@@ -185,3 +187,5 @@ RRECOMMENDS_${PN}_append_libc-glibc = " glibc-charmap-ibm850 \ | |||
185 | 187 | ||
186 | RPROVIDES_${PN} += "xbmc" | 188 | RPROVIDES_${PN} += "xbmc" |
187 | 189 | ||
190 | TOOLCHAIN = "gcc" | ||
191 | |||