[SCM] kodi-pvr-njoy/master: Imported Upstream version 2.4.0+git20160518

rbalint at users.alioth.debian.org rbalint at users.alioth.debian.org
Wed Nov 9 20:51:42 UTC 2016 

The following commit has been merged in the master branch:
commit de1154c7023ffc56cb703bb6e1825fbfeecc7070
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Mon Oct 10 16:24:18 2016 +0200

    Imported Upstream version 2.4.0+git20160518

diff --git a/.travis.yml b/.travis.yml
index 372e595..2fcfc40 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,8 +36,8 @@ before_install:
 #
 before_script:
   - cd $TRAVIS_BUILD_DIR/..
-  - git clone -b Jarvis --depth=1 https://github.com/xbmc/xbmc.git
+  - git clone --depth=1 https://github.com/xbmc/xbmc.git
   - cd pvr.njoy && mkdir build && cd build
-  - cmake -DADDONS_TO_BUILD=pvr.njoy -DADDON_SRC_PREFIX=../.. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=../../xbmc/addons -DPACKAGE_ZIP=1 ../../xbmc/project/cmake/addons
+  - cmake -DADDONS_TO_BUILD=pvr.njoy -DADDON_SRC_PREFIX=$TRAVIS_BUILD_DIR/.. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$TRAVIS_BUILD_DIR/../xbmc/addons -DPACKAGE_ZIP=1 $TRAVIS_BUILD_DIR/../xbmc/project/cmake/addons
 
 script: make
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2fc815c..3b24439 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,12 +9,12 @@ enable_language(CXX)
 option(PACKAGE_ZIP "Package Zip file?" OFF)
 
 find_package(TinyXML REQUIRED)
-find_package(kodi 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}
                     ${TINYXML_INCLUDE_DIR}
                     ${KODI_INCLUDE_DIR})
 
@@ -22,7 +22,7 @@ set(NJOY_SOURCES src/client.cpp
                  src/N7Xml.cpp)
 
 set(DEPLIBS ${kodiplatform_LIBRARIES}
-            ${platform_LIBRARIES}
+            ${p8-platform_LIBRARIES}
             ${TINYXML_LIBRARIES})
 
 build_addon(pvr.njoy NJOY DEPLIBS)
diff --git a/README.md b/README.md
index 6de9cfc..7fb6029 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/kodi-pvr/pvr.njoy.svg?branch=Jarvis)](https://travis-ci.org/kodi-pvr/pvr.njoy)
+[![Build Status](https://travis-ci.org/kodi-pvr/pvr.njoy.svg?branch=master)](https://travis-ci.org/kodi-pvr/pvr.njoy)
 [![Coverity Scan Build Status](https://scan.coverity.com/projects/5120/badge.svg)](https://scan.coverity.com/projects/5120)
 
 # Njoy PVR
diff --git a/pvr.njoy/addon.xml.in b/pvr.njoy/addon.xml.in
index b85e7e8..38f451f 100644
--- a/pvr.njoy/addon.xml.in
+++ b/pvr.njoy/addon.xml.in
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.njoy"
-  version="1.11.9"
+  version="2.4.0"
   name="Njoy N7 PVR Client"
   provider-name="Team Kodi">
   <requires>
     <c-pluff version="0.1"/>
-    <import addon="xbmc.pvr" version="4.1.0"/>
+    <import addon="xbmc.pvr" version="5.2.0"/>
   </requires>
   <extension
     point="xbmc.pvrclient"
diff --git a/pvr.njoy/changelog.txt b/pvr.njoy/changelog.txt
index 87a1eb1..32d81b5 100644
--- a/pvr.njoy/changelog.txt
+++ b/pvr.njoy/changelog.txt
@@ -1,3 +1,21 @@
+2.4.0
+- Cmake: rename find_package kodi to Kodi
+
+2.3.1
+- Fix includes
+
+2.3.0
+- Updated to PVR addon API v5.2.0
+
+2.2.0
+- Updated to PVR addon API v5.1.0
+
+2.1.0
+- Updated to PVR addon API v5.0.0
+
+2.0.0
+- Initial Kodi Krypton version.
+
 1.11.9
 - Updated Language files from Transifex
 
diff --git a/src/N7Xml.cpp b/src/N7Xml.cpp
index 58d4f7d..ac3d110 100644
--- a/src/N7Xml.cpp
+++ b/src/N7Xml.cpp
@@ -2,7 +2,7 @@
 
 #include "N7Xml.h"
 #include "tinyxml.h"
-#include "kodi/util/XMLUtils.h"
+#include "util/XMLUtils.h"
 
 using namespace ADDON;
 
diff --git a/src/client.cpp b/src/client.cpp
index d2e3cdd..9020a6e 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -20,10 +20,9 @@
  */
 
 #include "client.h"
-#include "kodi/xbmc_pvr_dll.h"
-#include "kodi/libKODI_guilib.h"
+#include "xbmc_pvr_dll.h"
 #include "N7Xml.h"
-#include "platform/util/util.h"
+#include "p8-platform/util/util.h"
 
 using namespace std;
 using namespace ADDON;
@@ -67,12 +66,12 @@ const char* GetMininumPVRAPIVersion(void)
 
 const char* GetGUIAPIVersion(void)
 {
-  return KODI_GUILIB_API_VERSION;
+  return ""; // GUI API not used
 }
 
 const char* GetMininumGUIAPIVersion(void)
 {
-  return KODI_GUILIB_MIN_API_VERSION;
+  return ""; // GUI API not used
 }
 
 ADDON_STATUS ADDON_Create(void* hdl, void* props)
@@ -189,15 +188,26 @@ void ADDON_FreeSettings()
   return;
 }
 
-void ADDON_Announce(const char *flag, const char *sender, const char *message, const void *data)
-{
-  return;
-}
-
 /***********************************************************
  * PVR Client AddOn specific public library functions
  ***********************************************************/
 
+void OnSystemSleep()
+{
+}
+
+void OnSystemWake()
+{
+}
+
+void OnPowerSavingActivated()
+{
+}
+
+void OnPowerSavingDeactivated()
+{
+}
+
 PVR_ERROR GetAddonCapabilities(PVR_ADDON_CAPABILITIES *pCapabilities)
 {
   pCapabilities->bSupportsTV                 = true;
@@ -260,7 +270,6 @@ PVR_ERROR OpenDialogChannelSettings(const PVR_CHANNEL &channel) { return PVR_ERR
 PVR_ERROR OpenDialogChannelAdd(const PVR_CHANNEL &channel) { return PVR_ERROR_NOT_IMPLEMENTED; }
 bool OpenLiveStream(const PVR_CHANNEL &channel) { return false; }
 void CloseLiveStream(void) {}
-int GetCurrentClientChannel() { return -1; }
 bool SwitchChannel(const PVR_CHANNEL &channelinfo) { return false; }
 PVR_ERROR SignalStatus(PVR_SIGNAL_STATUS &signalStatus) { return PVR_ERROR_NOT_IMPLEMENTED; }bool OpenRecordedStream(const PVR_RECORDING &recording) { return false; }
 void CloseRecordedStream(void) {}
@@ -300,6 +309,8 @@ bool IsTimeshifting(void) { return false; }
 time_t GetPlayingTime() { return 0; }
 time_t GetBufferTimeStart() { return 0; }
 time_t GetBufferTimeEnd() { return 0; }
+bool IsRealTimeStream() { return true; }
 PVR_ERROR UndeleteRecording(const PVR_RECORDING& recording) { return PVR_ERROR_NOT_IMPLEMENTED; }
 PVR_ERROR DeleteAllRecordingsFromTrash() { return PVR_ERROR_NOT_IMPLEMENTED; }
+PVR_ERROR SetEPGTimeFrame(int) { return PVR_ERROR_NOT_IMPLEMENTED; }
 } //end extern "C"
diff --git a/src/client.h b/src/client.h
index 900c11a..f44a993 100644
--- a/src/client.h
+++ b/src/client.h
@@ -20,9 +20,9 @@
  *
  */
 
-#include "platform/util/StdString.h"
-#include "kodi/libXBMC_addon.h"
-#include "kodi/libXBMC_pvr.h"
+#include "p8-platform/util/StdString.h"
+#include "libXBMC_addon.h"
+#include "libXBMC_pvr.h"
 
 #define DEFAULT_HOST  "127.0.0.1"
 #define DEFAULT_PORT  80

-- 
kodi-pvr-njoy packaging

More information about the pkg-multimedia-commits mailing list