jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-24 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

new package: add package 'xbmc-pvr-addons-master'

Browse Source 
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2014-06-15 04:07:14 +02:00
parent b2afc0cbef
commit e1026306d4
4 changed files with 472 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/mediacenter/package.mk
View File

@ -43,7 +43,11 @@ if [ "$MEDIACENTER" = "xbmc" -o "$MEDIACENTER" = "xbmc-master" ]; then
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET pycrypto"
# various PVR clients
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET xbmc-pvr-addons"
if [ "$MEDIACENTER" = "xbmc-master" ]; then
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET xbmc-pvr-addons-master"
else
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET xbmc-pvr-addons"
fi
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET xbmc-addon-xvdr"
# other packages

47
packages/mediacenter/xbmc-pvr-addons-master/package.mk Normal file
View File

@ -0,0 +1,47 @@
################################################################################
# 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 <http://www.gnu.org/licenses/>.
################################################################################
PKG_NAME="xbmc-pvr-addons-master"
PKG_VERSION="1db308b"
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
}

200
packages/mediacenter/xbmc-pvr-addons-master/patches/xbmc-pvr-addons-master-999.02-picons-support.patch Normal file
View File

@ -0,0 +1,200 @@
From e0281842588c867fdf3f26fe15f70576e1363f4e Mon Sep 17 00:00:00 2001
From: Rainer Hochecker <fernetmenta@online.de>
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 @@
<setting id="timeout" type="enum" label="30004" values="0|1|2|3|4|5|6|7|8|9|10|11|12|13|14|15" default="3"/>
<setting id="handlemessages" type="bool" label="30005" default="true" />
<setting id="autochannelgroups" type="bool" label="30046" default="false" />
+ <setting id="iconpath" type="folder" source="files" label="30048" default="" />
</settings>
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

220
packages/mediacenter/xbmc-pvr-addons-master/patches/xbmc-pvr-addons-master-buildfix.patch Normal file
View File

@ -0,0 +1,220 @@
diff -Naur xbmc-pvr-addons-master-1db308b/addons/Makefile.include.am xbmc-pvr-addons-master-1db308b.patch/addons/Makefile.include.am
--- xbmc-pvr-addons-master-1db308b/addons/Makefile.include.am 2014-06-15 02:39:46.000000000 +0200
+++ xbmc-pvr-addons-master-1db308b.patch/addons/Makefile.include.am 2014-06-15 03:44:26.914810581 +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 -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-1db308b/addons/pvr.argustv/Makefile.am xbmc-pvr-addons-master-1db308b.patch/addons/pvr.argustv/Makefile.am
--- xbmc-pvr-addons-master-1db308b/addons/pvr.argustv/Makefile.am 2014-06-15 02:39:46.000000000 +0200
+++ xbmc-pvr-addons-master-1db308b.patch/addons/pvr.argustv/Makefile.am 2014-06-15 03:41:47.992491868 +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-1db308b/addons/pvr.demo/Makefile.am xbmc-pvr-addons-master-1db308b.patch/addons/pvr.demo/Makefile.am
--- xbmc-pvr-addons-master-1db308b/addons/pvr.demo/Makefile.am 2014-06-15 02:39:46.000000000 +0200
+++ xbmc-pvr-addons-master-1db308b.patch/addons/pvr.demo/Makefile.am 2014-06-15 03:41:47.993491837 +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-1db308b/addons/pvr.dvblink/Makefile.am xbmc-pvr-addons-master-1db308b.patch/addons/pvr.dvblink/Makefile.am
--- xbmc-pvr-addons-master-1db308b/addons/pvr.dvblink/Makefile.am 2014-06-15 02:39:46.000000000 +0200
+++ xbmc-pvr-addons-master-1db308b.patch/addons/pvr.dvblink/Makefile.am 2014-06-15 03:41:47.994491808 +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-1db308b/addons/pvr.dvbviewer/Makefile.am xbmc-pvr-addons-master-1db308b.patch/addons/pvr.dvbviewer/Makefile.am
--- xbmc-pvr-addons-master-1db308b/addons/pvr.dvbviewer/Makefile.am 2014-06-15 02:39:46.000000000 +0200
+++ xbmc-pvr-addons-master-1db308b.patch/addons/pvr.dvbviewer/Makefile.am 2014-06-15 03:41:47.994491808 +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-1db308b/addons/pvr.hts/Makefile.am xbmc-pvr-addons-master-1db308b.patch/addons/pvr.hts/Makefile.am
--- xbmc-pvr-addons-master-1db308b/addons/pvr.hts/Makefile.am 2014-06-15 02:39:46.000000000 +0200
+++ xbmc-pvr-addons-master-1db308b.patch/addons/pvr.hts/Makefile.am 2014-06-15 03:41:47.995491780 +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-1db308b/addons/pvr.mediaportal.tvserver/Makefile.am xbmc-pvr-addons-master-1db308b.patch/addons/pvr.mediaportal.tvserver/Makefile.am
--- xbmc-pvr-addons-master-1db308b/addons/pvr.mediaportal.tvserver/Makefile.am 2014-06-15 02:39:46.000000000 +0200
+++ xbmc-pvr-addons-master-1db308b.patch/addons/pvr.mediaportal.tvserver/Makefile.am 2014-06-15 03:41:47.995491780 +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-1db308b/addons/pvr.mythtv.cmyth/Makefile.am xbmc-pvr-addons-master-1db308b.patch/addons/pvr.mythtv.cmyth/Makefile.am
--- xbmc-pvr-addons-master-1db308b/addons/pvr.mythtv.cmyth/Makefile.am 2014-06-15 02:39:46.000000000 +0200
+++ xbmc-pvr-addons-master-1db308b.patch/addons/pvr.mythtv.cmyth/Makefile.am 2014-06-15 03:41:47.996491755 +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-1db308b/addons/pvr.nextpvr/Makefile.am xbmc-pvr-addons-master-1db308b.patch/addons/pvr.nextpvr/Makefile.am
--- xbmc-pvr-addons-master-1db308b/addons/pvr.nextpvr/Makefile.am 2014-06-15 02:39:46.000000000 +0200
+++ xbmc-pvr-addons-master-1db308b.patch/addons/pvr.nextpvr/Makefile.am 2014-06-15 03:41:47.997491730 +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-1db308b/addons/pvr.njoy/Makefile.am xbmc-pvr-addons-master-1db308b.patch/addons/pvr.njoy/Makefile.am
--- xbmc-pvr-addons-master-1db308b/addons/pvr.njoy/Makefile.am 2014-06-15 02:39:46.000000000 +0200
+++ xbmc-pvr-addons-master-1db308b.patch/addons/pvr.njoy/Makefile.am 2014-06-15 03:41:47.997491730 +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-1db308b/addons/pvr.vuplus/Makefile.am xbmc-pvr-addons-master-1db308b.patch/addons/pvr.vuplus/Makefile.am
--- xbmc-pvr-addons-master-1db308b/addons/pvr.vuplus/Makefile.am 2014-06-15 02:39:46.000000000 +0200
+++ xbmc-pvr-addons-master-1db308b.patch/addons/pvr.vuplus/Makefile.am 2014-06-15 03:41:47.998491708 +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-1db308b/addons/pvr.wmc/Makefile.am xbmc-pvr-addons-master-1db308b.patch/addons/pvr.wmc/Makefile.am
--- xbmc-pvr-addons-master-1db308b/addons/pvr.wmc/Makefile.am 2014-06-15 02:39:46.000000000 +0200
+++ xbmc-pvr-addons-master-1db308b.patch/addons/pvr.wmc/Makefile.am 2014-06-15 03:41:47.998491708 +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-1db308b/lib/cmyth/libcmyth/Makefile.am xbmc-pvr-addons-master-1db308b.patch/lib/cmyth/libcmyth/Makefile.am
--- xbmc-pvr-addons-master-1db308b/lib/cmyth/libcmyth/Makefile.am 2014-06-15 02:39:46.000000000 +0200
+++ xbmc-pvr-addons-master-1db308b.patch/lib/cmyth/libcmyth/Makefile.am 2014-06-15 03:41:47.999491687 +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-1db308b/lib/cmyth/librefmem/Makefile.am xbmc-pvr-addons-master-1db308b.patch/lib/cmyth/librefmem/Makefile.am
--- xbmc-pvr-addons-master-1db308b/lib/cmyth/librefmem/Makefile.am 2014-06-15 02:39:46.000000000 +0200
+++ xbmc-pvr-addons-master-1db308b.patch/lib/cmyth/librefmem/Makefile.am 2014-06-15 03:41:47.999491687 +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-1db308b/lib/jsoncpp/Makefile.am xbmc-pvr-addons-master-1db308b.patch/lib/jsoncpp/Makefile.am
--- xbmc-pvr-addons-master-1db308b/lib/jsoncpp/Makefile.am 2014-06-15 02:39:46.000000000 +0200
+++ xbmc-pvr-addons-master-1db308b.patch/lib/jsoncpp/Makefile.am 2014-06-15 03:41:48.000491668 +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-1db308b/lib/libdvblinkremote/Makefile.am xbmc-pvr-addons-master-1db308b.patch/lib/libdvblinkremote/Makefile.am
--- xbmc-pvr-addons-master-1db308b/lib/libdvblinkremote/Makefile.am 2014-06-15 02:39:46.000000000 +0200
+++ xbmc-pvr-addons-master-1db308b.patch/lib/libdvblinkremote/Makefile.am 2014-06-15 03:41:48.000491668 +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)