diff -Nru kodi-pvr-iptvsimple-1.12.9/debian/changelog kodi-pvr-iptvsimple-1.12.10/debian/changelog
--- kodi-pvr-iptvsimple-1.12.9/debian/changelog 2016-01-21 07:57:03.000000000 +0000
+++ kodi-pvr-iptvsimple-1.12.10/debian/changelog 2016-02-20 20:56:16.000000000 +0000
@@ -1,36 +1,39 @@
-kodi-pvr-iptvsimple (1.12.9-1~trusty) trusty; urgency=low
+kodi-pvr-iptvsimple (1.12.10-1~trusty) trusty; urgency=low
[ kodi ]
* autogenerated dummy changelog
[ wsnipex ]
- * v1.12.9 - updated language files from Transifex v1.12.8 - updated
- language files from Transifex v1.12.7 - updated language files from
- Transifex v1.12.6 - Updated to PVR API v4.1.0 v1.12.5 - Updated to
- PVR API v4.0.0 v1.12.4 - Updated to PVR API v3.0.0 (API 1.9.7
- compatibility mode) v1.12.3 - Updated to PVR API v2.1.0 -
- Automatically fill in platform and library name v1.12.2 - Debian
- packaging: fix library install path - Miscellaneous backend fixes
- v1.12.1 - updated to API v2.0.0 v1.12.0 - updated to API v1.9.7
- v1.11.3 - updated language files from Transifex v1.11.2 - updated to
- use new libplatform-dev v1.11.1 - fixed EPG loading. v1.11.0 -
- updated to API v1.9.6 - new feature: channel logos from xmltv - new
- feature: map xmltv genre to Kodi genre via genres.xml - now possible
- to define full logo path in m3u if logos path is empty in setting -
- a lot of code improvements. v1.10.2 - updated to API v1.9.5 v1.10.1 -
- language files from Transifex - minor changes to conform with C++11 -
- Updated to API v1.9.4 v1.9.12 - added getBackendHostname function
- v1.9.10 - change library name to Kodi v1.9.9 - fixed deadlock when
- activating the addon on some darwin (osx, ios) runtimes v1.9.6 -
- updated to API v1.9.2 v1.9.3 - added setting to disable cache
- m3u/epg - added support for programme in epg - added
- possibility to specify logo path as URL - changed tvg-logo should
- contains full logo filename (with extention) - changed don't try
- download xmltv if it doesn't load after 3 attempt. v1.9.2 - add
- timeshift buffer functions v1.8.1 - fixed issue with BOM header in
- EPG XML - fixed issue with update channels if they are changed in
- m3u - added setting starting number of channels v1.8.0 - Initial
- version - Supports m3u as Live TV streams source and XMLTV as EPG
- source - Supports Live TV, Radio channels and EPG
+ * v1.12.10 - Fix: Don't ignore channels logo if base logo path setting
+ is empty. - Fix: Don't apply base logo path to channels logo if tvg-
+ logo has a full NET path. v1.12.9 - updated language files from
+ Transifex v1.12.8 - updated language files from Transifex v1.12.7 -
+ updated language files from Transifex v1.12.6 - Updated to PVR API
+ v4.1.0 v1.12.5 - Updated to PVR API v4.0.0 v1.12.4 - Updated to PVR
+ API v3.0.0 (API 1.9.7 compatibility mode) v1.12.3 - Updated to PVR
+ API v2.1.0 - Automatically fill in platform and library name v1.12.2
+ - Debian packaging: fix library install path - Miscellaneous backend
+ fixes v1.12.1 - updated to API v2.0.0 v1.12.0 - updated to API
+ v1.9.7 v1.11.3 - updated language files from Transifex v1.11.2 -
+ updated to use new libplatform-dev v1.11.1 - fixed EPG loading.
+ v1.11.0 - updated to API v1.9.6 - new feature: channel logos from
+ xmltv - new feature: map xmltv genre to Kodi genre via genres.xml -
+ now possible to define full logo path in m3u if logos path is empty
+ in setting - a lot of code improvements. v1.10.2 - updated to API
+ v1.9.5 v1.10.1 - language files from Transifex - minor changes to
+ conform with C++11 - Updated to API v1.9.4 v1.9.12 - added
+ getBackendHostname function v1.9.10 - change library name to Kodi
+ v1.9.9 - fixed deadlock when activating the addon on some darwin
+ (osx, ios) runtimes v1.9.6 - updated to API v1.9.2 v1.9.3 - added
+ setting to disable cache m3u/epg - added support for
+ programme in epg - added possibility to specify logo path as URL -
+ changed tvg-logo should contains full logo filename (with extention)
+ - changed don't try download xmltv if it doesn't load after 3
+ attempt. v1.9.2 - add timeshift buffer functions v1.8.1 - fixed
+ issue with BOM header in EPG XML - fixed issue with update channels
+ if they are changed in m3u - added setting starting number of
+ channels v1.8.0 - Initial version - Supports m3u as Live TV streams
+ source and XMLTV as EPG source - Supports Live TV, Radio channels
+ and EPG
- -- wsnipex Thu, 21 Jan 2016 08:57:03 +0100
+ -- wsnipex Sat, 20 Feb 2016 21:56:16 +0100
diff -Nru kodi-pvr-iptvsimple-1.12.9/debian/changelog.tmp kodi-pvr-iptvsimple-1.12.10/debian/changelog.tmp
--- kodi-pvr-iptvsimple-1.12.9/debian/changelog.tmp 2016-01-21 07:56:25.000000000 +0000
+++ kodi-pvr-iptvsimple-1.12.10/debian/changelog.tmp 2016-02-20 20:55:19.000000000 +0000
@@ -1,4 +1,4 @@
-kodi-pvr-iptvsimple (1.12.9-1~#DIST#) #DIST#; urgency=low
+kodi-pvr-iptvsimple (1.12.10-1~#DIST#) #DIST#; urgency=low
[ kodi ]
* autogenerated dummy changelog
diff -Nru kodi-pvr-iptvsimple-1.12.9/pvr.iptvsimple/addon.xml.in kodi-pvr-iptvsimple-1.12.10/pvr.iptvsimple/addon.xml.in
--- kodi-pvr-iptvsimple-1.12.9/pvr.iptvsimple/addon.xml.in 2016-01-10 21:41:24.000000000 +0000
+++ kodi-pvr-iptvsimple-1.12.10/pvr.iptvsimple/addon.xml.in 2016-02-18 08:57:30.000000000 +0000
@@ -1,7 +1,7 @@
diff -Nru kodi-pvr-iptvsimple-1.12.9/pvr.iptvsimple/changelog.txt kodi-pvr-iptvsimple-1.12.10/pvr.iptvsimple/changelog.txt
--- kodi-pvr-iptvsimple-1.12.9/pvr.iptvsimple/changelog.txt 2016-01-10 21:41:24.000000000 +0000
+++ kodi-pvr-iptvsimple-1.12.10/pvr.iptvsimple/changelog.txt 2016-02-18 08:57:30.000000000 +0000
@@ -1,3 +1,7 @@
+v1.12.10
+- Fix: Don't ignore channels logo if base logo path setting is empty.
+- Fix: Don't apply base logo path to channels logo if tvg-logo has a full NET path.
+
v1.12.9
- updated language files from Transifex
diff -Nru kodi-pvr-iptvsimple-1.12.9/README.md kodi-pvr-iptvsimple-1.12.10/README.md
--- kodi-pvr-iptvsimple-1.12.9/README.md 2016-01-10 21:41:24.000000000 +0000
+++ kodi-pvr-iptvsimple-1.12.10/README.md 2016-02-18 08:57:30.000000000 +0000
@@ -1,6 +1,19 @@
+[![Build Status](https://travis-ci.org/kodi-pvr/pvr.iptvsimple.svg?branch=Jarvis)](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)
+## 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/project/cmake/addons`
+5. `make`
+
##### Useful links
* [Kodi's PVR user support] (http://forum.kodi.tv/forumdisplay.php?fid=167)
diff -Nru kodi-pvr-iptvsimple-1.12.9/src/PVRIptvData.cpp kodi-pvr-iptvsimple-1.12.10/src/PVRIptvData.cpp
--- kodi-pvr-iptvsimple-1.12.9/src/PVRIptvData.cpp 2016-01-10 21:41:24.000000000 +0000
+++ kodi-pvr-iptvsimple-1.12.10/src/PVRIptvData.cpp 2016-02-18 08:57:30.000000000 +0000
@@ -968,14 +968,18 @@
void PVRIptvData::ApplyChannelsLogos()
{
- if (m_strLogoPath.empty())
- return;
-
std::vector::iterator channel;
for(channel = m_channels.begin(); channel < m_channels.end(); ++channel)
{
if (!channel->strTvgLogo.empty())
- channel->strLogoPath = PathCombine(m_strLogoPath, channel->strTvgLogo);
+ {
+ if (!m_strLogoPath.empty()
+ // special proto
+ && channel->strTvgLogo.find("://") == std::string::npos)
+ channel->strLogoPath = PathCombine(m_strLogoPath, channel->strTvgLogo);
+ else
+ channel->strLogoPath = channel->strTvgLogo;
+ }
}
}
diff -Nru kodi-pvr-iptvsimple-1.12.9/.travis.yml kodi-pvr-iptvsimple-1.12.10/.travis.yml
--- kodi-pvr-iptvsimple-1.12.9/.travis.yml 1970-01-01 00:00:00.000000000 +0000
+++ kodi-pvr-iptvsimple-1.12.10/.travis.yml 2016-02-18 08:57:30.000000000 +0000
@@ -0,0 +1,43 @@
+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++.
+#
+matrix:
+ include:
+ - os: linux
+ dist: trusty
+ sudo: required
+ compiler: gcc
+ - os: linux
+ dist: trusty
+ sudo: required
+ compiler: clang
+ - os: osx
+ osx_image: xcode7.3
+ - os: osx
+ osx_image: xcode6.1
+
+#
+# Some of the OS X images don't have cmake, contrary to what people
+# on the Internet say
+#
+before_install:
+ - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then which cmake || brew update ; fi
+ - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then which cmake || brew install cmake ; fi
+
+#
+# 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 -b Jarvis --depth=1 https://github.com/xbmc/xbmc.git
+ - cd pvr.iptvsimple && mkdir build && cd build
+ - cmake -DADDONS_TO_BUILD=pvr.iptvsimple -DADDON_SRC_PREFIX=../.. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=../../xbmc/addons -DPACKAGE_ZIP=1 ../../xbmc/project/cmake/addons
+
+script: make