[SCM] kodi-pvr-vdr-vnsi/master: Updated libcec-platform compatibilit patch

tiber-guest at users.alioth.debian.org tiber-guest at users.alioth.debian.org
Sun Feb 28 15:46:53 UTC 2016


The following commit has been merged in the master branch:
commit a5972adc9c4a6f5b52c0f738adc63281d991d753
Author: Tobias Grimm <etobi at debian.org>
Date:   Sun Feb 28 15:07:18 2016 +0100

    Updated libcec-platform compatibilit patch

diff --git a/debian/patches/libcec-platform.patch b/debian/patches/libcec-platform.patch
index 6a6d4eb..a176d2a 100644
--- a/debian/patches/libcec-platform.patch
+++ b/debian/patches/libcec-platform.patch
@@ -3,10 +3,8 @@ Description: Fixes references to libcec-platform headers
  to be more specfic
 Author: Tobias Grimm <etobi at debian.org>
 ---
-Index: kodi-pvr-vdr-vnsi/CMakeLists.txt
-===================================================================
---- kodi-pvr-vdr-vnsi.orig/CMakeLists.txt	2015-09-12 19:24:48.751502893 +0200
-+++ kodi-pvr-vdr-vnsi/CMakeLists.txt	2015-09-12 19:27:12.114458475 +0200
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
 @@ -8,7 +8,7 @@
  
  find_package(kodi REQUIRED)
@@ -16,7 +14,7 @@ Index: kodi-pvr-vdr-vnsi/CMakeLists.txt
  
  add_definitions(-DUSE_DEMUX)
  
-@@ -57,14 +57,14 @@
+@@ -61,14 +61,14 @@
                          src/VNSIRecording.cpp
                          src/VNSISession.cpp)
  
@@ -33,10 +31,8 @@ Index: kodi-pvr-vdr-vnsi/CMakeLists.txt
                      ${KODI_INCLUDE_DIR})
  
  build_addon(pvr.vdr.vnsi VDR DEPLIBS)
-Index: kodi-pvr-vdr-vnsi/src/VNSIData.cpp
-===================================================================
---- kodi-pvr-vdr-vnsi.orig/src/VNSIData.cpp	2015-09-12 19:26:23.686806787 +0200
-+++ kodi-pvr-vdr-vnsi/src/VNSIData.cpp	2015-09-12 19:27:12.114458475 +0200
+--- a/src/VNSIData.cpp
++++ b/src/VNSIData.cpp
 @@ -23,7 +23,7 @@
  #include "responsepacket.h"
  #include "requestpacket.h"
@@ -46,10 +42,8 @@ Index: kodi-pvr-vdr-vnsi/src/VNSIData.cpp
  
  using namespace ADDON;
  using namespace PLATFORM;
-Index: kodi-pvr-vdr-vnsi/src/VNSISession.cpp
-===================================================================
---- kodi-pvr-vdr-vnsi.orig/src/VNSISession.cpp	2015-09-12 19:26:23.686806787 +0200
-+++ kodi-pvr-vdr-vnsi/src/VNSISession.cpp	2015-09-12 19:27:12.114458475 +0200
+--- a/src/VNSISession.cpp
++++ b/src/VNSISession.cpp
 @@ -31,8 +31,8 @@
  #include "requestpacket.h"
  #include "vnsicommand.h"
@@ -61,10 +55,8 @@ Index: kodi-pvr-vdr-vnsi/src/VNSISession.cpp
  
  /* Needed on Mac OS/X */
   
-Index: kodi-pvr-vdr-vnsi/src/VNSISession.h
-===================================================================
---- kodi-pvr-vdr-vnsi.orig/src/VNSISession.h	2015-09-12 19:26:23.686806787 +0200
-+++ kodi-pvr-vdr-vnsi/src/VNSISession.h	2015-09-12 19:27:12.114458475 +0200
+--- a/src/VNSISession.h
++++ b/src/VNSISession.h
 @@ -22,7 +22,7 @@
  
  #include <stdint.h>
@@ -72,12 +64,10 @@ Index: kodi-pvr-vdr-vnsi/src/VNSISession.h
 -#include "platform/threads/threads.h"
 +#include "cec-platform/threads/threads.h"
  
+ #include <memory>
  
- class cResponsePacket;
-Index: kodi-pvr-vdr-vnsi/src/client.cpp
-===================================================================
---- kodi-pvr-vdr-vnsi.orig/src/client.cpp	2015-09-12 19:26:23.686806787 +0200
-+++ kodi-pvr-vdr-vnsi/src/client.cpp	2015-09-12 19:27:12.114458475 +0200
+--- a/src/client.cpp
++++ b/src/client.cpp
 @@ -26,7 +26,7 @@
  #include "VNSIData.h"
  #include "VNSIChannelScan.h"
@@ -87,29 +77,25 @@ Index: kodi-pvr-vdr-vnsi/src/client.cpp
  
  #include <sstream>
  #include <string>
-Index: kodi-pvr-vdr-vnsi/src/requestpacket.cpp
-===================================================================
---- kodi-pvr-vdr-vnsi.orig/src/requestpacket.cpp	2015-09-12 19:26:23.686806787 +0200
-+++ kodi-pvr-vdr-vnsi/src/requestpacket.cpp	2015-09-12 19:27:12.114458475 +0200
-@@ -26,7 +26,7 @@
+--- 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"
  
- uint32_t cRequestPacket::serialNumberCounter = 1;
- 
-Index: kodi-pvr-vdr-vnsi/src/responsepacket.cpp
-===================================================================
---- kodi-pvr-vdr-vnsi.orig/src/responsepacket.cpp	2015-09-12 19:26:23.686806787 +0200
-+++ kodi-pvr-vdr-vnsi/src/responsepacket.cpp	2015-09-12 19:27:12.114458475 +0200
-@@ -26,7 +26,7 @@
+ #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 "client.h"
 -#include "platform/sockets/tcp.h"
 +#include "cec-platform/sockets/tcp.h"
  
- cResponsePacket::cResponsePacket()
- {
+ #include <stdexcept>
+ #include <stdlib.h>

-- 
kodi-pvr-vdr-vnsi packaging



More information about the pkg-multimedia-commits mailing list