[SCM] kodi-pvr-hdhomerun/master: Refresh patches
rbalint at users.alioth.debian.org
rbalint at users.alioth.debian.org
Fri Apr 15 22:41:39 UTC 2016
The following commit has been merged in the master branch:
commit c36bf5a8cf2159e7f9a8218913db5f8b6de7a407
Author: Balint Reczey <balint at balintreczey.hu>
Date: Fri Apr 15 15:51:39 2016 +0200
Refresh patches
diff --git a/debian/patches/0001-Change-size_t-to-Json-Value-ArrayIndex.patch b/debian/patches/0001-Change-size_t-to-Json-Value-ArrayIndex.patch
deleted file mode 100644
index 20e8f08..0000000
--- a/debian/patches/0001-Change-size_t-to-Json-Value-ArrayIndex.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From d755887eeef556fbd6af90e90813fac38f06df02 Mon Sep 17 00:00:00 2001
-From: zcsizmadia <zcsizmadia at gmail.com>
-Date: Wed, 25 Nov 2015 20:26:52 -0600
-Subject: [PATCH] Change size_t to Json::Value::ArrayIndex
-
-Conflicts:
- src/HDHomeRunTuners.cpp
----
- src/HDHomeRunTuners.cpp | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/src/HDHomeRunTuners.cpp b/src/HDHomeRunTuners.cpp
-index d487038..48a01f4 100644
---- a/src/HDHomeRunTuners.cpp
-+++ b/src/HDHomeRunTuners.cpp
-@@ -47,7 +47,7 @@ unsigned int HDHomeRunTuners::PvrCalculateUniqueId(const String& str)
- bool HDHomeRunTuners::Update(int nMode)
- {
- struct hdhomerun_discover_device_t foundDevices[16];
-- size_t nTunerCount, nTunerIndex, nIndex, nCount, nGuideIndex;
-+ Json::Value::ArrayIndex nTunerCount, nTunerIndex, nIndex, nCount, nGuideIndex;
- String strUrl, strJson;
- Json::Reader jsonReader;
- Json::Value jsonResponse;
-@@ -119,7 +119,7 @@ bool HDHomeRunTuners::Update(int nMode)
- if (jsonGuide.type() != Json::arrayValue)
- continue;
-
-- for (size_t i = 0; i < jsonGuide.size(); i++, nCount++)
-+ for (Json::Value::ArrayIndex i = 0; i < jsonGuide.size(); i++, nCount++)
- {
- Json::Value& jsonGuideItem = jsonGuide[i];
- int iSeriesNumber = 0, iEpisodeNumber = 0;
-@@ -133,7 +133,7 @@ bool HDHomeRunTuners::Update(int nMode)
-
- unsigned int nGenreType = 0;
- Json::Value& jsonFilter = jsonGuideItem["Filter"];
-- for (size_t nGenreIndex = 0; nGenreIndex < jsonFilter.size(); nGenreIndex++)
-+ for (Json::Value::ArrayIndex nGenreIndex = 0; nGenreIndex < jsonFilter.size(); nGenreIndex++)
- {
- String str = jsonFilter[nGenreIndex].asString();
-
-@@ -248,7 +248,7 @@ int HDHomeRunTuners::PvrGetChannelsAmount()
- AutoLock l(this);
-
- for (Tuners::const_iterator iterTuner = m_Tuners.begin(); iterTuner != m_Tuners.end(); iterTuner++)
-- for (size_t nIndex = 0; nIndex < iterTuner->LineUp.size(); nIndex++)
-+ for (Json::Value::ArrayIndex nIndex = 0; nIndex < iterTuner->LineUp.size(); nIndex++)
- if (!iterTuner->LineUp[nIndex]["_Hide"].asBool())
- nCount++;
-
-@@ -258,7 +258,7 @@ int HDHomeRunTuners::PvrGetChannelsAmount()
- PVR_ERROR HDHomeRunTuners::PvrGetChannels(ADDON_HANDLE handle, bool bRadio)
- {
- PVR_CHANNEL pvrChannel;
-- size_t nIndex;
-+ Json::Value::ArrayIndex nIndex;
-
- if (bRadio)
- return PVR_ERROR_NO_ERROR;
-@@ -289,7 +289,7 @@ PVR_ERROR HDHomeRunTuners::PvrGetChannels(ADDON_HANDLE handle, bool bRadio)
-
- PVR_ERROR HDHomeRunTuners::PvrGetEPGForChannel(ADDON_HANDLE handle, const PVR_CHANNEL& channel, time_t iStart, time_t iEnd)
- {
-- size_t nChannelIndex, nGuideIndex;
-+ Json::Value::ArrayIndex nChannelIndex, nGuideIndex;
-
- AutoLock l(this);
-
-@@ -381,7 +381,7 @@ PVR_ERROR HDHomeRunTuners::PvrGetChannelGroupMembers(ADDON_HANDLE handle, const
- AutoLock l(this);
-
- for (Tuners::const_iterator iterTuner = m_Tuners.begin(); iterTuner != m_Tuners.end(); iterTuner++)
-- for (size_t nChannelIndex = 0; nChannelIndex < iterTuner->LineUp.size(); nChannelIndex++)
-+ for (Json::Value::ArrayIndex nChannelIndex = 0; nChannelIndex < iterTuner->LineUp.size(); nChannelIndex++)
- {
- const Json::Value& jsonChannel = iterTuner->LineUp[nChannelIndex];
-
-@@ -403,4 +403,4 @@ PVR_ERROR HDHomeRunTuners::PvrGetChannelGroupMembers(ADDON_HANDLE handle, const
- }
-
- return PVR_ERROR_NO_ERROR;
--}
-\ No newline at end of file
-+}
---
-2.1.4
-
diff --git a/debian/patches/01_use_cec-platform.patch b/debian/patches/01_use_cec-platform.patch
index 9644f82..687e4dd 100644
--- a/debian/patches/01_use_cec-platform.patch
+++ b/debian/patches/01_use_cec-platform.patch
@@ -10,20 +10,80 @@ Forwarded: not-needed
find_package(kodi REQUIRED)
find_package(kodiplatform REQUIRED)
-find_package(platform REQUIRED)
-+find_package(cec-platform REQUIRED)
++find_package(p8-platform REQUIRED)
find_package(JsonCpp REQUIRED)
find_package(hdhomerun REQUIRED)
include_directories(${kodiplatform_INCLUDE_DIRS}
- ${platform_INCLUDE_DIRS}
-+ ${cec-platform_INCLUDE_DIRS}
++ ${p8-platform_INCLUDE_DIRS}
${KODI_INCLUDE_DIR}
${JSONCPP_INCLUDE_DIRS}
${HDHOMERUN_INCLUDE_DIRS})
set(DEPLIBS ${kodiplatform_LIBRARIES}
- ${platform_LIBRARIES}
-+ ${cec-platform_LIBRARIES}
++ ${p8-platform_LIBRARIES}
${JSONCPP_LIBRARIES}
${HDHOMERUN_LIBRARIES})
+--- a/src/HDHomeRunTuners.h
++++ b/src/HDHomeRunTuners.h
+@@ -24,7 +24,7 @@
+ */
+
+ #include "client.h"
+-#include <platform/threads/mutex.h>
++#include <p8-platform/threads/mutex.h>
+ #include <hdhomerun.h>
+ #include <json/json.h>
+
+@@ -86,5 +86,5 @@
+
+ protected:
+ Tuners m_Tuners;
+- PLATFORM::CMutex m_Lock;
++ P8PLATFORM::CMutex m_Lock;
+ };
+--- a/src/client.cpp
++++ b/src/client.cpp
+@@ -25,8 +25,8 @@
+ #include "client.h"
+ #include <kodi/xbmc_pvr_dll.h>
+ #include <kodi/libKODI_guilib.h>
+-#include <platform/util/util.h>
+-#include <platform/threads/threads.h>
++#include <p8-platform/util/util.h>
++#include <p8-platform/threads/threads.h>
+ #include "HDHomeRunTuners.h"
+ #include "Utils.h"
+
+@@ -34,7 +34,7 @@
+
+ GlobalsType g;
+
+-class UpdateThread : public PLATFORM::CThread
++class UpdateThread : public P8PLATFORM::CThread
+ {
+ public:
+ void *Process()
+@@ -42,7 +42,7 @@
+ for (;;)
+ {
+ for (int i = 0; i < 60*60; i++)
+- if (PLATFORM::CThread::Sleep(1000))
++ if (P8PLATFORM::CThread::Sleep(1000))
+ break;
+
+ if (IsStopped())
+--- a/src/client.h
++++ b/src/client.h
+@@ -25,7 +25,7 @@
+
+ #include <kodi/libXBMC_addon.h>
+ #include <kodi/libXBMC_pvr.h>
+-#include <platform/util/StdString.h>
++#include <p8-platform/util/StdString.h>
+
+ typedef CStdString String;
+
diff --git a/debian/patches/series b/debian/patches/series
index 6a88337..d6fa0e7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
01_use_cec-platform.patch
-0001-Change-size_t-to-Json-Value-ArrayIndex.patch
--
kodi-pvr-hdhomerun packaging
More information about the pkg-multimedia-commits
mailing list