From 38376ad08704d19afee057f7a8140dc92390b952 Mon Sep 17 00:00:00 2001 From: chewitt Date: Mon, 27 Feb 2017 00:01:17 +0000 Subject: [PATCH] kodi: drop upstream-merged patches --- .../kodi-999.01-create-archive-cache.patch | 28 ------------------- .../kodi/patches/kodi-999.99-PR11663.patch | 22 --------------- 2 files changed, 50 deletions(-) delete mode 100644 packages/mediacenter/kodi/patches/kodi-999.01-create-archive-cache.patch delete mode 100644 packages/mediacenter/kodi/patches/kodi-999.99-PR11663.patch diff --git a/packages/mediacenter/kodi/patches/kodi-999.01-create-archive-cache.patch b/packages/mediacenter/kodi/patches/kodi-999.01-create-archive-cache.patch deleted file mode 100644 index a122c67c9b..0000000000 --- a/packages/mediacenter/kodi/patches/kodi-999.01-create-archive-cache.patch +++ /dev/null @@ -1,28 +0,0 @@ -From bf68ee5438cb0e1343e7a6c35df35e7a4fb36223 Mon Sep 17 00:00:00 2001 -From: Shani-08 -Date: Sat, 28 Jan 2017 23:21:30 +0000 -Subject: [PATCH] create archive_cache if not exists - ---- - xbmc/Application.cpp | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp -index c6ef0c0..13d2cfa 100644 ---- a/xbmc/Application.cpp -+++ b/xbmc/Application.cpp -@@ -1076,10 +1076,10 @@ void CApplication::CreateUserDirs() const - - //Let's clear our archive cache before starting up anything more - auto archiveCachePath = CSpecialProtocol::TranslatePath("special://temp/archive_cache/"); -- if (CDirectory::RemoveRecursive(archiveCachePath)) -- CDirectory::Create(archiveCachePath); -- else -- CLog::Log(LOGWARNING, "Failed to remove the archive cache at %s", archiveCachePath.c_str()); -+ if (CDirectory::Exists(archiveCachePath)) -+ if (!CDirectory::RemoveRecursive(archiveCachePath)) -+ CLog::Log(LOGWARNING, "Failed to remove the archive cache at %s", archiveCachePath.c_str()); -+ CDirectory::Create(archiveCachePath); - - } - diff --git a/packages/mediacenter/kodi/patches/kodi-999.99-PR11663.patch b/packages/mediacenter/kodi/patches/kodi-999.99-PR11663.patch deleted file mode 100644 index de03bf615c..0000000000 --- a/packages/mediacenter/kodi/patches/kodi-999.99-PR11663.patch +++ /dev/null @@ -1,22 +0,0 @@ -From adecb3af2e3eb5a2715e6f1264fe3047dd209318 Mon Sep 17 00:00:00 2001 -From: Jonas Karlman -Date: Sun, 12 Feb 2017 16:31:29 +0100 -Subject: [PATCH] [settings] change allowed remotedelay range to inlcude zero - ---- - xbmc/settings/AdvancedSettings.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp -index cc37998..1c00eda 100644 ---- a/xbmc/settings/AdvancedSettings.cpp -+++ b/xbmc/settings/AdvancedSettings.cpp -@@ -1010,7 +1010,7 @@ void CAdvancedSettings::ParseSettingsFile(const std::string &file) - } - } - -- XMLUtils::GetInt(pRootElement, "remotedelay", m_remoteDelay, 1, 20); -+ XMLUtils::GetInt(pRootElement, "remotedelay", m_remoteDelay, 0, 20); - XMLUtils::GetFloat(pRootElement, "controllerdeadzone", m_controllerDeadzone, 0.0f, 1.0f); - XMLUtils::GetUInt(pRootElement, "fanartres", m_fanartRes, 0, 1080); - XMLUtils::GetUInt(pRootElement, "imageres", m_imageRes, 0, 1080);