<xsl:value-of select="$title"/>

diff -Nru kodi-17.5+git20171026.2109-final/addons/metadata.common.imdb.com/addon.xml kodi-17.6+git20171114.2125-final/addons/metadata.common.imdb.com/addon.xml --- kodi-17.5+git20171026.2109-final/addons/metadata.common.imdb.com/addon.xml 2017-10-26 19:08:46.000000000 +0000 +++ kodi-17.6+git20171114.2125-final/addons/metadata.common.imdb.com/addon.xml 2017-11-14 20:24:10.000000000 +0000 @@ -1,7 +1,7 @@ diff -Nru kodi-17.5+git20171026.2109-final/addons/metadata.common.imdb.com/changelog.txt kodi-17.6+git20171114.2125-final/addons/metadata.common.imdb.com/changelog.txt --- kodi-17.5+git20171026.2109-final/addons/metadata.common.imdb.com/changelog.txt 2017-10-26 19:08:46.000000000 +0000 +++ kodi-17.6+git20171114.2125-final/addons/metadata.common.imdb.com/changelog.txt 2017-11-14 20:24:10.000000000 +0000 @@ -1,3 +1,10 @@ +[B]2.9.1[/B] +- changed: improved USA rating detection + +[B]2.9.0[/B] +- added: multiple ratings and uniqueid support (requires Kodi v17) +- fixed: another attempt to fix IMDb outline + [B]2.8.8[/B] - fixed: potential issue with IMDb outline (thanks scudlee) diff -Nru kodi-17.5+git20171026.2109-final/addons/metadata.common.imdb.com/imdb.xml kodi-17.6+git20171114.2125-final/addons/metadata.common.imdb.com/imdb.xml --- kodi-17.5+git20171026.2109-final/addons/metadata.common.imdb.com/imdb.xml 2017-10-26 19:08:46.000000000 +0000 +++ kodi-17.6+git20171114.2125-final/addons/metadata.common.imdb.com/imdb.xml 2017-11-14 20:24:10.000000000 +0000 @@ -14,7 +14,7 @@ - + @@ -28,6 +28,34 @@ + + + + + + + + + <span\sitemprop="ratingValue">([0-9.]+).*?ratingCount">([0-9,]+)< + + + + + + + + + + + + + + <span\sitemprop="ratingValue">([0-9.]+).*?ratingCount">([0-9,]+)< + + + + + @@ -73,7 +101,7 @@ - + @@ -87,6 +115,34 @@ + + + + + + + + + <div\sclass="metacriticScore\sscore_[^\s]+\stitleReviewBarSubItem">.*?<span>(\d*)(\d) + + + + + + + + + + + + + + <div\sclass="metacriticScore\sscore_[^\s]+\stitleReviewBarSubItem">.*?<span>(\d*)(\d) + + + + + @@ -125,6 +181,9 @@ itemprop="description">(.+?)</div> + + itemprop="description">(.+?)See\sfull\ssummary + @@ -278,7 +337,10 @@ - MPAA</a>:</h5><div\sclass="info-content">Rated\s([^<]*) + >\s*USA:(P?G|PG-13|R|NC-17)</a> + + + MPAA</a>:</h5><div\sclass="info-content">Rated\s(P?G|PG-13|R|NC-17) @@ -286,6 +348,12 @@ + + + + + USA + @@ -406,4 +474,4 @@ - + \ No newline at end of file diff -Nru kodi-17.5+git20171026.2109-final/addons/metadata.common.themoviedb.org/addon.xml kodi-17.6+git20171114.2125-final/addons/metadata.common.themoviedb.org/addon.xml --- kodi-17.5+git20171026.2109-final/addons/metadata.common.themoviedb.org/addon.xml 2017-10-26 19:08:46.000000000 +0000 +++ kodi-17.6+git20171114.2125-final/addons/metadata.common.themoviedb.org/addon.xml 2017-11-14 20:24:10.000000000 +0000 @@ -1,7 +1,7 @@ Binary files /tmp/tmp4KybDy/fqsbJDfKzy/kodi-17.5+git20171026.2109-final/addons/metadata.common.themoviedb.org/icon.png and /tmp/tmp4KybDy/IcKwaVA_yO/kodi-17.6+git20171114.2125-final/addons/metadata.common.themoviedb.org/icon.png differ diff -Nru kodi-17.5+git20171026.2109-final/addons/metadata.common.themoviedb.org/tmdb.xml kodi-17.6+git20171114.2125-final/addons/metadata.common.themoviedb.org/tmdb.xml --- kodi-17.5+git20171026.2109-final/addons/metadata.common.themoviedb.org/tmdb.xml 2017-10-26 19:08:46.000000000 +0000 +++ kodi-17.6+git20171114.2125-final/addons/metadata.common.themoviedb.org/tmdb.xml 2017-11-14 20:24:10.000000000 +0000 @@ -3,7 +3,7 @@ - + @@ -20,7 +20,7 @@ - + @@ -28,10 +28,16 @@ - + - + + + + + Keep Original + + @@ -39,6 +45,12 @@ "title":"([^"]*) + + + "original_title":"([^"]*) + + Keep Original + @@ -48,7 +60,7 @@ - + @@ -59,7 +71,7 @@ - + @@ -70,7 +82,7 @@ "overview":"(.*?)"," - + ^$ @@ -93,7 +105,7 @@ - + @@ -104,7 +116,7 @@ - + @@ -115,7 +127,7 @@ "tagline":"([^"]*) - + ^$ @@ -138,7 +150,7 @@ - + @@ -158,7 +170,7 @@ - + @@ -169,7 +181,7 @@ - + @@ -180,7 +192,7 @@ "belongs_to_collection":\{"id":[0-9]+,"name":"([^"]*) - + ^$ @@ -200,10 +212,10 @@ - + - + @@ -226,7 +238,7 @@ - + @@ -246,7 +258,7 @@ - + @@ -266,7 +278,7 @@ - + @@ -274,7 +286,7 @@ - + @@ -292,9 +304,9 @@ - + - + @@ -312,9 +324,49 @@ + + + + + + + + + + + + "vote_average":([^,]*)," + + + "vote_count":([0-9]+) + + + + + + + + + + + + + + + + + "vote_average":([^,]*)," + + + "vote_count":([0-9]+) + + + + + - + @@ -334,7 +386,7 @@ - + @@ -354,7 +406,7 @@ - + @@ -362,7 +414,7 @@ - + @@ -379,7 +431,7 @@ "source":"([^"]*) - + ^$ @@ -399,7 +451,7 @@ "source":"([^"]*) - + ^$ @@ -422,10 +474,10 @@ - + - + @@ -445,10 +497,10 @@ - + - + @@ -456,10 +508,10 @@ - + - + @@ -480,12 +532,12 @@ (.+) - + en ^$ - + ^((?!en).)*$ (.+) @@ -506,12 +558,12 @@ (.+) - + en ^$ - + ^((?!en).)*$ (.+) @@ -531,7 +583,7 @@ (.+) - + ^$ (.+) @@ -558,4 +610,21 @@ - + + + + + + + + + + + + "release_date":"([^"]*) + + + + + + \ No newline at end of file diff -Nru kodi-17.5+git20171026.2109-final/addons/metadata.themoviedb.org/addon.xml kodi-17.6+git20171114.2125-final/addons/metadata.themoviedb.org/addon.xml --- kodi-17.5+git20171026.2109-final/addons/metadata.themoviedb.org/addon.xml 2017-10-26 19:08:46.000000000 +0000 +++ kodi-17.6+git20171114.2125-final/addons/metadata.themoviedb.org/addon.xml 2017-11-14 20:24:10.000000000 +0000 @@ -1,7 +1,7 @@ diff -Nru kodi-17.5+git20171026.2109-final/addons/metadata.themoviedb.org/changelog.txt kodi-17.6+git20171114.2125-final/addons/metadata.themoviedb.org/changelog.txt --- kodi-17.5+git20171026.2109-final/addons/metadata.themoviedb.org/changelog.txt 2017-10-26 19:08:46.000000000 +0000 +++ kodi-17.6+git20171114.2125-final/addons/metadata.themoviedb.org/changelog.txt 2017-11-14 20:24:10.000000000 +0000 @@ -1,3 +1,10 @@ +[B]4.0.1[/B] +-switched API queries to https + +[B]4.0.0[/B] +- added: multiple ratings and uniqueid support (requires Kodi v17) -thanks phate89 +- added: premiered date -thanks phate89 + [B]3.9.4[/B] - Fixed after API layout changes Binary files /tmp/tmp4KybDy/fqsbJDfKzy/kodi-17.5+git20171026.2109-final/addons/metadata.themoviedb.org/icon.png and /tmp/tmp4KybDy/IcKwaVA_yO/kodi-17.6+git20171114.2125-final/addons/metadata.themoviedb.org/icon.png differ diff -Nru kodi-17.5+git20171026.2109-final/addons/metadata.themoviedb.org/resources/language/English/strings.po kodi-17.6+git20171114.2125-final/addons/metadata.themoviedb.org/resources/language/English/strings.po --- kodi-17.5+git20171026.2109-final/addons/metadata.themoviedb.org/resources/language/English/strings.po 2014-12-21 04:00:23.000000000 +0000 +++ kodi-17.6+git20171114.2125-final/addons/metadata.themoviedb.org/resources/language/English/strings.po 2017-11-14 20:24:10.000000000 +0000 @@ -29,7 +29,7 @@ msgstr "" msgctxt "#30003" -msgid "Get Rating from" +msgid "Default Rating from" msgstr "" msgctxt "#30004" @@ -43,3 +43,7 @@ msgctxt "#30006" msgid "Preferred Certification Country" msgstr "" + +msgctxt "#30007" +msgid "Add also IMDb ratings" +msgstr "" diff -Nru "/tmp/tmp4KybDy/fqsbJDfKzy/kodi-17.5+git20171026.2109-final/addons/metadata.themoviedb.org/resources/language/English (New Zealand)/strings.po" "/tmp/tmp4KybDy/IcKwaVA_yO/kodi-17.6+git20171114.2125-final/addons/metadata.themoviedb.org/resources/language/English (New Zealand)/strings.po" --- "/tmp/tmp4KybDy/fqsbJDfKzy/kodi-17.5+git20171026.2109-final/addons/metadata.themoviedb.org/resources/language/English (New Zealand)/strings.po" 2014-12-21 04:00:23.000000000 +0000 +++ "/tmp/tmp4KybDy/IcKwaVA_yO/kodi-17.6+git20171114.2125-final/addons/metadata.themoviedb.org/resources/language/English (New Zealand)/strings.po" 2017-11-14 20:24:10.000000000 +0000 @@ -9,37 +9,41 @@ "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Kodi Translation Team\n" -"Language-Team: English (New Zealand) (http://www.transifex.com/projects/p/xbmc-addons/language/en_NZ/)\n" +"Language-Team: English (http://www.transifex.com/projects/p/xbmc-addons/language/en/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: en_NZ\n" +"Language: en\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgctxt "#30000" msgid "Enable Fanart" -msgstr "Enable Fanart" +msgstr "" msgctxt "#30001" msgid "Prefer Trailer from HD-Trailers.net" -msgstr "Prefer Trailer from HD-Trailers.net" +msgstr "" msgctxt "#30002" msgid "Preferred Language" -msgstr "Preferred Language" +msgstr "" msgctxt "#30003" -msgid "Get Rating from" -msgstr "Get Rating from" +msgid "Default Rating from" +msgstr "" msgctxt "#30004" msgid "Enable Trailer (YouTube)" -msgstr "Enable Trailer (YouTube)" +msgstr "" msgctxt "#30005" msgid "Keep Original Title" -msgstr "Keep Original Title" +msgstr "" msgctxt "#30006" msgid "Preferred Certification Country" -msgstr "Preferred Certification Country" +msgstr "" + +msgctxt "#30007" +msgid "Add also IMDb ratings" +msgstr "" diff -Nru "/tmp/tmp4KybDy/fqsbJDfKzy/kodi-17.5+git20171026.2109-final/addons/metadata.themoviedb.org/resources/language/English (US)/strings.po" "/tmp/tmp4KybDy/IcKwaVA_yO/kodi-17.6+git20171114.2125-final/addons/metadata.themoviedb.org/resources/language/English (US)/strings.po" --- "/tmp/tmp4KybDy/fqsbJDfKzy/kodi-17.5+git20171026.2109-final/addons/metadata.themoviedb.org/resources/language/English (US)/strings.po" 2015-08-14 16:41:50.000000000 +0000 +++ "/tmp/tmp4KybDy/IcKwaVA_yO/kodi-17.6+git20171114.2125-final/addons/metadata.themoviedb.org/resources/language/English (US)/strings.po" 2017-11-14 20:24:10.000000000 +0000 @@ -9,33 +9,41 @@ "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Kodi Translation Team\n" -"Language-Team: English (US) (http://www.transifex.com/projects/p/xbmc-addons/language/en_US/)\n" +"Language-Team: English (http://www.transifex.com/projects/p/xbmc-addons/language/en/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: en_US\n" +"Language: en\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgctxt "#30000" msgid "Enable Fanart" -msgstr "Enable Fanart" +msgstr "" + +msgctxt "#30001" +msgid "Prefer Trailer from HD-Trailers.net" +msgstr "" msgctxt "#30002" msgid "Preferred Language" -msgstr "Preferred Language" +msgstr "" msgctxt "#30003" -msgid "Get Rating from" -msgstr "Get Rating from" +msgid "Default Rating from" +msgstr "" msgctxt "#30004" msgid "Enable Trailer (YouTube)" -msgstr "Enable Trailer (YouTube)" +msgstr "" msgctxt "#30005" msgid "Keep Original Title" -msgstr "Keep Original Title" +msgstr "" msgctxt "#30006" msgid "Preferred Certification Country" -msgstr "Preferred Certification Country" +msgstr "" + +msgctxt "#30007" +msgid "Add also IMDb ratings" +msgstr "" diff -Nru kodi-17.5+git20171026.2109-final/addons/metadata.themoviedb.org/resources/settings.xml kodi-17.6+git20171114.2125-final/addons/metadata.themoviedb.org/resources/settings.xml --- kodi-17.5+git20171026.2109-final/addons/metadata.themoviedb.org/resources/settings.xml 2016-12-23 07:13:11.000000000 +0000 +++ kodi-17.6+git20171114.2125-final/addons/metadata.themoviedb.org/resources/settings.xml 2017-11-14 20:24:10.000000000 +0000 @@ -6,5 +6,6 @@ + diff -Nru kodi-17.5+git20171026.2109-final/addons/metadata.themoviedb.org/tmdb.xml kodi-17.6+git20171114.2125-final/addons/metadata.themoviedb.org/tmdb.xml --- kodi-17.5+git20171026.2109-final/addons/metadata.themoviedb.org/tmdb.xml 2017-10-26 19:08:46.000000000 +0000 +++ kodi-17.6+git20171114.2125-final/addons/metadata.themoviedb.org/tmdb.xml 2017-11-14 20:24:10.000000000 +0000 @@ -1,7 +1,7 @@ - + (.+) @@ -9,34 +9,34 @@ - + (themoviedb.org/movie/)([0-9]*) - + imdb....?/title/tt([0-9]+) - + imdb....?/Title\?t{0,2}([0-9]+) - + "release_date":"([0-9]+)-.*?"id":([0-9]*),"original_title":"[^"]*","original_language":"[^"]*","title":"([^"]*)" - + "release_date":"([0-9]+)-.*?"id":([0-9]*),"original_title":"([^"]*)","original_language":"[^"]*" - + "release_date":null.*?"id":([0-9]*),"original_title":"([^"]*)","original_language":"[^"]*" - + "id":([0-9]*).*?title":"[^"]*".*?original_title":"([^"]*)".*?"release_date":"([0-9]+)- - + "id":([0-9]*).*?title":"([^"]*)".*?original_title":"[^"]*".*?"release_date":"([0-9]+)- - + "id":([0-9]*).*?title":"([^"]*)".*?original_title":"[^"]*".*?"release_date":null @@ -44,12 +44,15 @@ - - "id":([0-9]*),"imdb + + - + "id":[0-9]*,"imdb_id":"([^"]*) + + (.+) + "original_title":"([^"]*) @@ -71,19 +74,25 @@ "runtime":([0-9]+) - + ^$ (.+) - - - "id":[0-9]*,"imdb_id":"([^"]*) + + + (.+) + + + IMDb - + + + (.+) + TMDb diff -Nru kodi-17.5+git20171026.2109-final/addons/metadata.tvdb.com/addon.xml kodi-17.6+git20171114.2125-final/addons/metadata.tvdb.com/addon.xml --- kodi-17.5+git20171026.2109-final/addons/metadata.tvdb.com/addon.xml 2017-10-26 19:08:46.000000000 +0000 +++ kodi-17.6+git20171114.2125-final/addons/metadata.tvdb.com/addon.xml 2017-11-14 20:24:10.000000000 +0000 @@ -1,7 +1,7 @@ diff -Nru kodi-17.5+git20171026.2109-final/addons/metadata.tvdb.com/changelog.txt kodi-17.6+git20171114.2125-final/addons/metadata.tvdb.com/changelog.txt --- kodi-17.5+git20171026.2109-final/addons/metadata.tvdb.com/changelog.txt 2017-10-03 00:01:06.000000000 +0000 +++ kodi-17.6+git20171114.2125-final/addons/metadata.tvdb.com/changelog.txt 2017-11-14 20:24:10.000000000 +0000 @@ -1,3 +1,28 @@ +[B]2.0.5[/B] +- Fixed: Prevent language choices from interfering with IMDb ratings + +[B]2.0.4[/B] +- Fixed: Moved IMDb ratings to prevent clearing buffers before GetActors + +[B]2.0.3[/B] +- Fixed: IMDb series ratings +- Changed: Added the www back to the artwork URLs +- Changed: Turn fallback language on by default + +[B]2.0.2[/B] +- Fixed: Special episode placement +- Fixed: Episode thumbnails only when available +- Added: Use fallback language for artwork lookup + +[B]2.0.1[/B] +- Fixed: Backwards-compatibility code + +[B]2.0.0[/B] +- Updated: Complete rewrite for TVDB API 2.0 +- Added: Language fallback options +- Added: Merged DVD order split-episodes +- Added: Pseudo-absolute order for when not specified by TVDB + [B]1.8.4[/B] - Added: Runtime for tvshows - needs Krypton or newer Binary files /tmp/tmp4KybDy/fqsbJDfKzy/kodi-17.5+git20171026.2109-final/addons/metadata.tvdb.com/icon.png and /tmp/tmp4KybDy/IcKwaVA_yO/kodi-17.6+git20171114.2125-final/addons/metadata.tvdb.com/icon.png differ diff -Nru kodi-17.5+git20171026.2109-final/addons/metadata.tvdb.com/resources/language/English/strings.po kodi-17.6+git20171114.2125-final/addons/metadata.tvdb.com/resources/language/English/strings.po --- kodi-17.5+git20171026.2109-final/addons/metadata.tvdb.com/resources/language/English/strings.po 2014-12-21 04:00:23.000000000 +0000 +++ kodi-17.6+git20171114.2125-final/addons/metadata.tvdb.com/resources/language/English/strings.po 2017-11-14 20:24:10.000000000 +0000 @@ -43,3 +43,12 @@ msgctxt "#30006" msgid "Use TheTVDB Ratings in case IMDb is missing" msgstr "" + +msgctxt "#30007" +msgid "Use a fallback language for search and details" +msgstr "" + +msgctxt "#30008" +msgid "Fallback language" +msgstr "" + diff -Nru kodi-17.5+git20171026.2109-final/addons/metadata.tvdb.com/resources/settings.xml kodi-17.6+git20171114.2125-final/addons/metadata.tvdb.com/resources/settings.xml --- kodi-17.5+git20171026.2109-final/addons/metadata.tvdb.com/resources/settings.xml 2015-06-14 19:32:48.000000000 +0000 +++ kodi-17.6+git20171114.2125-final/addons/metadata.tvdb.com/resources/settings.xml 2017-11-14 20:24:10.000000000 +0000 @@ -6,6 +6,8 @@ + + diff -Nru kodi-17.5+git20171026.2109-final/addons/metadata.tvdb.com/tvdb.xml kodi-17.6+git20171114.2125-final/addons/metadata.tvdb.com/tvdb.xml --- kodi-17.5+git20171026.2109-final/addons/metadata.tvdb.com/tvdb.xml 2017-10-26 19:08:46.000000000 +0000 +++ kodi-17.6+git20171114.2125-final/addons/metadata.tvdb.com/tvdb.xml 2017-11-14 20:24:10.000000000 +0000 @@ -1,355 +1,1090 @@ - - - http://(?:www\.)?thetvdb.com/(?:index\.php)?\?tab=series&id=([0-9]+) + + + + + + imdb\....?/title/tt([0-9]*) + + + imdb\....?/title\?([0-9]*) + + + (?!^$) - - imdb....?/title/tt([0-9]*) + + https?://(?:www\.)?thetvdb.com/(?:index\.php)?\?tab=series&id=([0-9]+) - - imdb....?/Title\?([0-9]*) + + (?!^$)> - - - - <seriesid>([0-9]*)</seriesid> + + + + "token": "(.*)" + + + + + + + + "token": "(.*)" + + + + + "id": (\d+), + + - - - (.*?http://www.thetvdb.com.*) - - - (.*?http://thetvdb.com.*) - - - - - - - - - (.+) - + + + + + + + - - - - - - - <seriesid>([0-9]*)</seriesid>[^<]*<language>([^<]*)</language>[^<]*<SeriesName>([^<]*)</SeriesName> + + + + "token": "(.*)" + + + + + + + + + ^(?!\Q$INFO[fallbacklanguage]\E$) - - - - + + + + + + + + + + + + + + + "aliases": \[([^]]*)\],\s+"banner": "[^"]*",\s+"firstAired": "([^"]*)",\s+"id": (\d+),\s+"network": "[^"]*",\s+"overview": (?:"[^}]*"|null),\s+"seriesName": "([^}]*)", + + + + + + + + + 313081 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <xsl:value-of select="$title"/> +

+ $$16 +

-$INFO[language].json

https://api.thetvdb.com/series/|Authorization=Bearer%20$$19&accept-language=$INFO[language] +

+ + + + + + + + + + + + - - <Series>.*?<id>$$2</id>(.*) + + Authorization=Bearer%20(.+)&accept-language - - <Overview>([^<]*)</Overview> + + - - + + "id": (\d+), - - <ContentRating>([^<]*)</ContentRating> + + "seriesName": "(.*)",\s+"aliases" - - <FirstAired>([^<]*)</FirstAired> + + "seriesName": null,\s+"aliases" - - <Runtime>([^<]+)</Runtime> + + "firstAired": "([^"]*)", - - - <Rating>([^<]+)</Rating> - - - <RatingCount>([^<]+)</RatingCount> - - TheTVDB + + "runtime": "([^"]*)", - - - <IMDB_ID>([^<]+)</IMDB_ID> - - - - <Rating>([^<]+)</Rating> - - - <RatingCount>([^<]+)</RatingCount> + + "network": "([^"]*)", + + + + + "overview": "(.*)",\s+"lastUpdated" - ^$ - - - (.+) + (.*?)\\r - IMDb - - - <Network>([^<]*)</Network> - - - <SeriesName>([^<]*)</SeriesName> + (?!^$)(.*) - - <Genre>([^<]*)</Genre> + + "overview": null,\s+"lastUpdated" - - ([^\|]*)\| - - - ([^,]*), + + "rating": "([^"]*)", - - ([^\|,]+)$ + + + "genre": \[([^]]*)\] + + "([^"]+)" - - - <Actor>.*?<Image>([^<]+)</Image>.*?<Name>([^<]*)</Name>.*?<Role>([^<]*) + + + (?!^$) + + (?!^\Q$INFO[fallbacklanguage]\E$) - - - <Actor>.*?<Image>([^<]*)</Image>.*?<Name>([^<]*)</Name>.*?<Role>([^<]*) + + "id": (\d+), - - + + "id": (\d+), - - .*/(.*).zip + + + "siteRating": (?:(\d+(?:\.\d)?)|null) + + + "siteRatingCount": (?:(\d+)|null)\s+} + + + + + "imdbId": "(tt\d+)", + + (?!^$) + + + ^$ + + IMDb + + - - + + "id": (\d+), - - + - - + + + "seriesName": "(.*)",\s+"aliases" + + missingtitle + + + + + + "overview": "(.*)",\s+"lastUpdated" + + (.*?)\\r + + + + missingplot - - - - - <BannerPath>([^<]*)</BannerPath>[^<]*<BannerType>series</BannerType>[^<]*<BannerType2>graphical</BannerType2>[^<]*<Language>$INFO[language]</Language> + + + + + + + + + + "name": "([^}]+)",\s+"role": "([^}]+)",\s+"sortOrder": (\d+),\s+"image": "([^"]+)", - - <BannerPath>([^<]*)</BannerPath>[^<]*<BannerType>series</BannerType>[^<]*<BannerType2>graphical</BannerType2>[^<]*<Language>((?!$INFO[language])[a-z])*</Language> + + "name": "([^}]+)",\s+"role": "([^}]+)",\s+"sortOrder": (\d+),\s+"image": (?:""|null), - - <BannerPath>([^<]*)</BannerPath>[^<]*<BannerType>series</BannerType>[^<]*<BannerType2>text</BannerType2>[^<]*<Language>$INFO[language]</Language> + + + + + + + - - <BannerPath>([^<]*)</BannerPath>[^<]*<BannerType>series</BannerType>[^<]*<BannerType2>text</BannerType2>[^<]*<Language>((?!$INFO[language])[a-z])*</Language> + + - - <BannerPath>([^<]*)</BannerPath>[^<]*<BannerType>series</BannerType>[^<]*<BannerType2>blank</BannerType2>[^<]*<Language></Language> + + + + + + + "token": "(.*)" - - <BannerPath>([^<]*)</BannerPath>[^<]*<BannerType>season</BannerType>[^<]*<BannerType2>season</BannerType2>[^<]*<Language>$INFO[language]</Language>[^<]*[^S]*Season>([0-9]+)</Season> + + - - <BannerPath>([^<]*)</BannerPath>[^<]*<BannerType>season</BannerType>[^<]*<BannerType2>season</BannerType2>[^<]*<Language>((?!$INFO[language])[a-z])*</Language>[^<]*[^S]*Season>([0-9]+)</Season> + + - - <BannerPath>([^<]*)</BannerPath>[^<]*<BannerType>season</BannerType>[^<]*<BannerType2>seasonwide</BannerType2>[^<]*<Language>$INFO[language]</Language>[^<]*[^S]*Season>([0-9]+)</Season> + + - - <BannerPath>([^<]*)</BannerPath>[^<]*<BannerType>season</BannerType>[^<]*<BannerType2>seasonwide</BannerType2>[^<]*<Language>((?!$INFO[language])[a-z])*</Language>[^<]*[^S]*Season>([0-9]+)</Season> + + + + + + + - - <BannerPath>([^<]*)</BannerPath>[^<]*<BannerType>poster</BannerType> + + "keyType": "([^"]+)" - - <BannerPath>([^<]*)</BannerPath>[^<]*<BannerType>poster</BannerType> + + + + + + "keyType": "([^"]+)" + + ^(?!\Q$$16\E$|en$) - - - <BannerPath>([^<]*)</BannerPath>[^<]*<BannerType>fanart</BannerType>[^<]*<BannerType2>([^<]*)</BannerType2>[^<]*<Colors>([^<]*)</Colors>[^<]*<Language>$INFO[language]</Language> + + + - - <BannerPath>([^<]*)</BannerPath>[^<]*<BannerType>fanart</BannerType>[^<]*<BannerType2>([^<]*)</BannerType2>[^<]*<Colors>([^<]*)</Colors>[^<]*<Language>((?!$INFO[language])[a-z])*</Language> + + "keyType": "([^"]+)" - + ^(?!en) + + + + + "id": (\d+),\s+"keyType": "([^"]+)",\s+"subKey": "([^"]*)",\s+"fileName": "([^"]+)",\s+"resolution": "([^"]*)",\s+"ratingsInfo": {\s+"average": (?:([\d\.]+)|null),\s+"count": \d+\s+},\s+"thumbnail": "([^"]+)" + + "keyType": "([^"]+)", + + + + + + + + + + + + + +

+ + + + + + + + + + + + +

+ + + + +

+ + + + + + + + + poster + banner + + + + season +

+ +

http://www.thetvdb.com/banners/ + + + + + + + + poster + banner + + + season + -1 +

http://www.thetvdb.com/banners/ + + + + - - - - + + + + + + + "token": "(.*)" + + + "id":(\d+)} + + + (?!^$) + + + + + http://(?:www\.)?thetvdb\.com/api/.+/series/(\d+)/all/ + + + http://(?:www\.)?thetvdb\.com/api/.+/series/(\d+)/all/ + + + + + - - http://(?:www\.)?thetvdb.com/api/(.+)/series/([0-9]*)/all/(.+).zip + + "last": (\d+), + + + - - - - <Episode>.*?<id>([0-9]*).*?<EpisodeName>([^<]*).*?<FirstAired>([^<]*).*?<absolute_number>([0-9]*).*?</Episode> - - - - <Episode>.*?<id>([0-9]*).*?<EpisodeName>([^<]*).*?<EpisodeNumber>([0-9]*).*?<FirstAired>([^<]*).*?<SeasonNumber>0</SeasonNumber>.*?</Episode> - - - - <Episode>.*?<id>([0-9]+).*?<EpisodeName>([^<]*).*?<EpisodeNumber>([0-9]+)[^<]*.*?<FirstAired>([^<]*)</FirstAired>.*?<SeasonNumber>([0-9]+)[^<]*.*?</Episode> - - - - - <Episode>.*?<id>([0-9]+).*?<Combined_episodenumber>([^<]*).*?<Combined_season>([^<]*).*?<EpisodeName>([^<]*).*?<FirstAired>([^<]*)</FirstAired>.*?</Episode> + + + + + + + + + + + + + + + + + + LoadEpisodeListepisodes-$$18--$INFO[language].jsonhttps://api.thetvdb.com/series/$$18/episodes?page=|Authorization=Bearer%20$$19&accept-language=$INFO[language] + + + + + + + + + - + + + + + "absoluteNumber": (?:(\d+)|null),\s+"airedEpisodeNumber": (\d+),\s+"airedSeason": (\d+),\s+"airedSeasonID": \d+,\s+"dvdEpisodeNumber": (?:([\d\.]+)|null),\s+"dvdSeason": (?:(\d+)|null),\s+"episodeName": (?:"([^}]*)"|null),\s+"firstAired": (?:"([^"]*)"|null),\s+"id": (\d+),\s+"language": {[^}]+},\s+"lastUpdated": \d+,\s+"overview": (?:"([^}]*)"|null)\s+} + + + (?!^$) + + + + + + + + + + + + + + + + + + + + +

+ + + + + + + + + + + + + + + + + + + + +

+ + + + + + + + + + + - - - - - - <Episode>.*?<id>$$2</id>(.*?)</Episode> + + $$12 + + + + + Episode order: DVD Absolute Aired + + + + + + + + + +

+ <xsl:value-of select="EpisodeName"/> +

+ + + + + + +

+ + + 1 + +

0 +

+ + + + + +

+ + +

+ + + + + https://api.thetvdb.com/login?{"apikey":"439DFEBA9D3059C6","id":}|Content-Type=application/json&accept-language=$INFO[language] + + + + +

+ + + + + + + + +

+ <xsl:value-of select="$mergedtitle"/> +

+ https://api.thetvdb.com/login?{"apikey":"439DFEBA9D3059C6","id":}|Content-Type=application/json + + + + + + + + + + +

+ + +

+ + + + + + + + + + + + + + + + + + + + + + + + "id":(\d+)} - - + + "token": "(.*)" - - <Overview>([^<]*)</Overview> + + (\d+)\| - - <Writer>([^<]*)</Writer> + + - - ([^\|]*)\| + + + + + + + - - ([^,]*), + + "id": (\d+), - - ([^\|,]+)$ + + "id": (\d+), - - <Director>([^<]*)</Director> + + "airedSeason": (\d+), - - ([^\|]*)\| + + "airedEpisodeNumber": (\d+), - - ([^,]*), + + "episodeName": "(.*)",\s+"firstAired" - - ([^\|,]+)$ + + "episodeName": null,\s+"firstAired" - - <GuestStars>([^<]*)</GuestStars> + + "firstAired": (?:"([^"]*)"|null), - - ([^\|]*)\| + + + + "overview": "(.*)",\s+"language" + + (.*?)\\r + + (?!^$)(.*) - - ([^,]*), + + "overview": null,\s+"language" - - ([^\|,]+)$ + + "dvdSeason": (?:(\d+)|null), - - <EpisodeName>([^<]*)</EpisodeName> + + "dvdEpisodeNumber": (?:(\d+)|null), - - - <SeasonNumber>([1-9]*)</SeasonNumber>.*?<absolute_number>([0-9]*)</absolute_number> + + "absoluteNumber": (?:(\d+)|null), - - - <EpisodeNumber>([0-9]*)</EpisodeNumber>.*?<SeasonNumber>0</SeasonNumber> + + "airsAfterSeason": (?:(\d+)|null), - - - - <SeasonNumber>([^<]*)</SeasonNumber> - - - <Combined_season>([^<]*)</Combined_season> - - + + "airsBeforeSeason": (?:(\d+)|null), - - - <EpisodeNumber>([^<]*)</EpisodeNumber> - - - <Combined_episodenumber>([^<]*)</Combined_episodenumber> - - + + "airsBeforeEpisode": (?:(\d+)|null), - - <filename>([^<]+)</filename> + + "siteRating": (?:([\d\.]+)|null), - - <FirstAired>([^<]+)</FirstAired> + + "siteRatingCount": (?:(\d+)|null)\s+} - - <airsbefore_season>([^<]+)</airsbefore_season> + + "imdbId": "(tt\d+)", - - <airsbefore_episode>([^<]+)</airsbefore_episode> + + "filename": (?:"([^"]*)"|null), - - <airsafter_season>([^<]+)</airsafter_season> + + + "writers": \[([^]]*)\], + + "([^"]*)", - - - <Rating>([^<]+)</Rating> + + + "directors": \[([^]]*)\], - - <RatingCount>([^<]+)</RatingCount> + "([^"]*)", + + + + "guestStars": \[\s+"([^]]*)"\s+\], - TheTVDB + ([^,"]+)[,"\s]+ - - - <IMDB_ID>([^<]+)</IMDB_ID> + + + ^$ - - - <Rating>([^<]+)</Rating> - - - <RatingCount>([^<]+)</RatingCount> - - ^$ + + ^\Q$INFO[fallbacklanguage]\E$ - - (.+) + + + + + (?!^$) - IMDb + (?!^\Q$INFO[fallbacklanguage]\E$) - - <Runtime>([^<]+)</Runtime> + + + + + + + + "episodeName": "(.*)",\s+"firstAired" + + missingtitle + + + + + + "overview": "(.*)",\s+"language" + + (.*?)\\r + + + + missingplot + + + - - + + + + + + + + + + + + + $$12 + + + + + + + + + + + + + + + + + + + + + +

+ + <xsl:choose> + <xsl:when test="$single-episode"><xsl:value-of select="$FirstEpisode/episodeName"/></xsl:when> + <xsl:otherwise> + <xsl:variable name="title"> + <xsl:call-template name="merge-details"> + <xsl:with-param name="list" select="$episode-list" /> + <xsl:with-param name="element" select="'episodeName'" /> + <xsl:with-param name="divider" select="$title-divider" /> + </xsl:call-template> + </xsl:variable> + <xsl:call-template name="shrink-title"> + <xsl:with-param name="full-title" select="$title" /> + <xsl:with-param name="title-list" select="substring-after(concat($title,$title-divider),$title-divider)" /> + <xsl:with-param name="test-title" select="substring(substring-before($title,$title-divider),1,string-length(substring-before($title,$title-divider))-4)" /> + </xsl:call-template> + </xsl:otherwise> + </xsl:choose> + + + +

+ + + + + + + + + +

+ + + + + + +

+ + + 1 + + +

+ 0 + + +

+ + + + + + +

+ + + + +

+ + +

+ + + + + + + + + + + + +

+ + + 1 + + + + +

+ + + 1 + + + 1 + + + +

+ + + + + + +

+ + +

+ + + + + +

+ + + + +

+ + + + + + + + + + + + + + +

+ + + + + + + + +

+ + + + + + + + + + + + + + + + +

+ + +

+ + + + + + + + + + + + + + + + + + + + + +

+ 1 + + + + + + + + + + + + + +

+ +

+ + + + + + + + +

+ + + + + + + + + http://www.thetvdb.com/banners/ + + + + + + + + + + +

+ + + + + + + + + + + + + + \ No newline at end of file diff -Nru kodi-17.5+git20171026.2109-final/debian/changelog kodi-17.6+git20171114.2125-final/debian/changelog --- kodi-17.5+git20171026.2109-final/debian/changelog 2017-10-26 19:12:01.000000000 +0000 +++ kodi-17.6+git20171114.2125-final/debian/changelog 2017-11-14 20:27:50.000000000 +0000 @@ -1,4 +1,82 @@ -kodi (2:17.5+git20171026.2109-final-0trusty) trusty; urgency=high +kodi (2:17.6+git20171114.2125-final-0trusty) trusty; urgency=high + + [Martijn Kaijser] + * Bump to v17.6 + + [Rainer Hochecker] + * osx: fix high cpu usage when obscured + + [Kolja Lampe] + * Sync scrapers + + [Garrett Brown] + * Fix segfault when rapidly stopping/starting button mapping + + [Kolja Lampe] + * Sync scrapers + + [Rechi] + * [fix][websocket] Connection header must include not match Upgrade + + [Chris "Koying" Browet] + * FIX: [python] droid libs + + [Garrett Brown] + * Fix crash on startup when peripheral.joystick is disabled + + [Martijn Kaijser] + * Bump to v17.6 RC1 + + [Rechi] + * [win] remove HAS_WEB_SERVER & HAS_WEB_INTERFACE defines, they are handled trough HAVE_LIBMICROHTTPD (cmake) + + [Rechi] + * [cmake] build TestWebServer only if HTTPRequestHandlers are build + + + [Anton Fedchin] + * [win10] AESinkXAudio: cosmetics. + + [Anton Fedchin] + * [win32] AE: fix device initialization. + + [Jonas Karlman] + * windowing/gbm: register DRM PRIME video codec and renderer + + [Jonas Karlman] + * VideoPlayer: add drm legacy support in DRM PRIME renderer + + [Jonas Karlman] + * VideoPlayer: add DRM PRIME renderer + + [Jonas Karlman] + * VideoPlayer: add DRM PRIME video codec + + [Jonas Karlman] + * windowing/gbm: wait for vblank when nothing is rendered + + [Jonas Karlman] + * windowing/gbm: find video plane + + [Jonas Karlman] + * windowing/gbm: use fractal refresh rate when pixel clock is uneven + + [Jonas Karlman] + * windowing/gbm: use include files from libdrm + + + [Garrett Brown] + * Fix crash on startup when peripheral.joystick is disabled + + [Martijn Kaijser] + * Bump to v17.6 RC1 + + [Rechi] + * [win] remove HAS_WEB_SERVER & HAS_WEB_INTERFACE defines, they are handled trough HAVE_LIBMICROHTTPD (cmake) + + [Rechi] + * [cmake] build TestWebServer only if HTTPRequestHandlers are build + [Garrett Brown] * Fix crash on startup when peripheral.joystick is disabled diff -Nru kodi-17.5+git20171026.2109-final/debian/changelog.tmp kodi-17.6+git20171114.2125-final/debian/changelog.tmp --- kodi-17.5+git20171026.2109-final/debian/changelog.tmp 2017-10-26 19:09:54.000000000 +0000 +++ kodi-17.6+git20171114.2125-final/debian/changelog.tmp 2017-11-14 20:25:51.000000000 +0000 @@ -1,4 +1,82 @@ -kodi (2:17.5+git20171026.2109-final-0dist) dist; urgency=high +kodi (2:17.6+git20171114.2125-final-0dist) dist; urgency=high + + [Martijn Kaijser] + * Bump to v17.6 + + [Rainer Hochecker] + * osx: fix high cpu usage when obscured + + [Kolja Lampe] + * Sync scrapers + + [Garrett Brown] + * Fix segfault when rapidly stopping/starting button mapping + + [Kolja Lampe] + * Sync scrapers + + [Rechi] + * [fix][websocket] Connection header must include not match Upgrade + + [Chris "Koying" Browet] + * FIX: [python] droid libs + + [Garrett Brown] + * Fix crash on startup when peripheral.joystick is disabled + + [Martijn Kaijser] + * Bump to v17.6 RC1 + + [Rechi] + * [win] remove HAS_WEB_SERVER & HAS_WEB_INTERFACE defines, they are handled trough HAVE_LIBMICROHTTPD (cmake) + + [Rechi] + * [cmake] build TestWebServer only if HTTPRequestHandlers are build + + + [Anton Fedchin] + * [win10] AESinkXAudio: cosmetics. + + [Anton Fedchin] + * [win32] AE: fix device initialization. + + [Jonas Karlman] + * windowing/gbm: register DRM PRIME video codec and renderer + + [Jonas Karlman] + * VideoPlayer: add drm legacy support in DRM PRIME renderer + + [Jonas Karlman] + * VideoPlayer: add DRM PRIME renderer + + [Jonas Karlman] + * VideoPlayer: add DRM PRIME video codec + + [Jonas Karlman] + * windowing/gbm: wait for vblank when nothing is rendered + + [Jonas Karlman] + * windowing/gbm: find video plane + + [Jonas Karlman] + * windowing/gbm: use fractal refresh rate when pixel clock is uneven + + [Jonas Karlman] + * windowing/gbm: use include files from libdrm + + + [Garrett Brown] + * Fix crash on startup when peripheral.joystick is disabled + + [Martijn Kaijser] + * Bump to v17.6 RC1 + + [Rechi] + * [win] remove HAS_WEB_SERVER & HAS_WEB_INTERFACE defines, they are handled trough HAVE_LIBMICROHTTPD (cmake) + + [Rechi] + * [cmake] build TestWebServer only if HTTPRequestHandlers are build + [Garrett Brown] * Fix crash on startup when peripheral.joystick is disabled diff -Nru kodi-17.5+git20171026.2109-final/debian/changelog.tmp.old kodi-17.6+git20171114.2125-final/debian/changelog.tmp.old --- kodi-17.5+git20171026.2109-final/debian/changelog.tmp.old 2017-10-26 19:09:00.000000000 +0000 +++ kodi-17.6+git20171114.2125-final/debian/changelog.tmp.old 2017-11-14 20:25:08.000000000 +0000 @@ -1,5 +1,152 @@ kodi (2:17.0~git20160827.0200-a56be14-0dist) dist; urgency=high + [Anton Fedchin] + * [win10] AESinkXAudio: cosmetics. + + [Anton Fedchin] + * [win32] AE: fix device initialization. + + [Jonas Karlman] + * windowing/gbm: register DRM PRIME video codec and renderer + + [Jonas Karlman] + * VideoPlayer: add drm legacy support in DRM PRIME renderer + + [Jonas Karlman] + * VideoPlayer: add DRM PRIME renderer + + [Jonas Karlman] + * VideoPlayer: add DRM PRIME video codec + + [Jonas Karlman] + * windowing/gbm: wait for vblank when nothing is rendered + + [Jonas Karlman] + * windowing/gbm: find video plane + + [Jonas Karlman] + * windowing/gbm: use fractal refresh rate when pixel clock is uneven + + [Jonas Karlman] + * windowing/gbm: use include files from libdrm + + + [Garrett Brown] + * Fix crash on startup when peripheral.joystick is disabled + + [Martijn Kaijser] + * Bump to v17.6 RC1 + + [Rechi] + * [win] remove HAS_WEB_SERVER & HAS_WEB_INTERFACE defines, they are handled trough HAVE_LIBMICROHTTPD (cmake) + + [Rechi] + * [cmake] build TestWebServer only if HTTPRequestHandlers are build + + + [Garrett Brown] + * Fix crash on startup when peripheral.joystick is disabled + + [Martijn Kaijser] + * Bump to v17.6 RC1 + + [Martijn Kaijser] + * [release] bump to final v17.5 + + [Rechi] + * [win] remove HAS_WEB_SERVER & HAS_WEB_INTERFACE defines, they are handled trough HAVE_LIBMICROHTTPD (cmake) + + [Rechi] + * [cmake] build TestWebServer only if HTTPRequestHandlers are build + + [wsnipex] + * [cmake] allow reading GIT_REV from a VERSION file + + [ronie] + * skin.estouchy - partial backport of #12345 + + [Garrett Brown] + * Joysticks: Fix unintended handling of analog sticks + + [Garrett Brown] + * Joysticks: Fix accelerometers preventing screensaver + + [fritsch] + * AESinkAUDIOTrack: Use VerifySinkConfiguration also for ENCODING_PCM_FLOAT + + [fritsch] + * AudioFormat: Add CHANNEL_OUT_7POINT1_SURROUND + + [fritsch] + * AESinkAUDIOTRACK: Verify RAW formats too + + [fritsch] + * AESinkAUDIOTRACK: Implement VerifySinkConfiguration() + + [fritsch] + * AESinkAudioTrack: Properly handle 7.1 formats + + [fritsch] + * AESinkAUDIOTRACK: Workaround interpret RR and RL of CEA-861-D to map it on Android defaults + + [fritsch] + * AESinkAUDIOTRACK: Cleanup long gone channel pre lollipop compatibility + + [fritsch] + * AESinkAUDIOTRACK: Refactor and separate PCM and Passthrough Enumeration + + [Martijn Kaijser] + * [addons] remove htbackdrops from addon-manifest + + [Martijn Kaijser] + * [addons] update scrapers + + [fritsch] + * FFmpeg: Bump to 3.1.11-Krypton-17.5 (Krypton) + + [Memphiz] + * [XBMCHelper] - fixed up and down buttons on ir remotes with macOS High Sierra + + [Memphiz] + * [ios/tvos] - added latest apple devices to allow retina support + + [ronie] + * [skin.estouchy] pvr-fix + + [Lukas Obermann] + * [imdb] partial revert of crashfix due to a introduced bug + + [mglae] + * wrapper: add __xstat() and __fxstat() for libdvdnav + + [Kai Sommerfeld] + * [cec] Fix power messages handling. + + [Chris "Koying" Browet] + * FIX: [addons] clarify repo creation + + [DaveTBlake] + * Fix GetGenresByArtist to return the song genres for an artist derived via album as a priority to those via song artist + + [Wolfgang Schupp] + * Merge pull request #12727 from candrews/patch-6 + + [Kai Sommerfeld] + * [PVR] Fix jumping timeline while switching channel groups in Guide window. + + [Martijn Kaijser] + * bump to v17.5 RC1 + + [fritsch] + * ActiveAE: Fix up Typo + + [Memphiz] + * [AE/OSXSink] - fixed c&p in scoring algorithm - thx to dcb314 - fixes #17580 + + [Matthias Kortstiege] + * [videoinfoscanner] properly handle excludes (fixes #16444) + + [fritsch] * AESinkALSA: Check layout for sanity diff -Nru kodi-17.5+git20171026.2109-final/debian/control kodi-17.6+git20171114.2125-final/debian/control --- kodi-17.5+git20171026.2109-final/debian/control 2017-10-26 19:09:00.000000000 +0000 +++ kodi-17.6+git20171114.2125-final/debian/control 2017-11-14 20:25:08.000000000 +0000 @@ -111,7 +111,7 @@ python-imaging, python-simplejson, libmad0, - libass5 | libass4, + libass9 |libass5 | libass4, libgif5 | libgif7, libssh-4 | libssh2-1, libnfs8 | libnfs4 | libnfs1, diff -Nru kodi-17.5+git20171026.2109-final/gitrev kodi-17.6+git20171114.2125-final/gitrev --- kodi-17.5+git20171026.2109-final/gitrev 2017-10-26 19:09:00.000000000 +0000 +++ kodi-17.6+git20171114.2125-final/gitrev 2017-11-14 20:25:08.000000000 +0000 @@ -1 +1 @@ -5bd45ab +a9a7a20 Binary files /tmp/tmp4KybDy/fqsbJDfKzy/kodi-17.5+git20171026.2109-final/media/Splash.png and /tmp/tmp4KybDy/IcKwaVA_yO/kodi-17.6+git20171114.2125-final/media/Splash.png differ diff -Nru kodi-17.5+git20171026.2109-final/tools/depends/target/python27/android-binmodule.patch kodi-17.6+git20171114.2125-final/tools/depends/target/python27/android-binmodule.patch --- kodi-17.5+git20171026.2109-final/tools/depends/target/python27/android-binmodule.patch 1970-01-01 00:00:00.000000000 +0000 +++ kodi-17.6+git20171114.2125-final/tools/depends/target/python27/android-binmodule.patch 2017-11-14 20:24:10.000000000 +0000 @@ -0,0 +1,31 @@ +--- a/Python/dynload_shlib.c ++++ b/Python/dynload_shlib.c +@@ -112,10 +112,6 @@ + dlopenflags = PyThreadState_GET()->interp->dlopenflags; + #endif + +- if (Py_VerboseFlag) +- PySys_WriteStderr("dlopen(\"%s\", %x);\n", pathname, +- dlopenflags); +- + #ifdef __VMS + /* VMS currently don't allow a pathname, use a logical name instead */ + /* Concatenate 'python_module_' and shortname */ +@@ -125,8 +121,17 @@ + PyOS_snprintf(pathbuf, sizeof(pathbuf), "python_module_%-.200s", + shortname); + pathname = pathbuf; ++#elif defined(ANDROID) ++ /* Android does not allow a pathname and wants lib*.so */ ++ PyOS_snprintf(pathbuf, sizeof(pathbuf), "lib%-.200s.so", ++ shortname); ++ pathname = pathbuf; + #endif + ++ if (Py_VerboseFlag) ++ PySys_WriteStderr("dlopen(\"%s\", %x);\n", pathname, ++ dlopenflags); ++ + handle = dlopen(pathname, dlopenflags); + + if (handle == NULL) { diff -Nru kodi-17.5+git20171026.2109-final/tools/depends/target/python27/Makefile kodi-17.6+git20171114.2125-final/tools/depends/target/python27/Makefile --- kodi-17.5+git20171026.2109-final/tools/depends/target/python27/Makefile 2017-10-26 19:07:37.000000000 +0000 +++ kodi-17.6+git20171114.2125-final/tools/depends/target/python27/Makefile 2017-11-14 20:24:10.000000000 +0000 @@ -1,6 +1,6 @@ include ../../Makefile.include DEPS= ../../Makefile.include Makefile Python-2.7.12-crosscompile.patch Python-2.7.10-android.patch Python-no-export-path.patch \ - Python-setup.patch fix-datetime.patch Python-2.6.5-urllib.diff modules.setup make-fork-optional.patch + Python-setup.patch fix-datetime.patch Python-2.6.5-urllib.diff modules.setup make-fork-optional.patch android-binmodule.patch # lib name, version LIBNAME=Python @@ -39,6 +39,7 @@ cd $(PLATFORM); patch -p0 < ../Python-2.7.10-android.patch cd $(PLATFORM); patch -p0 < ../Python-no-export-path.patch cd $(PLATFORM); patch -p0 < ../fix-ffi.patch + cd $(PLATFORM); patch -p1 -i ../android-binmodule.patch ifeq ($(OS),ios) cd $(PLATFORM); patch -p0 < ../make-fork-optional.patch cd $(PLATFORM); patch -p0 < ../Python-2.6.5-urllib.diff diff -Nru kodi-17.5+git20171026.2109-final/VERSION kodi-17.6+git20171114.2125-final/VERSION --- kodi-17.5+git20171026.2109-final/VERSION 2017-10-26 19:09:00.000000000 +0000 +++ kodi-17.6+git20171114.2125-final/VERSION 2017-11-14 20:25:08.000000000 +0000 @@ -1 +1 @@ -5bd45ab +a9a7a20 diff -Nru kodi-17.5+git20171026.2109-final/version.txt kodi-17.6+git20171114.2125-final/version.txt --- kodi-17.5+git20171026.2109-final/version.txt 2017-10-26 19:08:47.000000000 +0000 +++ kodi-17.6+git20171114.2125-final/version.txt 2017-11-14 20:24:10.000000000 +0000 @@ -2,10 +2,10 @@ COMPANY_NAME XBMC-Foundation WEBSITE http://kodi.tv VERSION_MAJOR 17 -VERSION_MINOR 5 +VERSION_MINOR 6 VERSION_TAG -VERSION_CODE 1745000 -ADDON_API 17.5.0 +VERSION_CODE 1760000 +ADDON_API 17.6.0 # Notes: # Change AC_INIT in configure.ac diff -Nru kodi-17.5+git20171026.2109-final/xbmc/games/controllers/windows/GUIConfigurationWizard.cpp kodi-17.6+git20171114.2125-final/xbmc/games/controllers/windows/GUIConfigurationWizard.cpp --- kodi-17.5+git20171026.2109-final/xbmc/games/controllers/windows/GUIConfigurationWizard.cpp 2017-10-26 19:07:41.000000000 +0000 +++ kodi-17.6+git20171114.2125-final/xbmc/games/controllers/windows/GUIConfigurationWizard.cpp 2017-11-14 20:24:10.000000000 +0000 @@ -92,19 +92,17 @@ bool CGUIConfigurationWizard::Abort(bool bWait /* = true */) { - if (IsRunning()) - { - StopThread(false); - - m_inputEvent.Set(); - m_motionlessEvent.Set(); - - if (bWait) - StopThread(true); - - return true; - } - return false; + bool bWasRunning = !m_bStop; + + StopThread(false); + + m_inputEvent.Set(); + m_motionlessEvent.Set(); + + if (bWait) + StopThread(true); + + return bWasRunning; } void CGUIConfigurationWizard::Process(void) diff -Nru kodi-17.5+git20171026.2109-final/xbmc/network/test/CMakeLists.txt kodi-17.6+git20171114.2125-final/xbmc/network/test/CMakeLists.txt --- kodi-17.5+git20171026.2109-final/xbmc/network/test/CMakeLists.txt 2017-10-26 19:08:47.000000000 +0000 +++ kodi-17.6+git20171114.2125-final/xbmc/network/test/CMakeLists.txt 2017-11-14 20:24:10.000000000 +0000 @@ -1,3 +1,5 @@ -set(SOURCES TestWebServer.cpp) +if(MICROHTTPD_FOUND) + set(SOURCES TestWebServer.cpp) -core_add_test_library(network_test) + core_add_test_library(network_test) +endif() diff -Nru kodi-17.5+git20171026.2109-final/xbmc/network/websocket/WebSocketV13.cpp kodi-17.6+git20171114.2125-final/xbmc/network/websocket/WebSocketV13.cpp --- kodi-17.5+git20171026.2109-final/xbmc/network/websocket/WebSocketV13.cpp 2017-08-21 07:33:27.000000000 +0000 +++ kodi-17.6+git20171114.2125-final/xbmc/network/websocket/WebSocketV13.cpp 2017-11-14 20:24:10.000000000 +0000 @@ -18,6 +18,7 @@ * */ +#include #include #include @@ -102,7 +103,10 @@ // There must be a "Connection" header with the value "Upgrade" value = header.getValue(WS_HEADER_CONNECTION_LC); - if (value == NULL || strnicmp(value, WS_HEADER_UPGRADE, strlen(WS_HEADER_UPGRADE)) != 0) + std::vector elements; + if (value != nullptr) + elements = StringUtils::Split(value, ","); + if (elements.empty() || !std::any_of(elements.begin(), elements.end(), [](std::string& elem) { return StringUtils::EqualsNoCase(StringUtils::Trim(elem), WS_HEADER_UPGRADE); })) { CLog::Log(LOGINFO, "WebSocket [RFC6455]: invalid \"%s\" received", WS_HEADER_CONNECTION_LC); return true; diff -Nru kodi-17.5+git20171026.2109-final/xbmc/peripherals/devices/PeripheralJoystick.cpp kodi-17.6+git20171114.2125-final/xbmc/peripherals/devices/PeripheralJoystick.cpp --- kodi-17.5+git20171026.2109-final/xbmc/peripherals/devices/PeripheralJoystick.cpp 2017-10-26 19:08:47.000000000 +0000 +++ kodi-17.6+git20171114.2125-final/xbmc/peripherals/devices/PeripheralJoystick.cpp 2017-11-14 20:24:10.000000000 +0000 @@ -51,8 +51,11 @@ CPeripheralJoystick::~CPeripheralJoystick(void) { m_defaultInputHandler.AbortRumble(); - UnregisterJoystickInputHandler(m_joystickMonitor.get()); - m_joystickMonitor.reset(); + if (m_joystickMonitor) + { + UnregisterJoystickInputHandler(m_joystickMonitor.get()); + m_joystickMonitor.reset(); + } UnregisterJoystickInputHandler(&m_defaultInputHandler); m_deadzoneFilter.reset(); m_buttonMap.reset(); diff -Nru kodi-17.5+git20171026.2109-final/xbmc/system.h kodi-17.6+git20171114.2125-final/xbmc/system.h --- kodi-17.5+git20171026.2109-final/xbmc/system.h 2017-10-26 19:08:47.000000000 +0000 +++ kodi-17.6+git20171114.2125-final/xbmc/system.h 2017-11-14 20:24:10.000000000 +0000 @@ -97,8 +97,6 @@ #define HAS_WIN32_NETWORK #define HAS_IRSERVERSUITE #define HAS_AUDIO -#define HAS_WEB_SERVER -#define HAS_WEB_INTERFACE #define HAS_FILESYSTEM_SMB #define HAS_ZEROCONF #define HAS_MDNS diff -Nru kodi-17.5+git20171026.2109-final/xbmc/windowing/osx/WinSystemOSXGL.mm kodi-17.6+git20171114.2125-final/xbmc/windowing/osx/WinSystemOSXGL.mm --- kodi-17.5+git20171026.2109-final/xbmc/windowing/osx/WinSystemOSXGL.mm 2017-10-26 19:07:47.000000000 +0000 +++ kodi-17.6+git20171114.2125-final/xbmc/windowing/osx/WinSystemOSXGL.mm 2017-11-14 20:24:10.000000000 +0000 @@ -42,6 +42,11 @@ if (rendered) FlushBuffer(); + // FlushBuffer does not block if window is obscured + // in this case we need to throttle the render loop + if (IsObscured()) + usleep(10000); + if (m_delayDispReset && m_dispResetTimer.IsTimePast()) { m_delayDispReset = false;