Update to 19.0rc1-2

3 files changed, 2 insertions, 69 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0a73998814e6..03235dcfffb9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = kodi-devel
 	pkgver = 19.0rc1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://kodi.tv
 	arch = x86_64
 	license = GPL2
@@ -75,7 +75,6 @@ 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 = 305793e2a5f16f07853a82e8f1953a56baa4159c9eee762aee40e8b6692c317cb83e7713d99cbb767cff0c1ac2a2d8bfc3837525d8ad4c854f114f900ebdb294
 	b2sums = 283aa2cec0a2200d3569bc280cb9659e9224a6b3a77db8a35b269cd8caf1337ac9d8b92b806df66f63ef7458a46bd6261f0b8b14678b10e26644a79dcbeea5da
 	b2sums = 7573434a0ae8e8ccabf48173f81fcde29074eb138e119a2ae9156cde3c3d8bfd716f5d0e605b97f2dcac21f570781137c8533c5ae306b51e3905822fda318355
diff --git a/0001-Revert-jsonrpc-remove-ambiguous-and-duplicate-Player.patch b/0001-Revert-jsonrpc-remove-ambiguous-and-duplicate-Player.patch
deleted file mode 100644
index 29753e79741d..000000000000
--- a/0001-Revert-jsonrpc-remove-ambiguous-and-duplicate-Player.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-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 54b5561d5756..9f78cb3f0eb1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -24,7 +24,7 @@ pkgname=(
 )
 pkgver=19.0rc1
 #_major=18.7.1
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url="https://kodi.tv"
 license=('GPL2')
@@ -81,9 +81,6 @@ 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"