Update from upstream kodi-pvr/pvr.iptvsimple

.gitignore

@@ -0,0 +1,24 @@
+# build artifacts
+build/
+cmake-build-debug/
+debian/changelog
+debian/files
+debian/kodi-pvr-iptvsimple-dbg.debhelper.log
+debian/kodi-pvr-iptvsimple-dbg.substvars
+debian/kodi-pvr-iptvsimple-dbg/
+debian/kodi-pvr-iptvsimple.debhelper.log
+debian/kodi-pvr-iptvsimple.postinst.debhelper
+debian/kodi-pvr-iptvsimple.postrm.debhelper
+debian/kodi-pvr-iptvsimple.substvars
+debian/kodi-pvr-iptvsimple/
+debian/tmp/
+obj-x86_64-linux-gnu/
+pvr.iptvsimple/addon.xml
+
+# clion
+.idea/
+
+# Eclipse/CDT
+.cproject
+.project
+.settings/

.travis.yml

@@ -0,0 +1,41 @@
+language: cpp
+
+#
+# Define the build matrix
+#
+# Travis defaults to building on Ubuntu Precise when building on
+# Linux. We need Trusty in order to get up to date versions of
+# cmake and g++.
+#
+env:
+  global:
+    - app_id=pvr.iptvsimple
+
+matrix:
+  include:
+    - os: linux
+      dist: xenial
+      sudo: required
+      compiler: gcc
+    - os: linux
+      dist: xenial
+      sudo: required
+      compiler: clang
+    - os: osx
+      osx_image: xcode9
+    - os: osx
+      osx_image: xcode9.4
+
+#
+# The addon source is automatically checked out in $TRAVIS_BUILD_DIR,
+# we'll put the Kodi source on the same level
+#
+before_script:
+  - cd $TRAVIS_BUILD_DIR/..
+  - git clone --depth=1 https://github.com/xbmc/xbmc.git
+  - cd ${app_id} && mkdir build && cd build
+  - mkdir -p definition/${app_id}
+  - echo ${app_id} $TRAVIS_BUILD_DIR $TRAVIS_COMMIT > definition/${app_id}/${app_id}.txt
+  - cmake -DADDONS_TO_BUILD=${app_id} -DADDON_SRC_PREFIX=$TRAVIS_BUILD_DIR/.. -DADDONS_DEFINITION_DIR=$TRAVIS_BUILD_DIR/build/definition -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$TRAVIS_BUILD_DIR/../xbmc/addons -DPACKAGE_ZIP=1 $TRAVIS_BUILD_DIR/../xbmc/cmake/addons
+
+script: make

CMakeLists.txt

@@ -2,27 +2,36 @@ project(pvr.iptvsimple)
 
 cmake_minimum_required(VERSION 2.6)
 
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR})
+
 enable_language(CXX)
 
-find_package(kodi REQUIRED)
+find_package(Kodi REQUIRED)
 find_package(kodiplatform REQUIRED)
-find_package(platform REQUIRED)
+find_package(p8-platform REQUIRED)
+find_package(Rapidxml REQUIRED)
 find_package(ZLIB REQUIRED)
 
 include_directories(${kodiplatform_INCLUDE_DIRS}
-                    ${platform_INCLUDE_DIRS}
+                    ${p8-platform_INCLUDE_DIRS}
                     ${KODI_INCLUDE_DIR}
-                    ${ZLIB_INCLUDE_DIRS}
-                    ${PROJECT_SOURCE_DIR}/lib)
+                    ${RAPIDXML_INCLUDE_DIRS}
+                    ${ZLIB_INCLUDE_DIRS})
 
-set(DEPLIBS ${platform_LIBRARIES}
+set(DEPLIBS ${p8-platform_LIBRARIES}
             ${ZLIB_LIBRARIES})
 
 message(STATUS "ZLIB_LIBRARIES: ${ZLIB_LIBRARIES}")
 
 set(IPTV_SOURCES src/client.cpp
                  src/PVRIptvData.cpp)
 
+set(IPTV_HEADERS src/client.h
+                 src/PVRIptvData.h)
+
+addon_version(pvr.iptvsimple IPTV)
+add_definitions(-DIPTV_VERSION=${IPTV_VERSION})
+
 build_addon(pvr.iptvsimple IPTV DEPLIBS)
 
 include(CPack)

FindRapidxml.cmake

@@ -0,0 +1,12 @@
+# - Try to find rapidxml
+# Once done this will define
+#
+# RAPIDXML_FOUND - system has rapidxml
+# RAPIDXML_INCLUDE_DIRS - the rapidxml include directory
+
+find_path(RAPIDXML_INCLUDE_DIRS rapidxml/rapidxml.hpp)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Rapidxml DEFAULT_MSG RAPIDXML_INCLUDE_DIRS)
+
+mark_as_advanced(RAPIDXML_INCLUDE_DIRS)

Jenkinsfile

@@ -0,0 +1 @@
+buildPlugin()

README.md

@@ -1,7 +1,21 @@
+[![Build Status](https://travis-ci.org/kodi-pvr/pvr.iptvsimple.svg?branch=master)](https://travis-ci.org/kodi-pvr/pvr.iptvsimple)
+[![Coverity Scan Build Status](https://scan.coverity.com/projects/5120/badge.svg)](https://scan.coverity.com/projects/5120)
+
 # IPTV Simple PVR
-IPTV Live TV and Radio PVR client addon for [Kodi] (http://kodi.tv)
+
+IPTV Live TV and Radio PVR client addon for [Kodi](http://kodi.tv)
+
+## Build instructions
+
+### Linux
+
+1. `git clone https://github.com/xbmc/xbmc.git`
+2. `git clone https://github.com/kodi-pvr/pvr.iptvsimple.git`
+3. `cd pvr.iptvsimple && mkdir build && cd build`
+4. `cmake -DADDONS_TO_BUILD=pvr.iptvsimple -DADDON_SRC_PREFIX=../.. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=../../xbmc/addons -DPACKAGE_ZIP=1 ../../xbmc/cmake/addons`
+5. `make`
 
 ##### Useful links
 
-* [Kodi's PVR user support] (http://forum.kodi.tv/forumdisplay.php?fid=167)
-* [Kodi's PVR development support] (http://forum.kodi.tv/forumdisplay.php?fid=136)
+* [Kodi's PVR user support](http://forum.kodi.tv/forumdisplay.php?fid=167)
+* [Kodi's PVR development support](http://forum.kodi.tv/forumdisplay.php?fid=136)

debian/control

@@ -1,8 +1,8 @@
 Source: kodi-pvr-iptvsimple
 Priority: extra
 Maintainer: Anton Fedchin <[email protected]>
-Build-Depends: debhelper (>= 9.0.0), cmake, kodi-pvr-dev,
-               libkodiplatform-dev (>= 16.0.0), kodi-addon-dev, zlib1g-dev
+Build-Depends: debhelper (>= 9.0.0), cmake, libkodiplatform-dev (>= 16.0.0),
+               kodi-addon-dev, librapidxml-dev, zlib1g-dev
 Standards-Version: 3.9.4
 Section: libs
 

debian/kodi-pvr-iptvsimple.install

@@ -1,2 +1,2 @@
-usr/lib/*/addons/pvr.iptvsimple/pvr.iptvsimple.so* usr/lib/kodi/addons/pvr.iptvsimple
-usr/share/kodi/addons/pvr.iptvsimple
+usr/lib/*
+usr/share/*

depends/common/rapidxml/01-fix-windows.patch

@@ -0,0 +1,29 @@
+--- a/rapidxml.hpp
++++ b/rapidxml.hpp
+@@ -382,7 +382,7 @@
+     public:
+
+         //! \cond internal
+-        typedef void *(alloc_func)(std::size_t);       // Type of user-defined function used to allocate memory
++        typedef void *(alloc_func_)(std::size_t);       // Type of user-defined function used to allocate memory
+         typedef void (free_func)(void *);              // Type of user-defined function used to free memory
+         //! \endcond
+
+@@ -549,7 +549,7 @@ namespace rapidxml
+         //! </code><br>
+         //! \param af Allocation function, or 0 to restore default function
+         //! \param ff Free function, or 0 to restore default function
+-        void set_allocator(alloc_func *af, free_func *ff)
++        void set_allocator(alloc_func_ *af, free_func *ff)
+         {
+             assert(m_begin == m_static_memory && m_ptr == align(m_begin));    // Verify that no memory is allocated yet
+             m_alloc_func = af;
+@@ -634,7 +634,7 @@ namespace rapidxml
+         char *m_ptr;                                        // First free byte in current pool
+         char *m_end;                                        // One past last available byte in current pool
+         char m_static_memory[RAPIDXML_STATIC_POOL_SIZE];    // Static raw memory
+-        alloc_func *m_alloc_func;                           // Allocator function, or 0 if default is to be used
++        alloc_func_ *m_alloc_func;                           // Allocator function, or 0 if default is to be used
+         free_func *m_free_func;                             // Free function, or 0 if default is to be used
+     };
+

depends/common/rapidxml/CMakeLists.txt

@@ -0,0 +1,5 @@
+cmake_minimum_required(VERSION 3.5)
+
+project(rapidxml)
+
+install(FILES rapidxml.hpp rapidxml_iterators.hpp rapidxml_print.hpp rapidxml_utils.hpp DESTINATION include/rapidxml)

depends/common/rapidxml/rapidxml.sha256

@@ -0,0 +1 @@
+c3f0b886374981bb20fabcf323d755db4be6dba42064599481da64a85f5b3571

depends/common/rapidxml/rapidxml.txt

@@ -0,0 +1 @@
+rapidxml http://mirrors.kodi.tv/build-deps/sources/rapidxml-1.13.zip

depends/common/zlib/01-build-static.patch

@@ -0,0 +1,36 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -183,10 +183,11 @@
+     set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj)
+ endif(MINGW)
+
+-add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
+-add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
+-set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
+-set_target_properties(zlib PROPERTIES SOVERSION 1)
++add_library(zlib ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
++if(BUILD_SHARED_LIBS)
++    set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
++    set_target_properties(zlib PROPERTIES SOVERSION 1)
++endif()
+
+ if(NOT CYGWIN)
+     # This property causes shared libraries on Linux to have the full version
+@@ -201,7 +202,7 @@
+
+ if(UNIX)
+     # On unix-like platforms the library is almost always called libz
+-   set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z)
++   set_target_properties(zlib PROPERTIES OUTPUT_NAME z)
+    if(NOT APPLE)
+      set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"")
+    endif()
+@@ -211,7 +212,7 @@
+ endif()
+
+ if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL )
+-    install(TARGETS zlib zlibstatic
++    install(TARGETS zlib
+         RUNTIME DESTINATION "${INSTALL_BIN_DIR}"
+         ARCHIVE DESTINATION "${INSTALL_LIB_DIR}"
+         LIBRARY DESTINATION "${INSTALL_LIB_DIR}" )