summaryrefslogtreecommitdiffstats
path: root/meta-multimedia
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2016-11-01 09:14:19 -0700
committerMartin Jansa <Martin.Jansa@gmail.com>2017-02-06 16:48:12 +0100
commitab4369c5841e7f87bdc52aa8a67363c4e6524211 (patch)
treed807b43dc2ae43d8ef2a5d9a465252138a773d90 /meta-multimedia
parent5ecbf9bab404af0de7d0f058d1620f40dae0d2d8 (diff)
downloadmeta-openembedded-ab4369c5841e7f87bdc52aa8a67363c4e6524211.tar.gz
kodi: Add krypton/17.0 recipe
remove obsoleted xbmc recipes rename to recipes-mediacenter Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-multimedia')
-rw-r--r--meta-multimedia/recipes-mediacenter/kodi/jsonschemabuilder-native.bb24
-rw-r--r--meta-multimedia/recipes-mediacenter/kodi/kodi-17/0001-configure-don-t-try-to-run-stuff-to-find-tinyxml.patch25
-rw-r--r--meta-multimedia/recipes-mediacenter/kodi/kodi-17/0002-handle-SIGTERM.patch163
-rw-r--r--meta-multimedia/recipes-mediacenter/kodi/kodi-17/0003-add-support-to-read-frequency-output-if-using-intel-.patch26
-rw-r--r--meta-multimedia/recipes-mediacenter/kodi/kodi-17/0004-Disable-DVD-support.patch35
-rw-r--r--meta-multimedia/recipes-mediacenter/kodi/kodi-addon-pvr-hts/0001-Update-to-p8-platform.patch427
-rw-r--r--meta-multimedia/recipes-mediacenter/kodi/kodi-addon-pvr-hts_git.bb55
-rw-r--r--meta-multimedia/recipes-mediacenter/kodi/kodi-platform/0001-Fix-build-after-platform-rename.patch67
-rw-r--r--meta-multimedia/recipes-mediacenter/kodi/kodi-platform/0001-fix-cross-compile-badness.patch40
-rw-r--r--meta-multimedia/recipes-mediacenter/kodi/kodi-platform/kodi-platform-02_no-multi-lib.patch12
-rw-r--r--meta-multimedia/recipes-mediacenter/kodi/kodi-platform_git.bb39
-rw-r--r--meta-multimedia/recipes-mediacenter/kodi/kodi-startup.bb20
-rw-r--r--meta-multimedia/recipes-mediacenter/kodi/kodi-startup/kodi.service14
-rw-r--r--meta-multimedia/recipes-mediacenter/kodi/kodi_17.bb179
-rw-r--r--meta-multimedia/recipes-mediacentre/xbmc/xbmc/0001-configure-don-t-run-python-distutils-to-find-STAGING.patch31
-rw-r--r--meta-multimedia/recipes-mediacentre/xbmc/xbmc/0002-Revert-fixed-ios-Add-memory-barriers-to-atomic-Add-S.patch97
-rw-r--r--meta-multimedia/recipes-mediacentre/xbmc/xbmc/0003-Revert-fixed-ios-Add-memory-barriers-to-cas-assembly.patch69
-rw-r--r--meta-multimedia/recipes-mediacentre/xbmc/xbmc/0004-configure-cope-with-ld-is-gold-DISTRO_FEATURE.patch43
-rw-r--r--meta-multimedia/recipes-mediacentre/xbmc/xbmc/configure.in-Avoid-running-code.patch32
-rw-r--r--meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb97
20 files changed, 1126 insertions, 369 deletions
diff --git a/meta-multimedia/recipes-mediacenter/kodi/jsonschemabuilder-native.bb b/meta-multimedia/recipes-mediacenter/kodi/jsonschemabuilder-native.bb
new file mode 100644
index 000000000..094ccff98
--- /dev/null
+++ b/meta-multimedia/recipes-mediacenter/kodi/jsonschemabuilder-native.bb
@@ -0,0 +1,24 @@
1SUMMARY = "Kodi Media Center"
2
3LICENSE = "GPLv2+"
4LIC_FILES_CHKSUM = "file://JsonSchemaBuilder.cpp;beginline=2;endline=18;md5=1f67721215c03f66545390f6e45b99c7"
5
6SRCREV = "b587e98911fcedc4b800cd923a882c7aeeaa2146"
7
8PV = "16.0+gitr${SRCPV}"
9SRC_URI = "git://github.com/xbmc/xbmc.git;branch=Jarvis"
10
11inherit autotools-brokensep gettext native
12
13S = "${WORKDIR}/git/tools/depends/native/JsonSchemaBuilder/src"
14
15do_compile_prepend() {
16 for i in $(find . -name "Makefile") ; do
17 sed -i -e 's:I/usr/include:I${STAGING_INCDIR}:g' $i
18 done
19
20 for i in $(find . -name "*.mak*" -o -name "Makefile") ; do
21 sed -i -e 's:I/usr/include:I${STAGING_INCDIR}:g' -e 's:-rpath \$(libdir):-rpath ${libdir}:g' $i
22 done
23}
24
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/0001-configure-don-t-try-to-run-stuff-to-find-tinyxml.patch
new file mode 100644
index 000000000..b3780db89
--- /dev/null
+++ b/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0001-configure-don-t-try-to-run-stuff-to-find-tinyxml.patch
@@ -0,0 +1,25 @@
1From 53c7b1667a41b25775d1dc009d8ced61f383da0b Mon Sep 17 00:00:00 2001
2From: Koen Kooi <koen@dominion.thruhere.net>
3Date: Sat, 6 Feb 2016 15:43:01 +0100
4Subject: [PATCH 1/3] configure: don't try to run stuff to find tinyxml
5
6---
7 configure.ac | 2 +-
8 1 file changed, 1 insertion(+), 1 deletion(-)
9
10diff --git a/configure.ac b/configure.ac
11index 5a41fb4..243c7e5 100644
12--- a/configure.ac
13+++ b/configure.ac
14@@ -1043,7 +1043,7 @@ fi
15 AC_LANG_PUSH([C++])
16 PKG_CHECK_MODULES([TINYXML], [tinyxml >= 2.6.2],
17 [INCLUDES="$INCLUDES $TINYXML_CFLAGS"; LIBS="$LIBS $TINYXML_LIBS"],
18- [AC_RUN_IFELSE(
19+ [AC_COMPILE_IFELSE(
20 [AC_LANG_SOURCE([[
21 #include <stdlib.h>
22 #include <tinyxml.h>
23--
242.10.1
25
diff --git a/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0002-handle-SIGTERM.patch b/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0002-handle-SIGTERM.patch
new file mode 100644
index 000000000..b2af5deb2
--- /dev/null
+++ b/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0002-handle-SIGTERM.patch
@@ -0,0 +1,163 @@
1From 1c1484303a055bfde655ffae3829554aaefc2e07 Mon Sep 17 00:00:00 2001
2From: Stefan Saraev <stefan@saraev.ca>
3Date: Wed, 2 Nov 2016 11:28:34 -0700
4Subject: [PATCH 2/3] handle SIGTERM
5
60. CApplication::Stop cant be trusted. (deadlocks crashes and boo)
7
8so, when shutdown/reboot is requested:
9
101. save an exit code (for CEC...)
112. call CPowerManager::{Reboot,PowerDown}
123. ... then systemd sends TERM and waits xx seconds before sending KILL
134. CApplication::Stop has xx seconds to save guisettings.xml and boo
145. CEC thread has xx seconds to switch off after it received OnQuit
156. addons / pvrmanager / cec / everything else.. are free to deadlock / crash now, we dont care
167. KILL
17
18Signed-off-by: Stefan Saraev <stefan@saraev.ca>
19Signed-off-by: Khem Raj <raj.khem@gmail.com>
20---
21 xbmc/Application.cpp | 17 ++++++++++++-----
22 xbmc/Application.h | 1 +
23 xbmc/XBApplicationEx.cpp | 1 +
24 xbmc/XBApplicationEx.h | 1 +
25 xbmc/platform/posix/main.cpp | 15 +++++++++++++++
26 5 files changed, 30 insertions(+), 5 deletions(-)
27
28diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
29index 4c118e0..58b151a 100644
30--- a/xbmc/Application.cpp
31+++ b/xbmc/Application.cpp
32@@ -2428,12 +2428,12 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg)
33 switch (pMsg->dwMessage)
34 {
35 case TMSG_POWERDOWN:
36- Stop(EXITCODE_POWERDOWN);
37+ SetExitCode(EXITCODE_POWERDOWN);
38 g_powerManager.Powerdown();
39 break;
40
41 case TMSG_QUIT:
42- Stop(EXITCODE_QUIT);
43+ SetExitCode(EXITCODE_QUIT);
44 break;
45
46 case TMSG_SHUTDOWN:
47@@ -2454,12 +2454,13 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg)
48
49 case TMSG_RESTART:
50 case TMSG_RESET:
51- Stop(EXITCODE_REBOOT);
52+ SetExitCode(EXITCODE_REBOOT);
53 g_powerManager.Reboot();
54 break;
55
56 case TMSG_RESTARTAPP:
57 #if defined(TARGET_WINDOWS) || defined(TARGET_LINUX)
58+ SetExitCode(EXITCODE_RESTARTAPP);
59 Stop(EXITCODE_RESTARTAPP);
60 #endif
61 break;
62@@ -2883,6 +2884,13 @@ bool CApplication::Cleanup()
63 }
64 }
65
66+void CApplication::SetExitCode(int exitCode)
67+{
68+ // save it for CEC
69+ m_ExitCode = exitCode;
70+ m_ExitCodeSet = true;
71+}
72+
73 void CApplication::Stop(int exitCode)
74 {
75 try
76@@ -2890,7 +2898,7 @@ void CApplication::Stop(int exitCode)
77 m_frameMoveGuard.unlock();
78
79 CVariant vExitCode(CVariant::VariantTypeObject);
80- vExitCode["exitcode"] = exitCode;
81+ vExitCode["exitcode"] = m_ExitCode;
82 CAnnouncementManager::GetInstance().Announce(System, "xbmc", "OnQuit", vExitCode);
83
84 // Abort any active screensaver
85@@ -2924,7 +2932,6 @@ void CApplication::Stop(int exitCode)
86
87 m_bStop = true;
88 m_AppFocused = false;
89- m_ExitCode = exitCode;
90 CLog::Log(LOGNOTICE, "stop all");
91
92 // cancel any jobs from the jobmanager
93diff --git a/xbmc/Application.h b/xbmc/Application.h
94index 22aca81..9992677 100644
95--- a/xbmc/Application.h
96+++ b/xbmc/Application.h
97@@ -160,6 +160,7 @@ public:
98 void StopPVRManager();
99 void ReinitPVRManager();
100 bool IsCurrentThread() const;
101+ void SetExitCode(int exitCode);
102 void Stop(int exitCode);
103 void RestartApp();
104 void UnloadSkin(bool forReload = false);
105diff --git a/xbmc/XBApplicationEx.cpp b/xbmc/XBApplicationEx.cpp
106index 035aed2..34102f5 100644
107--- a/xbmc/XBApplicationEx.cpp
108+++ b/xbmc/XBApplicationEx.cpp
109@@ -46,6 +46,7 @@ CXBApplicationEx::CXBApplicationEx()
110 m_bStop = false;
111 m_AppFocused = true;
112 m_ExitCode = EXITCODE_QUIT;
113+ m_ExitCodeSet = false;
114 m_renderGUI = false;
115 }
116
117diff --git a/xbmc/XBApplicationEx.h b/xbmc/XBApplicationEx.h
118index 9bc14fa..f696b89 100644
119--- a/xbmc/XBApplicationEx.h
120+++ b/xbmc/XBApplicationEx.h
121@@ -42,6 +42,7 @@ public:
122 // Variables for timing
123 bool m_bStop;
124 int m_ExitCode;
125+ bool m_ExitCodeSet;
126 bool m_AppFocused;
127 bool m_renderGUI;
128
129diff --git a/xbmc/platform/posix/main.cpp b/xbmc/platform/posix/main.cpp
130index a8b64e5..3d80032 100644
131--- a/xbmc/platform/posix/main.cpp
132+++ b/xbmc/platform/posix/main.cpp
133@@ -41,12 +41,27 @@
134 #include "input/linux/LIRC.h"
135 #endif
136 #include "platform/XbmcContext.h"
137+#include "Application.h"
138+
139+void xbmc_term_handler(int signum)
140+{
141+ CLog::Log(LOGINFO, "Received SIGTERM...");
142+ if (!g_application.m_ExitCodeSet)
143+ g_application.SetExitCode(EXITCODE_RESTARTAPP);
144+ g_application.Stop(EXITCODE_RESTARTAPP);
145+}
146
147 #ifdef __cplusplus
148 extern "C"
149 #endif
150 int main(int argc, char* argv[])
151 {
152+ // SIGTERM handler
153+ struct sigaction action;
154+ memset(&action, 0, sizeof(struct sigaction));
155+ action.sa_handler = xbmc_term_handler;
156+ sigaction(SIGTERM, &action, NULL);
157+
158 // set up some xbmc specific relationships
159 XBMC::Context context;
160
161--
1622.10.1
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/0003-add-support-to-read-frequency-output-if-using-intel-.patch
new file mode 100644
index 000000000..d638550e9
--- /dev/null
+++ b/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0003-add-support-to-read-frequency-output-if-using-intel-.patch
@@ -0,0 +1,26 @@
1From 4ef1e9dab9193f1a5305d25c8eda97f8f06ea154 Mon Sep 17 00:00:00 2001
2From: Stephan Raue <stephan@openelec.tv>
3Date: Mon, 1 Sep 2014 03:16:37 +0200
4Subject: [PATCH 3/3] add support to read frequency output if using intel's
5 pstate driver
6
7---
8 xbmc/utils/CPUInfo.cpp | 2 ++
9 1 file changed, 2 insertions(+)
10
11diff --git a/xbmc/utils/CPUInfo.cpp b/xbmc/utils/CPUInfo.cpp
12index 5e2ebbd..fd04d5a 100644
13--- a/xbmc/utils/CPUInfo.cpp
14+++ b/xbmc/utils/CPUInfo.cpp
15@@ -274,6 +274,8 @@ CCPUInfo::CCPUInfo(void)
16 m_fProcTemperature = fopen("/sys/class/thermal/thermal_zone0/temp", "r"); // On Raspberry PIs
17
18 m_fCPUFreq = fopen ("/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq", "r");
19+ if (m_fCPUFreq == NULL)
20+ m_fCPUFreq = fopen ("/sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_cur_freq", "r");
21 if (!m_fCPUFreq)
22 {
23 m_cpuInfoForFreq = true;
24--
252.10.1
26
diff --git a/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0004-Disable-DVD-support.patch b/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0004-Disable-DVD-support.patch
new file mode 100644
index 000000000..6f5f9a232
--- /dev/null
+++ b/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0004-Disable-DVD-support.patch
@@ -0,0 +1,35 @@
1From 191cf3f084b4d34846711034a7fe3078f8243c82 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 2 Nov 2016 12:39:20 -0700
4Subject: [PATCH 4/4] Disable DVD support
5
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7---
8 Makefile.in | 4 +---
9 1 file changed, 1 insertion(+), 3 deletions(-)
10
11diff --git a/Makefile.in b/Makefile.in
12index 58b3a17..b7c3fce 100644
13--- a/Makefile.in
14+++ b/Makefile.in
15@@ -10,8 +10,7 @@ EC_DIRS= \
16 tools/EventClients
17
18 DVDPCODECS_DIRS= \
19- lib \
20- lib/libdvd
21+ lib
22
23 VideoPlayer_ARCHIVES=xbmc/cores/VideoPlayer/VideoPlayer.a \
24 xbmc/cores/VideoPlayer/DVDCodecs/DVDCodecs.a \
25@@ -343,7 +342,6 @@ libaddon: exports
26 $(MAKE) -C lib/addons/library.xbmc.pvr
27 $(MAKE) -C lib/addons/library.kodi.inputstream
28 dvdpcodecs: dllloader
29- $(MAKE) -C lib/libdvd
30
31 dvdpextcodecs:
32
33--
342.10.1
35
diff --git a/meta-multimedia/recipes-mediacenter/kodi/kodi-addon-pvr-hts/0001-Update-to-p8-platform.patch b/meta-multimedia/recipes-mediacenter/kodi/kodi-addon-pvr-hts/0001-Update-to-p8-platform.patch
new file mode 100644
index 000000000..c4a6ae731
--- /dev/null
+++ b/meta-multimedia/recipes-mediacenter/kodi/kodi-addon-pvr-hts/0001-Update-to-p8-platform.patch
@@ -0,0 +1,427 @@
1From 06a8224c99282ac1a606edd9e8ea3f591112942d Mon Sep 17 00:00:00 2001
2From: Koen Kooi <koen@dominion.thruhere.net>
3Date: Thu, 18 Feb 2016 14:04:31 +0100
4Subject: [PATCH] Update to p8-platform
5
6---
7 CMakeLists.txt | 6 +++---
8 pvr.hts/changelog.txt | 4 ++--
9 src/AutoRecordings.cpp | 2 +-
10 src/HTSPConnection.cpp | 8 +++----
11 src/HTSPDemuxer.cpp | 2 +-
12 src/HTSPVFS.cpp | 6 +++---
13 src/TimeRecordings.cpp | 2 +-
14 src/Tvheadend.cpp | 4 ++--
15 src/Tvheadend.h | 38 +++++++++++++++++-----------------
16 src/client.cpp | 4 ++--
17 src/client.h | 4 ++--
18 src/tvheadend/Subscription.cpp | 2 +-
19 src/tvheadend/Subscription.h | 4 ++--
20 src/tvheadend/utilities/AsyncState.cpp | 4 ++--
21 src/tvheadend/utilities/AsyncState.h | 6 +++---
22 15 files changed, 48 insertions(+), 48 deletions(-)
23
24diff --git a/CMakeLists.txt b/CMakeLists.txt
25index 0842682..cb04942 100644
26--- a/CMakeLists.txt
27+++ b/CMakeLists.txt
28@@ -6,10 +6,10 @@ enable_language(CXX)
29
30 find_package(kodi REQUIRED)
31 find_package(kodiplatform REQUIRED)
32-find_package(platform REQUIRED)
33+find_package(p8-platform REQUIRED)
34
35 include_directories(${kodiplatform_INCLUDE_DIRS}
36- ${platform_INCLUDE_DIRS}
37+ ${p8-platform_INCLUDE_DIRS}
38 ${KODI_INCLUDE_DIR}
39 ${PROJECT_SOURCE_DIR}/lib)
40
41@@ -95,7 +95,7 @@ list(APPEND HTS_SOURCES
42
43 add_subdirectory(lib/libhts)
44
45-set(DEPLIBS ${platform_LIBRARIES} hts)
46+set(DEPLIBS ${p8-platform_LIBRARIES} hts)
47 if(WIN32)
48 list(APPEND DEPLIBS ws2_32)
49 endif()
50diff --git a/pvr.hts/changelog.txt b/pvr.hts/changelog.txt
51index 9ffa33c..1e7fe30 100644
52--- a/pvr.hts/changelog.txt
53+++ b/pvr.hts/changelog.txt
54@@ -49,7 +49,7 @@
55 - fixed: Autorec: Start and stop time handling.
56 - fixed: LocaltimeToUTC conversion (timer settings clock display incorrect).
57 - fixed: Several issues with predictive tuning.
58-- added: build: Automatically fill in platform and library name.
59+- added: build: Automatically fill in p8-platform and library name.
60 - fixed: Use epg data only for creation of epg-based timers.
61 - improved: Do not try to reconnect to tvh while suspending or not fully awake again.
62
63@@ -97,7 +97,7 @@
64 - added: support for creating repeating timers, aka time schedules
65 - fixed: conditions for addon restart after settings changes
66 - internal: fixed build system regressions introduced with move to cmake
67-- internal: updated to use libplatform
68+- internal: updated to use libp8-platform
69
70 2.1.7
71 - added: support for radio channel groups
72diff --git a/src/AutoRecordings.cpp b/src/AutoRecordings.cpp
73index 5fa60a0..d9e5e1d 100644
74--- a/src/AutoRecordings.cpp
75+++ b/src/AutoRecordings.cpp
76@@ -26,7 +26,7 @@
77 #include "tvheadend/utilities/Utilities.h"
78 #include "tvheadend/utilities/Logger.h"
79
80-using namespace PLATFORM;
81+using namespace P8PLATFORM;
82 using namespace tvheadend;
83 using namespace tvheadend::entity;
84 using namespace tvheadend::utilities;
85diff --git a/src/HTSPConnection.cpp b/src/HTSPConnection.cpp
86index aec1296..86f5004 100644
87--- a/src/HTSPConnection.cpp
88+++ b/src/HTSPConnection.cpp
89@@ -19,9 +19,9 @@
90 *
91 */
92
93-#include "platform/threads/mutex.h"
94-#include "platform/util/StringUtils.h"
95-#include "platform/sockets/tcp.h"
96+#include "p8-platform/threads/mutex.h"
97+#include "p8-platform/util/StringUtils.h"
98+#include "p8-platform/sockets/tcp.h"
99
100 extern "C" {
101 #include "libhts/htsmsg_binary.h"
102@@ -33,7 +33,7 @@ extern "C" {
103
104 using namespace std;
105 using namespace ADDON;
106-using namespace PLATFORM;
107+using namespace P8PLATFORM;
108 using namespace tvheadend;
109 using namespace tvheadend::utilities;
110
111diff --git a/src/HTSPDemuxer.cpp b/src/HTSPDemuxer.cpp
112index a6e1f12..7f45345 100644
113--- a/src/HTSPDemuxer.cpp
114+++ b/src/HTSPDemuxer.cpp
115@@ -27,7 +27,7 @@
116
117 using namespace std;
118 using namespace ADDON;
119-using namespace PLATFORM;
120+using namespace P8PLATFORM;
121 using namespace tvheadend;
122 using namespace tvheadend::utilities;
123
124diff --git a/src/HTSPVFS.cpp b/src/HTSPVFS.cpp
125index 0463f56..0404bab 100644
126--- a/src/HTSPVFS.cpp
127+++ b/src/HTSPVFS.cpp
128@@ -19,8 +19,8 @@
129 *
130 */
131
132-#include "platform/threads/mutex.h"
133-#include "platform/util/StringUtils.h"
134+#include "p8-platform/threads/mutex.h"
135+#include "p8-platform/util/StringUtils.h"
136 #include "tvheadend/utilities/Logger.h"
137
138 extern "C" {
139@@ -30,7 +30,7 @@ extern "C" {
140 #include "Tvheadend.h"
141
142 using namespace std;
143-using namespace PLATFORM;
144+using namespace P8PLATFORM;
145 using namespace tvheadend::utilities;
146
147 /*
148diff --git a/src/TimeRecordings.cpp b/src/TimeRecordings.cpp
149index 5d34938..97aae09 100644
150--- a/src/TimeRecordings.cpp
151+++ b/src/TimeRecordings.cpp
152@@ -25,7 +25,7 @@
153 #include "tvheadend/utilities/Utilities.h"
154 #include "tvheadend/utilities/Logger.h"
155
156-using namespace PLATFORM;
157+using namespace P8PLATFORM;
158 using namespace tvheadend;
159 using namespace tvheadend::entity;
160 using namespace tvheadend::utilities;
161diff --git a/src/Tvheadend.cpp b/src/Tvheadend.cpp
162index 2057241..14c3bd4 100644
163--- a/src/Tvheadend.cpp
164+++ b/src/Tvheadend.cpp
165@@ -23,7 +23,7 @@
166 #include <ctime>
167 #include <memory>
168
169-#include "platform/util/StringUtils.h"
170+#include "p8-platform/util/StringUtils.h"
171
172 #include "Tvheadend.h"
173 #include "tvheadend/utilities/Utilities.h"
174@@ -31,7 +31,7 @@
175
176 using namespace std;
177 using namespace ADDON;
178-using namespace PLATFORM;
179+using namespace P8PLATFORM;
180 using namespace tvheadend;
181 using namespace tvheadend::entity;
182 using namespace tvheadend::utilities;
183diff --git a/src/Tvheadend.h b/src/Tvheadend.h
184index 2ce4552..e794716 100644
185--- a/src/Tvheadend.h
186+++ b/src/Tvheadend.h
187@@ -22,10 +22,10 @@
188 */
189
190 #include "client.h"
191-#include "platform/sockets/tcp.h"
192-#include "platform/threads/threads.h"
193-#include "platform/threads/mutex.h"
194-#include "platform/util/buffer.h"
195+#include "p8-platform/sockets/tcp.h"
196+#include "p8-platform/threads/threads.h"
197+#include "p8-platform/threads/mutex.h"
198+#include "p8-platform/util/buffer.h"
199 #include "kodi/xbmc_codec_types.h"
200 #include "kodi/xbmc_stream_utils.hpp"
201 #include "kodi/libXBMC_addon.h"
202@@ -88,7 +88,7 @@ class CHTSPMessage;
203
204 /* Typedefs */
205 typedef std::map<uint32_t,CHTSPResponse*> CHTSPResponseList;
206-typedef PLATFORM::SyncedBuffer<CHTSPMessage> CHTSPMessageQueue;
207+typedef P8PLATFORM::SyncedBuffer<CHTSPMessage> CHTSPMessageQueue;
208
209 /*
210 * HTSP Response handler
211@@ -98,10 +98,10 @@ class CHTSPResponse
212 public:
213 CHTSPResponse();
214 ~CHTSPResponse();
215- htsmsg_t *Get ( PLATFORM::CMutex &mutex, uint32_t timeout );
216+ htsmsg_t *Get ( P8PLATFORM::CMutex &mutex, uint32_t timeout );
217 void Set ( htsmsg_t *m );
218 private:
219- PLATFORM::CCondition<volatile bool> m_cond;
220+ P8PLATFORM::CCondition<volatile bool> m_cond;
221 bool m_flag;
222 htsmsg_t *m_msg;
223 };
224@@ -146,7 +146,7 @@ public:
225 * HTSP Connection registration thread
226 */
227 class CHTSPRegister
228- : public PLATFORM::CThread
229+ : public P8PLATFORM::CThread
230 {
231 friend class CHTSPConnection;
232
233@@ -163,7 +163,7 @@ private:
234 * HTSP Connection
235 */
236 class CHTSPConnection
237- : public PLATFORM::CThread
238+ : public P8PLATFORM::CThread
239 {
240 friend class CHTSPRegister;
241
242@@ -190,7 +190,7 @@ public:
243 inline bool IsConnected ( void ) const { return m_ready; }
244 bool WaitForConnection ( void );
245
246- inline PLATFORM::CMutex& Mutex ( void ) { return m_mutex; }
247+ inline P8PLATFORM::CMutex& Mutex ( void ) { return m_mutex; }
248
249 void OnSleep ( void );
250 void OnWake ( void );
251@@ -202,10 +202,10 @@ private:
252 bool SendHello ( void );
253 bool SendAuth ( const std::string &u, const std::string &p );
254
255- PLATFORM::CTcpSocket *m_socket;
256- PLATFORM::CMutex m_mutex;
257+ P8PLATFORM::CTcpSocket *m_socket;
258+ P8PLATFORM::CMutex m_mutex;
259 CHTSPRegister m_regThread;
260- PLATFORM::CCondition<volatile bool> m_regCond;
261+ P8PLATFORM::CCondition<volatile bool> m_regCond;
262 bool m_ready;
263 uint32_t m_seq;
264 std::string m_serverName;
265@@ -273,13 +273,13 @@ public:
266 void SetStreamingProfile(const std::string &profile);
267
268 private:
269- PLATFORM::CMutex m_mutex;
270+ P8PLATFORM::CMutex m_mutex;
271 CHTSPConnection &m_conn;
272- PLATFORM::SyncedBuffer<DemuxPacket*> m_pktBuffer;
273+ P8PLATFORM::SyncedBuffer<DemuxPacket*> m_pktBuffer;
274 ADDON::XbmcStreamProperties m_streams;
275 std::map<int,int> m_streamStat;
276 int64_t m_seekTime;
277- PLATFORM::CCondition<volatile int64_t> m_seekCond;
278+ P8PLATFORM::CCondition<volatile int64_t> m_seekCond;
279 bool m_seeking;
280 bool m_speedChange;
281 tvheadend::status::SourceInfo m_sourceInfo;
282@@ -350,7 +350,7 @@ private:
283 * Root object for Tvheadend connection
284 */
285 class CTvheadend
286- : public PLATFORM::CThread
287+ : public P8PLATFORM::CThread
288 {
289 public:
290 CTvheadend();
291@@ -422,7 +422,7 @@ private:
292 */
293 tvheadend::Profiles m_profiles;
294
295- PLATFORM::CMutex m_mutex;
296+ P8PLATFORM::CMutex m_mutex;
297
298 CHTSPConnection m_conn;
299
300@@ -519,7 +519,7 @@ public:
301 */
302 bool WaitForConnection ( void )
303 {
304- PLATFORM::CLockObject lock(m_conn.Mutex());
305+ P8PLATFORM::CLockObject lock(m_conn.Mutex());
306 return m_conn.WaitForConnection();
307 }
308 std::string GetServerName ( void )
309diff --git a/src/client.cpp b/src/client.cpp
310index 94d2db9..3295914 100644
311--- a/src/client.cpp
312+++ b/src/client.cpp
313@@ -22,14 +22,14 @@
314 #include "client.h"
315 #include "kodi/xbmc_pvr_dll.h"
316 #include "kodi/libKODI_guilib.h"
317-#include "platform/util/util.h"
318+#include "p8-platform/util/util.h"
319 #include "Tvheadend.h"
320 #include "tvheadend/Settings.h"
321 #include "tvheadend/utilities/Logger.h"
322
323 using namespace std;
324 using namespace ADDON;
325-using namespace PLATFORM;
326+using namespace P8PLATFORM;
327 using namespace tvheadend;
328 using namespace tvheadend::utilities;
329
330diff --git a/src/client.h b/src/client.h
331index 3a5f950..a10659b 100644
332--- a/src/client.h
333+++ b/src/client.h
334@@ -20,8 +20,8 @@
335 *
336 */
337
338-#include "platform/os.h"
339-#include "platform/threads/mutex.h"
340+#include "p8-platform/os.h"
341+#include "p8-platform/threads/mutex.h"
342 #include "kodi/libXBMC_addon.h"
343 #include "kodi/libXBMC_pvr.h"
344 #include "kodi/libXBMC_codec.h"
345diff --git a/src/tvheadend/Subscription.cpp b/src/tvheadend/Subscription.cpp
346index 182ca7f..e18af1e 100644
347--- a/src/tvheadend/Subscription.cpp
348+++ b/src/tvheadend/Subscription.cpp
349@@ -23,7 +23,7 @@
350 #include "utilities/Logger.h"
351 #include "../Tvheadend.h"
352
353-using namespace PLATFORM;
354+using namespace P8PLATFORM;
355 using namespace tvheadend;
356 using namespace tvheadend::utilities;
357
358diff --git a/src/tvheadend/Subscription.h b/src/tvheadend/Subscription.h
359index b03bcce..363e5ef 100644
360--- a/src/tvheadend/Subscription.h
361+++ b/src/tvheadend/Subscription.h
362@@ -22,7 +22,7 @@
363 */
364
365 #include <string>
366-#include "platform/threads/mutex.h"
367+#include "p8-platform/threads/mutex.h"
368
369 extern "C"
370 {
371@@ -146,6 +146,6 @@ namespace tvheadend
372 std::string m_profile;
373 CHTSPConnection &m_conn;
374
375- mutable PLATFORM::CMutex m_mutex;
376+ mutable P8PLATFORM::CMutex m_mutex;
377 };
378 }
379diff --git a/src/tvheadend/utilities/AsyncState.cpp b/src/tvheadend/utilities/AsyncState.cpp
380index 0c30a93..1f4fdf3 100644
381--- a/src/tvheadend/utilities/AsyncState.cpp
382+++ b/src/tvheadend/utilities/AsyncState.cpp
383@@ -22,7 +22,7 @@
384 #include "AsyncState.h"
385
386 using namespace tvheadend::utilities;
387-using namespace PLATFORM;
388+using namespace P8PLATFORM;
389
390 struct Param {
391 eAsyncState state;
392@@ -37,7 +37,7 @@ AsyncState::AsyncState(int timeout)
393
394 eAsyncState AsyncState::GetState()
395 {
396- PLATFORM::CLockObject lock(m_mutex);
397+ P8PLATFORM::CLockObject lock(m_mutex);
398 return m_state;
399 }
400
401diff --git a/src/tvheadend/utilities/AsyncState.h b/src/tvheadend/utilities/AsyncState.h
402index 1d672da..0819cd8 100644
403--- a/src/tvheadend/utilities/AsyncState.h
404+++ b/src/tvheadend/utilities/AsyncState.h
405@@ -22,7 +22,7 @@
406 #ifndef ASYNCSTATE_H
407 #define ASYNCSTATE_H
408
409-#include "platform/threads/mutex.h"
410+#include "p8-platform/threads/mutex.h"
411
412 namespace tvheadend {
413 namespace utilities {
414@@ -75,8 +75,8 @@ namespace tvheadend {
415 static bool PredicateCallback ( void *param );
416
417 eAsyncState m_state;
418- PLATFORM::CMutex m_mutex;
419- PLATFORM::CCondition<bool> m_condition;
420+ P8PLATFORM::CMutex m_mutex;
421+ P8PLATFORM::CCondition<bool> m_condition;
422 int m_timeout;
423
424 };
425--
4262.0.1
427
diff --git a/meta-multimedia/recipes-mediacenter/kodi/kodi-addon-pvr-hts_git.bb b/meta-multimedia/recipes-mediacenter/kodi/kodi-addon-pvr-hts_git.bb
new file mode 100644
index 000000000..1f33a8a39
--- /dev/null
+++ b/meta-multimedia/recipes-mediacenter/kodi/kodi-addon-pvr-hts_git.bb
@@ -0,0 +1,55 @@
1SUMMARY = "Kodi Media Center PVR plugins"
2
3LICENSE = "GPLv2+"
4LIC_FILES_CHKSUM = "file://src/client.cpp;md5=c8f6b73c5bc1048a3d6506700a7a91d2"
5
6DEPENDS = " \
7 zip-native \
8 p8platform \
9 kodi-platform \
10 "
11
12SRCREV_pvrhts = "7f75b70527922aef953123ff97ebaa22d9fb7cb4"
13
14SRCREV_FORMAT = "pvrhts"
15
16PV = "2.2.13+gitr${SRCPV}"
17SRC_URI = "git://github.com/kodi-pvr/pvr.hts.git;branch=Jarvis;destsuffix=pvr.hts;name=pvrhts \
18 file://0001-Update-to-p8-platform.patch \
19 "
20
21inherit cmake pkgconfig gettext
22
23S = "${WORKDIR}/pvr.hts"
24
25EXTRA_OECMAKE = " \
26 -DADDONS_TO_BUILD=pvr.hts \
27 -DADDON_SRC_PREFIX=${WORKDIR}/git \
28 -DCMAKE_BUILD_TYPE=Debug \
29 -DCMAKE_INSTALL_PREFIX=${datadir}/kodi/addons \
30 -DCMAKE_MODULE_PATH=${STAGING_DIR_HOST}${libdir}/kodi \
31 -DCMAKE_PREFIX_PATH=${STAGING_DIR_HOST}${prefix} \
32 -DPACKAGE_ZIP=1 \
33 "
34
35do_compile_prepend() {
36 sed -i -e 's:I/usr/include:I${STAGING_INCDIR}:g' \
37 -e 's:-pipe:${HOST_CC_ARCH} ${TOOLCHAIN_OPTIONS} -pipe:g' \
38 ${B}/CMakeFiles/*/flags.make
39 sed -i -e 's:-pipe:${HOST_CC_ARCH} ${TOOLCHAIN_OPTIONS} -pipe:g'\
40 ${B}/CMakeFiles/*/link.txt
41}
42
43# Make zip package for manual installation
44do_install_append() {
45 install -d ${D}${datadir}/kodi/addons/packages/
46 ( cd ${D}${datadir}/kodi/addons
47 zip -r ${D}${datadir}/kodi/addons/packages/pvr.hts-${PV}.zip pvr.hts -x '*.debug*' )
48}
49
50# Doesn't get added automagically, dlopen()?
51RDEPENDS_${PN} = "libkodiplatform"
52
53INSANE_SKIP_${PN} = "dev-so"
54FILES_${PN} += "${datadir}/kodi"
55FILES_${PN}-dbg += "${datadir}/kodi/addons/*/.debug/"
diff --git a/meta-multimedia/recipes-mediacenter/kodi/kodi-platform/0001-Fix-build-after-platform-rename.patch b/meta-multimedia/recipes-mediacenter/kodi/kodi-platform/0001-Fix-build-after-platform-rename.patch
new file mode 100644
index 000000000..35e51342f
--- /dev/null
+++ b/meta-multimedia/recipes-mediacenter/kodi/kodi-platform/0001-Fix-build-after-platform-rename.patch
@@ -0,0 +1,67 @@
1From 7cf366faa7a24c7146c745c8cd8dc3ae3d1cabea Mon Sep 17 00:00:00 2001
2From: Garrett Brown <themagnificentmrb@gmail.com>
3Date: Thu, 7 Jan 2016 15:55:22 -0800
4Subject: [PATCH] Fix build after platform rename
5
6update source code to use renamed platform pkg
7---
8 CMakeLists.txt | 6 +++---
9 debian/control | 2 +-
10 src/util/XMLUtils.h | 2 +-
11 3 files changed, 5 insertions(+), 5 deletions(-)
12
13diff --git a/CMakeLists.txt b/CMakeLists.txt
14index 2ce8c0d..bf6b659 100644
15--- a/CMakeLists.txt
16+++ b/CMakeLists.txt
17@@ -8,7 +8,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR})
18 find_package(kodi REQUIRED)
19 find_package(TinyXML REQUIRED)
20 find_package(Threads REQUIRED)
21-find_package(platform REQUIRED)
22+find_package(p8-platform REQUIRED)
23 include(UseMultiArch.cmake)
24 include(CheckAtomic.cmake)
25
26@@ -36,10 +36,10 @@ endif()
27
28 set(SOURCES src/util/XMLUtils.cpp)
29
30-include_directories(${TINYXML_INCLUDE_DIR} ${KODI_INCLUDE_DIR} ${platform_INCLUDE_DIRS})
31+include_directories(${TINYXML_INCLUDE_DIR} ${KODI_INCLUDE_DIR} ${p8-platform_INCLUDE_DIRS})
32
33 add_library(kodiplatform ${SOURCES} ${PLAT_SOURCES})
34-target_link_libraries(kodiplatform ${kodiplatform_LIBRARIES} ${platform_LIBRARIES})
35+target_link_libraries(kodiplatform ${kodiplatform_LIBRARIES} ${p8-platform_LIBRARIES})
36 set_target_properties(kodiplatform PROPERTIES VERSION ${kodiplatform_VERSION_MAJOR}.${kodiplatform_VERSION_MINOR}.${kodiplatform_VERSION_PATCH}
37 SOVERSION ${kodiplatform_VERSION_MAJOR}.0)
38
39diff --git a/debian/control b/debian/control
40index 42cadb2..e40c982 100644
41--- a/debian/control
42+++ b/debian/control
43@@ -1,7 +1,7 @@
44 Source: kodiplatform
45 Priority: extra
46 Maintainer: Arne Morten Kvarving <arne.morten.kvarving@sintef.no>
47-Build-Depends: debhelper (>= 8.0.0), cmake, libtinyxml-dev, kodi-addon-dev, libplatform-dev
48+Build-Depends: debhelper (>= 8.0.0), cmake, libtinyxml-dev, kodi-addon-dev, libp8-platform-dev
49 Standards-Version: 3.9.2
50 Section: libs
51
52diff --git a/src/util/XMLUtils.h b/src/util/XMLUtils.h
53index f22fd07..a10d831 100644
54--- a/src/util/XMLUtils.h
55+++ b/src/util/XMLUtils.h
56@@ -21,7 +21,7 @@
57 *
58 */
59
60-#include <platform/util/StdString.h>
61+#include <p8-platform/util/StdString.h>
62 #include "tinyxml.h"
63
64 class XMLUtils
65--
662.0.1
67
diff --git a/meta-multimedia/recipes-mediacenter/kodi/kodi-platform/0001-fix-cross-compile-badness.patch b/meta-multimedia/recipes-mediacenter/kodi/kodi-platform/0001-fix-cross-compile-badness.patch
new file mode 100644
index 000000000..27e9d217c
--- /dev/null
+++ b/meta-multimedia/recipes-mediacenter/kodi/kodi-platform/0001-fix-cross-compile-badness.patch
@@ -0,0 +1,40 @@
1From 3136317f096ea7fda4fb907e775a01952c4aae3d Mon Sep 17 00:00:00 2001
2From: Stefan Saraev <stefan@saraev.ca>
3Date: Fri, 19 Feb 2016 10:33:00 +0100
4Subject: [PATCH] fix cross compile badness
5
6From https://github.com/OpenELEC/OpenELEC.tv/blob/master/packages/mediacenter/kodi-platform/patches/kodi-platform-01_crosscompile-badness.patch
7---
8 CMakeLists.txt | 2 +-
9 kodiplatform-config.cmake.in | 2 +-
10 2 files changed, 2 insertions(+), 2 deletions(-)
11
12diff --git a/CMakeLists.txt b/CMakeLists.txt
13index bf6b659..9abe773 100644
14--- a/CMakeLists.txt
15+++ b/CMakeLists.txt
16@@ -22,7 +22,7 @@ if(NOT WIN32)
17 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
18 endif()
19
20-set(kodiplatform_INCLUDE_DIRS ${TINYXML_INCLUDE_DIR} "${CMAKE_INSTALL_PREFIX}/include/kodi")
21+set(kodiplatform_INCLUDE_DIRS ${TINYXML_INCLUDE_DIR} "${CMAKE_INSTALL_PREFIX_TOOLCHAIN}/include/kodi")
22 IF(WIN32)
23 LIST(APPEND kodiplatform_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/include/kodi/windows")
24 ENDIF(WIN32)
25diff --git a/kodiplatform-config.cmake.in b/kodiplatform-config.cmake.in
26index 3fc5273..60bdf1b 100644
27--- a/kodiplatform-config.cmake.in
28+++ b/kodiplatform-config.cmake.in
29@@ -10,7 +10,7 @@
30 #
31 # propagate these properties from one build system to the other
32 set (kodiplatform_VERSION "@kodiplatform_VERSION_MAJOR@.@kodiplatform_VERSION_MINOR@")
33-set (kodiplatform_INCLUDE_DIRS @kodiplatform_INCLUDE_DIRS@ @CMAKE_INSTALL_PREFIX@/include)
34+set (kodiplatform_INCLUDE_DIRS @kodiplatform_INCLUDE_DIRS@ @CMAKE_INSTALL_PREFIX_TOOLCHAIN@/include)
35 set (kodiplatform_LIBRARY_DIRS "@CMAKE_LIBRARY_OUTPUT_DIRECTORY@")
36 set (kodiplatform_LINKER_FLAGS "@kodiplatform_LINKER_FLAGS@")
37 set (kodiplatform_CONFIG_VARS "@kodiplatform_CONFIG_VARS@")
38--
392.0.1
40
diff --git a/meta-multimedia/recipes-mediacenter/kodi/kodi-platform/kodi-platform-02_no-multi-lib.patch b/meta-multimedia/recipes-mediacenter/kodi/kodi-platform/kodi-platform-02_no-multi-lib.patch
new file mode 100644
index 000000000..a13c53be1
--- /dev/null
+++ b/meta-multimedia/recipes-mediacenter/kodi/kodi-platform/kodi-platform-02_no-multi-lib.patch
@@ -0,0 +1,12 @@
1diff --git a/CMakeLists.txt b/CMakeLists.txt
2index 9abe773..ae433fc 100644
3--- a/CMakeLists.txt
4+++ b/CMakeLists.txt
5@@ -9,7 +9,6 @@ find_package(kodi REQUIRED)
6 find_package(TinyXML REQUIRED)
7 find_package(Threads REQUIRED)
8 find_package(p8-platform REQUIRED)
9-include(UseMultiArch.cmake)
10 include(CheckAtomic.cmake)
11
12 set(kodiplatform_NAME kodiplatform)
diff --git a/meta-multimedia/recipes-mediacenter/kodi/kodi-platform_git.bb b/meta-multimedia/recipes-mediacenter/kodi/kodi-platform_git.bb
new file mode 100644
index 000000000..50774544b
--- /dev/null
+++ b/meta-multimedia/recipes-mediacenter/kodi/kodi-platform_git.bb
@@ -0,0 +1,39 @@
1SUMMARY = "Platform support library used by libCEC and binary add-ons for Kodi"
2HOMEPAGE = "http://libcec.pulse-eight.com/"
3
4LICENSE = "GPLv2+"
5LIC_FILES_CHKSUM = "file://src/util/XMLUtils.cpp;beginline=2;endline=18;md5=dae8e846500e70dd8ecee55f3f018c30"
6
7DEPENDS = "libtinyxml kodi"
8
9PV = "16.0.0"
10
11SRCREV = "15edaf78d6307eaa5e1d17028122d8bce9d55aa2"
12SRC_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 \
15 file://kodi-platform-02_no-multi-lib.patch \
16 "
17
18S = "${WORKDIR}/git"
19
20inherit cmake pkgconfig
21
22EXTRA_OECMAKE = " -DCMAKE_INSTALL_PREFIX_TOOLCHAIN=${STAGING_DIR_TARGET} \
23 -DCMAKE_INSTALL_LIBDIR=${libdir} \
24 -DCMAKE_INSTALL_LIBDIR_NOARCH=${libdir} \
25 -DKODI_INCLUDE_DIR=${STAGING_LIBDIR}/kodi \
26 -DKODI_INCLUDE_DIR=${STAGING_INCDIR}/kodi \
27 "
28
29do_compile_prepend() {
30 sed -i -e 's:I/usr/include:I${STAGING_INCDIR}:g' \
31 -e 's:-pipe:${HOST_CC_ARCH} ${TOOLCHAIN_OPTIONS} -pipe:g' \
32 ${B}/CMakeFiles/kodiplatform.dir/flags.make
33 sed -i -e 's:-pipe:${HOST_CC_ARCH} ${TOOLCHAIN_OPTIONS} -pipe:g'\
34 ${B}/CMakeFiles/kodiplatform.dir/link.txt
35}
36
37RPROVIDES_${PN} += "libkodiplatform"
38FILES_${PN}-dev += "${libdir}/*platform"
39
diff --git a/meta-multimedia/recipes-mediacenter/kodi/kodi-startup.bb b/meta-multimedia/recipes-mediacenter/kodi/kodi-startup.bb
new file mode 100644
index 000000000..955d02bf7
--- /dev/null
+++ b/meta-multimedia/recipes-mediacenter/kodi/kodi-startup.bb
@@ -0,0 +1,20 @@
1SUMMARY = "Systemd service for kodi startup"
2
3LICENSE = "MIT"
4LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690"
5
6PV = "1.0"
7
8SRC_URI = "file://kodi.service"
9
10inherit systemd
11
12do_install() {
13 install -d ${D}/lib/systemd/system
14 install -m 0644 ${WORKDIR}/kodi.service ${D}/lib/systemd/system/
15}
16
17SYSTEMD_PACKAGES = "${PN}"
18SYSTEMD_SERVICE_${PN} = "kodi.service"
19
20RDEPENDS_${PN} += "xinit kodi"
diff --git a/meta-multimedia/recipes-mediacenter/kodi/kodi-startup/kodi.service b/meta-multimedia/recipes-mediacenter/kodi/kodi-startup/kodi.service
new file mode 100644
index 000000000..29d0394e4
--- /dev/null
+++ b/meta-multimedia/recipes-mediacenter/kodi/kodi-startup/kodi.service
@@ -0,0 +1,14 @@
1[Unit]
2Description=Kodi media thing
3
4[Service]
5User=root
6Type=simple
7SuccessExitStatus=0 1
8IOSchedulingClass=realtime
9IOSchedulingPriority=0
10
11ExecStart=/usr/bin/xinit /usr/bin/kodi-standalone -- /usr/bin/X :0
12
13[Install]
14WantedBy=basic.target
diff --git a/meta-multimedia/recipes-mediacenter/kodi/kodi_17.bb b/meta-multimedia/recipes-mediacenter/kodi/kodi_17.bb
new file mode 100644
index 000000000..c9de5920d
--- /dev/null
+++ b/meta-multimedia/recipes-mediacenter/kodi/kodi_17.bb
@@ -0,0 +1,179 @@
1SUMMARY = "Kodi Media Center"
2
3LICENSE = "GPLv2"
4LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=930e2a5f63425d8dd72dbd7391c43c46"
5
6DEFAULT_PREFERENCE = "-1"
7
8FILESPATH =. "${FILE_DIRNAME}/kodi-17:"
9
10DEPENDS = " \
11 cmake-native \
12 curl-native \
13 gperf-native \
14 jsonschemabuilder-native \
15 nasm-native \
16 swig-native \
17 yasm-native \
18 zip-native \
19 avahi \
20 boost \
21 bzip2 \
22 curl \
23 dcadec \
24 enca \
25 expat \
26 faad2 \
27 ffmpeg \
28 fontconfig \
29 fribidi \
30 giflib \
31 jasper \
32 libass \
33 libcdio \
34 libcec \
35 libmad \
36 libmicrohttpd \
37 libmms \
38 libmms \
39 libmodplug \
40 libpcre \
41 libplist \
42 libsamplerate0 \
43 libsdl-image \
44 libsdl-mixer \
45 libsquish \
46 libssh \
47 libtinyxml \
48 libusb1 \
49 libxslt \
50 lzo \
51 mpeg2dec \
52 python \
53 samba \
54 sqlite3 \
55 taglib \
56 virtual/egl \
57 virtual/libsdl \
58 wavpack \
59 yajl \
60 zlib \
61 ${@enable_glew(bb, d)} \
62 "
63
64PROVIDES = "xbmc"
65
66SRCREV = "32c7788e7cce711be5b7f3893c82dddd79658268"
67PV = "17.0+gitr${SRCPV}"
68SRC_URI = "git://github.com/xbmc/xbmc.git;branch=master \
69 file://0001-configure-don-t-try-to-run-stuff-to-find-tinyxml.patch \
70 file://0002-handle-SIGTERM.patch \
71 file://0003-add-support-to-read-frequency-output-if-using-intel-.patch \
72 file://0004-Disable-DVD-support.patch \
73"
74
75inherit autotools-brokensep gettext pythonnative
76
77S = "${WORKDIR}/git"
78
79# breaks compilation
80ASNEEDED = ""
81
82ACCEL ?= ""
83ACCEL_x86 = "vaapi vdpau"
84ACCEL_x86-64 = "vaapi vdpau"
85
86PACKAGECONFIG ??= "${ACCEL}"
87PACKAGECONFIG_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'x11', ' x11', '', d)}"
88PACKAGECONFIG_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', ' opengl', ' openglesv2', d)}"
89
90PACKAGECONFIG[opengl] = "--enable-gl,--enable-gles,"
91PACKAGECONFIG[openglesv2] = "--enable-gles,--enable-gl,virtual/egl"
92PACKAGECONFIG[vaapi] = "--enable-vaapi,--disable-vaapi,libva"
93PACKAGECONFIG[vdpau] = "--enable-vdpau,--disable-vdpau,libvdpau"
94PACKAGECONFIG[mysql] = "--enable-mysql,--disable-mysql,mysql5"
95PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,libxinerama libxmu libxrandr libxtst"
96PACKAGECONFIG[pulseaudio] = "--enable-pulse,--disable-pulse,pulseaudio"
97
98EXTRA_OECONF = " \
99 --disable-debug \
100 --disable-libcap \
101 --disable-ccache \
102 --disable-mid \
103 --enable-libusb \
104 --enable-alsa \
105 --enable-airplay \
106 --disable-optical-drive \
107 --with-ffmpeg=shared \
108 --enable-texturepacker=no \
109"
110
111FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations -fomit-frame-pointer -O4 -ffast-math"
112FULL_OPTIMIZATION_armv7ve = "-fexpensive-optimizations -fomit-frame-pointer -O4 -ffast-math"
113BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}"
114
115# for python modules
116export HOST_SYS
117export BUILD_SYS
118export STAGING_LIBDIR
119export STAGING_INCDIR
120export PYTHON_DIR
121
122def enable_glew(bb, d):
123 if bb.utils.contains('PACKAGECONFIG', 'x11', True, False, d) and bb.utils.contains('DISTRO_FEATURES', 'opengl', True, False, d):
124 return "glew"
125 return ""
126
127do_configure() {
128 ( for i in $(find ${S} -name "configure.*" ) ; do
129 cd $(dirname $i) && gnu-configize --force || true
130 done )
131 make -C tools/depends/target/crossguid PREFIX=${STAGING_DIR_HOST}${prefix}
132
133 BOOTSTRAP_STANDALONE=1 make -f bootstrap.mk JSON_BUILDER="${STAGING_BINDIR_NATIVE}/JsonSchemaBuilder"
134 BOOTSTRAP_STANDALONE=1 make -f codegenerator.mk JSON_BUILDER="${STAGING_BINDIR_NATIVE}/JsonSchemaBuilder"
135 oe_runconf
136}
137
138do_compile_prepend() {
139 for i in $(find . -name "Makefile") ; do
140 sed -i -e 's:I/usr/include:I${STAGING_INCDIR}:g' $i
141 done
142
143 for i in $(find . -name "*.mak*" -o -name "Makefile") ; do
144 sed -i -e 's:I/usr/include:I${STAGING_INCDIR}:g' -e 's:-rpath \$(libdir):-rpath ${libdir}:g' $i
145 done
146}
147
148INSANE_SKIP_${PN} = "rpaths"
149
150FILES_${PN} += "${datadir}/xsessions ${datadir}/icons ${libdir}/xbmc ${datadir}/xbmc"
151FILES_${PN}-dbg += "${libdir}/kodi/.debug ${libdir}/kodi/*/.debug ${libdir}/kodi/*/*/.debug ${libdir}/kodi/*/*/*/.debug"
152
153# kodi uses some kind of dlopen() method for libcec so we need to add it manually
154# OpenGL builds need glxinfo, that's in mesa-demos
155RRECOMMENDS_${PN}_append = " libcec \
156 python \
157 python-lang \
158 python-re \
159 python-netclient \
160 python-html \
161 python-difflib \
162 python-json \
163 python-zlib \
164 python-shell \
165 python-sqlite3 \
166 python-compression \
167 libcurl \
168 ${@bb.utils.contains('PACKAGECONFIG', 'x11', 'xrandr xdpyinfo', '', d)} \
169"
170RRECOMMENDS_${PN}_append_libc-glibc = " glibc-charmap-ibm850 \
171 glibc-gconv-ibm850 \
172 glibc-gconv-unicode \
173 glibc-gconv-utf-32 \
174 glibc-charmap-utf-8 \
175 glibc-localedata-en-us \
176 "
177
178RPROVIDES_${PN} += "xbmc"
179
diff --git a/meta-multimedia/recipes-mediacentre/xbmc/xbmc/0001-configure-don-t-run-python-distutils-to-find-STAGING.patch b/meta-multimedia/recipes-mediacentre/xbmc/xbmc/0001-configure-don-t-run-python-distutils-to-find-STAGING.patch
deleted file mode 100644
index dfc3959a1..000000000
--- a/meta-multimedia/recipes-mediacentre/xbmc/xbmc/0001-configure-don-t-run-python-distutils-to-find-STAGING.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From 0dce5a2abd9f42876616c35772a4d71c5399543c Mon Sep 17 00:00:00 2001
2From: Koen Kooi <koen@dominion.thruhere.net>
3Date: Sat, 17 Dec 2011 11:38:15 +0100
4Subject: [PATCH 1/4] configure: don't run python distutils to find STAGING_INCDIR/python, it is not safe for per-machine sysroots
5
6Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
7---
8 m4/ax_python_devel.m4 | 7 +------
9 1 files changed, 1 insertions(+), 6 deletions(-)
10
11diff --git a/m4/ax_python_devel.m4 b/m4/ax_python_devel.m4
12index adbd207..dee70f6 100644
13--- a/m4/ax_python_devel.m4
14+++ b/m4/ax_python_devel.m4
15@@ -151,12 +151,7 @@ $ac_distutils_result])
16 #
17 AC_MSG_CHECKING([for Python include path])
18 if test -z "$PYTHON_CPPFLAGS"; then
19- python_path=`$PYTHON -c "import distutils.sysconfig; \
20- print (distutils.sysconfig.get_python_inc ());"`
21- if test -n "${python_path}"; then
22- python_path="-I$python_path"
23- fi
24- PYTHON_CPPFLAGS=$python_path
25+ PYTHON_CPPFLAGS="-I${STAGING_INCDIR}/${PYTHON_DIR}"
26 fi
27 AC_MSG_RESULT([$PYTHON_CPPFLAGS])
28 AC_SUBST([PYTHON_CPPFLAGS])
29--
301.7.2.5
31
diff --git a/meta-multimedia/recipes-mediacentre/xbmc/xbmc/0002-Revert-fixed-ios-Add-memory-barriers-to-atomic-Add-S.patch b/meta-multimedia/recipes-mediacentre/xbmc/xbmc/0002-Revert-fixed-ios-Add-memory-barriers-to-atomic-Add-S.patch
deleted file mode 100644
index e0a4037bc..000000000
--- a/meta-multimedia/recipes-mediacentre/xbmc/xbmc/0002-Revert-fixed-ios-Add-memory-barriers-to-atomic-Add-S.patch
+++ /dev/null
@@ -1,97 +0,0 @@
1From 7b2a8a7869d257cba35f53f6d877877c29cdac27 Mon Sep 17 00:00:00 2001
2From: Paul Menzel <paulepanter@users.sourceforge.net>
3Date: Sun, 14 Aug 2011 21:53:47 +0200
4Subject: [PATCH 2/4] Revert "fixed:[ios] Add memory barriers to atomic Add/Subtract and Increment/Decrement functions to ensure synchronized accesses."
5
6This reverts commit 9a10c48710df79118e39e9b3bb0a15bf1fe694d1.
7
8The build (OpenEmbedded `angstrom-2010.x` for `MACHINE = "beagleboard") fails with the following error.
9
10 make -C xbmc/threads
11 make[1]: Entering directory `/oe/build-angstrom-next/angstrom-dev/work/armv7a-angstrom-linux-gnueabi/xbmc-10.05-r11+gitr0+9a10c48710df79118e39e9b3bb0a15bf1fe694d1/git/xbmc/threads'
12 CPP Atomics.o
13 /tmp/ccIzTm3L.s: Assembler messages:
14 /tmp/ccIzTm3L.s:40: Error: garbage following instruction -- `dmb ish'
15 /tmp/ccIzTm3L.s:48: Error: garbage following instruction -- `dmb ish'
16 /tmp/ccIzTm3L.s:76: Error: garbage following instruction -- `dmb ish'
17 /tmp/ccIzTm3L.s:83: Error: garbage following instruction -- `dmb ish'
18 /tmp/ccIzTm3L.s:111: Error: garbage following instruction -- `dmb ish'
19 /tmp/ccIzTm3L.s:118: Error: garbage following instruction -- `dmb ish'
20 /tmp/ccIzTm3L.s:145: Error: garbage following instruction -- `dmb ish'
21 /tmp/ccIzTm3L.s:152: Error: garbage following instruction -- `dmb ish'
22 /tmp/ccIzTm3L.s:180: Error: garbage following instruction -- `dmb ish'
23 /tmp/ccIzTm3L.s:187: Error: garbage following instruction -- `dmb ish'
24 make[1]: *** [Atomics.o] Error 1
25 make[1]: Leaving directory `/oe/build-angstrom-next/angstrom-dev/work/armv7a-angstrom-linux-gnueabi/xbmc-10.05-r11+gitr0+9a10c48710df79118e39e9b3bb0a15bf1fe694d1/git/xbmc/threads'
26 make: *** [xbmc/threads/threads.a] Error 2
27---
28 xbmc/threads/Atomics.cpp | 8 --------
29 1 files changed, 0 insertions(+), 8 deletions(-)
30
31diff --git a/xbmc/threads/Atomics.cpp b/xbmc/threads/Atomics.cpp
32index 5b09f18..0a98a7e 100644
33--- a/xbmc/threads/Atomics.cpp
34+++ b/xbmc/threads/Atomics.cpp
35@@ -194,14 +194,12 @@ long AtomicIncrement(volatile long* pAddr)
36 {
37 register long val;
38 asm volatile (
39- "dmb ish \n" // Memory barrier. Make sure all memory accesses appearing before this complete before any that appear after
40 "1: \n"
41 "ldrex %0, [%1] \n" // (val = *pAddr)
42 "add %0, #1 \n" // (val += 1)
43 "strex r1, %0, [%1] \n"
44 "cmp r1, #0 \n"
45 "bne 1b \n"
46- "dmb ish \n" // Memory barrier.
47 : "=&r" (val)
48 : "r"(pAddr)
49 : "r1"
50@@ -273,14 +271,12 @@ long AtomicAdd(volatile long* pAddr, long amount)
51 {
52 register long val;
53 asm volatile (
54- "dmb ish \n" // Memory barrier. Make sure all memory accesses appearing before this complete before any that appear after
55 "1: \n"
56 "ldrex %0, [%1] \n" // (val = *pAddr)
57 "add %0, %2 \n" // (val += amount)
58 "strex r1, %0, [%1] \n"
59 "cmp r1, #0 \n"
60 "bne 1b \n"
61- "dmb ish \n" // Memory barrier.
62 : "=&r" (val)
63 : "r"(pAddr), "r"(amount)
64 : "r1"
65@@ -351,14 +347,12 @@ long AtomicDecrement(volatile long* pAddr)
66 {
67 register long val;
68 asm volatile (
69- "dmb ish \n" // Memory barrier. Make sure all memory accesses appearing before this complete before any that appear after
70 "1: \n"
71 "ldrex %0, [%1] \n" // (val = *pAddr)
72 "sub %0, #1 \n" // (val -= 1)
73 "strex r1, %0, [%1] \n"
74 "cmp r1, #0 \n"
75 "bne 1b \n"
76- "dmb ish \n" // Memory barrier.
77 : "=&r" (val)
78 : "r"(pAddr)
79 : "r1"
80@@ -431,14 +425,12 @@ long AtomicSubtract(volatile long* pAddr, long amount)
81 {
82 register long val;
83 asm volatile (
84- "dmb ish \n" // Memory barrier. Make sure all memory accesses appearing before this complete before any that appear after
85 "1: \n"
86 "ldrex %0, [%1] \n" // (val = *pAddr)
87 "sub %0, %2 \n" // (val -= amount)
88 "strex r1, %0, [%1] \n"
89 "cmp r1, #0 \n"
90 "bne 1b \n"
91- "dmb ish \n" // Memory barrier.
92 : "=&r" (val)
93 : "r"(pAddr), "r"(amount)
94 : "r1"
95--
961.7.2.5
97
diff --git a/meta-multimedia/recipes-mediacentre/xbmc/xbmc/0003-Revert-fixed-ios-Add-memory-barriers-to-cas-assembly.patch b/meta-multimedia/recipes-mediacentre/xbmc/xbmc/0003-Revert-fixed-ios-Add-memory-barriers-to-cas-assembly.patch
deleted file mode 100644
index 629017b7b..000000000
--- a/meta-multimedia/recipes-mediacentre/xbmc/xbmc/0003-Revert-fixed-ios-Add-memory-barriers-to-cas-assembly.patch
+++ /dev/null
@@ -1,69 +0,0 @@
1From aaae1616a09d359b52e929f944ca0ceb4bb7f831 Mon Sep 17 00:00:00 2001
2From: Paul Menzel <paulepanter@users.sourceforge.net>
3Date: Sun, 14 Aug 2011 21:55:09 +0200
4Subject: [PATCH 3/4] Revert "fixed:[ios] Add memory barriers to cas() assembly to ensure alignment of memory accesses."
5
6This reverts commit 92bab651e2253d172879995b50985645b77fecd2.
7
8The build (OpenEmbedded `angstrom-2010.x` for `MACHINE = "beagleboard") fails with the following error.
9
10 CPP Atomics.o
11 make[1]: Entering directory `/oe/build-angstrom-next/angstrom-dev/work/armv7a-angstrom-linux-gnueabi/xbmc-10.05-r11+gitr0+92bab651e2253d172879995b50985645b77fecd2/git/xbmc/windows'
12 CPP GUIMediaWindow.o
13 /tmp/ccrsywuV.s: Assembler messages:
14 /tmp/ccrsywuV.s:40: Error: garbage following instruction -- `dmb ish'
15 /tmp/ccrsywuV.s:48: Error: garbage following instruction -- `dmb ish'
16 make[1]: *** [Atomics.o] Error 1
17 make[1]: Leaving directory `/oe/build-angstrom-next/angstrom-dev/work/armv7a-angstrom-linux-gnueabi/xbmc-10.05-r11+gitr0+92bab651e2253d172879995b50985645b77fecd2/git/xbmc/threads'
18 make: *** [xbmc/threads/threads.a] Error 2
19---
20 xbmc/threads/Atomics.cpp | 33 ++++++++++++++++-----------------
21 1 files changed, 16 insertions(+), 17 deletions(-)
22
23diff --git a/xbmc/threads/Atomics.cpp b/xbmc/threads/Atomics.cpp
24index 0a98a7e..0967eb2 100644
25--- a/xbmc/threads/Atomics.cpp
26+++ b/xbmc/threads/Atomics.cpp
27@@ -49,23 +49,22 @@ long cas(volatile long *pAddr, long expectedVal, long swapVal)
28 #elif defined(__arm__)
29 long cas(volatile long* pAddr, long expectedVal, long swapVal)
30 {
31- register long prev;
32- asm volatile (
33- "dmb ish \n" // Memory barrier. Make sure all memory accesses appearing before this complete before any that appear after
34- "1: \n"
35- "ldrex %0, [%1] \n" // Load the current value of *pAddr(%1) into prev (%0) and lock pAddr,
36- "cmp %0, %2 \n" // Verify that the current value (%0) == old value (%2)
37- "bne 2f \n" // Bail if the two values are not equal [not as expected]
38- "strex r1, %3, [%1] \n"
39- "cmp r1, #0 \n"
40- "bne 1b \n"
41- "dmb ish \n" // Memory barrier.
42- "2: \n"
43- : "=&r" (prev)
44- : "r"(pAddr), "r"(expectedVal),"r"(swapVal)
45- : "r1"
46- );
47- return prev;
48+ return(__sync_val_compare_and_swap(pAddr, expectedVal, swapVal));
49+// register long prev;
50+// asm volatile (
51+// "1: \n"
52+// "ldrex %0, [%1] \n" /* Load the current value of *pAddr(%1) into prev (%0) and lock pAddr, */
53+// "cmp %0, %2 \n" /* Verify that the current value (%0) == old value (%2) */
54+// "bne 2f \n" /* Bail if the two values are not equal [not as expected] */
55+// "strex r1, %3, [%1] \n"
56+// "cmp r1, #0 \n"
57+// "bne 1b \n"
58+// "2: "
59+// : "=&r" (prev)
60+// : "r"(pAddr), "r"(expectedVal),"r"(swapVal)
61+// : "r1"
62+// );
63+// return prev;
64 }
65
66 #elif defined(__mips__)
67--
681.7.2.5
69
diff --git a/meta-multimedia/recipes-mediacentre/xbmc/xbmc/0004-configure-cope-with-ld-is-gold-DISTRO_FEATURE.patch b/meta-multimedia/recipes-mediacentre/xbmc/xbmc/0004-configure-cope-with-ld-is-gold-DISTRO_FEATURE.patch
deleted file mode 100644
index 345e20ee1..000000000
--- a/meta-multimedia/recipes-mediacentre/xbmc/xbmc/0004-configure-cope-with-ld-is-gold-DISTRO_FEATURE.patch
+++ /dev/null
@@ -1,43 +0,0 @@
1From fd8f73826240aae543a41a2bfeea0056e2fe594d Mon Sep 17 00:00:00 2001
2From: Koen Kooi <koen@dominion.thruhere.net>
3Date: Mon, 11 Mar 2013 11:04:29 +0100
4Subject: [PATCH] configure: cope with ld-is-gold DISTRO_FEATURE
5
6Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
7---
8
9Upstream-Stature: backport
10
11 configure.in | 12 +++++++-----
12 1 files changed, 7 insertions(+), 5 deletions(-)
13
14diff --git a/configure.in b/configure.in
15index ef94683..c8b459b 100755
16--- a/configure.in
17+++ b/configure.in
18@@ -18,9 +18,14 @@ tolower(){
19 # check for library basenames
20 AC_DEFUN([XB_FIND_SONAME],
21 [
22+ #set -x
23 if [[ "$host_vendor" != "apple" ]]; then
24 AC_MSG_CHECKING([for lib$2 soname])
25 $1_FILENAME=$($CC -nostdlib -o /dev/null $LDFLAGS -l$2 -Wl,-M 2>/dev/null | grep "^LOAD.*$2" | awk '{V=2; print $V}')
26+ if [[ -z $$1_FILENAME ]]; then
27+ #try gold linker syntax
28+ $1_FILENAME=$($CC -nostdlib -o /dev/null $LDFLAGS -l$2 -Wl,-t 3>&1 1>&2 2>&3 | grep "$2")
29+ fi
30 if [[ ! -z $$1_FILENAME ]]; then
31 $1_SONAME=$(objdump -p $$1_FILENAME | grep "SONAME.*$2" | awk '{V=2; print $V}')
32 fi
33@@ -55,6 +60,7 @@ AC_DEFUN([XB_FIND_SONAME],
34 AC_MSG_RESULT([$$1_SONAME])
35 AC_SUBST($1_SONAME)
36 fi
37+ #set +x
38 ])
39
40 # Function to push and pop libs and includes for a command
41--
421.7.7.6
43
diff --git a/meta-multimedia/recipes-mediacentre/xbmc/xbmc/configure.in-Avoid-running-code.patch b/meta-multimedia/recipes-mediacentre/xbmc/xbmc/configure.in-Avoid-running-code.patch
deleted file mode 100644
index 5c1405982..000000000
--- a/meta-multimedia/recipes-mediacentre/xbmc/xbmc/configure.in-Avoid-running-code.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From cfd851660a594801a591e80dc820c65cb7bd7836 Mon Sep 17 00:00:00 2001
2From: Otavio Salvador <otavio@ossystems.com.br>
3Date: Sat, 6 Oct 2012 06:40:03 -0300
4Subject: [PATCH] configure.in: Avoid running code or we break cross-compile
5
6Upstream-Status: Backport [similar change done for 12.0]
7
8Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
9---
10 configure.in | 6 +-----
11 1 files changed, 1 insertions(+), 5 deletions(-)
12
13diff --git a/configure.in b/configure.in
14index ef94683..d7efcb0 100755
15--- a/configure.in
16+++ b/configure.in
17@@ -1246,11 +1246,7 @@ if test "$use_external_ffmpeg" = "yes"; then
18 AC_DEFINE([USE_EXTERNAL_FFMPEG], [1], [Whether to use external FFmpeg libraries.])
19
20 # Disable vdpau support if external libavcodec doesn't have it
21- AC_RUN_IFELSE(
22- AC_LANG_PROGRAM([[#include <libavcodec/avcodec.h>]],
23- [[avcodec_register_all();
24- AVCodec *codec = avcodec_find_decoder_by_name("vc1_vdpau");
25- return (codec) ? 0 : 1;]]),,
26+ AC_CHECK_LIB([avcodec], [ff_vdpau_vc1_decode_picture],,
27 [if test "x$use_vdpau" = "xyes"; then
28 AC_MSG_ERROR($ffmpeg_vdpau_not_supported)
29 else
30--
311.7.2.5
32
diff --git a/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb b/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb
deleted file mode 100644
index 0d8dd5cb3..000000000
--- a/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb
+++ /dev/null
@@ -1,97 +0,0 @@
1SUMMARY = "XBMC Media Center"
2
3LICENSE = "GPLv2"
4LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=6eb631b6da7fdb01508a80213ffc35ff"
5
6DEPENDS = "libusb1 libcec libplist expat yajl gperf-native libxmu fribidi mpeg2dec ffmpeg samba fontconfig curl python libass libmodplug libmicrohttpd wavpack libmms cmake-native libsdl-image libsdl-mixer virtual/egl mysql5 sqlite3 libmms faad2 libcdio libpcre boost lzo enca avahi libsamplerate0 libxinerama libxrandr libxtst bzip2 virtual/libsdl jasper zip-native zlib libtinyxml libmad"
7#require recipes/egl/egl.inc
8
9
10SRCREV = "82388d55dae79cbb2e486e307e23202e76a43efa"
11
12# multiple issues
13PNBLACKLIST[xbmc] ?= "/usr/include/c++/ctime:70:11: error: '::gmtime' has not been declared"
14
15PV = "11.0+gitr${SRCPV}"
16PR = "r14"
17SRC_URI = "git://github.com/xbmc/xbmc.git;branch=Eden \
18 file://0001-configure-don-t-run-python-distutils-to-find-STAGING.patch \
19 file://0002-Revert-fixed-ios-Add-memory-barriers-to-atomic-Add-S.patch \
20 file://0003-Revert-fixed-ios-Add-memory-barriers-to-cas-assembly.patch \
21 file://0004-configure-cope-with-ld-is-gold-DISTRO_FEATURE.patch \
22 file://configure.in-Avoid-running-code.patch \
23"
24
25inherit autotools gettext python-dir
26
27S = "${WORKDIR}/git"
28
29# breaks compilation
30CCACHE = ""
31
32CACHED_CONFIGUREVARS += " \
33 ac_cv_path_PYTHON="${STAGING_BINDIR_NATIVE}/python-native/python" \
34"
35
36PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl', 'openglesv2', d)}"
37PACKAGECONFIG[opengl] = "--enable-gl,--enable-gles,glew"
38PACKAGECONFIG[openglesv2] = "--enable-gles,--enable-gl,"
39
40EXTRA_OECONF = " \
41 --disable-rpath \
42 --enable-libusb \
43 --enable-airplay \
44 --disable-optical-drive \
45 --enable-external-libraries \
46 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '--enable-gl', '--enable-gles', d)} \
47"
48
49FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations -fomit-frame-pointer -O4 -ffast-math"
50BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}"
51
52EXTRA_OECONF_append_armv7a = "--cpu=cortex-a8"
53
54# for python modules
55export STAGING_LIBDIR
56export STAGING_INCDIR
57export PYTHON_DIR
58
59do_configure() {
60 sh bootstrap
61 oe_runconf
62}
63
64PARALLEL_MAKE = ""
65
66do_compile_prepend() {
67 for i in $(find . -name "Makefile") ; do
68 sed -i -e 's:I/usr/include:I${STAGING_INCDIR}:g' $i
69 done
70
71 for i in $(find . -name "*.mak*" -o -name "Makefile") ; do
72 sed -i -e 's:I/usr/include:I${STAGING_INCDIR}:g' -e 's:-rpath \$(libdir):-rpath ${libdir}:g' $i
73 done
74}
75
76INSANE_SKIP_${PN} = "rpaths"
77
78# on ARM architectures xbmc will use GLES which will make the regular wrapper fail, so start it directly
79do_install_append_arm() {
80 sed -i -e 's:Exec=xbmc:Exec=${libdir}/xbmc/xbmc.bin:g' ${D}${datadir}/applications/xbmc.desktop
81}
82
83FILES_${PN} += "${datadir}/xsessions ${datadir}/icons"
84FILES_${PN}-dbg += "${libdir}/xbmc/.debug ${libdir}/xbmc/*/.debug ${libdir}/xbmc/*/*/.debug ${libdir}/xbmc/*/*/*/.debug"
85
86# xbmc uses some kind of dlopen() method for libcec so we need to add it manually
87# OpenGL builds need glxinfo, that's in mesa-demos
88RRECOMMENDS_${PN}_append = " libcec \
89 python \
90 python-lang \
91 python-re \
92 python-netclient \
93 libcurl \
94 xdpyinfo \
95 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-demos', '', d)} \
96"
97RRECOMMENDS_${PN}_append_libc-glibc = " glibc-charmap-ibm850 glibc-gconv-ibm850"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-28 17:01:31 +0000