diff options
author | graysky | 2020-12-29 15:16:34 -0500 |
---|---|---|
committer | graysky | 2020-12-29 15:16:34 -0500 |
commit | 482793b83cda46cfe61421aa4f265d5696782fe0 (patch) | |
tree | 6f9661da82070be4abf1ed9174e556aa0513373c | |
parent | 0a65a421c0e26c27c61f31aaa98b83377b793350 (diff) | |
download | aur-482793b83cda46cfe61421aa4f265d5696782fe0.tar.gz |
Update to r56865.af8aded66c1-2
-rw-r--r-- | .SRCINFO | 4 | ||||
-rw-r--r-- | 0001-Revert-jsonrpc-remove-ambiguous-and-duplicate-Player.patch | 63 | ||||
-rw-r--r-- | PKGBUILD | 10 |
3 files changed, 74 insertions, 3 deletions
@@ -1,6 +1,6 @@ pkgbase = kodi-git pkgver = r56865.af8aded66c1 - pkgrel = 1 + pkgrel = 2 url = https://kodi.tv arch = x86_64 license = GPL2 @@ -75,6 +75,7 @@ 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 @@ -86,6 +87,7 @@ 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) 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 + @@ -22,7 +22,7 @@ pkgname=( "$pkgbase-eventclients" "$pkgbase-tools-texturepacker" "$pkgbase-dev" ) pkgver=r56865.af8aded66c1 -pkgrel=1 +pkgrel=2 arch=('x86_64') url="https://kodi.tv" license=('GPL2') @@ -81,6 +81,7 @@ 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 + 0001-Revert-jsonrpc-remove-ambiguous-and-duplicate-Player.patch ) noextract=( "libdvdcss-$_libdvdcss_version.tar.gz" @@ -103,7 +104,8 @@ b2sums=('SKIP' 'a8b68fcb8613f0d30e5ff7b862b37408472162585ca71cdff328e3299ff50476fd265467bbd77b352b22bb88c590969044f74d91c5468475504568fd269fa69e' '69024d77e6e7a5036e24729e337b17680dc3735cb1d209058a88b980989826fe56ff113c1177410106e0f70d827fa82603372277e3bc1aa4d12ffe5bb979af96' 'bac6c6650f8347458dd2dd66f318b43a769b0896d68f6a6f1310754527a69feaa52b2f6f48d67c7e811c2dafa5d3863a9a07c738df8c12abed2718fb06254b28' - '6d647177380c619529fb875374ec46f1fff6273be1550f056c18cb96e0dea8055272b47664bb18cdc964496a3e9007fda435e67c4f1cee6375a80c048ae83dd0') + '6d647177380c619529fb875374ec46f1fff6273be1550f056c18cb96e0dea8055272b47664bb18cdc964496a3e9007fda435e67c4f1cee6375a80c048ae83dd0' + '05f4158b4006822bc93d77aa13fc77ff1f266b840594d18882bab751d81a772ef99676c5ffc55fa7e977bb1efb66035cdf2bbdfa4a98ff50b9c3770e1c8b8cdc') pkgver() { cd "$_gitname" @@ -120,6 +122,10 @@ 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() { |