From f51c449a3bc0f987399ee60d786b36e31c1ae66a Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 27 Jul 2014 14:42:32 +0200 Subject: [PATCH] xbmc-pvr-addons-master: move to package 'xbmc-pvr-addons' Signed-off-by: Stephan Raue --- .../xbmc-pvr-addons-master/package.mk | 47 ---- .../xbmc-pvr-addons-master-buildfix.patch | 220 ------------------ .../mediacenter/xbmc-pvr-addons/package.mk | 2 +- ...bmc-pvr-addons-999.02-picons-support.patch | 200 ---------------- .../patches/xbmc-pvr-addons-buildfix.patch | 100 ++++---- 5 files changed, 51 insertions(+), 518 deletions(-) delete mode 100644 packages/mediacenter/xbmc-pvr-addons-master/package.mk delete mode 100644 packages/mediacenter/xbmc-pvr-addons-master/patches/xbmc-pvr-addons-master-buildfix.patch delete mode 100644 packages/mediacenter/xbmc-pvr-addons/patches/xbmc-pvr-addons-999.02-picons-support.patch diff --git a/packages/mediacenter/xbmc-pvr-addons-master/package.mk b/packages/mediacenter/xbmc-pvr-addons-master/package.mk deleted file mode 100644 index b38af0a124..0000000000 --- a/packages/mediacenter/xbmc-pvr-addons-master/package.mk +++ /dev/null @@ -1,47 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv) -# -# OpenELEC is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 2 of the License, or -# (at your option) any later version. -# -# OpenELEC is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC. If not, see . -################################################################################ - -PKG_NAME="xbmc-pvr-addons-master" -PKG_VERSION="a6c2ec7" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="GPL" -PKG_SITE="https://github.com/opdenkamp/xbmc-pvr-addons" -PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS_TARGET="toolchain curl" -PKG_PRIORITY="optional" -PKG_SECTION="mediacenter" -PKG_SHORTDESC="Various PVR addons for XBMC" -PKG_LONGDESC="This addons allows XBMC PVR to connect to various TV/PVR backends and tuners." -PKG_IS_ADDON="no" -PKG_AUTORECONF="yes" - -if [ "$MYSQL_SUPPORT" = yes ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET mysql" - PVRADDONS_MYSQL="--enable-mysql" -else - PVRADDONS_MYSQL="--disable-mysql" -fi - -PKG_CONFIGURE_OPTS_TARGET="--enable-addons-with-dependencies $PVRADDONS_MYSQL" - -post_makeinstall_target() { - if [ "$DEBUG" != yes ]; then - $STRIP $INSTALL/usr/lib/xbmc/addons/pvr.*/*.pvr - fi -} diff --git a/packages/mediacenter/xbmc-pvr-addons-master/patches/xbmc-pvr-addons-master-buildfix.patch b/packages/mediacenter/xbmc-pvr-addons-master/patches/xbmc-pvr-addons-master-buildfix.patch deleted file mode 100644 index e62c21a226..0000000000 --- a/packages/mediacenter/xbmc-pvr-addons-master/patches/xbmc-pvr-addons-master-buildfix.patch +++ /dev/null @@ -1,220 +0,0 @@ -diff -Naur xbmc-pvr-addons-master-a6c2ec7/addons/Makefile.include.am xbmc-pvr-addons-master-a6c2ec7.patch/addons/Makefile.include.am ---- xbmc-pvr-addons-master-a6c2ec7/addons/Makefile.include.am 2014-07-19 03:01:51.000000000 +0200 -+++ xbmc-pvr-addons-master-a6c2ec7.patch/addons/Makefile.include.am 2014-07-19 03:07:43.450044259 +0200 -@@ -36,7 +36,9 @@ - mkdir -m 755 -p $(DESTDIR)@LIBDIR@/$(ADDONNAME) - mkdir -m 755 -p $(DESTDIR)@DATADIR@/$(ADDONNAME) - cp -f @BINPREFIX@$(ADDONBINNAME)@BIN_EXT@ $(DESTDIR)@LIBDIR@/$(ADDONNAME) ; chmod 655 $(DESTDIR)@LIBDIR@/$(ADDONNAME)/@BINPREFIX@$(ADDONBINNAME)@BIN_EXT@; find $(DESTDIR)@DATADIR@/$(ADDONNAME) -type f -exec chmod 0644 {} \; -- cp -r -f @abs_top_srcdir@/addons/$(ADDONNAME)/addon/* $(DESTDIR)@DATADIR@/$(ADDONNAME) ; chmod -R o+rx $(DESTDIR)@DATADIR@/$(ADDONNAME) -+ cp -r -f @abs_top_srcdir@/addons/$(ADDONNAME)/addon/* $(DESTDIR)@DATADIR@/$(ADDONNAME) -+ cp -r -f @abs_top_builddir@/addons/$(ADDONNAME)/addon/* $(DESTDIR)@DATADIR@/$(ADDONNAME) -+ chmod -R o+rx $(DESTDIR)@DATADIR@/$(ADDONNAME) - rm -f $(DESTDIR)@DATADIR@/$(ADDONNAME)/addon.xml.in - endif - -diff -Naur xbmc-pvr-addons-master-a6c2ec7/addons/pvr.argustv/Makefile.am xbmc-pvr-addons-master-a6c2ec7.patch/addons/pvr.argustv/Makefile.am ---- xbmc-pvr-addons-master-a6c2ec7/addons/pvr.argustv/Makefile.am 2014-07-19 03:01:51.000000000 +0200 -+++ xbmc-pvr-addons-master-a6c2ec7.patch/addons/pvr.argustv/Makefile.am 2014-07-19 03:05:39.986714713 +0200 -@@ -10,11 +10,11 @@ - LIBNAME = libargustv-addon - lib_LTLIBRARIES = libargustv-addon.la - --LIBS = @abs_top_srcdir@/lib/jsoncpp/libjsoncpp.la -+LIBS = @abs_top_builddir@/lib/jsoncpp/libjsoncpp.la - - include ../Makefile.include.am - --INCLUDES+=-Isrc -Isrc/lib/filesystem -I@abs_top_srcdir@/lib/jsoncpp/include -+INCLUDES+=-I$(srcdir)/src -I$(srcdir)/src/lib/filesystem -I@abs_top_srcdir@/lib/jsoncpp/include - - libargustv_addon_la_SOURCES = src/activerecording.cpp \ - src/channel.cpp \ -diff -Naur xbmc-pvr-addons-master-a6c2ec7/addons/pvr.demo/Makefile.am xbmc-pvr-addons-master-a6c2ec7.patch/addons/pvr.demo/Makefile.am ---- xbmc-pvr-addons-master-a6c2ec7/addons/pvr.demo/Makefile.am 2014-07-19 03:01:51.000000000 +0200 -+++ xbmc-pvr-addons-master-a6c2ec7.patch/addons/pvr.demo/Makefile.am 2014-07-19 03:05:39.986714713 +0200 -@@ -10,7 +10,7 @@ - LIBNAME = libpvrdemo-addon - lib_LTLIBRARIES = libpvrdemo-addon.la - --LIBS = @abs_top_srcdir@/lib/tinyxml/libtinyxml.la -+LIBS = @abs_top_builddir@/lib/tinyxml/libtinyxml.la - - include ../Makefile.include.am - -diff -Naur xbmc-pvr-addons-master-a6c2ec7/addons/pvr.dvblink/Makefile.am xbmc-pvr-addons-master-a6c2ec7.patch/addons/pvr.dvblink/Makefile.am ---- xbmc-pvr-addons-master-a6c2ec7/addons/pvr.dvblink/Makefile.am 2014-07-19 03:01:51.000000000 +0200 -+++ xbmc-pvr-addons-master-a6c2ec7.patch/addons/pvr.dvblink/Makefile.am 2014-07-19 03:05:39.988714812 +0200 -@@ -10,11 +10,11 @@ - LIBNAME = libdvblink-addon - lib_LTLIBRARIES = libdvblink-addon.la - --LIBS = @abs_top_srcdir@/lib/libdvblinkremote/libdvblinkremote.la -+LIBS = @abs_top_builddir@/lib/libdvblinkremote/libdvblinkremote.la - - include ../Makefile.include.am - --INCLUDES+=-Isrc -+INCLUDES+=-I$(srcdir)/src - - libdvblink_addon_la_SOURCES = src/client.cpp \ - src/base64.cpp \ -diff -Naur xbmc-pvr-addons-master-a6c2ec7/addons/pvr.dvbviewer/Makefile.am xbmc-pvr-addons-master-a6c2ec7.patch/addons/pvr.dvbviewer/Makefile.am ---- xbmc-pvr-addons-master-a6c2ec7/addons/pvr.dvbviewer/Makefile.am 2014-07-19 03:01:51.000000000 +0200 -+++ xbmc-pvr-addons-master-a6c2ec7.patch/addons/pvr.dvbviewer/Makefile.am 2014-07-19 03:05:39.988714812 +0200 -@@ -10,7 +10,7 @@ - LIBNAME = libdvbviewer-addon - lib_LTLIBRARIES = libdvbviewer-addon.la - --LIBS = @abs_top_srcdir@/lib/tinyxml/libtinyxml.la -+LIBS = @abs_top_builddir@/lib/tinyxml/libtinyxml.la - - include ../Makefile.include.am - -diff -Naur xbmc-pvr-addons-master-a6c2ec7/addons/pvr.hts/Makefile.am xbmc-pvr-addons-master-a6c2ec7.patch/addons/pvr.hts/Makefile.am ---- xbmc-pvr-addons-master-a6c2ec7/addons/pvr.hts/Makefile.am 2014-07-19 03:01:51.000000000 +0200 -+++ xbmc-pvr-addons-master-a6c2ec7.patch/addons/pvr.hts/Makefile.am 2014-07-19 03:05:39.989714857 +0200 -@@ -10,7 +10,7 @@ - LIBNAME = libtvheadend-addon - lib_LTLIBRARIES = libtvheadend-addon.la - --LIBS = @abs_top_srcdir@/lib/libhts/libhts.la -ldl -+LIBS = @abs_top_builddir@/lib/libhts/libhts.la -ldl - - include ../Makefile.include.am - -diff -Naur xbmc-pvr-addons-master-a6c2ec7/addons/pvr.mediaportal.tvserver/Makefile.am xbmc-pvr-addons-master-a6c2ec7.patch/addons/pvr.mediaportal.tvserver/Makefile.am ---- xbmc-pvr-addons-master-a6c2ec7/addons/pvr.mediaportal.tvserver/Makefile.am 2014-07-19 03:01:51.000000000 +0200 -+++ xbmc-pvr-addons-master-a6c2ec7.patch/addons/pvr.mediaportal.tvserver/Makefile.am 2014-07-19 03:05:39.990714900 +0200 -@@ -10,11 +10,11 @@ - LIBNAME = libmediaportal-addon - lib_LTLIBRARIES = libmediaportal-addon.la - --LIBS = @abs_top_srcdir@/lib/tinyxml/libtinyxml.la -+LIBS = @abs_top_builddir@/lib/tinyxml/libtinyxml.la - - include ../Makefile.include.am - --INCLUDES+=-Isrc -+INCLUDES+=-I$(srcdir)/src - - libmediaportal_addon_la_SOURCES = src/Cards.cpp \ - src/channels.cpp \ -diff -Naur xbmc-pvr-addons-master-a6c2ec7/addons/pvr.mythtv.cmyth/Makefile.am xbmc-pvr-addons-master-a6c2ec7.patch/addons/pvr.mythtv.cmyth/Makefile.am ---- xbmc-pvr-addons-master-a6c2ec7/addons/pvr.mythtv.cmyth/Makefile.am 2014-07-19 03:01:51.000000000 +0200 -+++ xbmc-pvr-addons-master-a6c2ec7.patch/addons/pvr.mythtv.cmyth/Makefile.am 2014-07-19 03:05:39.990714900 +0200 -@@ -10,7 +10,7 @@ - LIBNAME = libmythtvcmyth-addon - lib_LTLIBRARIES = libmythtvcmyth-addon.la - --LIBS = @abs_top_srcdir@/lib/cmyth/libcmyth.la -+LIBS = @abs_top_builddir@/lib/cmyth/libcmyth.la - - AM_CPPFLAGS = -I$(abs_top_srcdir)/lib/cmyth/include - -diff -Naur xbmc-pvr-addons-master-a6c2ec7/addons/pvr.nextpvr/Makefile.am xbmc-pvr-addons-master-a6c2ec7.patch/addons/pvr.nextpvr/Makefile.am ---- xbmc-pvr-addons-master-a6c2ec7/addons/pvr.nextpvr/Makefile.am 2014-07-19 03:01:51.000000000 +0200 -+++ xbmc-pvr-addons-master-a6c2ec7.patch/addons/pvr.nextpvr/Makefile.am 2014-07-19 03:05:39.990714900 +0200 -@@ -10,11 +10,11 @@ - LIBNAME = libnextpvr-addon - lib_LTLIBRARIES = libnextpvr-addon.la - --LIBS = @abs_top_srcdir@/lib/tinyxml/libtinyxml.la -+LIBS = @abs_top_builddir@/lib/tinyxml/libtinyxml.la - - include ../Makefile.include.am - --INCLUDES+=-Isrc -+INCLUDES+=-I$(srcdir)/src - - libnextpvr_addon_la_SOURCES = src/client.cpp \ - src/pvrclient-nextpvr.cpp \ -diff -Naur xbmc-pvr-addons-master-a6c2ec7/addons/pvr.njoy/Makefile.am xbmc-pvr-addons-master-a6c2ec7.patch/addons/pvr.njoy/Makefile.am ---- xbmc-pvr-addons-master-a6c2ec7/addons/pvr.njoy/Makefile.am 2014-07-19 03:01:51.000000000 +0200 -+++ xbmc-pvr-addons-master-a6c2ec7.patch/addons/pvr.njoy/Makefile.am 2014-07-19 03:05:39.990714900 +0200 -@@ -10,7 +10,7 @@ - LIBNAME = libpvrnjoy-addon - lib_LTLIBRARIES = libpvrnjoy-addon.la - --LIBS = @abs_top_srcdir@/lib/tinyxml/libtinyxml.la -+LIBS = @abs_top_builddir@/lib/tinyxml/libtinyxml.la - - include ../Makefile.include.am - -diff -Naur xbmc-pvr-addons-master-a6c2ec7/addons/pvr.vuplus/Makefile.am xbmc-pvr-addons-master-a6c2ec7.patch/addons/pvr.vuplus/Makefile.am ---- xbmc-pvr-addons-master-a6c2ec7/addons/pvr.vuplus/Makefile.am 2014-07-19 03:01:51.000000000 +0200 -+++ xbmc-pvr-addons-master-a6c2ec7.patch/addons/pvr.vuplus/Makefile.am 2014-07-19 03:05:39.992714978 +0200 -@@ -10,7 +10,7 @@ - LIBNAME = libvuplus-addon - lib_LTLIBRARIES = libvuplus-addon.la - --LIBS = @abs_top_srcdir@/lib/tinyxml/libtinyxml.la -+LIBS = @abs_top_builddir@/lib/tinyxml/libtinyxml.la - - include ../Makefile.include.am - -diff -Naur xbmc-pvr-addons-master-a6c2ec7/addons/pvr.wmc/Makefile.am xbmc-pvr-addons-master-a6c2ec7.patch/addons/pvr.wmc/Makefile.am ---- xbmc-pvr-addons-master-a6c2ec7/addons/pvr.wmc/Makefile.am 2014-07-19 03:01:51.000000000 +0200 -+++ xbmc-pvr-addons-master-a6c2ec7.patch/addons/pvr.wmc/Makefile.am 2014-07-19 03:05:39.992714978 +0200 -@@ -10,7 +10,7 @@ - LIBNAME = libpvrwmc-addon - lib_LTLIBRARIES = libpvrwmc-addon.la - --LIBS = @abs_top_srcdir@/lib/tinyxml/libtinyxml.la -+LIBS = @abs_top_builddir@/lib/tinyxml/libtinyxml.la - - include ../Makefile.include.am - -diff -Naur xbmc-pvr-addons-master-a6c2ec7/lib/cmyth/libcmyth/Makefile.am xbmc-pvr-addons-master-a6c2ec7.patch/lib/cmyth/libcmyth/Makefile.am ---- xbmc-pvr-addons-master-a6c2ec7/lib/cmyth/libcmyth/Makefile.am 2014-07-19 03:01:51.000000000 +0200 -+++ xbmc-pvr-addons-master-a6c2ec7.patch/lib/cmyth/libcmyth/Makefile.am 2014-07-19 03:05:39.993715014 +0200 -@@ -26,7 +26,7 @@ - storagegroup.c \ - epginfo.c - --INCLUDES=-I../include/ $(MYSQL_INCLUDES) -+INCLUDES=-I$(srcdir)/../include/ $(MYSQL_INCLUDES) - - $(LIB): libcmyth.la - cp -f .libs/libcmyth.a . -diff -Naur xbmc-pvr-addons-master-a6c2ec7/lib/cmyth/librefmem/Makefile.am xbmc-pvr-addons-master-a6c2ec7.patch/lib/cmyth/librefmem/Makefile.am ---- xbmc-pvr-addons-master-a6c2ec7/lib/cmyth/librefmem/Makefile.am 2014-07-19 03:01:51.000000000 +0200 -+++ xbmc-pvr-addons-master-a6c2ec7.patch/lib/cmyth/librefmem/Makefile.am 2014-07-19 03:05:39.993715014 +0200 -@@ -3,7 +3,7 @@ - librefmem_la_SOURCES = alloc.c \ - debug_refmem.c - --INCLUDES=-I../include/ -I../libcmyth/ -+INCLUDES=-I$(srcdir)/../include/ -I$(srcdir)/../libcmyth/ - - $(LIB): librefmem.la - cp -f .libs/librefmem.a . -diff -Naur xbmc-pvr-addons-master-a6c2ec7/lib/jsoncpp/Makefile.am xbmc-pvr-addons-master-a6c2ec7.patch/lib/jsoncpp/Makefile.am ---- xbmc-pvr-addons-master-a6c2ec7/lib/jsoncpp/Makefile.am 2014-07-19 03:01:51.000000000 +0200 -+++ xbmc-pvr-addons-master-a6c2ec7.patch/lib/jsoncpp/Makefile.am 2014-07-19 03:05:39.993715014 +0200 -@@ -4,7 +4,7 @@ - src/lib_json/json_value.cpp \ - src/lib_json/json_writer.cpp - --INCLUDES=-Iinclude/ -+INCLUDES=-I$(srcdir)/include/ - - $(LIB): libjsoncpp.la - cp -f .libs/libjsoncpp.a . -diff -Naur xbmc-pvr-addons-master-a6c2ec7/lib/libdvblinkremote/Makefile.am xbmc-pvr-addons-master-a6c2ec7.patch/lib/libdvblinkremote/Makefile.am ---- xbmc-pvr-addons-master-a6c2ec7/lib/libdvblinkremote/Makefile.am 2014-07-19 03:01:51.000000000 +0200 -+++ xbmc-pvr-addons-master-a6c2ec7.patch/lib/libdvblinkremote/Makefile.am 2014-07-19 03:05:39.993715014 +0200 -@@ -26,10 +26,10 @@ - util.cpp \ - xml_object_serializer_factory.cpp - --LIBS= @abs_top_srcdir@/lib/tinyxml2/libtinyxml2.la -+LIBS= @abs_top_builddir@/lib/tinyxml2/libtinyxml2.la - --INCLUDES=-I.. -+INCLUDES=-I$(srcdir)/.. - - $(LIB): libdvblinkremote.la - cp -f .libs/libdvblinkremote.a . -- cp -f .libs/libdvblinkremote.la $(LIB) -\ Kein Zeilenumbruch am Dateiende. -+ cp -f .libs/libdvblinkremote.la $(LIB) diff --git a/packages/mediacenter/xbmc-pvr-addons/package.mk b/packages/mediacenter/xbmc-pvr-addons/package.mk index 2f83386ac2..0c4155164f 100644 --- a/packages/mediacenter/xbmc-pvr-addons/package.mk +++ b/packages/mediacenter/xbmc-pvr-addons/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="xbmc-pvr-addons" -PKG_VERSION="be12a8d" +PKG_VERSION="a6c2ec7" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc-pvr-addons/patches/xbmc-pvr-addons-999.02-picons-support.patch b/packages/mediacenter/xbmc-pvr-addons/patches/xbmc-pvr-addons-999.02-picons-support.patch deleted file mode 100644 index 977a90609f..0000000000 --- a/packages/mediacenter/xbmc-pvr-addons/patches/xbmc-pvr-addons-999.02-picons-support.patch +++ /dev/null @@ -1,200 +0,0 @@ -From e0281842588c867fdf3f26fe15f70576e1363f4e Mon Sep 17 00:00:00 2001 -From: Rainer Hochecker -Date: Sun, 11 May 2014 12:01:23 +0200 -Subject: [PATCH] VNSI: add icon path to channels - ---- - .../addon/resources/language/English/strings.po | 6 +++++- - addons/pvr.vdr.vnsi/addon/resources/settings.xml | 1 + - addons/pvr.vdr.vnsi/src/VNSIAdmin.cpp | 6 +++++- - addons/pvr.vdr.vnsi/src/VNSIData.cpp | 13 +++++++++++++ - addons/pvr.vdr.vnsi/src/VNSISession.cpp | 6 +++--- - addons/pvr.vdr.vnsi/src/VNSISession.h | 6 +++--- - addons/pvr.vdr.vnsi/src/client.cpp | 15 +++++++++++++++ - addons/pvr.vdr.vnsi/src/client.h | 1 + - addons/pvr.vdr.vnsi/src/vnsicommand.h | 5 ++++- - 9 files changed, 50 insertions(+), 9 deletions(-) - -diff --git a/addons/pvr.vdr.vnsi/addon/resources/language/English/strings.po b/addons/pvr.vdr.vnsi/addon/resources/language/English/strings.po -index 0dbd547..b5ca004 100644 ---- a/addons/pvr.vdr.vnsi/addon/resources/language/English/strings.po -+++ b/addons/pvr.vdr.vnsi/addon/resources/language/English/strings.po -@@ -210,7 +210,11 @@ msgctxt "#30047" - msgid "Request Timeshift" - msgstr "" - --#empty strings from id 30048 to 30099 -+msgctxt "#30048" -+msgid "Path to channel icons" -+msgstr "" -+ -+#empty strings from id 30049 to 30099 - - msgctxt "#30100" - msgid "VDR OSD" -diff --git a/addons/pvr.vdr.vnsi/addon/resources/settings.xml b/addons/pvr.vdr.vnsi/addon/resources/settings.xml -index c75cc8c..e750ee0 100644 ---- a/addons/pvr.vdr.vnsi/addon/resources/settings.xml -+++ b/addons/pvr.vdr.vnsi/addon/resources/settings.xml -@@ -8,4 +8,5 @@ - - - -+ - -diff --git a/addons/pvr.vdr.vnsi/src/VNSIAdmin.cpp b/addons/pvr.vdr.vnsi/src/VNSIAdmin.cpp -index a8b5403..36a2dff 100644 ---- a/addons/pvr.vdr.vnsi/src/VNSIAdmin.cpp -+++ b/addons/pvr.vdr.vnsi/src/VNSIAdmin.cpp -@@ -1427,11 +1427,15 @@ bool cVNSIAdmin::ReadChannelList(bool radio) - char *strChannelName = vresp->extract_String(); - channel.m_name = strChannelName; - char *strProviderName = vresp->extract_String(); -- channel.m_provider = strProviderName; -+ channel.m_provider = strProviderName; - channel.m_id = vresp->extract_U32(); - vresp->extract_U32(); // first caid - char *strCaids = vresp->extract_String(); - channel.SetCaids(strCaids); -+ if (m_protocol >= 6) -+ { -+ std::string ref = vresp->extract_String(); -+ } - channel.m_radio = radio; - - delete[] strChannelName; -diff --git a/addons/pvr.vdr.vnsi/src/VNSIData.cpp b/addons/pvr.vdr.vnsi/src/VNSIData.cpp -index cc14adf..34ed599 100644 ---- a/addons/pvr.vdr.vnsi/src/VNSIData.cpp -+++ b/addons/pvr.vdr.vnsi/src/VNSIData.cpp -@@ -235,6 +235,19 @@ bool cVNSIData::GetChannelsList(ADDON_HANDLE handle, bool radio) - tag.iUniqueId = vresp->extract_U32(); - tag.iEncryptionSystem = vresp->extract_U32(); - char *strCaids = vresp->extract_String(); -+ if (m_protocol >= 6) -+ { -+ std::string path = g_szIconPath; -+ std::string ref = vresp->extract_String(); -+ if (!path.empty()) -+ { -+ if (path[path.length()-1] != '/') -+ path += '/'; -+ path += ref; -+ path += ".png"; -+ strncpy(tag.strIconPath, path.c_str(), sizeof(tag.strIconPath) - 1); -+ } -+ } - tag.bIsRadio = radio; - - PVR->TransferChannelEntry(handle, &tag); -diff --git a/addons/pvr.vdr.vnsi/src/VNSISession.cpp b/addons/pvr.vdr.vnsi/src/VNSISession.cpp -index fe2766f..01ff652 100644 ---- a/addons/pvr.vdr.vnsi/src/VNSISession.cpp -+++ b/addons/pvr.vdr.vnsi/src/VNSISession.cpp -@@ -44,8 +44,8 @@ using namespace ADDON; - using namespace PLATFORM; - - cVNSISession::cVNSISession() -- : m_socket(NULL) -- , m_protocol(0) -+ : m_protocol(0) -+ , m_socket(NULL) - , m_connectionLost(false) - { - } -@@ -131,7 +131,7 @@ bool cVNSISession::Login() - m_version = ServerVersion; - m_protocol = (int)protocol; - -- if (m_protocol < VNSI_PROTOCOLVERSION) -+ if (m_protocol < VNSI_MIN_PROTOCOLVERSION) - throw "Protocol versions do not match"; - - if (m_name.empty()) -diff --git a/addons/pvr.vdr.vnsi/src/VNSISession.h b/addons/pvr.vdr.vnsi/src/VNSISession.h -index c09e276..b8bdabc 100644 ---- a/addons/pvr.vdr.vnsi/src/VNSISession.h -+++ b/addons/pvr.vdr.vnsi/src/VNSISession.h -@@ -70,6 +70,9 @@ class cVNSISession - int m_port; - std::string m_name; - PLATFORM::CMutex m_mutex; -+ int m_protocol; -+ std::string m_server; -+ std::string m_version; - - private: - -@@ -77,8 +80,5 @@ class cVNSISession - - PLATFORM::CTcpConnection *m_socket; - PLATFORM::CMutex m_readMutex; -- int m_protocol; -- std::string m_server; -- std::string m_version; - bool m_connectionLost; - }; -diff --git a/addons/pvr.vdr.vnsi/src/client.cpp b/addons/pvr.vdr.vnsi/src/client.cpp -index 5898615..9cd7f8f 100644 ---- a/addons/pvr.vdr.vnsi/src/client.cpp -+++ b/addons/pvr.vdr.vnsi/src/client.cpp -@@ -49,6 +49,7 @@ int g_iConnectTimeout = DEFAULT_TIMEOUT; ///< The Socket - int g_iPriority = DEFAULT_PRIORITY; ///< The Priority this client have in response to other clients - bool g_bAutoChannelGroups = DEFAULT_AUTOGROUPS; - int g_iTimeshift = 1; -+std::string g_szIconPath = ""; - - CHelper_libXBMC_addon *XBMC = NULL; - CHelper_libXBMC_codec *CODEC = NULL; -@@ -178,6 +179,20 @@ ADDON_STATUS ADDON_Create(void* hdl, void* props) - g_bAutoChannelGroups = DEFAULT_AUTOGROUPS; - } - -+ /* Read setting "iconpath" from settings.xml */ -+ buffer = (char*) malloc(512); -+ buffer[0] = 0; /* Set the end of string */ -+ -+ if (XBMC->GetSetting("iconpath", buffer)) -+ g_szIconPath = buffer; -+ else -+ { -+ /* If setting is unknown fallback to defaults */ -+ XBMC->Log(LOG_ERROR, "Couldn't get 'iconpath' setting"); -+ g_szHostname = ""; -+ } -+ free(buffer); -+ - VNSIData = new cVNSIData; - if (!VNSIData->Open(g_szHostname, g_iPort)) - { -diff --git a/addons/pvr.vdr.vnsi/src/client.h b/addons/pvr.vdr.vnsi/src/client.h -index 454be38..02093fa 100644 ---- a/addons/pvr.vdr.vnsi/src/client.h -+++ b/addons/pvr.vdr.vnsi/src/client.h -@@ -41,6 +41,7 @@ extern int g_iPriority; ///< The Priority this client have in - extern bool g_bCharsetConv; ///< Convert VDR's incoming strings to UTF8 character set - extern bool g_bHandleMessages; ///< Send VDR's OSD status messages to XBMC OSD - extern int g_iTimeshift; -+extern std::string g_szIconPath; ///< path to channel icons - - extern ADDON::CHelper_libXBMC_addon *XBMC; - extern CHelper_libXBMC_codec *CODEC; -diff --git a/addons/pvr.vdr.vnsi/src/vnsicommand.h b/addons/pvr.vdr.vnsi/src/vnsicommand.h -index f570fd3..c227188 100644 ---- a/addons/pvr.vdr.vnsi/src/vnsicommand.h -+++ b/addons/pvr.vdr.vnsi/src/vnsicommand.h -@@ -23,7 +23,10 @@ - #define VNSI_COMMAND_H - - /** Current VNSI Protocol Version number */ --#define VNSI_PROTOCOLVERSION 5 -+#define VNSI_PROTOCOLVERSION 6 -+ -+/** Minimum VNSI Protocol Version number */ -+#define VNSI_MIN_PROTOCOLVERSION 5 - - /** Packet types */ - #define VNSI_CHANNEL_REQUEST_RESPONSE 1 --- -1.9.3 - diff --git a/packages/mediacenter/xbmc-pvr-addons/patches/xbmc-pvr-addons-buildfix.patch b/packages/mediacenter/xbmc-pvr-addons/patches/xbmc-pvr-addons-buildfix.patch index 70a66f0293..e62c21a226 100644 --- a/packages/mediacenter/xbmc-pvr-addons/patches/xbmc-pvr-addons-buildfix.patch +++ b/packages/mediacenter/xbmc-pvr-addons/patches/xbmc-pvr-addons-buildfix.patch @@ -1,20 +1,20 @@ -diff -Naur xbmc-pvr-addons-f38b2eb/addons/Makefile.include.am xbmc-pvr-addons-f38b2eb.patch/addons/Makefile.include.am ---- xbmc-pvr-addons-f38b2eb/addons/Makefile.include.am 2014-05-04 14:27:57.000000000 +0200 -+++ xbmc-pvr-addons-f38b2eb.patch/addons/Makefile.include.am 2014-05-04 14:35:47.618601552 +0200 +diff -Naur xbmc-pvr-addons-master-a6c2ec7/addons/Makefile.include.am xbmc-pvr-addons-master-a6c2ec7.patch/addons/Makefile.include.am +--- xbmc-pvr-addons-master-a6c2ec7/addons/Makefile.include.am 2014-07-19 03:01:51.000000000 +0200 ++++ xbmc-pvr-addons-master-a6c2ec7.patch/addons/Makefile.include.am 2014-07-19 03:07:43.450044259 +0200 @@ -36,7 +36,9 @@ mkdir -m 755 -p $(DESTDIR)@LIBDIR@/$(ADDONNAME) mkdir -m 755 -p $(DESTDIR)@DATADIR@/$(ADDONNAME) - cp -f @BINPREFIX@$(ADDONBINNAME)@BIN_EXT@ $(DESTDIR)@LIBDIR@/$(ADDONNAME) ; chmod 655 $(DESTDIR)@LIBDIR@/$(ADDONNAME)/@BINPREFIX@$(ADDONBINNAME)@BIN_EXT@ + cp -f @BINPREFIX@$(ADDONBINNAME)@BIN_EXT@ $(DESTDIR)@LIBDIR@/$(ADDONNAME) ; chmod 655 $(DESTDIR)@LIBDIR@/$(ADDONNAME)/@BINPREFIX@$(ADDONBINNAME)@BIN_EXT@; find $(DESTDIR)@DATADIR@/$(ADDONNAME) -type f -exec chmod 0644 {} \; - cp -r -f @abs_top_srcdir@/addons/$(ADDONNAME)/addon/* $(DESTDIR)@DATADIR@/$(ADDONNAME) ; chmod -R o+rx $(DESTDIR)@DATADIR@/$(ADDONNAME) + cp -r -f @abs_top_srcdir@/addons/$(ADDONNAME)/addon/* $(DESTDIR)@DATADIR@/$(ADDONNAME) + cp -r -f @abs_top_builddir@/addons/$(ADDONNAME)/addon/* $(DESTDIR)@DATADIR@/$(ADDONNAME) + chmod -R o+rx $(DESTDIR)@DATADIR@/$(ADDONNAME) + rm -f $(DESTDIR)@DATADIR@/$(ADDONNAME)/addon.xml.in endif - all: @BUILD_TYPE@ -diff -Naur xbmc-pvr-addons-f38b2eb/addons/pvr.argustv/Makefile.am xbmc-pvr-addons-f38b2eb.patch/addons/pvr.argustv/Makefile.am ---- xbmc-pvr-addons-f38b2eb/addons/pvr.argustv/Makefile.am 2014-05-04 14:27:57.000000000 +0200 -+++ xbmc-pvr-addons-f38b2eb.patch/addons/pvr.argustv/Makefile.am 2014-05-04 14:35:47.618601552 +0200 +diff -Naur xbmc-pvr-addons-master-a6c2ec7/addons/pvr.argustv/Makefile.am xbmc-pvr-addons-master-a6c2ec7.patch/addons/pvr.argustv/Makefile.am +--- xbmc-pvr-addons-master-a6c2ec7/addons/pvr.argustv/Makefile.am 2014-07-19 03:01:51.000000000 +0200 ++++ xbmc-pvr-addons-master-a6c2ec7.patch/addons/pvr.argustv/Makefile.am 2014-07-19 03:05:39.986714713 +0200 @@ -10,11 +10,11 @@ LIBNAME = libargustv-addon lib_LTLIBRARIES = libargustv-addon.la @@ -29,9 +29,9 @@ diff -Naur xbmc-pvr-addons-f38b2eb/addons/pvr.argustv/Makefile.am xbmc-pvr-addon libargustv_addon_la_SOURCES = src/activerecording.cpp \ src/channel.cpp \ -diff -Naur xbmc-pvr-addons-f38b2eb/addons/pvr.demo/Makefile.am xbmc-pvr-addons-f38b2eb.patch/addons/pvr.demo/Makefile.am ---- xbmc-pvr-addons-f38b2eb/addons/pvr.demo/Makefile.am 2014-05-04 14:27:57.000000000 +0200 -+++ xbmc-pvr-addons-f38b2eb.patch/addons/pvr.demo/Makefile.am 2014-05-04 14:35:47.618601552 +0200 +diff -Naur xbmc-pvr-addons-master-a6c2ec7/addons/pvr.demo/Makefile.am xbmc-pvr-addons-master-a6c2ec7.patch/addons/pvr.demo/Makefile.am +--- xbmc-pvr-addons-master-a6c2ec7/addons/pvr.demo/Makefile.am 2014-07-19 03:01:51.000000000 +0200 ++++ xbmc-pvr-addons-master-a6c2ec7.patch/addons/pvr.demo/Makefile.am 2014-07-19 03:05:39.986714713 +0200 @@ -10,7 +10,7 @@ LIBNAME = libpvrdemo-addon lib_LTLIBRARIES = libpvrdemo-addon.la @@ -41,9 +41,9 @@ diff -Naur xbmc-pvr-addons-f38b2eb/addons/pvr.demo/Makefile.am xbmc-pvr-addons-f include ../Makefile.include.am -diff -Naur xbmc-pvr-addons-f38b2eb/addons/pvr.dvblink/Makefile.am xbmc-pvr-addons-f38b2eb.patch/addons/pvr.dvblink/Makefile.am ---- xbmc-pvr-addons-f38b2eb/addons/pvr.dvblink/Makefile.am 2014-05-04 14:27:57.000000000 +0200 -+++ xbmc-pvr-addons-f38b2eb.patch/addons/pvr.dvblink/Makefile.am 2014-05-04 14:38:41.761644652 +0200 +diff -Naur xbmc-pvr-addons-master-a6c2ec7/addons/pvr.dvblink/Makefile.am xbmc-pvr-addons-master-a6c2ec7.patch/addons/pvr.dvblink/Makefile.am +--- xbmc-pvr-addons-master-a6c2ec7/addons/pvr.dvblink/Makefile.am 2014-07-19 03:01:51.000000000 +0200 ++++ xbmc-pvr-addons-master-a6c2ec7.patch/addons/pvr.dvblink/Makefile.am 2014-07-19 03:05:39.988714812 +0200 @@ -10,11 +10,11 @@ LIBNAME = libdvblink-addon lib_LTLIBRARIES = libdvblink-addon.la @@ -58,9 +58,9 @@ diff -Naur xbmc-pvr-addons-f38b2eb/addons/pvr.dvblink/Makefile.am xbmc-pvr-addon libdvblink_addon_la_SOURCES = src/client.cpp \ src/base64.cpp \ -diff -Naur xbmc-pvr-addons-f38b2eb/addons/pvr.dvbviewer/Makefile.am xbmc-pvr-addons-f38b2eb.patch/addons/pvr.dvbviewer/Makefile.am ---- xbmc-pvr-addons-f38b2eb/addons/pvr.dvbviewer/Makefile.am 2014-05-04 14:27:57.000000000 +0200 -+++ xbmc-pvr-addons-f38b2eb.patch/addons/pvr.dvbviewer/Makefile.am 2014-05-04 14:36:53.759689719 +0200 +diff -Naur xbmc-pvr-addons-master-a6c2ec7/addons/pvr.dvbviewer/Makefile.am xbmc-pvr-addons-master-a6c2ec7.patch/addons/pvr.dvbviewer/Makefile.am +--- xbmc-pvr-addons-master-a6c2ec7/addons/pvr.dvbviewer/Makefile.am 2014-07-19 03:01:51.000000000 +0200 ++++ xbmc-pvr-addons-master-a6c2ec7.patch/addons/pvr.dvbviewer/Makefile.am 2014-07-19 03:05:39.988714812 +0200 @@ -10,7 +10,7 @@ LIBNAME = libdvbviewer-addon lib_LTLIBRARIES = libdvbviewer-addon.la @@ -70,9 +70,9 @@ diff -Naur xbmc-pvr-addons-f38b2eb/addons/pvr.dvbviewer/Makefile.am xbmc-pvr-add include ../Makefile.include.am -diff -Naur xbmc-pvr-addons-f38b2eb/addons/pvr.hts/Makefile.am xbmc-pvr-addons-f38b2eb.patch/addons/pvr.hts/Makefile.am ---- xbmc-pvr-addons-f38b2eb/addons/pvr.hts/Makefile.am 2014-05-04 14:27:57.000000000 +0200 -+++ xbmc-pvr-addons-f38b2eb.patch/addons/pvr.hts/Makefile.am 2014-05-04 14:35:47.618601552 +0200 +diff -Naur xbmc-pvr-addons-master-a6c2ec7/addons/pvr.hts/Makefile.am xbmc-pvr-addons-master-a6c2ec7.patch/addons/pvr.hts/Makefile.am +--- xbmc-pvr-addons-master-a6c2ec7/addons/pvr.hts/Makefile.am 2014-07-19 03:01:51.000000000 +0200 ++++ xbmc-pvr-addons-master-a6c2ec7.patch/addons/pvr.hts/Makefile.am 2014-07-19 03:05:39.989714857 +0200 @@ -10,7 +10,7 @@ LIBNAME = libtvheadend-addon lib_LTLIBRARIES = libtvheadend-addon.la @@ -82,9 +82,9 @@ diff -Naur xbmc-pvr-addons-f38b2eb/addons/pvr.hts/Makefile.am xbmc-pvr-addons-f3 include ../Makefile.include.am -diff -Naur xbmc-pvr-addons-f38b2eb/addons/pvr.mediaportal.tvserver/Makefile.am xbmc-pvr-addons-f38b2eb.patch/addons/pvr.mediaportal.tvserver/Makefile.am ---- xbmc-pvr-addons-f38b2eb/addons/pvr.mediaportal.tvserver/Makefile.am 2014-05-04 14:27:57.000000000 +0200 -+++ xbmc-pvr-addons-f38b2eb.patch/addons/pvr.mediaportal.tvserver/Makefile.am 2014-05-04 14:35:47.618601552 +0200 +diff -Naur xbmc-pvr-addons-master-a6c2ec7/addons/pvr.mediaportal.tvserver/Makefile.am xbmc-pvr-addons-master-a6c2ec7.patch/addons/pvr.mediaportal.tvserver/Makefile.am +--- xbmc-pvr-addons-master-a6c2ec7/addons/pvr.mediaportal.tvserver/Makefile.am 2014-07-19 03:01:51.000000000 +0200 ++++ xbmc-pvr-addons-master-a6c2ec7.patch/addons/pvr.mediaportal.tvserver/Makefile.am 2014-07-19 03:05:39.990714900 +0200 @@ -10,11 +10,11 @@ LIBNAME = libmediaportal-addon lib_LTLIBRARIES = libmediaportal-addon.la @@ -99,9 +99,9 @@ diff -Naur xbmc-pvr-addons-f38b2eb/addons/pvr.mediaportal.tvserver/Makefile.am x libmediaportal_addon_la_SOURCES = src/Cards.cpp \ src/channels.cpp \ -diff -Naur xbmc-pvr-addons-f38b2eb/addons/pvr.mythtv.cmyth/Makefile.am xbmc-pvr-addons-f38b2eb.patch/addons/pvr.mythtv.cmyth/Makefile.am ---- xbmc-pvr-addons-f38b2eb/addons/pvr.mythtv.cmyth/Makefile.am 2014-05-04 14:27:57.000000000 +0200 -+++ xbmc-pvr-addons-f38b2eb.patch/addons/pvr.mythtv.cmyth/Makefile.am 2014-05-04 14:35:47.618601552 +0200 +diff -Naur xbmc-pvr-addons-master-a6c2ec7/addons/pvr.mythtv.cmyth/Makefile.am xbmc-pvr-addons-master-a6c2ec7.patch/addons/pvr.mythtv.cmyth/Makefile.am +--- xbmc-pvr-addons-master-a6c2ec7/addons/pvr.mythtv.cmyth/Makefile.am 2014-07-19 03:01:51.000000000 +0200 ++++ xbmc-pvr-addons-master-a6c2ec7.patch/addons/pvr.mythtv.cmyth/Makefile.am 2014-07-19 03:05:39.990714900 +0200 @@ -10,7 +10,7 @@ LIBNAME = libmythtvcmyth-addon lib_LTLIBRARIES = libmythtvcmyth-addon.la @@ -111,9 +111,9 @@ diff -Naur xbmc-pvr-addons-f38b2eb/addons/pvr.mythtv.cmyth/Makefile.am xbmc-pvr- AM_CPPFLAGS = -I$(abs_top_srcdir)/lib/cmyth/include -diff -Naur xbmc-pvr-addons-f38b2eb/addons/pvr.nextpvr/Makefile.am xbmc-pvr-addons-f38b2eb.patch/addons/pvr.nextpvr/Makefile.am ---- xbmc-pvr-addons-f38b2eb/addons/pvr.nextpvr/Makefile.am 2014-05-04 14:27:57.000000000 +0200 -+++ xbmc-pvr-addons-f38b2eb.patch/addons/pvr.nextpvr/Makefile.am 2014-05-04 14:35:47.618601552 +0200 +diff -Naur xbmc-pvr-addons-master-a6c2ec7/addons/pvr.nextpvr/Makefile.am xbmc-pvr-addons-master-a6c2ec7.patch/addons/pvr.nextpvr/Makefile.am +--- xbmc-pvr-addons-master-a6c2ec7/addons/pvr.nextpvr/Makefile.am 2014-07-19 03:01:51.000000000 +0200 ++++ xbmc-pvr-addons-master-a6c2ec7.patch/addons/pvr.nextpvr/Makefile.am 2014-07-19 03:05:39.990714900 +0200 @@ -10,11 +10,11 @@ LIBNAME = libnextpvr-addon lib_LTLIBRARIES = libnextpvr-addon.la @@ -128,9 +128,9 @@ diff -Naur xbmc-pvr-addons-f38b2eb/addons/pvr.nextpvr/Makefile.am xbmc-pvr-addon libnextpvr_addon_la_SOURCES = src/client.cpp \ src/pvrclient-nextpvr.cpp \ -diff -Naur xbmc-pvr-addons-f38b2eb/addons/pvr.njoy/Makefile.am xbmc-pvr-addons-f38b2eb.patch/addons/pvr.njoy/Makefile.am ---- xbmc-pvr-addons-f38b2eb/addons/pvr.njoy/Makefile.am 2014-05-04 14:27:57.000000000 +0200 -+++ xbmc-pvr-addons-f38b2eb.patch/addons/pvr.njoy/Makefile.am 2014-05-04 14:35:47.618601552 +0200 +diff -Naur xbmc-pvr-addons-master-a6c2ec7/addons/pvr.njoy/Makefile.am xbmc-pvr-addons-master-a6c2ec7.patch/addons/pvr.njoy/Makefile.am +--- xbmc-pvr-addons-master-a6c2ec7/addons/pvr.njoy/Makefile.am 2014-07-19 03:01:51.000000000 +0200 ++++ xbmc-pvr-addons-master-a6c2ec7.patch/addons/pvr.njoy/Makefile.am 2014-07-19 03:05:39.990714900 +0200 @@ -10,7 +10,7 @@ LIBNAME = libpvrnjoy-addon lib_LTLIBRARIES = libpvrnjoy-addon.la @@ -140,9 +140,9 @@ diff -Naur xbmc-pvr-addons-f38b2eb/addons/pvr.njoy/Makefile.am xbmc-pvr-addons-f include ../Makefile.include.am -diff -Naur xbmc-pvr-addons-f38b2eb/addons/pvr.vuplus/Makefile.am xbmc-pvr-addons-f38b2eb.patch/addons/pvr.vuplus/Makefile.am ---- xbmc-pvr-addons-f38b2eb/addons/pvr.vuplus/Makefile.am 2014-05-04 14:27:57.000000000 +0200 -+++ xbmc-pvr-addons-f38b2eb.patch/addons/pvr.vuplus/Makefile.am 2014-05-04 14:35:47.619601641 +0200 +diff -Naur xbmc-pvr-addons-master-a6c2ec7/addons/pvr.vuplus/Makefile.am xbmc-pvr-addons-master-a6c2ec7.patch/addons/pvr.vuplus/Makefile.am +--- xbmc-pvr-addons-master-a6c2ec7/addons/pvr.vuplus/Makefile.am 2014-07-19 03:01:51.000000000 +0200 ++++ xbmc-pvr-addons-master-a6c2ec7.patch/addons/pvr.vuplus/Makefile.am 2014-07-19 03:05:39.992714978 +0200 @@ -10,7 +10,7 @@ LIBNAME = libvuplus-addon lib_LTLIBRARIES = libvuplus-addon.la @@ -152,9 +152,9 @@ diff -Naur xbmc-pvr-addons-f38b2eb/addons/pvr.vuplus/Makefile.am xbmc-pvr-addons include ../Makefile.include.am -diff -Naur xbmc-pvr-addons-f38b2eb/addons/pvr.wmc/Makefile.am xbmc-pvr-addons-f38b2eb.patch/addons/pvr.wmc/Makefile.am ---- xbmc-pvr-addons-f38b2eb/addons/pvr.wmc/Makefile.am 2014-05-04 14:27:57.000000000 +0200 -+++ xbmc-pvr-addons-f38b2eb.patch/addons/pvr.wmc/Makefile.am 2014-05-04 14:35:47.619601641 +0200 +diff -Naur xbmc-pvr-addons-master-a6c2ec7/addons/pvr.wmc/Makefile.am xbmc-pvr-addons-master-a6c2ec7.patch/addons/pvr.wmc/Makefile.am +--- xbmc-pvr-addons-master-a6c2ec7/addons/pvr.wmc/Makefile.am 2014-07-19 03:01:51.000000000 +0200 ++++ xbmc-pvr-addons-master-a6c2ec7.patch/addons/pvr.wmc/Makefile.am 2014-07-19 03:05:39.992714978 +0200 @@ -10,7 +10,7 @@ LIBNAME = libpvrwmc-addon lib_LTLIBRARIES = libpvrwmc-addon.la @@ -164,9 +164,9 @@ diff -Naur xbmc-pvr-addons-f38b2eb/addons/pvr.wmc/Makefile.am xbmc-pvr-addons-f3 include ../Makefile.include.am -diff -Naur xbmc-pvr-addons-f38b2eb/lib/cmyth/libcmyth/Makefile.am xbmc-pvr-addons-f38b2eb.patch/lib/cmyth/libcmyth/Makefile.am ---- xbmc-pvr-addons-f38b2eb/lib/cmyth/libcmyth/Makefile.am 2014-05-04 14:27:57.000000000 +0200 -+++ xbmc-pvr-addons-f38b2eb.patch/lib/cmyth/libcmyth/Makefile.am 2014-05-04 14:35:47.619601641 +0200 +diff -Naur xbmc-pvr-addons-master-a6c2ec7/lib/cmyth/libcmyth/Makefile.am xbmc-pvr-addons-master-a6c2ec7.patch/lib/cmyth/libcmyth/Makefile.am +--- xbmc-pvr-addons-master-a6c2ec7/lib/cmyth/libcmyth/Makefile.am 2014-07-19 03:01:51.000000000 +0200 ++++ xbmc-pvr-addons-master-a6c2ec7.patch/lib/cmyth/libcmyth/Makefile.am 2014-07-19 03:05:39.993715014 +0200 @@ -26,7 +26,7 @@ storagegroup.c \ epginfo.c @@ -176,9 +176,9 @@ diff -Naur xbmc-pvr-addons-f38b2eb/lib/cmyth/libcmyth/Makefile.am xbmc-pvr-addon $(LIB): libcmyth.la cp -f .libs/libcmyth.a . -diff -Naur xbmc-pvr-addons-f38b2eb/lib/cmyth/librefmem/Makefile.am xbmc-pvr-addons-f38b2eb.patch/lib/cmyth/librefmem/Makefile.am ---- xbmc-pvr-addons-f38b2eb/lib/cmyth/librefmem/Makefile.am 2014-05-04 14:27:57.000000000 +0200 -+++ xbmc-pvr-addons-f38b2eb.patch/lib/cmyth/librefmem/Makefile.am 2014-05-04 14:35:47.619601641 +0200 +diff -Naur xbmc-pvr-addons-master-a6c2ec7/lib/cmyth/librefmem/Makefile.am xbmc-pvr-addons-master-a6c2ec7.patch/lib/cmyth/librefmem/Makefile.am +--- xbmc-pvr-addons-master-a6c2ec7/lib/cmyth/librefmem/Makefile.am 2014-07-19 03:01:51.000000000 +0200 ++++ xbmc-pvr-addons-master-a6c2ec7.patch/lib/cmyth/librefmem/Makefile.am 2014-07-19 03:05:39.993715014 +0200 @@ -3,7 +3,7 @@ librefmem_la_SOURCES = alloc.c \ debug_refmem.c @@ -188,9 +188,9 @@ diff -Naur xbmc-pvr-addons-f38b2eb/lib/cmyth/librefmem/Makefile.am xbmc-pvr-addo $(LIB): librefmem.la cp -f .libs/librefmem.a . -diff -Naur xbmc-pvr-addons-f38b2eb/lib/jsoncpp/Makefile.am xbmc-pvr-addons-f38b2eb.patch/lib/jsoncpp/Makefile.am ---- xbmc-pvr-addons-f38b2eb/lib/jsoncpp/Makefile.am 2014-05-04 14:27:57.000000000 +0200 -+++ xbmc-pvr-addons-f38b2eb.patch/lib/jsoncpp/Makefile.am 2014-05-04 14:35:47.619601641 +0200 +diff -Naur xbmc-pvr-addons-master-a6c2ec7/lib/jsoncpp/Makefile.am xbmc-pvr-addons-master-a6c2ec7.patch/lib/jsoncpp/Makefile.am +--- xbmc-pvr-addons-master-a6c2ec7/lib/jsoncpp/Makefile.am 2014-07-19 03:01:51.000000000 +0200 ++++ xbmc-pvr-addons-master-a6c2ec7.patch/lib/jsoncpp/Makefile.am 2014-07-19 03:05:39.993715014 +0200 @@ -4,7 +4,7 @@ src/lib_json/json_value.cpp \ src/lib_json/json_writer.cpp @@ -200,9 +200,9 @@ diff -Naur xbmc-pvr-addons-f38b2eb/lib/jsoncpp/Makefile.am xbmc-pvr-addons-f38b2 $(LIB): libjsoncpp.la cp -f .libs/libjsoncpp.a . -diff -Naur xbmc-pvr-addons-f38b2eb/lib/libdvblinkremote/Makefile.am xbmc-pvr-addons-f38b2eb.patch/lib/libdvblinkremote/Makefile.am ---- xbmc-pvr-addons-f38b2eb/lib/libdvblinkremote/Makefile.am 2014-05-04 14:27:57.000000000 +0200 -+++ xbmc-pvr-addons-f38b2eb.patch/lib/libdvblinkremote/Makefile.am 2014-05-04 14:35:47.619601641 +0200 +diff -Naur xbmc-pvr-addons-master-a6c2ec7/lib/libdvblinkremote/Makefile.am xbmc-pvr-addons-master-a6c2ec7.patch/lib/libdvblinkremote/Makefile.am +--- xbmc-pvr-addons-master-a6c2ec7/lib/libdvblinkremote/Makefile.am 2014-07-19 03:01:51.000000000 +0200 ++++ xbmc-pvr-addons-master-a6c2ec7.patch/lib/libdvblinkremote/Makefile.am 2014-07-19 03:05:39.993715014 +0200 @@ -26,10 +26,10 @@ util.cpp \ xml_object_serializer_factory.cpp