Merge pull request #7485 from Hoshpak/update-kodi

kodi: update to 17.4

srcpkgs/kodi-rpi/files/swig.nojava-17.3

@@ -1 +0,0 @@
-../../kodi/files/swig.nojava-17.3

srcpkgs/kodi-rpi/files/swig.nojava-17.4

@@ -0,0 +1 @@
+../../kodi/files/swig.nojava-17.4

srcpkgs/kodi-rpi/template

@@ -1,6 +1,6 @@
 # Template file for 'kodi-rpi'
 pkgname=kodi-rpi
-version=17.3
+version=17.4
 revision=1
 build_style=cmake
 patch_args="-Np1"
@@ -11,7 +11,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.kodi.tv/"
 license="GPL-2"
 distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz"
-checksum=1de8653a3729cefd1baaf09ecde5ace01a1e3a58fbf29d48c1363f2503d331a1
+checksum=b05e11b2d108222bfc3ff0c9a466d798c0feedf1228166239948e6ed37c3cb4f
 build_wrksrc=project/cmake
 
 nopie=yes
@@ -44,6 +44,7 @@ configure_args="
  -DENABLE_INTERNAL_CROSSGUID=OFF
  -DENABLE_VAAPI=OFF
  -DENABLE_VDPAU=OFF
+ -DWITH_FFMPEG=/usr
  -DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/opt/vc
 "
 case "$XBPS_TARGET_MACHINE" in

srcpkgs/kodi/files/swig.nojava-17.4/AddonModuleXbmc.i.cpp

@@ -9218,7 +9218,7 @@ namespace PythonBindings
 
    // constants
    PyModule_AddStringConstant(module, (char*)"__author__", (char*)"Team Kodi <http://kodi.tv>");
-   PyModule_AddStringConstant(module, (char*)"__date__", (char*)"Fri May 26 08:01:11 GMT 2017");
+   PyModule_AddStringConstant(module, (char*)"__date__", (char*)"Wed Aug 23 05:23:28 GMT 2017");
    PyModule_AddStringConstant(module, (char*)"__version__", (char*)"2.25.0");
    PyModule_AddStringConstant(module, (char*)"__credits__", (char*)"Team Kodi");
    PyModule_AddStringConstant(module, (char*)"__platform__", (char*)"ALL");

srcpkgs/kodi/files/swig.nojava-17.4/AddonModuleXbmcaddon.i.cpp

@@ -482,7 +482,7 @@ namespace PythonBindings
 
    // constants
    PyModule_AddStringConstant(module, (char*)"__author__", (char*)"Team Kodi <http://kodi.tv>");
-   PyModule_AddStringConstant(module, (char*)"__date__", (char*)"Fri May 26 08:00:57 GMT 2017");
+   PyModule_AddStringConstant(module, (char*)"__date__", (char*)"Wed Aug 23 05:22:55 GMT 2017");
    PyModule_AddStringConstant(module, (char*)"__version__", (char*)"2.25.0");
    PyModule_AddStringConstant(module, (char*)"__credits__", (char*)"Team Kodi");
    PyModule_AddStringConstant(module, (char*)"__platform__", (char*)"ALL");

srcpkgs/kodi/files/swig.nojava-17.4/AddonModuleXbmcgui.i.cpp

@@ -12956,7 +12956,7 @@ namespace PythonBindings
 
    // constants
    PyModule_AddStringConstant(module, (char*)"__author__", (char*)"Team Kodi <http://kodi.tv>");
-   PyModule_AddStringConstant(module, (char*)"__date__", (char*)"Fri May 26 08:01:05 GMT 2017");
+   PyModule_AddStringConstant(module, (char*)"__date__", (char*)"Wed Aug 23 05:23:13 GMT 2017");
    PyModule_AddStringConstant(module, (char*)"__version__", (char*)"2.25.0");
    PyModule_AddStringConstant(module, (char*)"__credits__", (char*)"Team Kodi");
    PyModule_AddStringConstant(module, (char*)"__platform__", (char*)"ALL");

srcpkgs/kodi/files/swig.nojava-17.4/AddonModuleXbmcplugin.i.cpp

@@ -858,7 +858,7 @@ namespace PythonBindings
 
    // constants
    PyModule_AddStringConstant(module, (char*)"__author__", (char*)"Team Kodi <http://kodi.tv>");
-   PyModule_AddStringConstant(module, (char*)"__date__", (char*)"Fri May 26 08:01:15 GMT 2017");
+   PyModule_AddStringConstant(module, (char*)"__date__", (char*)"Wed Aug 23 05:23:36 GMT 2017");
    PyModule_AddStringConstant(module, (char*)"__version__", (char*)"2.25.0");
    PyModule_AddStringConstant(module, (char*)"__credits__", (char*)"Team Kodi");
    PyModule_AddStringConstant(module, (char*)"__platform__", (char*)"ALL");

srcpkgs/kodi/files/swig.nojava-17.4/AddonModuleXbmcvfs.i.cpp

@@ -1584,7 +1584,7 @@ namespace PythonBindings
 
    // constants
    PyModule_AddStringConstant(module, (char*)"__author__", (char*)"Team Kodi <http://kodi.tv>");
-   PyModule_AddStringConstant(module, (char*)"__date__", (char*)"Fri May 26 08:01:19 GMT 2017");
+   PyModule_AddStringConstant(module, (char*)"__date__", (char*)"Wed Aug 23 05:23:44 GMT 2017");
    PyModule_AddStringConstant(module, (char*)"__version__", (char*)"2.25.0");
    PyModule_AddStringConstant(module, (char*)"__credits__", (char*)"Team Kodi");
    PyModule_AddStringConstant(module, (char*)"__platform__", (char*)"ALL");

srcpkgs/kodi/files/swig.nojava-17.4/AddonModuleXbmcwsgi.i.cpp

@@ -1270,7 +1270,7 @@ namespace PythonBindings
 
    // constants
    PyModule_AddStringConstant(module, (char*)"__author__", (char*)"Team Kodi <http://kodi.tv>");
-   PyModule_AddStringConstant(module, (char*)"__date__", (char*)"Fri May 26 08:00:54 GMT 2017");
+   PyModule_AddStringConstant(module, (char*)"__date__", (char*)"Wed Aug 23 05:22:47 GMT 2017");
    PyModule_AddStringConstant(module, (char*)"__version__", (char*)"2.25.0");
    PyModule_AddStringConstant(module, (char*)"__credits__", (char*)"Team Kodi");
    PyModule_AddStringConstant(module, (char*)"__platform__", (char*)"ALL");

srcpkgs/kodi/patches/fix-string.patch

@@ -1,71 +0,0 @@
---- a/xbmc/filesystem/FTPParse.cpp	2017-08-17 20:50:22.046693292 +0200
-+++ b/xbmc/filesystem/FTPParse.cpp	2017-08-17 20:52:31.200140598 +0200
-@@ -34,7 +34,7 @@
-   m_time = 0;
- }
- 
--string CFTPParse::getName()
-+std::string CFTPParse::getName()
- {
-   return m_name;
- }
-@@ -59,16 +59,16 @@
-   return m_time;
- }
- 
--void CFTPParse::setTime(string str)
-+void CFTPParse::setTime(std::string str)
- {
-   /* Variables used to capture patterns via the regexes */
--  string month;
--  string day;
--  string year;
--  string hour;
--  string minute;
--  string second;
--  string am_or_pm;
-+  std::string month;
-+  std::string day;
-+  std::string year;
-+  std::string hour;
-+  std::string minute;
-+  std::string second;
-+  std::string am_or_pm;
- 
-   /* time struct used to set the time_t variable */
-   struct tm time_struct = {};
-@@ -338,21 +338,21 @@
-   return day_of_week;
- }
- 
--int CFTPParse::FTPParse(string str)
-+int CFTPParse::FTPParse(std::string str)
- {
-   /* Various variable to capture patterns via the regexes */
--  string permissions;
--  string link_count;
--  string owner;
--  string group;
--  string size;
--  string date;
--  string name;
--  string type;
--  string stuff;
--  string facts;
--  string version;
--  string file_id;
-+  std::string permissions;
-+  std::string link_count;
-+  std::string owner;
-+  std::string group;
-+  std::string size;
-+  std::string date;
-+  std::string name;
-+  std::string type;
-+  std::string stuff;
-+  std::string facts;
-+  std::string version;
-+  std::string file_id;
- 
-   /* Regex for standard Unix listing formats */
-   pcrecpp::RE unix_re("^([-bcdlps])" // type

srcpkgs/kodi/template

@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
-version=17.3
+version=17.4
-revision=2
+revision=1
 build_style=cmake
 patch_args="-Np1"
 _codename="Krypton"
@@ -11,7 +11,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.kodi.tv/"
 license="GPL-2"
 distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz"
-checksum=1de8653a3729cefd1baaf09ecde5ace01a1e3a58fbf29d48c1363f2503d331a1
+checksum=b05e11b2d108222bfc3ff0c9a466d798c0feedf1228166239948e6ed37c3cb4f
 build_wrksrc=project/cmake
 
 lib32disabled=yes