[SCM] kodi-pvr-vuplus/master: Drop unused obsoleted patch
rbalint at users.alioth.debian.org
rbalint at users.alioth.debian.org
Fri Nov 4 10:36:33 UTC 2016
The following commit has been merged in the master branch:
commit dc512fe791aa3fd29a5167f1427bc8af5a428bd9
Author: Balint Reczey <balint at balintreczey.hu>
Date: Fri Nov 4 11:27:07 2016 +0100
Drop unused obsoleted patch
diff --git a/debian/patches/0001-src-Update-to-p8-platform.patch b/debian/patches/0001-src-Update-to-p8-platform.patch
deleted file mode 100644
index f273580..0000000
--- a/debian/patches/0001-src-Update-to-p8-platform.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From fb1312a7f27c6d0de3a9abe24c19e94f66e782b2 Mon Sep 17 00:00:00 2001
-From: "h.udo" <hudokkow at gmail.com>
-Date: Wed, 6 Jan 2016 15:09:13 +0000
-Subject: [PATCH 1/2] [src] Update to p8-platform
-
----
- src/VuData.cpp | 2 +-
- src/VuData.h | 10 +++++-----
- src/client.cpp | 2 +-
- 3 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/src/VuData.cpp b/src/VuData.cpp
-index f59b438..ae080de 100644
---- a/src/VuData.cpp
-+++ b/src/VuData.cpp
-@@ -29,7 +29,7 @@
-
-
- using namespace ADDON;
--using namespace PLATFORM;
-+using namespace P8PLATFORM;
-
- bool CCurlFile::Get(const std::string &strURL, std::string &strResult)
- {
-diff --git a/src/VuData.h b/src/VuData.h
-index 2d6aa8f..20fc54b 100644
---- a/src/VuData.h
-+++ b/src/VuData.h
-@@ -21,9 +21,9 @@
- *
- */
-
--#include "platform/util/StdString.h"
-+#include "p8-platform/util/StdString.h"
- #include "client.h"
--#include "platform/threads/threads.h"
-+#include "p8-platform/threads/threads.h"
- #include "tinyxml.h"
-
- #define CHANNELDATAVERSION 2
-@@ -140,7 +140,7 @@ struct VuRecording
- std::string strIconPath;
- };
-
--class Vu : public PLATFORM::CThread
-+class Vu : public P8PLATFORM::CThread
- {
- private:
-
-@@ -164,8 +164,8 @@ private:
- std::vector<std::string> m_locations;
- unsigned int m_iClientIndexCounter;
-
-- PLATFORM::CMutex m_mutex;
-- PLATFORM::CCondition<bool> m_started;
-+ P8PLATFORM::CMutex m_mutex;
-+ P8PLATFORM::CCondition<bool> m_started;
-
- bool m_bUpdating;
-
-diff --git a/src/client.cpp b/src/client.cpp
-index 26fd5ca..cc09e3f 100644
---- a/src/client.cpp
-+++ b/src/client.cpp
-@@ -25,7 +25,7 @@
- #include "kodi/libKODI_guilib.h"
- #include <stdlib.h>
- #include "VuData.h"
--#include "platform/util/util.h"
-+#include "p8-platform/util/util.h"
-
- using namespace std;
- using namespace ADDON;
---
-2.1.4
-
diff --git a/debian/patches/0002-cmake-Update-to-p8-platform.patch b/debian/patches/0002-cmake-Update-to-p8-platform.patch
deleted file mode 100644
index 164096b..0000000
--- a/debian/patches/0002-cmake-Update-to-p8-platform.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From d4d7dc29c0e362e5e2355384689003a9d71210cb Mon Sep 17 00:00:00 2001
-From: "h.udo" <hudokkow at gmail.com>
-Date: Wed, 6 Jan 2016 15:21:56 +0000
-Subject: [PATCH 2/2] [cmake] Update to p8-platform
-
----
- CMakeLists.txt | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 971e6a9..992eff4 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -8,11 +8,11 @@ enable_language(CXX)
-
- find_package(kodi REQUIRED)
- find_package(kodiplatform REQUIRED)
--find_package(platform REQUIRED)
-+find_package(p8-platform REQUIRED)
- find_package(TinyXML REQUIRED)
-
- include_directories(${kodiplatform_INCLUDE_DIRS}
-- ${platform_INCLUDE_DIRS}
-+ ${p8-platform_INCLUDE_DIRS}
- ${TINYXML_INCLUDE_DIR}
- ${KODI_INCLUDE_DIR})
-
-@@ -20,7 +20,7 @@ set(VUPLUS_SOURCES src/client.cpp
- src/VuData.cpp)
-
- set(DEPLIBS ${kodiplatform_LIBRARIES}
-- ${platform_LIBRARIES}
-+ ${p8-platform_LIBRARIES}
- ${TINYXML_LIBRARIES})
-
- build_addon(pvr.vuplus VUPLUS DEPLIBS)
---
-2.1.4
-
diff --git a/debian/patches/series b/debian/patches/series
index da7fc4f..8b13789 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-0001-src-Update-to-p8-platform.patch
-0002-cmake-Update-to-p8-platform.patch
+
--
kodi-pvr-vuplus packaging
More information about the pkg-multimedia-commits
mailing list