[SCM] kodi-pvr-dvbviewer/master: Switch to p8-platform from (cec-)platform
rbalint at users.alioth.debian.org
rbalint at users.alioth.debian.org
Wed Mar 2 20:21:20 UTC 2016
The following commit has been merged in the master branch:
commit 62b30d7a37897152bb3e192cfe63197f1f9bc2a2
Author: Balint Reczey <balint at balintreczey.hu>
Date: Wed Mar 2 21:13:43 2016 +0100
Switch to p8-platform from (cec-)platform
diff --git a/debian/control b/debian/control
index 0e4b8ec..21c5cee 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Priority: extra
Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
Uploaders: Balint Reczey <balint at balintreczey.hu>
Build-Depends: debhelper (>= 9.0.0), cmake,
- libkodiplatform-dev (>= 16.0.0), kodi-addons-dev
+ libkodiplatform-dev (>= 17.0.0), kodi-addons-dev
Standards-Version: 3.9.6
Section: libs
Homepage: https://github.com/kodi-pvr/pvr.dvbviewer.git
diff --git a/debian/patches/0001-src-Update-to-p8-platform.patch b/debian/patches/0001-src-Update-to-p8-platform.patch
new file mode 100644
index 0000000..ed5e140
--- /dev/null
+++ b/debian/patches/0001-src-Update-to-p8-platform.patch
@@ -0,0 +1,177 @@
+From 1dd5d43af06f7adc9114bde06d3583e57f3f9d15 Mon Sep 17 00:00:00 2001
+From: "h.udo" <hudokkow at gmail.com>
+Date: Wed, 6 Jan 2016 15:08:39 +0000
+Subject: [PATCH 1/2] [src] Update to p8-platform
+
+---
+ src/DvbData.cpp | 4 ++--
+ src/DvbData.h | 10 +++++-----
+ src/RecordingReader.cpp | 6 +++---
+ src/RecordingReader.h | 2 +-
+ src/TimeshiftBuffer.cpp | 2 +-
+ src/TimeshiftBuffer.h | 8 ++++----
+ src/client.cpp | 2 +-
+ src/client.h | 2 +-
+ 8 files changed, 18 insertions(+), 18 deletions(-)
+
+diff --git a/src/DvbData.cpp b/src/DvbData.cpp
+index ea5fd48..6b6cc16 100644
+--- a/src/DvbData.cpp
++++ b/src/DvbData.cpp
+@@ -1,6 +1,6 @@
+ #include "DvbData.h"
+ #include "client.h"
+-#include "platform/util/util.h"
++#include "p8-platform/util/util.h"
+ #include "kodi/util/XMLUtils.h"
+ #include <tinyxml.h>
+ #include <inttypes.h>
+@@ -10,7 +10,7 @@
+ #include <algorithm>
+
+ using namespace ADDON;
+-using namespace PLATFORM;
++using namespace P8PLATFORM;
+
+ Dvb::Dvb()
+ : m_connected(false), m_backendVersion(0), m_currentChannel(0),
+diff --git a/src/DvbData.h b/src/DvbData.h
+index 6eb7800..3ba3d80 100644
+--- a/src/DvbData.h
++++ b/src/DvbData.h
+@@ -5,8 +5,8 @@
+
+ #include "client.h"
+ #include "RecordingReader.h"
+-#include "platform/util/StdString.h"
+-#include "platform/threads/threads.h"
++#include "p8-platform/util/StdString.h"
++#include "p8-platform/threads/threads.h"
+ #include <list>
+ #include <functional>
+
+@@ -182,7 +182,7 @@ typedef std::vector<DvbGroup> DvbGroups_t;
+ typedef std::vector<DvbTimer> DvbTimers_t;
+
+ class Dvb
+- : public PLATFORM::CThread
++ : public P8PLATFORM::CThread
+ {
+ public:
+ Dvb(void);
+@@ -272,8 +272,8 @@ private:
+ DvbTimers_t m_timers;
+ unsigned int m_nextTimerId;
+
+- PLATFORM::CMutex m_mutex;
+- PLATFORM::CCondition<bool> m_started;
++ P8PLATFORM::CMutex m_mutex;
++ P8PLATFORM::CCondition<bool> m_started;
+ };
+
+ #endif
+diff --git a/src/RecordingReader.cpp b/src/RecordingReader.cpp
+index 729ab9b..547d56e 100644
+--- a/src/RecordingReader.cpp
++++ b/src/RecordingReader.cpp
+@@ -1,7 +1,7 @@
+ #include "RecordingReader.h"
+ #include "client.h"
+-#include "platform/util/util.h"
+-#include "platform/threads/mutex.h"
++#include "p8-platform/util/util.h"
++#include "p8-platform/threads/mutex.h"
+
+ #define REOPEN_INTERVAL 30
+ #define REOPEN_INTERVAL_FAST 10
+@@ -61,7 +61,7 @@ FORCE_REOPEN:
+ sleep = std::min(sleep, static_cast<int>(m_nextReopen - now + 1));
+ XBMC->Log(LOG_DEBUG, "RecordingReader: End reached. Sleeping %d secs",
+ sleep);
+- PLATFORM::CEvent::Sleep(sleep * 1000);
++ P8PLATFORM::CEvent::Sleep(sleep * 1000);
+ now += sleep;
+ m_fastReopen = true;
+ goto FORCE_REOPEN;
+diff --git a/src/RecordingReader.h b/src/RecordingReader.h
+index ae6a5a7..72fb559 100644
+--- a/src/RecordingReader.h
++++ b/src/RecordingReader.h
+@@ -3,7 +3,7 @@
+ #ifndef PVR_DVBVIEWER_RECORDINGREADER_H
+ #define PVR_DVBVIEWER_RECORDINGREADER_H
+
+-#include "platform/util/StdString.h"
++#include "p8-platform/util/StdString.h"
+
+ class RecordingReader
+ {
+diff --git a/src/TimeshiftBuffer.cpp b/src/TimeshiftBuffer.cpp
+index e8b61e5..78fad23 100644
+--- a/src/TimeshiftBuffer.cpp
++++ b/src/TimeshiftBuffer.cpp
+@@ -1,6 +1,6 @@
+ #include "TimeshiftBuffer.h"
+ #include "client.h"
+-#include "platform/util/util.h"
++#include "p8-platform/util/util.h"
+
+ #define STREAM_READ_BUFFER_SIZE 32768
+ #define BUFFER_READ_TIMEOUT 10000
+diff --git a/src/TimeshiftBuffer.h b/src/TimeshiftBuffer.h
+index 1d063d8..c59c884 100644
+--- a/src/TimeshiftBuffer.h
++++ b/src/TimeshiftBuffer.h
+@@ -3,11 +3,11 @@
+ #ifndef PVR_DVBVIEWER_TIMESHIFTBUFFER_H
+ #define PVR_DVBVIEWER_TIMESHIFTBUFFER_H
+
+-#include "platform/util/StdString.h"
+-#include "platform/threads/threads.h"
++#include "p8-platform/util/StdString.h"
++#include "p8-platform/threads/threads.h"
+
+ class TimeshiftBuffer
+- : public PLATFORM::CThread
++ : public P8PLATFORM::CThread
+ {
+ public:
+ TimeshiftBuffer(CStdString streamURL, CStdString bufferPath);
+@@ -30,7 +30,7 @@ private:
+ void *m_filebufferWriteHandle;
+ time_t m_start;
+ #ifndef TARGET_POSIX
+- PLATFORM::CMutex m_mutex;
++ P8PLATFORM::CMutex m_mutex;
+ uint64_t m_writePos;
+ #endif
+ };
+diff --git a/src/client.cpp b/src/client.cpp
+index b72609e..2829a6e 100644
+--- a/src/client.cpp
++++ b/src/client.cpp
+@@ -24,7 +24,7 @@
+ #include "RecordingReader.h"
+ #include "kodi/xbmc_pvr_dll.h"
+ #include "kodi/libKODI_guilib.h"
+-#include "platform/util/util.h"
++#include "p8-platform/util/util.h"
+ #include <stdlib.h>
+
+ using namespace ADDON;
+diff --git a/src/client.h b/src/client.h
+index bdf0bf4..26611d0 100644
+--- a/src/client.h
++++ b/src/client.h
+@@ -24,7 +24,7 @@
+
+ #include "kodi/libXBMC_addon.h"
+ #include "kodi/libXBMC_pvr.h"
+-#include "platform/util/StdString.h"
++#include "p8-platform/util/StdString.h"
+
+ #ifndef _UNUSED
+ #if defined(__GNUC__)
+--
+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
new file mode 100644
index 0000000..38e55e4
--- /dev/null
+++ b/debian/patches/0002-cmake-Update-to-p8-platform.patch
@@ -0,0 +1,38 @@
+From 800fb5e560f3a3258f08e0e2bd7c010c61e5a38d Mon Sep 17 00:00:00 2001
+From: "h.udo" <hudokkow at gmail.com>
+Date: Wed, 6 Jan 2016 15:21:21 +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 e044caa..ecc74d1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -9,10 +9,10 @@ enable_language(CXX)
+ find_package(TinyXML REQUIRED)
+ find_package(kodi REQUIRED)
+ find_package(kodiplatform REQUIRED)
+-find_package(platform REQUIRED)
++find_package(p8-platform REQUIRED)
+
+ include_directories(${kodiplatform_INCLUDE_DIRS}
+- ${platform_INCLUDE_DIRS}
++ ${p8-platform_INCLUDE_DIRS}
+ ${KODI_INCLUDE_DIR}
+ ${TINYXML_INCLUDE_DIRS})
+
+@@ -24,7 +24,7 @@ set(DVBVIEWER_SOURCES src/client.cpp
+ src/TimeshiftBuffer.cpp)
+
+ set(DEPLIBS ${kodiplatform_LIBRARIES}
+- ${platform_LIBRARIES}
++ ${p8-platform_LIBRARIES}
+ ${TINYXML_LIBRARIES})
+
+ build_addon(pvr.dvbviewer DVBVIEWER DEPLIBS)
+--
+2.1.4
+
diff --git a/debian/patches/01_use_cec-platform.patch b/debian/patches/01_use_cec-platform.patch
deleted file mode 100644
index 82ab415..0000000
--- a/debian/patches/01_use_cec-platform.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Description: Use platform library under libcec-platform name.
- The library is renamed for packaging it in Debian under a less generic name.
- .
-Author: Balint Reczey <balint at balintreczey.hu>
-Forwarded: not-needed
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -9,10 +9,10 @@
- find_package(TinyXML REQUIRED)
- find_package(kodi REQUIRED)
- find_package(kodiplatform REQUIRED)
--find_package(platform REQUIRED)
-+find_package(cec-platform REQUIRED)
-
- include_directories(${kodiplatform_INCLUDE_DIRS}
-- ${platform_INCLUDE_DIRS}
-+ ${cec-platform_INCLUDE_DIRS}
- ${KODI_INCLUDE_DIR}
- ${TINYXML_INCLUDE_DIRS})
-
-@@ -24,7 +24,7 @@
- src/TimeshiftBuffer.cpp)
-
- set(DEPLIBS ${kodiplatform_LIBRARIES}
-- ${platform_LIBRARIES}
-+ ${cec-platform_LIBRARIES}
- ${TINYXML_LIBRARIES})
-
- build_addon(pvr.dvbviewer DVBVIEWER DEPLIBS)
diff --git a/debian/patches/series b/debian/patches/series
index d6fa0e7..da7fc4f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
-01_use_cec-platform.patch
+0001-src-Update-to-p8-platform.patch
+0002-cmake-Update-to-p8-platform.patch
--
kodi-pvr-dvbviewer packaging
More information about the pkg-multimedia-commits
mailing list