summaryrefslogtreecommitdiffstats
path: root/meta-multimedia
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@googlemail.com>2017-08-08 23:38:20 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2017-08-13 13:21:01 +0200
commit965d410adbe8a083cbc28d3bdd39e195889d984f (patch)
tree152187a48c2e8b5c014221f441569bb6e3488a23 /meta-multimedia
parent42c990172d31e95ffad3933ea004c5740a7adb9f (diff)
downloadmeta-openembedded-965d410adbe8a083cbc28d3bdd39e195889d984f.tar.gz
kodi: fix build with latest gcc
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-multimedia')
-rw-r--r--meta-multimedia/recipes-mediacenter/kodi/kodi-17/0013-FTPParse.cpp-use-std-string.patch96
-rw-r--r--meta-multimedia/recipes-mediacenter/kodi/kodi_17.bb1
2 files changed, 97 insertions, 0 deletions
diff --git a/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0013-FTPParse.cpp-use-std-string.patch b/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0013-FTPParse.cpp-use-std-string.patch
new file mode 100644
index 000000000..c9c906644
--- /dev/null
+++ b/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0013-FTPParse.cpp-use-std-string.patch
@@ -0,0 +1,96 @@
1From 5fa10ff6b1b60abee172296d9c1dec8dfc10615c Mon Sep 17 00:00:00 2001
2From: Stefan Saraev <stefan@saraev.ca>
3Date: Sun, 7 May 2017 17:30:47 +0300
4Subject: [PATCH] FTPParse.cpp: use std::string
5
6Fixes build with newer gcc versions.
7
8Taken from [1]
9
10Upstream-Status: Backport [2]
11
12[1] https://git.busybox.net/buildroot/plain/package/kodi/0003-FTPParse.cpp-use-std-string.patch?id=e2f03a6bde19766a1ac047c5ccfb049b5c4f61ca
13[2] https://github.com/xbmc/xbmc/commit/5fa10ff6b1b60abee172296d9c1dec8dfc10615c
14
15Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
16---
17 xbmc/filesystem/FTPParse.cpp | 44 ++++++++++++++++++++++----------------------
18 1 file changed, 22 insertions(+), 22 deletions(-)
19
20diff --git a/xbmc/filesystem/FTPParse.cpp b/xbmc/filesystem/FTPParse.cpp
21index cfcc7c64ed..b0f676ae1a 100644
22--- a/xbmc/filesystem/FTPParse.cpp
23+++ b/xbmc/filesystem/FTPParse.cpp
24@@ -34,7 +34,7 @@ CFTPParse::CFTPParse()
25 m_time = 0;
26 }
27
28-string CFTPParse::getName()
29+std::string CFTPParse::getName()
30 {
31 return m_name;
32 }
33@@ -59,16 +59,16 @@ time_t CFTPParse::getTime()
34 return m_time;
35 }
36
37-void CFTPParse::setTime(string str)
38+void CFTPParse::setTime(std::string str)
39 {
40 /* Variables used to capture patterns via the regexes */
41- string month;
42- string day;
43- string year;
44- string hour;
45- string minute;
46- string second;
47- string am_or_pm;
48+ std::string month;
49+ std::string day;
50+ std::string year;
51+ std::string hour;
52+ std::string minute;
53+ std::string second;
54+ std::string am_or_pm;
55
56 /* time struct used to set the time_t variable */
57 struct tm time_struct = {};
58@@ -338,21 +338,21 @@ int CFTPParse::getDayOfWeek(int month, int date, int year)
59 return day_of_week;
60 }
61
62-int CFTPParse::FTPParse(string str)
63+int CFTPParse::FTPParse(std::string str)
64 {
65 /* Various variable to capture patterns via the regexes */
66- string permissions;
67- string link_count;
68- string owner;
69- string group;
70- string size;
71- string date;
72- string name;
73- string type;
74- string stuff;
75- string facts;
76- string version;
77- string file_id;
78+ std::string permissions;
79+ std::string link_count;
80+ std::string owner;
81+ std::string group;
82+ std::string size;
83+ std::string date;
84+ std::string name;
85+ std::string type;
86+ std::string stuff;
87+ std::string facts;
88+ std::string version;
89+ std::string file_id;
90
91 /* Regex for standard Unix listing formats */
92 pcrecpp::RE unix_re("^([-bcdlps])" // type
93--
942.11.0
95
96
diff --git a/meta-multimedia/recipes-mediacenter/kodi/kodi_17.bb b/meta-multimedia/recipes-mediacenter/kodi/kodi_17.bb
index 5a9fa9801..5158f05b6 100644
--- a/meta-multimedia/recipes-mediacenter/kodi/kodi_17.bb
+++ b/meta-multimedia/recipes-mediacenter/kodi/kodi_17.bb
@@ -79,6 +79,7 @@ SRC_URI = "git://github.com/xbmc/xbmc.git;branch=Krypton \
79 file://0011-Let-configure-pass-on-unknown-architectures-setting-.patch \ 79 file://0011-Let-configure-pass-on-unknown-architectures-setting-.patch \
80 file://0012-Revert-droid-fix-builds-with-AML-disabled.patch \ 80 file://0012-Revert-droid-fix-builds-with-AML-disabled.patch \
81 file://0001-change-order-of-detecting-libegl-and-libgles2.patch \ 81 file://0001-change-order-of-detecting-libegl-and-libgles2.patch \
82 file://0013-FTPParse.cpp-use-std-string.patch \
82" 83"
83 84
84SRC_URI_append_libc-musl = " \ 85SRC_URI_append_libc-musl = " \