xbmc-pvr-addons: update to xbmc-pvr-addons-f38b2eb

Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2014-05-04 14:41:52 +02:00
parent 62c2b52a0c
commit ffbc33a64a
3 changed files with 79 additions and 141 deletions

View File

@ -17,7 +17,7 @@
################################################################################
PKG_NAME="xbmc-pvr-addons"
PKG_VERSION="82dd3c4"
PKG_VERSION="f38b2eb"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -1,64 +0,0 @@
From 720574030a20b6d4f98ced3203cda35404e8d42b Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Sun, 30 Mar 2014 20:52:24 +0300
Subject: [PATCH] vnsi5: confluence color fixes
---
.../addon/resources/skins/skin.confluence/720p/Admin.xml | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/addons/pvr.vdr.vnsi/addon/resources/skins/skin.confluence/720p/Admin.xml b/addons/pvr.vdr.vnsi/addon/resources/skins/skin.confluence/720p/Admin.xml
index d81f85a..c4054a3 100644
--- a/addons/pvr.vdr.vnsi/addon/resources/skins/skin.confluence/720p/Admin.xml
+++ b/addons/pvr.vdr.vnsi/addon/resources/skins/skin.confluence/720p/Admin.xml
@@ -91,7 +91,7 @@
<width>380</width>
<height>55</height>
<font>font24_title</font>
- <textcolor>grey3</textcolor>
+ <textcolor>grey2</textcolor>
<align>right</align>
<aligny>center</aligny>
<label>$INFO[ListItem.Label]</label>
@@ -270,7 +270,7 @@
<width>250</width>
<height>30</height>
<font>font16caps</font>
- <textcolor>grey3</textcolor>
+ <textcolor>grey2</textcolor>
<focusedcolor>white</focusedcolor>
<texturefocus border="0,2,0,2">MenuItemFO.png</texturefocus>
<texturenofocus border="0,2,0,2">MenuItemNF.png</texturenofocus>
@@ -289,7 +289,8 @@
<texturenofocus border="5">MenuItemNF.png</texturenofocus>
<label>$ADDON[pvr.vdr.vnsi 30109]</label>
<font>font16caps</font>
- <textcolor>grey3</textcolor>
+ <textcolor>grey2</textcolor>
+ <focusedcolor>white</focusedcolor>
<onleft>10</onleft>
<onright>36</onright>
<onup>32</onup>
@@ -305,7 +306,8 @@
<texturenofocus border="5">MenuItemNF.png</texturenofocus>
<label>$ADDON[pvr.vdr.vnsi 30110]</label>
<font>font16caps</font>
- <textcolor>grey3</textcolor>
+ <textcolor>grey2</textcolor>
+ <focusedcolor>white</focusedcolor>
<onleft>10</onleft>
<onright>36</onright>
<onup>33</onup>
@@ -321,7 +323,8 @@
<texturenofocus border="5">MenuItemNF.png</texturenofocus>
<label>$ADDON[pvr.vdr.vnsi 30113]</label>
<font>font16caps</font>
- <textcolor>grey3</textcolor>
+ <textcolor>grey2</textcolor>
+ <focusedcolor>white</focusedcolor>
<onleft>10</onleft>
<onright>36</onright>
<onup>34</onup>
--
1.9.1

View File

@ -1,8 +1,7 @@
diff --git a/addons/Makefile.include.am b/addons/Makefile.include.am
index 81c55a5..5324046 100644
--- a/addons/Makefile.include.am
+++ b/addons/Makefile.include.am
@@ -36,7 +36,9 @@ else
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
@@ -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@
@ -13,11 +12,10 @@ index 81c55a5..5324046 100644
endif
all: @BUILD_TYPE@
diff --git a/addons/pvr.argustv/Makefile.am b/addons/pvr.argustv/Makefile.am
index c8d334b..87344be 100644
--- a/addons/pvr.argustv/Makefile.am
+++ b/addons/pvr.argustv/Makefile.am
@@ -10,11 +10,11 @@ ADDONNAME = pvr.argustv
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
@@ -10,11 +10,11 @@
LIBNAME = libargustv-addon
lib_LTLIBRARIES = libargustv-addon.la
@ -31,11 +29,10 @@ index c8d334b..87344be 100644
libargustv_addon_la_SOURCES = src/activerecording.cpp \
src/channel.cpp \
diff --git a/addons/pvr.demo/Makefile.am b/addons/pvr.demo/Makefile.am
index 88081b5..c9b53b7 100644
--- a/addons/pvr.demo/Makefile.am
+++ b/addons/pvr.demo/Makefile.am
@@ -10,7 +10,7 @@ ADDONNAME = pvr.demo
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
@@ -10,7 +10,7 @@
LIBNAME = libpvrdemo-addon
lib_LTLIBRARIES = libpvrdemo-addon.la
@ -44,11 +41,10 @@ index 88081b5..c9b53b7 100644
include ../Makefile.include.am
diff --git a/addons/pvr.dvblink/Makefile.am b/addons/pvr.dvblink/Makefile.am
index 422aa7e..17f0c0f 100644
--- a/addons/pvr.dvblink/Makefile.am
+++ b/addons/pvr.dvblink/Makefile.am
@@ -10,7 +10,7 @@ ADDONNAME = pvr.dvblink
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
@@ -10,11 +10,11 @@
LIBNAME = libdvblink-addon
lib_LTLIBRARIES = libdvblink-addon.la
@ -57,11 +53,27 @@ index 422aa7e..17f0c0f 100644
include ../Makefile.include.am
diff --git a/addons/pvr.hts/Makefile.am b/addons/pvr.hts/Makefile.am
index 9a04a49..e732e0c 100644
--- a/addons/pvr.hts/Makefile.am
+++ b/addons/pvr.hts/Makefile.am
@@ -10,7 +10,7 @@ ADDONNAME = pvr.hts
-INCLUDES+=-Isrc
+INCLUDES+=-I$(srcdir)/src
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
@@ -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-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
@@ -10,7 +10,7 @@
LIBNAME = libtvheadend-addon
lib_LTLIBRARIES = libtvheadend-addon.la
@ -70,11 +82,10 @@ index 9a04a49..e732e0c 100644
include ../Makefile.include.am
diff --git a/addons/pvr.mediaportal.tvserver/Makefile.am b/addons/pvr.mediaportal.tvserver/Makefile.am
index eae58bb..cc7c696 100644
--- a/addons/pvr.mediaportal.tvserver/Makefile.am
+++ b/addons/pvr.mediaportal.tvserver/Makefile.am
@@ -10,11 +10,11 @@ ADDONNAME = pvr.mediaportal.tvserver
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
@@ -10,11 +10,11 @@
LIBNAME = libmediaportal-addon
lib_LTLIBRARIES = libmediaportal-addon.la
@ -88,11 +99,10 @@ index eae58bb..cc7c696 100644
libmediaportal_addon_la_SOURCES = src/Cards.cpp \
src/channels.cpp \
diff --git a/addons/pvr.mythtv.cmyth/Makefile.am b/addons/pvr.mythtv.cmyth/Makefile.am
index dcc5901..a70a68a 100644
--- a/addons/pvr.mythtv.cmyth/Makefile.am
+++ b/addons/pvr.mythtv.cmyth/Makefile.am
@@ -10,7 +10,7 @@ ADDONNAME = pvr.mythtv.cmyth
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
@@ -10,7 +10,7 @@
LIBNAME = libmythtvcmyth-addon
lib_LTLIBRARIES = libmythtvcmyth-addon.la
@ -101,11 +111,10 @@ index dcc5901..a70a68a 100644
AM_CPPFLAGS = -I$(abs_top_srcdir)/lib/cmyth/include
diff --git a/addons/pvr.nextpvr/Makefile.am b/addons/pvr.nextpvr/Makefile.am
index 8b96235..da82559 100644
--- a/addons/pvr.nextpvr/Makefile.am
+++ b/addons/pvr.nextpvr/Makefile.am
@@ -10,11 +10,11 @@ ADDONNAME = pvr.nextpvr
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
@@ -10,11 +10,11 @@
LIBNAME = libnextpvr-addon
lib_LTLIBRARIES = libnextpvr-addon.la
@ -119,11 +128,10 @@ index 8b96235..da82559 100644
libnextpvr_addon_la_SOURCES = src/client.cpp \
src/pvrclient-nextpvr.cpp \
diff --git a/addons/pvr.njoy/Makefile.am b/addons/pvr.njoy/Makefile.am
index 6395f44..b64575d 100644
--- a/addons/pvr.njoy/Makefile.am
+++ b/addons/pvr.njoy/Makefile.am
@@ -10,7 +10,7 @@ ADDONNAME = pvr.njoy
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
@@ -10,7 +10,7 @@
LIBNAME = libpvrnjoy-addon
lib_LTLIBRARIES = libpvrnjoy-addon.la
@ -132,11 +140,10 @@ index 6395f44..b64575d 100644
include ../Makefile.include.am
diff --git a/addons/pvr.vuplus/Makefile.am b/addons/pvr.vuplus/Makefile.am
index 7fda63e..08fcc9b 100644
--- a/addons/pvr.vuplus/Makefile.am
+++ b/addons/pvr.vuplus/Makefile.am
@@ -10,7 +10,7 @@ ADDONNAME = pvr.vuplus
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
@@ -10,7 +10,7 @@
LIBNAME = libvuplus-addon
lib_LTLIBRARIES = libvuplus-addon.la
@ -145,11 +152,10 @@ index 7fda63e..08fcc9b 100644
include ../Makefile.include.am
diff --git a/addons/pvr.wmc/Makefile.am b/addons/pvr.wmc/Makefile.am
index cdcc73b..bda8e3a 100644
--- a/addons/pvr.wmc/Makefile.am
+++ b/addons/pvr.wmc/Makefile.am
@@ -10,7 +10,7 @@ ADDONNAME = pvr.wmc
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
@@ -10,7 +10,7 @@
LIBNAME = libpvrwmc-addon
lib_LTLIBRARIES = libpvrwmc-addon.la
@ -158,11 +164,10 @@ index cdcc73b..bda8e3a 100644
include ../Makefile.include.am
diff --git a/lib/cmyth/libcmyth/Makefile.am b/lib/cmyth/libcmyth/Makefile.am
index de75de6..b15eb75 100644
--- a/lib/cmyth/libcmyth/Makefile.am
+++ b/lib/cmyth/libcmyth/Makefile.am
@@ -26,7 +26,7 @@ libcmyth_la_SOURCES = bookmark.c \
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
@@ -26,7 +26,7 @@
storagegroup.c \
epginfo.c
@ -171,11 +176,10 @@ index de75de6..b15eb75 100644
$(LIB): libcmyth.la
cp -f .libs/libcmyth.a .
diff --git a/lib/cmyth/librefmem/Makefile.am b/lib/cmyth/librefmem/Makefile.am
index 1bdfb35..68d21be 100644
--- a/lib/cmyth/librefmem/Makefile.am
+++ b/lib/cmyth/librefmem/Makefile.am
@@ -3,7 +3,7 @@ noinst_LTLIBRARIES = librefmem.la
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
@@ -3,7 +3,7 @@
librefmem_la_SOURCES = alloc.c \
debug_refmem.c
@ -184,11 +188,10 @@ index 1bdfb35..68d21be 100644
$(LIB): librefmem.la
cp -f .libs/librefmem.a .
diff --git a/lib/jsoncpp/Makefile.am b/lib/jsoncpp/Makefile.am
index 659b91c..3e4739c 100644
--- a/lib/jsoncpp/Makefile.am
+++ b/lib/jsoncpp/Makefile.am
@@ -4,7 +4,7 @@ libjsoncpp_la_SOURCES = src/lib_json/json_reader.cpp \
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
@@ -4,7 +4,7 @@
src/lib_json/json_value.cpp \
src/lib_json/json_writer.cpp
@ -197,11 +200,10 @@ index 659b91c..3e4739c 100644
$(LIB): libjsoncpp.la
cp -f .libs/libjsoncpp.a .
diff --git a/lib/libdvblinkremote/Makefile.am b/lib/libdvblinkremote/Makefile.am
index f8fbbbd..eee4c2a 100644
--- a/lib/libdvblinkremote/Makefile.am
+++ b/lib/libdvblinkremote/Makefile.am
@@ -26,10 +26,10 @@ libdvblinkremote_la_SOURCES = channel.cpp \
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
@@ -26,10 +26,10 @@
util.cpp \
xml_object_serializer_factory.cpp
@ -214,5 +216,5 @@ index f8fbbbd..eee4c2a 100644
$(LIB): libdvblinkremote.la
cp -f .libs/libdvblinkremote.a .
- cp -f .libs/libdvblinkremote.la $(LIB)
\ No newline at end of file
\ Kein Zeilenumbruch am Dateiende.
+ cp -f .libs/libdvblinkremote.la $(LIB)