Update to 19.0b2-5

3 files changed, 72 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9635cc58aa3a..3c85d99a42d4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = kodi-devel
 	pkgver = 19.0b2
-	pkgrel = 4
+	pkgrel = 5
 	url = https://kodi.tv
 	arch = x86_64
 	license = GPL2
@@ -75,6 +75,7 @@ pkgbase = kodi-devel
 	source = http://mirrors.kodi.tv/build-deps/sources/flatbuffers-1.11.0.tar.gz
 	source = http://mirrors.kodi.tv/build-deps/sources/spdlog-1.5.0.tar.gz
 	source = cheat-sse-build.patch
+	source = 0001-Revert-jsonrpc-remove-ambiguous-and-duplicate-Player.patch
 	b2sums = 79b9606b48d1a4a2a2ad7c2799bddf539edd04e1954892299507f245fd1c1db057dc22f753877fd0ba56f414c1addb32168c73328d5cf62dec1428941eebb590
 	b2sums = 283aa2cec0a2200d3569bc280cb9659e9224a6b3a77db8a35b269cd8caf1337ac9d8b92b806df66f63ef7458a46bd6261f0b8b14678b10e26644a79dcbeea5da
 	b2sums = 7573434a0ae8e8ccabf48173f81fcde29074eb138e119a2ae9156cde3c3d8bfd716f5d0e605b97f2dcac21f570781137c8533c5ae306b51e3905822fda318355
@@ -86,6 +87,7 @@ pkgbase = kodi-devel
 	b2sums = 69024d77e6e7a5036e24729e337b17680dc3735cb1d209058a88b980989826fe56ff113c1177410106e0f70d827fa82603372277e3bc1aa4d12ffe5bb979af96
 	b2sums = bac6c6650f8347458dd2dd66f318b43a769b0896d68f6a6f1310754527a69feaa52b2f6f48d67c7e811c2dafa5d3863a9a07c738df8c12abed2718fb06254b28
 	b2sums = 6d647177380c619529fb875374ec46f1fff6273be1550f056c18cb96e0dea8055272b47664bb18cdc964496a3e9007fda435e67c4f1cee6375a80c048ae83dd0
+	b2sums = 05f4158b4006822bc93d77aa13fc77ff1f266b840594d18882bab751d81a772ef99676c5ffc55fa7e977bb1efb66035cdf2bbdfa4a98ff50b9c3770e1c8b8cdc
 
 pkgname = kodi-devel
 	pkgdesc = Alpha, Beta, or RC versions of the software media player and entertainment hub for digital media
diff --git a/0001-Revert-jsonrpc-remove-ambiguous-and-duplicate-Player.patch b/0001-Revert-jsonrpc-remove-ambiguous-and-duplicate-Player.patch
new file mode 100644
index 000000000000..29753e79741d
--- /dev/null
+++ b/0001-Revert-jsonrpc-remove-ambiguous-and-duplicate-Player.patch
@@ -0,0 +1,63 @@
+From 88b3174bdc47bfa7fb0e798ef0d01cd0bdf8e734 Mon Sep 17 00:00:00 2001
+From: graysky <graysky@archlinux.us>
+Date: Tue, 29 Dec 2020 14:42:12 -0500
+Subject: [PATCH] Revert "[jsonrpc] remove ambiguous and duplicate Player.Seek
+ options"
+
+This reverts commit 3801ec4b07d74c81d830c83c799ae90228c5cf2e.
+---
+ xbmc/interfaces/json-rpc/PlayerOperations.cpp | 14 +++++++-------
+ xbmc/interfaces/json-rpc/schema/methods.json  |  3 +++
+ 2 files changed, 10 insertions(+), 7 deletions(-)
+
+diff --git a/xbmc/interfaces/json-rpc/PlayerOperations.cpp b/xbmc/interfaces/json-rpc/PlayerOperations.cpp
+index 8572736bef..d472a6951f 100644
+--- a/xbmc/interfaces/json-rpc/PlayerOperations.cpp
++++ b/xbmc/interfaces/json-rpc/PlayerOperations.cpp
+@@ -401,11 +401,11 @@ JSONRPC_STATUS CPlayerOperations::Seek(const std::string &method, ITransportLaye
+         return FailedToExecute;
+ 
+       const CVariant& value = parameterObject["value"];
+-      if (value.isMember("percentage"))
+-        g_application.SeekPercentage(value["percentage"].asFloat());
+-      else if (value.isMember("step"))
++      if (IsType(value, NumberValue) || value.isMember("percentage"))
++        g_application.SeekPercentage(IsType(value, NumberValue) ? value.asFloat() : value["percentage"].asFloat());
++      else if (value.isString() || value.isMember("step"))
+       {
+-        std::string step = value["step"].asString();
++        std::string step = value.isString() ? value.asString() : value["step"].asString();
+         if (step == "smallforward")
+           CBuiltins::GetInstance().Execute("playercontrol(smallskipforward)");
+         else if (step == "smallbackward")
+@@ -417,10 +417,10 @@ JSONRPC_STATUS CPlayerOperations::Seek(const std::string &method, ITransportLaye
+         else
+           return InvalidParams;
+       }
+-      else if (value.isMember("seconds"))
++      else if (value.isMember("seconds") && value.size() == 1)
+         g_application.GetAppPlayer().GetSeekHandler().SeekSeconds(static_cast<int>(value["seconds"].asInteger()));
+-      else if (value.isMember("time"))
+-        g_application.SeekTime(ParseTimeInSeconds(value["time"]));
++      else if (value.isObject())
++        g_application.SeekTime(ParseTimeInSeconds(value.isMember("time") ? value["time"] : value));
+       else
+         return InvalidParams;
+ 
+diff --git a/xbmc/interfaces/json-rpc/schema/methods.json b/xbmc/interfaces/json-rpc/schema/methods.json
+index d23ad943d7..a2e2927b2a 100644
+--- a/xbmc/interfaces/json-rpc/schema/methods.json
++++ b/xbmc/interfaces/json-rpc/schema/methods.json
+@@ -295,6 +295,9 @@
+     "params": [
+       { "name": "playerid", "$ref": "Player.Id", "required": true },
+       { "name": "value", "required": true, "type": [
++          { "$ref": "Player.Position.Percentage", "required": true, "description": "Percentage value to seek to" },
++          { "$ref": "Player.Position.Time", "required": true, "description": "Time to seek to" },
++          { "type": "string", "enum": [ "smallforward", "smallbackward", "bigforward", "bigbackward" ], "required": true, "description": "Seek by predefined jumps" },
+           { "type": "object", "properties": { "percentage": { "$ref": "Player.Position.Percentage", "required": true, "description": "Percentage value to seek to" } }, "additionalProperties": false, "required": true },
+           { "type": "object", "properties": { "time": { "$ref": "Player.Position.Time", "required": true, "description": "Time to seek to" } }, "additionalProperties": false, "required": true },
+           { "type": "object", "properties": { "step": { "type": "string", "enum": [ "smallforward", "smallbackward", "bigforward", "bigbackward" ], "required": true, "description": "Seek by predefined jumps" } }, "additionalProperties": false, "required": true },
+-- 
+2.30.0
+
diff --git a/PKGBUILD b/PKGBUILD
index 98e54014c310..324dbab0063f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -24,7 +24,7 @@ pkgname=(
 )
 pkgver=19.0b2
 #_major=18.7.1
-pkgrel=4
+pkgrel=5
 arch=('x86_64')
 url="https://kodi.tv"
 license=('GPL2')
@@ -83,6 +83,9 @@ source=(
   "http://mirrors.kodi.tv/build-deps/sources/flatbuffers-$_flatbuffers_version.tar.gz"
   "http://mirrors.kodi.tv/build-deps/sources/spdlog-$_spdlog_version.tar.gz"
   cheat-sse-build.patch
+  # this causes issues for the official iOS app
+  # see: https://github.com/xbmc/Official-Kodi-Remote-iOS/issues/95
+  0001-Revert-jsonrpc-remove-ambiguous-and-duplicate-Player.patch
 )
 noextract=(
   "libdvdcss-$_libdvdcss_version.tar.gz"
@@ -105,7 +108,8 @@ b2sums=('79b9606b48d1a4a2a2ad7c2799bddf539edd04e1954892299507f245fd1c1db057dc22f
         'a8b68fcb8613f0d30e5ff7b862b37408472162585ca71cdff328e3299ff50476fd265467bbd77b352b22bb88c590969044f74d91c5468475504568fd269fa69e'
         '69024d77e6e7a5036e24729e337b17680dc3735cb1d209058a88b980989826fe56ff113c1177410106e0f70d827fa82603372277e3bc1aa4d12ffe5bb979af96'
         'bac6c6650f8347458dd2dd66f318b43a769b0896d68f6a6f1310754527a69feaa52b2f6f48d67c7e811c2dafa5d3863a9a07c738df8c12abed2718fb06254b28'
-        '6d647177380c619529fb875374ec46f1fff6273be1550f056c18cb96e0dea8055272b47664bb18cdc964496a3e9007fda435e67c4f1cee6375a80c048ae83dd0')
+        '6d647177380c619529fb875374ec46f1fff6273be1550f056c18cb96e0dea8055272b47664bb18cdc964496a3e9007fda435e67c4f1cee6375a80c048ae83dd0'
+        '05f4158b4006822bc93d77aa13fc77ff1f266b840594d18882bab751d81a772ef99676c5ffc55fa7e977bb1efb66035cdf2bbdfa4a98ff50b9c3770e1c8b8cdc')
 prepare() {
   [[ -d kodi-build-x11 ]] && rm -rf kodi-build-x11
   mkdir kodi-build-x11