Update to r57033.af9b6445fda-1

3 files changed, 10 insertions, 83 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9cc911b0797b..e133f2dbf0fe 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = kodi-git
-	pkgver = r56939.6995aad7c37
+	pkgver = r57033.af9b6445fda
 	pkgrel = 1
 	url = https://kodi.tv
 	arch = x86_64
@@ -75,7 +75,6 @@ pkgbase = kodi-git
 	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 = SKIP
 	b2sums = 283aa2cec0a2200d3569bc280cb9659e9224a6b3a77db8a35b269cd8caf1337ac9d8b92b806df66f63ef7458a46bd6261f0b8b14678b10e26644a79dcbeea5da
 	b2sums = 7573434a0ae8e8ccabf48173f81fcde29074eb138e119a2ae9156cde3c3d8bfd716f5d0e605b97f2dcac21f570781137c8533c5ae306b51e3905822fda318355
@@ -87,7 +86,6 @@ pkgbase = kodi-git
 	b2sums = 69024d77e6e7a5036e24729e337b17680dc3735cb1d209058a88b980989826fe56ff113c1177410106e0f70d827fa82603372277e3bc1aa4d12ffe5bb979af96
 	b2sums = bac6c6650f8347458dd2dd66f318b43a769b0896d68f6a6f1310754527a69feaa52b2f6f48d67c7e811c2dafa5d3863a9a07c738df8c12abed2718fb06254b28
 	b2sums = 6d647177380c619529fb875374ec46f1fff6273be1550f056c18cb96e0dea8055272b47664bb18cdc964496a3e9007fda435e67c4f1cee6375a80c048ae83dd0
-	b2sums = 05f4158b4006822bc93d77aa13fc77ff1f266b840594d18882bab751d81a772ef99676c5ffc55fa7e977bb1efb66035cdf2bbdfa4a98ff50b9c3770e1c8b8cdc
 
 pkgname = kodi-git
 	pkgdesc = A software media player and entertainment hub for digital media (master branch)
@@ -107,7 +105,7 @@ pkgname = kodi-git
 	optdepends = pulseaudio: PulseAudio support
 	optdepends = upower: Display battery level
 	provides = xbmc
-	provides = kodi=r56939.6995aad7c37
+	provides = kodi=r57033.af9b6445fda
 	conflicts = xbmc
 	conflicts = kodi
 	replaces = xbmc
@@ -137,7 +135,7 @@ pkgname = kodi-git-x11
 	depends = tinyxml
 	depends = kodi-git
 	provides = KODI-GIT-BIN
-	provides = kodi-x11=r56939.6995aad7c37
+	provides = kodi-x11=r57033.af9b6445fda
 	conflicts = kodi-x11
 	replaces = kodi-bin
 
@@ -165,7 +163,7 @@ pkgname = kodi-git-wayland
 	depends = waylandpp
 	depends = kodi-git
 	provides = KODI-GIT-BIN
-	provides = kodi-wayland=r56939.6995aad7c37
+	provides = kodi-wayland=r57033.af9b6445fda
 	conflicts = kodi-wayland
 
 pkgname = kodi-git-gbm
@@ -193,13 +191,13 @@ pkgname = kodi-git-gbm
 	depends = tinyxml
 	depends = kodi-git
 	provides = KODI-GIT-BIN
-	provides = kodi-gbm=r56939.6995aad7c37
+	provides = kodi-gbm=r57033.af9b6445fda
 	conflicts = kodi-gbm
 
 pkgname = kodi-git-eventclients
 	pkgdesc = Kodi Event Clients (master branch)
 	optdepends = python: most eventclients are implemented in python
-	provides = kodi-eventclients=r56939.6995aad7c37
+	provides = kodi-eventclients=r57033.af9b6445fda
 	conflicts = kodi-eventclients
 
 pkgname = kodi-git-tools-texturepacker
@@ -208,12 +206,12 @@ pkgname = kodi-git-tools-texturepacker
 	depends = giflib
 	depends = libjpeg-turbo
 	depends = lzo
-	provides = kodi-tools-texturepacker=r56939.6995aad7c37
+	provides = kodi-tools-texturepacker=r57033.af9b6445fda
 	conflicts = kodi-tools-texturepacker
 
 pkgname = kodi-git-dev
 	pkgdesc = Kodi dev files (master branch)
 	depends = kodi-git
-	provides = kodi-dev=r56939.6995aad7c37
+	provides = kodi-dev=r57033.af9b6445fda
 	conflicts = kodi-dev
 
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 ae8fa6a6c9c4..b68e498015e6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -21,7 +21,7 @@ pkgname=(
   "$pkgbase" "$pkgbase-x11" "$pkgbase-wayland" "$pkgbase-gbm"
   "$pkgbase-eventclients" "$pkgbase-tools-texturepacker" "$pkgbase-dev"
 )
-pkgver=r56939.6995aad7c37
+pkgver=r57033.af9b6445fda
 pkgrel=1
 arch=('x86_64')
 url="https://kodi.tv"
@@ -77,9 +77,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"
@@ -102,8 +99,7 @@ b2sums=('SKIP'
         'a8b68fcb8613f0d30e5ff7b862b37408472162585ca71cdff328e3299ff50476fd265467bbd77b352b22bb88c590969044f74d91c5468475504568fd269fa69e'
         '69024d77e6e7a5036e24729e337b17680dc3735cb1d209058a88b980989826fe56ff113c1177410106e0f70d827fa82603372277e3bc1aa4d12ffe5bb979af96'
         'bac6c6650f8347458dd2dd66f318b43a769b0896d68f6a6f1310754527a69feaa52b2f6f48d67c7e811c2dafa5d3863a9a07c738df8c12abed2718fb06254b28'
-        '6d647177380c619529fb875374ec46f1fff6273be1550f056c18cb96e0dea8055272b47664bb18cdc964496a3e9007fda435e67c4f1cee6375a80c048ae83dd0'
-        '05f4158b4006822bc93d77aa13fc77ff1f266b840594d18882bab751d81a772ef99676c5ffc55fa7e977bb1efb66035cdf2bbdfa4a98ff50b9c3770e1c8b8cdc')
+        '6d647177380c619529fb875374ec46f1fff6273be1550f056c18cb96e0dea8055272b47664bb18cdc964496a3e9007fda435e67c4f1cee6375a80c048ae83dd0')
 
 pkgver() {
   cd "$_gitname"
@@ -120,10 +116,6 @@ prepare() {
 
   cd "$_gitname"
   [[ "$_sse_workaround" -eq 1 ]] && patch -p1 -i "$srcdir/cheat-sse-build.patch"
-
-  # this causes issues for the official iOS app
-  # see: https://github.com/xbmc/Official-Kodi-Remote-iOS/issues/95
-  patch -Np1 -i ../0001-Revert-jsonrpc-remove-ambiguous-and-duplicate-Player.patch
 }
 
 build() {