[SCM] kodi-pvr-vdr-vnsi/master: Now using libkodiplatform > 17.0.0 and libp8-platform (instead of libcec-platform)
tiber-guest at users.alioth.debian.org
tiber-guest at users.alioth.debian.org
Wed Mar 2 22:20:54 UTC 2016
The following commit has been merged in the master branch:
commit f52350e3c9d0e4e8630287c6213aff355ea7c852
Author: Tobias Grimm <etobi at debian.org>
Date: Wed Mar 2 22:05:36 2016 +0100
Now using libkodiplatform > 17.0.0 and libp8-platform (instead of libcec-platform)
diff --git a/debian/control b/debian/control
index 665b5a0..8eb36d9 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,8 @@ Build-Depends: debhelper (>= 9~),
cmake,
libtinyxml-dev,
pkg-config,
- libkodiplatform-dev (>= 16.0.0),
+ libkodiplatform-dev (>= 17.0.0),
+ libp8-platform-dev,
kodi-addons-dev (>= 16),
libgles2-mesa-dev [armel armhf] | libgl1-mesa-dev | libgl-dev
Standards-Version: 3.9.6
diff --git a/debian/patches/libcec-platform.patch b/debian/patches/libcec-platform.patch
deleted file mode 100644
index a176d2a..0000000
--- a/debian/patches/libcec-platform.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-Description: Fixes references to libcec-platform headers
- The Debian packaging of the "platform" library has named this "cec-platform"
- to be more specfic
-Author: Tobias Grimm <etobi at debian.org>
----
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -8,7 +8,7 @@
-
- find_package(kodi REQUIRED)
- find_package(kodiplatform REQUIRED)
--find_package(platform REQUIRED)
-+find_package(cec-platform REQUIRED)
-
- add_definitions(-DUSE_DEMUX)
-
-@@ -61,14 +61,14 @@
- src/VNSIRecording.cpp
- src/VNSISession.cpp)
-
--list(APPEND DEPLIBS ${platform_LIBRARIES})
-+list(APPEND DEPLIBS ${cec-platform_LIBRARIES})
- if(WIN32)
- list(APPEND DEPLIBS ws2_32)
- endif()
-
- include_directories(${INCLUDES}
- ${kodiplatform_INCLUDE_DIRS}
-- ${platform_INCLUDE_DIRS}
-+ ${cec-platform_INCLUDE_DIRS}
- ${KODI_INCLUDE_DIR})
-
- build_addon(pvr.vdr.vnsi VDR DEPLIBS)
---- a/src/VNSIData.cpp
-+++ b/src/VNSIData.cpp
-@@ -23,7 +23,7 @@
- #include "responsepacket.h"
- #include "requestpacket.h"
- #include "vnsicommand.h"
--#include "platform/util/StdString.h"
-+#include "cec-platform/util/StdString.h"
-
- using namespace ADDON;
- using namespace PLATFORM;
---- a/src/VNSISession.cpp
-+++ b/src/VNSISession.cpp
-@@ -31,8 +31,8 @@
- #include "requestpacket.h"
- #include "vnsicommand.h"
- #include "tools.h"
--#include "platform/sockets/tcp.h"
--#include "platform/util/timeutils.h"
-+#include "cec-platform/sockets/tcp.h"
-+#include "cec-platform/util/timeutils.h"
-
- /* Needed on Mac OS/X */
-
---- a/src/VNSISession.h
-+++ b/src/VNSISession.h
-@@ -22,7 +22,7 @@
-
- #include <stdint.h>
- #include <string>
--#include "platform/threads/threads.h"
-+#include "cec-platform/threads/threads.h"
-
- #include <memory>
-
---- a/src/client.cpp
-+++ b/src/client.cpp
-@@ -26,7 +26,7 @@
- #include "VNSIData.h"
- #include "VNSIChannelScan.h"
- #include "VNSIAdmin.h"
--#include "platform/util/util.h"
-+#include "cec-platform/util/util.h"
-
- #include <sstream>
- #include <string>
---- a/src/requestpacket.cpp
-+++ b/src/requestpacket.cpp
-@@ -22,7 +22,7 @@
- #include "requestpacket.h"
- #include "vnsicommand.h"
- #include "tools.h"
--#include "platform/sockets/tcp.h"
-+#include "cec-platform/sockets/tcp.h"
-
- #include <assert.h>
- #include <stdlib.h>
---- a/src/responsepacket.cpp
-+++ b/src/responsepacket.cpp
-@@ -22,7 +22,7 @@
- #include "responsepacket.h"
- #include "vnsicommand.h"
- #include "tools.h"
--#include "platform/sockets/tcp.h"
-+#include "cec-platform/sockets/tcp.h"
-
- #include <stdexcept>
- #include <stdlib.h>
diff --git a/debian/patches/libp8-platform.patch b/debian/patches/libp8-platform.patch
new file mode 100644
index 0000000..fd2373f
--- /dev/null
+++ b/debian/patches/libp8-platform.patch
@@ -0,0 +1,207 @@
+Description: Fixes references to libp8-platform headers
+ The Debian packaging of the "platform" library has named this "p8-platform"
+ to be more specfic
+Author: Tobias Grimm <etobi at debian.org>
+---
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -8,7 +8,7 @@
+
+ find_package(kodi REQUIRED)
+ find_package(kodiplatform REQUIRED)
+-find_package(platform REQUIRED)
++find_package(p8-platform REQUIRED)
+
+ add_definitions(-DUSE_DEMUX)
+
+@@ -61,14 +61,14 @@
+ src/VNSIRecording.cpp
+ src/VNSISession.cpp)
+
+-list(APPEND DEPLIBS ${platform_LIBRARIES})
++list(APPEND DEPLIBS ${p8-platform_LIBRARIES})
+ if(WIN32)
+ list(APPEND DEPLIBS ws2_32)
+ endif()
+
+ include_directories(${INCLUDES}
+ ${kodiplatform_INCLUDE_DIRS}
+- ${platform_INCLUDE_DIRS}
++ ${p8-platform_INCLUDE_DIRS}
+ ${KODI_INCLUDE_DIR})
+
+ build_addon(pvr.vdr.vnsi VDR DEPLIBS)
+--- a/src/VNSIData.cpp
++++ b/src/VNSIData.cpp
+@@ -23,10 +23,10 @@
+ #include "responsepacket.h"
+ #include "requestpacket.h"
+ #include "vnsicommand.h"
+-#include "platform/util/StdString.h"
++#include "p8-platform/util/StdString.h"
+
+ using namespace ADDON;
+-using namespace PLATFORM;
++using namespace P8PLATFORM;
+
+ cVNSIData::SMessage &
+ cVNSIData::Queue::Enqueue(uint32_t serial)
+--- a/src/VNSISession.cpp
++++ b/src/VNSISession.cpp
+@@ -31,8 +31,8 @@
+ #include "requestpacket.h"
+ #include "vnsicommand.h"
+ #include "tools.h"
+-#include "platform/sockets/tcp.h"
+-#include "platform/util/timeutils.h"
++#include "p8-platform/sockets/tcp.h"
++#include "p8-platform/util/timeutils.h"
+
+ /* Needed on Mac OS/X */
+
+@@ -41,7 +41,7 @@
+ #endif
+
+ using namespace ADDON;
+-using namespace PLATFORM;
++using namespace P8PLATFORM;
+
+ cVNSISession::cVNSISession()
+ : m_protocol(0)
+--- a/src/VNSISession.h
++++ b/src/VNSISession.h
+@@ -22,14 +22,14 @@
+
+ #include <stdint.h>
+ #include <string>
+-#include "platform/threads/threads.h"
++#include "p8-platform/threads/threads.h"
+
+ #include <memory>
+
+ class cResponsePacket;
+ class cRequestPacket;
+
+-namespace PLATFORM
++namespace P8PLATFORM
+ {
+ class CTcpConnection;
+ }
+@@ -70,7 +70,7 @@
+ std::string m_hostname;
+ int m_port;
+ std::string m_name;
+- PLATFORM::CMutex m_mutex;
++ P8PLATFORM::CMutex m_mutex;
+ int m_protocol;
+ std::string m_server;
+ std::string m_version;
+@@ -79,7 +79,7 @@
+
+ bool readData(uint8_t* buffer, int totalBytes, int timeout);
+
+- PLATFORM::CTcpConnection *m_socket;
+- PLATFORM::CMutex m_readMutex;
++ P8PLATFORM::CTcpConnection *m_socket;
++ P8PLATFORM::CMutex m_readMutex;
+ bool m_connectionLost;
+ };
+--- a/src/client.cpp
++++ b/src/client.cpp
+@@ -26,7 +26,7 @@
+ #include "VNSIData.h"
+ #include "VNSIChannelScan.h"
+ #include "VNSIAdmin.h"
+-#include "platform/util/util.h"
++#include "p8-platform/util/util.h"
+
+ #include <sstream>
+ #include <string>
+@@ -34,7 +34,7 @@
+
+ using namespace std;
+ using namespace ADDON;
+-using namespace PLATFORM;
++using namespace P8PLATFORM;
+
+ ADDON_STATUS m_CurStatus = ADDON_STATUS_UNKNOWN;
+
+@@ -66,7 +66,7 @@
+ time_t TimeshiftStartTime;
+ time_t TimeshiftEndTime;
+ time_t TimeshiftPlayTime;
+-PLATFORM::CMutex TimeshiftMutex;
++P8PLATFORM::CMutex TimeshiftMutex;
+
+ extern "C" {
+
+--- a/src/requestpacket.cpp
++++ b/src/requestpacket.cpp
+@@ -22,7 +22,7 @@
+ #include "requestpacket.h"
+ #include "vnsicommand.h"
+ #include "tools.h"
+-#include "platform/sockets/tcp.h"
++#include "p8-platform/sockets/tcp.h"
+
+ #include <assert.h>
+ #include <stdlib.h>
+--- a/src/responsepacket.cpp
++++ b/src/responsepacket.cpp
+@@ -22,7 +22,7 @@
+ #include "responsepacket.h"
+ #include "vnsicommand.h"
+ #include "tools.h"
+-#include "platform/sockets/tcp.h"
++#include "p8-platform/sockets/tcp.h"
+
+ #include <stdexcept>
+ #include <stdlib.h>
+--- a/src/VNSIAdmin.cpp
++++ b/src/VNSIAdmin.cpp
+@@ -135,7 +135,7 @@
+
+
+ using namespace ADDON;
+-using namespace PLATFORM;
++using namespace P8PLATFORM;
+
+
+ class cOSDTexture
+--- a/src/VNSIAdmin.h
++++ b/src/VNSIAdmin.h
+@@ -89,5 +89,5 @@
+ int m_width, m_height;
+ int m_osdWidth, m_osdHeight;
+ cOSDRender *m_osdRender;
+- PLATFORM::CMutex m_osdMutex;
++ P8PLATFORM::CMutex m_osdMutex;
+ };
+--- a/src/VNSIData.h
++++ b/src/VNSIData.h
+@@ -29,7 +29,7 @@
+ class cResponsePacket;
+ class cRequestPacket;
+
+-class cVNSIData : public cVNSISession, public PLATFORM::CThread
++class cVNSIData : public cVNSISession, public P8PLATFORM::CThread
+ {
+ public:
+
+@@ -85,14 +85,14 @@
+
+ struct SMessage
+ {
+- PLATFORM::CEvent event;
++ P8PLATFORM::CEvent event;
+ std::unique_ptr<cResponsePacket> pkt;
+ };
+
+ class Queue {
+ typedef std::map<int, SMessage> SMessages;
+ SMessages m_queue;
+- PLATFORM::CMutex m_mutex;
++ P8PLATFORM::CMutex m_mutex;
+
+ public:
+ SMessage &Enqueue(uint32_t serial);
diff --git a/debian/patches/series b/debian/patches/series
index 7aaf946..3056ae5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-libcec-platform.patch
+libp8-platform.patch
--
kodi-pvr-vdr-vnsi packaging
More information about the pkg-multimedia-commits
mailing list