rpms/kodi-pvr-addons/devel kodi-pvr-addons-14.0-cppmyth_1.1.0.patch, NONE, 1.1 kodi-pvr-addons-14.0-use_external_cppmyth.patch, NONE, 1.1 kodi-pvr-addons-14.0-use_external_jsoncpp.patch, NONE, 1.1 kodi-pvr-addons-14.0-use_external_rapidxml.patch, NONE, 1.1 kodi-pvr-addons-14.0-use_external_tinyxml.patch, NONE, 1.1 kodi-pvr-addons-14.0-use_external_tinyxml2.patch, NONE, 1.1 kodi-pvr-addons-14.0-use_external_xbmc.patch, NONE, 1.1 kodi-pvr-addons.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Mohamed ElMorabity
melmorabity at rpmfusion.org
Fri Jan 2 01:42:05 CET 2015
Author: melmorabity
Update of /cvs/free/rpms/kodi-pvr-addons/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv14985/devel
Modified Files:
.cvsignore sources
Added Files:
kodi-pvr-addons-14.0-cppmyth_1.1.0.patch
kodi-pvr-addons-14.0-use_external_cppmyth.patch
kodi-pvr-addons-14.0-use_external_jsoncpp.patch
kodi-pvr-addons-14.0-use_external_rapidxml.patch
kodi-pvr-addons-14.0-use_external_tinyxml.patch
kodi-pvr-addons-14.0-use_external_tinyxml2.patch
kodi-pvr-addons-14.0-use_external_xbmc.patch
kodi-pvr-addons.spec
Log Message:
First import
kodi-pvr-addons-14.0-cppmyth_1.1.0.patch:
addon/resources/language/English/strings.po | 6 +++++-
addon/resources/settings.xml | 1 +
src/client.cpp | 21 +++++++++++++++++++++
src/client.h | 2 ++
src/cppmyth/MythScheduleManager.cpp | 4 ++--
src/cppmyth/MythScheduleManager.h | 2 +-
src/fileOps.cpp | 4 ++--
src/fileOps.h | 2 +-
src/pvrclient-mythtv.cpp | 8 ++++----
9 files changed, 39 insertions(+), 11 deletions(-)
--- NEW FILE kodi-pvr-addons-14.0-cppmyth_1.1.0.patch ---
>From a629869c34a0e5b2dede9216aebb3ae2e0044a96 Mon Sep 17 00:00:00 2001
From: nerddtvg <drew at drewgarrett.com>
Date: Sun, 9 Nov 2014 16:51:42 -0600
Subject: [PATCH] [pvr.mythtv] Adding WSAPI Security Pin parameter for
GetConnectionInfo with backwards compatibility
---
.../addon/resources/language/English/strings.po | 6 +++++-
addons/pvr.mythtv/addon/resources/settings.xml | 1 +
addons/pvr.mythtv/src/client.cpp | 21 +++++++++++++++++++++
addons/pvr.mythtv/src/client.h | 2 ++
.../pvr.mythtv/src/cppmyth/MythScheduleManager.cpp | 4 ++--
addons/pvr.mythtv/src/cppmyth/MythScheduleManager.h | 2 +-
addons/pvr.mythtv/src/fileOps.cpp | 4 ++--
addons/pvr.mythtv/src/fileOps.h | 2 +-
addons/pvr.mythtv/src/pvrclient-mythtv.cpp | 8 ++++----
9 files changed, 39 insertions(+), 11 deletions(-)
diff --git a/addons/pvr.mythtv/addon/resources/language/English/strings.po b/addons/pvr.mythtv/addon/resources/language/English/strings.po
index f7422d4..f1398f1 100644
--- a/addons/pvr.mythtv/addon/resources/language/English/strings.po
+++ b/addons/pvr.mythtv/addon/resources/language/English/strings.po
@@ -73,7 +73,11 @@ msgctxt "#30013"
msgid "MythTV Backend Port for API services"
msgstr ""
-#empty strings from id 30014 to 30018
+msgctxt "#30014"
+msgid "MythTV Security Pin for API services"
+msgstr ""
+
+#empty strings from id 30015 to 30018
msgctxt "#30019"
msgid "General"
diff --git a/addons/pvr.mythtv/addon/resources/settings.xml b/addons/pvr.mythtv/addon/resources/settings.xml
index 6da293b..4bd511a 100644
--- a/addons/pvr.mythtv/addon/resources/settings.xml
+++ b/addons/pvr.mythtv/addon/resources/settings.xml
@@ -4,6 +4,7 @@
<setting id="host" type="text" label="30000" default="127.0.0.1" />
<setting id="port" type="number" option="int" label="30001" default="6543" />
<setting id="wsport" type="number" option="int" label="30013" default="6544" />
+ <setting id="wssecuritypin" type="text" label="30014" default="0000" />
<setting id="host_ether" type="text" label="30012" default="" />
<setting id="livetv" type="bool" label="30006" default="true" />
<setting id="livetv_priority" type="bool" label="30007" default="true" />
diff --git a/addons/pvr.mythtv/src/client.cpp b/addons/pvr.mythtv/src/client.cpp
index 8e4032e..7b2bfb3 100644
--- a/addons/pvr.mythtv/src/client.cpp
+++ b/addons/pvr.mythtv/src/client.cpp
@@ -35,6 +35,7 @@ std::string g_szMythHostname = DEFAULT_HOST; ///<
std::string g_szMythHostEther = ""; ///< The Host MAC address of the mythtv server
int g_iProtoPort = DEFAULT_PROTO_PORT; ///< The mythtv protocol port (default is 6543)
int g_iWSApiPort = DEFAULT_WSAPI_PORT; ///< The mythtv sevice API port (default is 6544)
+std::string g_szWSSecurityPin = DEFAULT_WSAPI_SECURITY_PIN; ///< The default security pin for the mythtv wsapi
bool g_bExtraDebug = DEFAULT_EXTRA_DEBUG; ///< Output extensive debug information to the log
bool g_bLiveTV = DEFAULT_LIVETV; ///< LiveTV support (or recordings only)
bool g_bLiveTVPriority = DEFAULT_LIVETV_PRIORITY; ///< MythTV Backend setting to allow live TV to move scheduled shows
@@ -170,6 +171,17 @@ ADDON_STATUS ADDON_Create(void *hdl, void *props)
g_iWSApiPort = DEFAULT_WSAPI_PORT;
}
+ /* Read setting "wssecuritypin" from settings.xml */
+ if (XBMC->GetSetting("wssecuritypin", buffer))
+ g_szWSSecurityPin = buffer;
+ else
+ {
+ /* If setting is unknown fallback to defaults */
+ XBMC->Log(LOG_ERROR, "Couldn't get 'wssecuritypin' setting, falling back to '%s' as default", DEFAULT_WSAPI_SECURITY_PIN);
+ g_szWSSecurityPin = DEFAULT_WSAPI_SECURITY_PIN;
+ }
+ buffer[0] = 0;
+
/* Read setting "extradebug" from settings.xml */
if (!XBMC->GetSetting("extradebug", &g_bExtraDebug))
{
@@ -446,6 +458,15 @@ ADDON_STATUS ADDON_SetSetting(const char *settingName, const void *settingValue)
return ADDON_STATUS_NEED_RESTART;
}
}
+ else if (str == "wssecuritypin")
+ {
+ std::string tmp_sWSSecurityPin;
+ XBMC->Log(LOG_INFO, "Changed Setting 'wssecuritypin' from %s to %s", g_szWSSecurityPin.c_str(), (const char*)settingValue);
+ tmp_sWSSecurityPin = g_szWSSecurityPin;
+ g_szWSSecurityPin = (const char*)settingValue;
+ if (tmp_sWSSecurityPin != g_szWSSecurityPin)
+ return ADDON_STATUS_NEED_RESTART;
+ }
else if (str == "demuxing")
{
XBMC->Log(LOG_INFO, "Changed Setting 'demuxing' from %u to %u", g_bDemuxing, *(bool*)settingValue);
diff --git a/addons/pvr.mythtv/src/client.h b/addons/pvr.mythtv/src/client.h
index c3e45d3..0ce91be 100644
--- a/addons/pvr.mythtv/src/client.h
+++ b/addons/pvr.mythtv/src/client.h
@@ -41,6 +41,7 @@
#define DEFAULT_LIVETV true
#define DEFAULT_PROTO_PORT 6543
#define DEFAULT_WSAPI_PORT 6544
+#define DEFAULT_WSAPI_SECURITY_PIN "0000"
#define DEFAULT_RECORD_TEMPLATE 1
#define SUBTITLE_SEPARATOR " - "
@@ -84,6 +85,7 @@ extern std::string g_szMythHostname; ///< The Host name or IP of the
extern std::string g_szMythHostEther; ///< The Host MAC address of the mythtv server
extern int g_iProtoPort; ///< The mythtv protocol port (default is 6543)
extern int g_iWSApiPort; ///< The mythtv service API port (default is 6544)
+extern std::string g_szWSSecurityPin; ///< The default security pin for the mythtv wsapi
extern bool g_bExtraDebug; ///< Debug logging
extern bool g_bLiveTV; ///< LiveTV support (or recordings only)
extern bool g_bLiveTVPriority; ///< MythTV Backend setting to allow live TV to move scheduled shows
diff --git a/addons/pvr.mythtv/src/cppmyth/MythScheduleManager.cpp b/addons/pvr.mythtv/src/cppmyth/MythScheduleManager.cpp
index 645a092..c3932aa 100644
--- a/addons/pvr.mythtv/src/cppmyth/MythScheduleManager.cpp
+++ b/addons/pvr.mythtv/src/cppmyth/MythScheduleManager.cpp
@@ -105,14 +105,14 @@ bool MythRecordingRuleNode::IsInactiveRule() const
//// MythScheduleManager
////
-MythScheduleManager::MythScheduleManager(const std::string& server, unsigned protoPort, unsigned wsapiPort)
+MythScheduleManager::MythScheduleManager(const std::string& server, unsigned protoPort, unsigned wsapiPort, const std::string& wsapiSecurityPin)
: m_lock()
, m_control(NULL)
, m_protoVersion(0)
, m_versionHelper(NULL)
, m_showNotRecording(false)
{
- m_control = new Myth::Control(server, protoPort, wsapiPort);
+ m_control = new Myth::Control(server, protoPort, wsapiPort, wsapiSecurityPin);
this->Update();
}
diff --git a/addons/pvr.mythtv/src/cppmyth/MythScheduleManager.h b/addons/pvr.mythtv/src/cppmyth/MythScheduleManager.h
index 12bdbee..5289e7e 100644
--- a/addons/pvr.mythtv/src/cppmyth/MythScheduleManager.h
+++ b/addons/pvr.mythtv/src/cppmyth/MythScheduleManager.h
@@ -78,7 +78,7 @@ class MythScheduleManager
MSM_ERROR_SUCCESS = 1
};
- MythScheduleManager(const std::string& server, unsigned protoPort, unsigned wsapiPort);
+ MythScheduleManager(const std::string& server, unsigned protoPort, unsigned wsapiPort, const std::string& wsapiSecurityPin);
~MythScheduleManager();
// Called by GetTimers
diff --git a/addons/pvr.mythtv/src/fileOps.cpp b/addons/pvr.mythtv/src/fileOps.cpp
index 9f307d0..810b273 100644
--- a/addons/pvr.mythtv/src/fileOps.cpp
+++ b/addons/pvr.mythtv/src/fileOps.cpp
@@ -32,7 +32,7 @@
using namespace ADDON;
using namespace PLATFORM;
-FileOps::FileOps(const std::string& server, unsigned wsapiport)
+FileOps::FileOps(const std::string& server, unsigned wsapiport, const std::string& wsapiSecurityPin)
: CThread()
, m_wsapi(NULL)
, m_localBasePath(g_szUserPath.c_str())
@@ -45,7 +45,7 @@ FileOps::FileOps(const std::string& server, unsigned wsapiport)
if (!XBMC->DirectoryExists(m_localBasePath.c_str()) && !XBMC->CreateDirectory(m_localBasePath.c_str()))
XBMC->Log(LOG_ERROR,"%s - Failed to create cache directory %s", __FUNCTION__, m_localBasePath.c_str());
- m_wsapi = new Myth::WSAPI(server, wsapiport);
+ m_wsapi = new Myth::WSAPI(server, wsapiport, wsapiSecurityPin);
CreateThread();
}
diff --git a/addons/pvr.mythtv/src/fileOps.h b/addons/pvr.mythtv/src/fileOps.h
index 3aebc1f..f19d833 100644
--- a/addons/pvr.mythtv/src/fileOps.h
+++ b/addons/pvr.mythtv/src/fileOps.h
@@ -87,7 +87,7 @@ class FileOps : public PLATFORM::CThread
static const int c_timeoutProcess = 10; // Wake the thread every 10s
static const int c_maximumAttemptsOnReadError = 3; // Retry when reading file failed
- FileOps(const std::string& server, unsigned wsapiport);
+ FileOps(const std::string& server, unsigned wsapiport, const std::string& wsapiSecurityPin);
virtual ~FileOps();
std::string GetChannelIconPath(const MythChannel& channel);
diff --git a/addons/pvr.mythtv/src/pvrclient-mythtv.cpp b/addons/pvr.mythtv/src/pvrclient-mythtv.cpp
index 520e33a..6e76c38 100644
--- a/addons/pvr.mythtv/src/pvrclient-mythtv.cpp
+++ b/addons/pvr.mythtv/src/pvrclient-mythtv.cpp
@@ -102,7 +102,7 @@ void PVRClientMythTV::SetDebug()
bool PVRClientMythTV::Connect()
{
SetDebug();
- m_control = new Myth::Control(g_szMythHostname, g_iProtoPort, g_iWSApiPort, g_bBlockMythShutdown);
+ m_control = new Myth::Control(g_szMythHostname, g_iProtoPort, g_iWSApiPort, g_szWSSecurityPin, g_bBlockMythShutdown);
if (!m_control->IsOpen())
{
SAFE_DELETE(m_control);
@@ -115,7 +115,7 @@ bool PVRClientMythTV::Connect()
if (!m_control->CheckService())
{
SAFE_DELETE(m_control);
- XBMC->Log(LOG_ERROR,"Failed to connect to MythTV backend on %s:%d", g_szMythHostname.c_str(), g_iWSApiPort);
+ XBMC->Log(LOG_ERROR,"Failed to connect to MythTV backend on %s:%d with pin %s", g_szMythHostname.c_str(), g_iWSApiPort, g_szWSSecurityPin.c_str());
return false;
}
@@ -129,10 +129,10 @@ bool PVRClientMythTV::Connect()
m_eventHandler->SubscribeForEvent(m_eventSubscriberId, Myth::EVENT_RECORDING_LIST_CHANGE);
// Create schedule manager
- m_scheduleManager = new MythScheduleManager(g_szMythHostname, g_iProtoPort, g_iWSApiPort);
+ m_scheduleManager = new MythScheduleManager(g_szMythHostname, g_iProtoPort, g_iWSApiPort, g_szWSSecurityPin);
// Create file operation helper (image caching)
- m_fileOps = new FileOps(g_szMythHostname, g_iWSApiPort);
+ m_fileOps = new FileOps(g_szMythHostname, g_iWSApiPort, g_szWSSecurityPin);
// Start event handler
m_eventHandler->Start();
kodi-pvr-addons-14.0-use_external_cppmyth.patch:
addons/pvr.mythtv/Makefile.am | 5 ++---
addons/pvr.mythtv/src/avinfo.h | 2 +-
addons/pvr.mythtv/src/cppmyth/MythChannel.h | 2 +-
addons/pvr.mythtv/src/cppmyth/MythEPGInfo.h | 2 +-
addons/pvr.mythtv/src/cppmyth/MythProgramInfo.h | 2 +-
addons/pvr.mythtv/src/cppmyth/MythRecordingRule.h | 2 +-
addons/pvr.mythtv/src/cppmyth/MythScheduleManager.h | 2 +-
addons/pvr.mythtv/src/demux.h | 2 +-
addons/pvr.mythtv/src/fileOps.h | 2 +-
addons/pvr.mythtv/src/pvrclient-mythtv.h | 12 ++++++------
configure.ac | 2 --
lib/Makefile.am | 2 +-
12 files changed, 17 insertions(+), 20 deletions(-)
--- NEW FILE kodi-pvr-addons-14.0-use_external_cppmyth.patch ---
diff -up ./addons/pvr.mythtv/Makefile.am.orig ./addons/pvr.mythtv/Makefile.am
--- ./addons/pvr.mythtv/Makefile.am.orig 2014-12-12 15:59:56.000000000 +0100
+++ ./addons/pvr.mythtv/Makefile.am 2014-12-25 11:07:40.944299129 +0100
@@ -10,10 +10,9 @@ ADDONNAME = pvr.mythtv
LIBNAME = libmythtv-addon
lib_LTLIBRARIES = libmythtv-addon.la
-LIBS = @abs_top_srcdir@/lib/cppmyth/cppmyth/libcppmyth.la \
- @abs_top_srcdir@/lib/cppmyth/jansson/src/libjansson.la
+LIBS = $(shell pkg-config --libs cppmyth)
-AM_CPPFLAGS = -I at abs_top_srcdir@/lib/cppmyth/cppmyth/src
+AM_CPPFLAGS = $(shell pkg-config --cflags cppmyth)
include ../Makefile.include.am
diff -up ./addons/pvr.mythtv/src/avinfo.h.orig ./addons/pvr.mythtv/src/avinfo.h
--- ./addons/pvr.mythtv/src/avinfo.h.orig 2014-12-12 15:59:56.000000000 +0100
+++ ./addons/pvr.mythtv/src/avinfo.h 2014-12-25 11:08:55.783199277 +0100
@@ -24,7 +24,7 @@
#include "demuxer/tsDemuxer.h"
#include "client.h"
-#include <mythstream.h>
+#include <cppmyth/mythstream.h>
#include <set>
#include <vector>
diff -up ./addons/pvr.mythtv/src/cppmyth/MythChannel.h.orig ./addons/pvr.mythtv/src/cppmyth/MythChannel.h
--- ./addons/pvr.mythtv/src/cppmyth/MythChannel.h.orig 2014-12-12 15:59:56.000000000 +0100
+++ ./addons/pvr.mythtv/src/cppmyth/MythChannel.h 2014-12-25 11:08:55.813198435 +0100
@@ -19,7 +19,7 @@
*
*/
-#include <mythtypes.h>
+#include <cppmyth/mythtypes.h>
class MythChannel
{
diff -up ./addons/pvr.mythtv/src/cppmyth/MythEPGInfo.h.orig ./addons/pvr.mythtv/src/cppmyth/MythEPGInfo.h
--- ./addons/pvr.mythtv/src/cppmyth/MythEPGInfo.h.orig 2014-12-12 15:59:56.000000000 +0100
+++ ./addons/pvr.mythtv/src/cppmyth/MythEPGInfo.h 2014-12-25 11:08:55.810198519 +0100
@@ -19,7 +19,7 @@
*
*/
-#include <mythtypes.h>
+#include <cppmyth/mythtypes.h>
class MythEPGInfo
{
diff -up ./addons/pvr.mythtv/src/cppmyth/MythProgramInfo.h.orig ./addons/pvr.mythtv/src/cppmyth/MythProgramInfo.h
--- ./addons/pvr.mythtv/src/cppmyth/MythProgramInfo.h.orig 2014-12-12 15:59:56.000000000 +0100
+++ ./addons/pvr.mythtv/src/cppmyth/MythProgramInfo.h 2014-12-25 11:08:55.803198715 +0100
@@ -19,7 +19,7 @@
*
*/
-#include <mythtypes.h>
+#include <cppmyth/mythtypes.h>
class MythProgramInfo;
typedef std::map<std::string, MythProgramInfo> ProgramInfoMap;
diff -up ./addons/pvr.mythtv/src/cppmyth/MythRecordingRule.h.orig ./addons/pvr.mythtv/src/cppmyth/MythRecordingRule.h
--- ./addons/pvr.mythtv/src/cppmyth/MythRecordingRule.h.orig 2014-12-12 15:59:56.000000000 +0100
+++ ./addons/pvr.mythtv/src/cppmyth/MythRecordingRule.h 2014-12-25 11:08:55.806198631 +0100
@@ -19,7 +19,7 @@
*
*/
-#include <mythtypes.h>
+#include <cppmyth/mythtypes.h>
class MythRecordingRule
{
diff -up ./addons/pvr.mythtv/src/cppmyth/MythScheduleManager.h.orig ./addons/pvr.mythtv/src/cppmyth/MythScheduleManager.h
--- ./addons/pvr.mythtv/src/cppmyth/MythScheduleManager.h.orig 2014-12-12 15:59:56.000000000 +0100
+++ ./addons/pvr.mythtv/src/cppmyth/MythScheduleManager.h 2014-12-25 11:08:55.817198323 +0100
@@ -19,7 +19,7 @@
*
*/
-#include <mythcontrol.h>
+#include <cppmyth/mythcontrol.h>
#include "MythRecordingRule.h"
#include "MythProgramInfo.h"
#include "MythEPGInfo.h"
diff -up ./addons/pvr.mythtv/src/demux.h.orig ./addons/pvr.mythtv/src/demux.h
--- ./addons/pvr.mythtv/src/demux.h.orig 2014-12-12 15:59:56.000000000 +0100
+++ ./addons/pvr.mythtv/src/demux.h 2014-12-25 11:08:55.799198828 +0100
@@ -24,7 +24,7 @@
#include "demuxer/tsDemuxer.h"
#include "client.h"
-#include <mythstream.h>
+#include <cppmyth/mythstream.h>
#include <platform/threads/threads.h>
#include <platform/threads/mutex.h>
#include <platform/util/buffer.h>
diff -up ./addons/pvr.mythtv/src/fileOps.h.orig ./addons/pvr.mythtv/src/fileOps.h
--- ./addons/pvr.mythtv/src/fileOps.h.orig 2014-12-12 15:59:56.000000000 +0100
+++ ./addons/pvr.mythtv/src/fileOps.h 2014-12-25 11:08:55.789199108 +0100
@@ -24,7 +24,7 @@
#include "cppmyth/MythChannel.h"
#include "cppmyth/MythProgramInfo.h"
-#include <mythwsapi.h>
+#include <cppmyth/mythwsapi.h>
#include <platform/threads/threads.h>
#include <string>
diff -up ./addons/pvr.mythtv/src/pvrclient-mythtv.h.orig ./addons/pvr.mythtv/src/pvrclient-mythtv.h
--- ./addons/pvr.mythtv/src/pvrclient-mythtv.h.orig 2014-12-12 15:59:56.000000000 +0100
+++ ./addons/pvr.mythtv/src/pvrclient-mythtv.h 2014-12-25 11:08:55.794198968 +0100
@@ -28,12 +28,12 @@
#include <xbmc_pvr_types.h>
#include <platform/threads/mutex.h>
-#include <mythsharedptr.h>
-#include <mythcontrol.h>
-#include <mytheventhandler.h>
-#include <mythlivetvplayback.h>
-#include <mythrecordingplayback.h>
-#include <mythdebug.h>
+#include <cppmyth/mythsharedptr.h>
+#include <cppmyth/mythcontrol.h>
+#include <cppmyth/mytheventhandler.h>
+#include <cppmyth/mythlivetvplayback.h>
+#include <cppmyth/mythrecordingplayback.h>
+#include <cppmyth/mythdebug.h>
#include <string>
#include <vector>
diff -up ./configure.ac.orig ./configure.ac
--- ./configure.ac.orig 2014-12-12 15:59:56.000000000 +0100
+++ ./configure.ac 2014-12-25 11:09:47.274754512 +0100
@@ -278,8 +278,6 @@ else
fi
AC_SUBST(DATADIR)
-AC_CONFIG_SUBDIRS([lib/cppmyth])
-
### Keep this in alphabetical order
AC_CONFIG_FILES([Makefile \
lib/Makefile \
diff -up ./lib/Makefile.am.orig ./lib/Makefile.am
--- ./lib/Makefile.am.orig 2014-12-12 15:59:56.000000000 +0100
+++ ./lib/Makefile.am 2014-12-25 11:09:24.871383112 +0100
@@ -1,4 +1,4 @@
-SUBDIRS = libhts tinyxml tinyxml2 jsoncpp libdvblinkremote cppmyth $(ADDITIONAL_SUBDIRS)
+SUBDIRS = libhts tinyxml tinyxml2 jsoncpp libdvblinkremote $(ADDITIONAL_SUBDIRS)
zip:
kodi-pvr-addons-14.0-use_external_jsoncpp.patch:
addons/pvr.argustv/Makefile.am | 4 ++--
configure.ac | 1 -
lib/Makefile.am | 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
--- NEW FILE kodi-pvr-addons-14.0-use_external_jsoncpp.patch ---
diff -up ./addons/pvr.argustv/Makefile.am.orig ./addons/pvr.argustv/Makefile.am
--- ./addons/pvr.argustv/Makefile.am.orig 2014-12-12 15:59:56.000000000 +0100
+++ ./addons/pvr.argustv/Makefile.am 2014-12-25 11:12:17.280545603 +0100
@@ -10,11 +10,11 @@ ADDONNAME = pvr.argustv
LIBNAME = libargustv-addon
lib_LTLIBRARIES = libargustv-addon.la
-LIBS = @abs_top_srcdir@/lib/jsoncpp/libjsoncpp.la
+LIBS = $(shell pkg-config --libs jsoncpp)
include ../Makefile.include.am
-INCLUDES+=-Isrc -Isrc/lib/filesystem -I at abs_top_srcdir@/lib/jsoncpp/include
+INCLUDES+=-Isrc -Isrc/lib/filesystem $(shell pkg-config --cflags jsoncpp)
libargustv_addon_la_SOURCES = src/activerecording.cpp \
src/channel.cpp \
diff -up ./configure.ac.orig ./configure.ac
--- ./configure.ac.orig 2014-12-25 11:09:47.274754512 +0100
+++ ./configure.ac 2014-12-25 11:11:24.615023308 +0100
@@ -281,7 +281,6 @@ AC_SUBST(DATADIR)
### Keep this in alphabetical order
AC_CONFIG_FILES([Makefile \
lib/Makefile \
- lib/jsoncpp/Makefile \
lib/libdvblinkremote/Makefile \
lib/libhts/Makefile \
lib/tinyxml/Makefile \
diff -up ./lib/Makefile.am.orig ./lib/Makefile.am
--- ./lib/Makefile.am.orig 2014-12-25 11:09:24.871383112 +0100
+++ ./lib/Makefile.am 2014-12-25 11:11:43.312498688 +0100
@@ -1,4 +1,4 @@
-SUBDIRS = libhts tinyxml tinyxml2 jsoncpp libdvblinkremote $(ADDITIONAL_SUBDIRS)
+SUBDIRS = libhts tinyxml tinyxml2 libdvblinkremote $(ADDITIONAL_SUBDIRS)
zip:
kodi-pvr-addons-14.0-use_external_rapidxml.patch:
PVRIptvData.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE kodi-pvr-addons-14.0-use_external_rapidxml.patch ---
diff -up ./addons/pvr.iptvsimple/src/PVRIptvData.cpp.orig ./addons/pvr.iptvsimple/src/PVRIptvData.cpp
--- ./addons/pvr.iptvsimple/src/PVRIptvData.cpp.orig 2014-12-12 15:59:56.000000000 +0100
+++ ./addons/pvr.iptvsimple/src/PVRIptvData.cpp 2014-12-25 11:15:24.957267496 +0100
@@ -28,7 +28,7 @@
#include <fstream>
#include <map>
#include "zlib.h"
-#include "rapidxml/rapidxml.hpp"
+#include <rapidxml.h>
#include "PVRIptvData.h"
#define M3U_START_MARKER "#EXTM3U"
@@ -1005,4 +1005,4 @@ int PVRIptvData::GetChannelId(const char
iId = ((iId << 5) + iId) + c; /* iId * 33 + c */
return abs(iId);
-}
\ Pas de fin de ligne à la fin du fichier
+}
kodi-pvr-addons-14.0-use_external_tinyxml.patch:
addons/pvr.demo/Makefile.am | 4 +++-
addons/pvr.dvbviewer/Makefile.am | 4 +++-
addons/pvr.dvbviewer/src/DvbData.cpp | 2 +-
addons/pvr.mediaportal.tvserver/Makefile.am | 4 ++--
addons/pvr.mediaportal.tvserver/src/GenreTable.cpp | 2 +-
addons/pvr.nextpvr/Makefile.am | 4 ++--
addons/pvr.nextpvr/src/pvrclient-nextpvr.cpp | 2 +-
addons/pvr.njoy/Makefile.am | 4 +++-
addons/pvr.njoy/src/N7Xml.cpp | 2 +-
addons/pvr.vuplus/Makefile.am | 4 +++-
addons/pvr.vuplus/src/VuData.h | 2 +-
addons/pvr.wmc/Makefile.am | 4 +++-
lib/tinyxml/Makefile.am | 10 +++++-----
lib/tinyxml/XMLUtils.h | 2 +-
14 files changed, 30 insertions(+), 20 deletions(-)
--- NEW FILE kodi-pvr-addons-14.0-use_external_tinyxml.patch ---
diff -up ./addons/pvr.demo/Makefile.am.orig ./addons/pvr.demo/Makefile.am
--- ./addons/pvr.demo/Makefile.am.orig 2014-12-12 15:59:56.000000000 +0100
+++ ./addons/pvr.demo/Makefile.am 2014-12-25 11:33:27.706653917 +0100
@@ -10,7 +10,9 @@ ADDONNAME = pvr.demo
LIBNAME = libpvrdemo-addon
lib_LTLIBRARIES = libpvrdemo-addon.la
-LIBS = @abs_top_srcdir@/lib/tinyxml/libtinyxml.la
+LIBS = $(shell pkg-config --libs tinyxml) @abs_top_srcdir@/lib/tinyxml/libtinyxml.la
+
+INCLUDES = $(shell pkg-config --cflags tinyxml)
include ../Makefile.include.am
diff -up ./addons/pvr.dvbviewer/Makefile.am.orig ./addons/pvr.dvbviewer/Makefile.am
--- ./addons/pvr.dvbviewer/Makefile.am.orig 2014-12-12 15:59:56.000000000 +0100
+++ ./addons/pvr.dvbviewer/Makefile.am 2014-12-25 11:33:01.541405637 +0100
@@ -10,7 +10,9 @@ ADDONNAME = pvr.dvbviewer
LIBNAME = libdvbviewer-addon
lib_LTLIBRARIES = libdvbviewer-addon.la
-LIBS = @abs_top_srcdir@/lib/tinyxml/libtinyxml.la
+LIBS = $(shell pkg-config --libs tinyxml) @abs_top_srcdir@/lib/tinyxml/libtinyxml.la
+
+INCLUDES = $(shell pkg-config --cflags tinyxml)
include ../Makefile.include.am
diff -up ./addons/pvr.dvbviewer/src/DvbData.cpp.orig ./addons/pvr.dvbviewer/src/DvbData.cpp
--- ./addons/pvr.dvbviewer/src/DvbData.cpp.orig 2014-12-12 15:59:56.000000000 +0100
+++ ./addons/pvr.dvbviewer/src/DvbData.cpp 2014-12-25 11:25:13.533661661 +0100
@@ -1,7 +1,7 @@
#include "DvbData.h"
#include "client.h"
#include "platform/util/util.h"
-#include "tinyxml/tinyxml.h"
+#include <tinyxml.h>
#include "tinyxml/XMLUtils.h"
#include <inttypes.h>
#include <set>
diff -up ./addons/pvr.mediaportal.tvserver/Makefile.am.orig ./addons/pvr.mediaportal.tvserver/Makefile.am
--- ./addons/pvr.mediaportal.tvserver/Makefile.am.orig 2014-12-12 15:59:56.000000000 +0100
+++ ./addons/pvr.mediaportal.tvserver/Makefile.am 2014-12-25 11:31:57.360249544 +0100
@@ -10,11 +10,11 @@ ADDONNAME = pvr.mediaportal.tvserv
LIBNAME = libmediaportal-addon
lib_LTLIBRARIES = libmediaportal-addon.la
-LIBS = @abs_top_srcdir@/lib/tinyxml/libtinyxml.la
+LIBS = $(shell pkg-config --libs tinyxml) @abs_top_srcdir@/lib/tinyxml/libtinyxml.la
include ../Makefile.include.am
-INCLUDES+=-Isrc
+INCLUDES+=-Isrc $(shell pkg-config --cflags tinyxml)
libmediaportal_addon_la_SOURCES = src/Cards.cpp \
src/channels.cpp \
diff -up ./addons/pvr.mediaportal.tvserver/src/GenreTable.cpp.orig ./addons/pvr.mediaportal.tvserver/src/GenreTable.cpp
--- ./addons/pvr.mediaportal.tvserver/src/GenreTable.cpp.orig 2014-12-12 15:59:56.000000000 +0100
+++ ./addons/pvr.mediaportal.tvserver/src/GenreTable.cpp 2014-12-25 11:25:13.535661605 +0100
@@ -19,7 +19,7 @@
#include "client.h"
#include "GenreTable.h"
-#include "tinyxml/tinyxml.h"
+#include <tinyxml.h>
using namespace ADDON;
using namespace std;
diff -up ./addons/pvr.nextpvr/Makefile.am.orig ./addons/pvr.nextpvr/Makefile.am
--- ./addons/pvr.nextpvr/Makefile.am.orig 2014-12-12 15:59:56.000000000 +0100
+++ ./addons/pvr.nextpvr/Makefile.am 2014-12-25 11:32:46.564835910 +0100
@@ -10,11 +10,11 @@ ADDONNAME = pvr.nextpvr
LIBNAME = libnextpvr-addon
lib_LTLIBRARIES = libnextpvr-addon.la
-LIBS = @abs_top_srcdir@/lib/tinyxml/libtinyxml.la
+LIBS = $(shell pkg-config --libs tinyxml) @abs_top_srcdir@/lib/tinyxml/libtinyxml.la
include ../Makefile.include.am
-INCLUDES+=-Isrc
+INCLUDES+=-Isrc $(shell pkg-config --cflags tinyxml)
libnextpvr_addon_la_SOURCES = src/client.cpp \
src/pvrclient-nextpvr.cpp \
diff -up ./addons/pvr.nextpvr/src/pvrclient-nextpvr.cpp.orig ./addons/pvr.nextpvr/src/pvrclient-nextpvr.cpp
--- ./addons/pvr.nextpvr/src/pvrclient-nextpvr.cpp.orig 2014-12-12 15:59:56.000000000 +0100
+++ ./addons/pvr.nextpvr/src/pvrclient-nextpvr.cpp 2014-12-25 11:25:13.536661577 +0100
@@ -30,7 +30,7 @@
#include "md5.h"
-#include "tinyxml/tinyxml.h"
+#include <tinyxml.h>
#if defined(TARGET_WINDOWS)
#define atoll(S) _atoi64(S)
diff -up ./addons/pvr.njoy/Makefile.am.orig ./addons/pvr.njoy/Makefile.am
--- ./addons/pvr.njoy/Makefile.am.orig 2014-12-12 15:59:56.000000000 +0100
+++ ./addons/pvr.njoy/Makefile.am 2014-12-25 11:31:12.604530995 +0100
@@ -10,7 +10,9 @@ ADDONNAME = pvr.njoy
LIBNAME = libpvrnjoy-addon
lib_LTLIBRARIES = libpvrnjoy-addon.la
-LIBS = @abs_top_srcdir@/lib/tinyxml/libtinyxml.la
+LIBS = $(shell pkg-config --libs tinyxml) @abs_top_srcdir@/lib/tinyxml/libtinyxml.la
+
+INCLUDES = $(shell pkg-config --cflags tinyxml)
include ../Makefile.include.am
diff -up ./addons/pvr.njoy/src/N7Xml.cpp.orig ./addons/pvr.njoy/src/N7Xml.cpp
--- ./addons/pvr.njoy/src/N7Xml.cpp.orig 2014-12-12 15:59:56.000000000 +0100
+++ ./addons/pvr.njoy/src/N7Xml.cpp 2014-12-25 11:25:13.537661549 +0100
@@ -1,7 +1,7 @@
#include "N7Xml.h"
-#include "tinyxml/tinyxml.h"
+#include <tinyxml.h>
#include "tinyxml/XMLUtils.h"
using namespace ADDON;
diff -up ./addons/pvr.vuplus/Makefile.am.orig ./addons/pvr.vuplus/Makefile.am
--- ./addons/pvr.vuplus/Makefile.am.orig 2014-12-12 15:59:56.000000000 +0100
+++ ./addons/pvr.vuplus/Makefile.am 2014-12-25 11:33:15.310010070 +0100
@@ -10,7 +10,9 @@ ADDONNAME = pvr.vuplus
LIBNAME = libvuplus-addon
lib_LTLIBRARIES = libvuplus-addon.la
-LIBS = @abs_top_srcdir@/lib/tinyxml/libtinyxml.la
+LIBS = $(shell pkg-config --libs tinyxml) @abs_top_srcdir@/lib/tinyxml/libtinyxml.la
+
+INCLUDES = $(shell pkg-config --cflags tinyxml)
include ../Makefile.include.am
diff -up ./addons/pvr.vuplus/src/VuData.h.orig ./addons/pvr.vuplus/src/VuData.h
--- ./addons/pvr.vuplus/src/VuData.h.orig 2014-12-12 15:59:56.000000000 +0100
+++ ./addons/pvr.vuplus/src/VuData.h 2014-12-25 11:25:13.538661520 +0100
@@ -3,7 +3,7 @@
#include "platform/util/StdString.h"
#include "client.h"
#include "platform/threads/threads.h"
-#include "tinyxml/tinyxml.h"
+#include <tinyxml.h>
#define CHANNELDATAVERSION 2
diff -up ./addons/pvr.wmc/Makefile.am.orig ./addons/pvr.wmc/Makefile.am
--- ./addons/pvr.wmc/Makefile.am.orig 2014-12-12 15:59:56.000000000 +0100
+++ ./addons/pvr.wmc/Makefile.am 2014-12-25 11:32:27.123394459 +0100
@@ -10,7 +10,9 @@ ADDONNAME = pvr.wmc
LIBNAME = libpvrwmc-addon
lib_LTLIBRARIES = libpvrwmc-addon.la
-LIBS = @abs_top_srcdir@/lib/tinyxml/libtinyxml.la
+LIBS = $(shell pkg-config --libs tinyxml) @abs_top_srcdir@/lib/tinyxml/libtinyxml.la
+
+INCLUDES = $(shell pkg-config --cflags tinyxml)
include ../Makefile.include.am
diff -up ./lib/tinyxml/Makefile.am.orig ./lib/tinyxml/Makefile.am
--- ./lib/tinyxml/Makefile.am.orig 2014-12-12 15:59:56.000000000 +0100
+++ ./lib/tinyxml/Makefile.am 2014-12-25 11:28:52.705478045 +0100
@@ -1,10 +1,10 @@
noinst_LTLIBRARIES = libtinyxml.la
-libtinyxml_la_SOURCES = tinystr.cpp \
- tinyxml.cpp \
- tinyxmlerror.cpp \
- tinyxmlparser.cpp \
- XMLUtils.cpp
+AM_CPPFLAGS = $(shell pkg-config --cflags tinyxml)
+
+libtinyxml_la_SOURCES = XMLUtils.cpp
+
+libtinyxml_la_LDFLAGS = $(shell pkg-config --libs tinyxml)
$(LIB): libtinyxml.la
cp -f .libs/libtinyxml.a .
diff -up ./lib/tinyxml/XMLUtils.h.orig ./lib/tinyxml/XMLUtils.h
--- ./lib/tinyxml/XMLUtils.h.orig 2014-12-12 15:59:56.000000000 +0100
+++ ./lib/tinyxml/XMLUtils.h 2014-12-25 11:25:53.121544747 +0100
@@ -23,7 +23,7 @@
*/
#include "../platform/util/StdString.h"
-#include "tinyxml.h"
+#include <tinyxml.h>
class CDateTime;
kodi-pvr-addons-14.0-use_external_tinyxml2.patch:
configure.ac | 1 -
lib/Makefile.am | 2 +-
lib/libdvblinkremote/Makefile.am | 6 +++---
lib/libdvblinkremote/util.h | 2 +-
lib/libdvblinkremote/xml_object_serializer.h | 2 +-
5 files changed, 6 insertions(+), 7 deletions(-)
--- NEW FILE kodi-pvr-addons-14.0-use_external_tinyxml2.patch ---
diff -up ./configure.ac.orig ./configure.ac
--- ./configure.ac.orig 2014-12-25 11:24:48.053380551 +0100
+++ ./configure.ac 2014-12-25 11:36:03.001192347 +0100
@@ -284,7 +284,6 @@ AC_CONFIG_FILES([Makefile \
lib/libdvblinkremote/Makefile \
lib/libhts/Makefile \
lib/tinyxml/Makefile \
- lib/tinyxml2/Makefile \
addons/Makefile \
addons/pvr.argustv/Makefile \
addons/pvr.demo/Makefile \
diff -up ./lib/libdvblinkremote/Makefile.am.orig ./lib/libdvblinkremote/Makefile.am
--- ./lib/libdvblinkremote/Makefile.am.orig 2014-12-12 15:59:56.000000000 +0100
+++ ./lib/libdvblinkremote/Makefile.am 2014-12-25 11:36:37.796192697 +0100
@@ -26,10 +26,10 @@ libdvblinkremote_la_SOURCES = channel.cp
util.cpp \
xml_object_serializer_factory.cpp
-LIBS= @abs_top_srcdir@/lib/tinyxml2/libtinyxml2.la
+LIBS=$(shell pkg-config --libs tinyxml2)
-INCLUDES=-I..
+INCLUDES=$(shell pkg-config --cflags tinyxml2)
$(LIB): libdvblinkremote.la
cp -f .libs/libdvblinkremote.a .
- cp -f .libs/libdvblinkremote.la $(LIB)
\ Pas de fin de ligne à la fin du fichier
+ cp -f .libs/libdvblinkremote.la $(LIB)
diff -up ./lib/libdvblinkremote/util.h.orig ./lib/libdvblinkremote/util.h
--- ./lib/libdvblinkremote/util.h.orig 2014-12-12 15:59:56.000000000 +0100
+++ ./lib/libdvblinkremote/util.h 2014-12-25 11:38:11.878489736 +0100
@@ -27,7 +27,7 @@
#include <sstream>
#include <iostream>
#include <cstdio>
-#include "tinyxml2/tinyxml2.h"
+#include <tinyxml2.h>
namespace dvblinkremote {
class Util {
diff -up ./lib/libdvblinkremote/xml_object_serializer.h.orig ./lib/libdvblinkremote/xml_object_serializer.h
--- ./lib/libdvblinkremote/xml_object_serializer.h.orig 2014-12-12 15:59:56.000000000 +0100
+++ ./lib/libdvblinkremote/xml_object_serializer.h 2014-12-25 11:38:11.880489679 +0100
@@ -30,7 +30,7 @@
#include "request.h"
#include "response.h"
#include "util.h"
-#include "tinyxml2/tinyxml2.h"
+#include <tinyxml2.h>
using namespace dvblinkremote;
diff -up ./lib/Makefile.am.orig ./lib/Makefile.am
--- ./lib/Makefile.am.orig 2014-12-25 11:24:48.053380551 +0100
+++ ./lib/Makefile.am 2014-12-25 11:38:25.515097961 +0100
@@ -1,4 +1,4 @@
-SUBDIRS = libhts tinyxml tinyxml2 libdvblinkremote $(ADDITIONAL_SUBDIRS)
+SUBDIRS = libhts tinyxml libdvblinkremote $(ADDITIONAL_SUBDIRS)
zip:
kodi-pvr-addons-14.0-use_external_xbmc.patch:
Makefile.include.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE kodi-pvr-addons-14.0-use_external_xbmc.patch ---
diff -up ./addons/Makefile.include.am.orig ./addons/Makefile.include.am
--- ./addons/Makefile.include.am.orig 2014-12-12 15:59:56.000000000 +0100
+++ ./addons/Makefile.include.am 2014-12-25 11:39:10.429807574 +0100
@@ -2,7 +2,7 @@
# Makefile include for XBMC PVR add-ons
#
-INCLUDES = -I. -I$(abs_top_srcdir)/xbmc -I$(abs_top_srcdir)/lib @HOST_INCLUDES@
+INCLUDES = -I. -I/usr/include/kodi -I$(abs_top_srcdir)/xbmc -I$(abs_top_srcdir)/lib @HOST_INCLUDES@
WARNINGS = -Wall -Wextra -Wno-missing-field-initializers -Woverloaded-virtual -Wno-parentheses
DEFINES = @ARCH_DEFINES@ -DUSE_DEMUX -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS
AM_CXXFLAGS = -g -O2 -fPIC $(WARNINGS) $(DEFINES) @HOST_CXXFLAGS@
--- NEW FILE kodi-pvr-addons.spec ---
# Upstream xbmc hardcodes a Git hash for OSes that bundle xbmc-pvr-addons. Let's
# try using the same hash that upstream uses for the current Kodi version
# available in RPMFusion. It can be found in the Kodi source tree like so:
# grep ^VERSION tools/depends/target/xbmc-pvr-addons/Makefile
%global commit 9f63d1bc39ffcb28f8aea580ea0669211e4d16e5
%global short_commit %(c=%{commit}; echo ${c:0:7})
%global commit_date 20141212
%global snapshot_release %{commit_date}git%{short_commit}
# %%global tag 14.0-Helix
%global alt_name xbmc-pvr-addons
# Minimum supported version of Kodi
%global kodi_version 14.0
Name: kodi-pvr-addons
Version: 14.0
Release: 0.1.%{snapshot_release}%{?dist}
# Release: 1%%{?dist}
Summary: Kodi PVR add-ons
Group: Applications/Multimedia
# Entire package is GPLv3 (see COPYING). All the PVR addons are GPLv2+. Portions
# of lib/libhts are LGPLv2+. lib/dvblinkremote is MIT
License: GPLv3 and GPLv2+ and LGPLv2+ and MIT
URL: https://github.com/opdenkamp/xbmc-pvr-addons/
Source0: https://github.com/opdenkamp/%{alt_name}/archive/%{short_commit}/%{alt_name}-%{short_commit}.tar.gz
# Source0: https://github.com/opdenkamp/%%{name}/archive/%%{tag}/%%{name}-%%{tag}.tar.gz
# Use system cppmyth library
Patch0: %{name}-14.0-use_external_cppmyth.patch
# Use system jsoncpp library
Patch1: %{name}-14.0-use_external_jsoncpp.patch
# Use system rapidxml library
Patch2: %{name}-14.0-use_external_rapidxml.patch
# Use system tinyxml library
Patch3: %{name}-14.0-use_external_tinyxml.patch
# Use system tinyxml2 library
Patch4: %{name}-14.0-use_external_tinyxml2.patch
# Use system Kodi headers
Patch5: %{name}-14.0-use_external_xbmc.patch
# Fix compilation with cppmyth >= 1.1.0 (see
# https://github.com/janbar/xbmc-pvr-addons/commit/a629869)
Patch6: %{name}-14.0-cppmyth_1.1.0.patch
BuildRequires: cppmyth-devel
BuildRequires: cryptopp-devel
BuildRequires: jsoncpp-devel
BuildRequires: kodi-devel >= %{kodi_version}
BuildRequires: libcurl-devel
BuildRequires: libtool
BuildRequires: mariadb-devel
BuildRequires: mesa-libEGL-devel
BuildRequires: mesa-libGL-devel
BuildRequires: mesa-libGLES-devel
BuildRequires: rapidxml-devel
BuildRequires: tinyxml-devel
BuildRequires: tinyxml2-devel
BuildRequires: zlib-devel
%description
%{summary}.
%package common
Summary: Files common to Kodi PVR addons
Group: Applications/Multimedia
Provides: xbmc-pvr-addons-common = %{version}-%{release}
Obsoletes: xbmc-pvr-addons-common < 14.0
Requires: kodi >= %{kodi_version}
BuildArch: noarch
%description common
This package contains files common to Kodi PVR addons.
%package -n kodi-pvr-argustv
Summary: Kodi frontend for the ARGUS TV PVR
Group: Applications/Multimedia
Requires: %{name}-common = %{version}-%{release}
Provides: xbmc-pvr-argustv = %{version}-%{release}
Obsoletes: xbmc-pvr-argustv < 14.0
%description -n kodi-pvr-argustv
ARGUS TV PVR frontend for Kodi. Supports streaming of Live TV & recordings,
listening to radio channels, EPG and schedules.
%package -n kodi-pvr-demo
Summary: Demo PVR Client for Kodi
Group: Applications/Multimedia
Requires: %{name}-common = %{version}-%{release}
Provides: xbmc-pvr-demo = %{version}-%{release}
Obsoletes: xbmc-pvr-demo < 14.0
%description -n kodi-pvr-demo
%{summary}.
%package -n kodi-pvr-dvblink
Summary: Kodi PVR Plugin for DVBLink
Group: Applications/Multimedia
Requires: %{name}-common = %{version}-%{release}
Provides: xbmc-pvr-dvblink = %{version}-%{release}
Obsoletes: xbmc-pvr-dvblink < 14.0
%description -n kodi-pvr-dvblink
PVR Plugin for DVBLink from DvbLogic.com for Kodi; supporting streaming of Live
TV & recordings, EPG, timers.
%package -n kodi-pvr-dvbviewer
Summary: Kodi's frontend for DVBViewer
Group: Applications/Multimedia
Requires: %{name}-common = %{version}-%{release}
Provides: xbmc-pvr-dvbviewer = %{version}-%{release}
Obsoletes: xbmc-pvr-dvbviewer < 14.0
%description -n kodi-pvr-dvbviewer
DVBViewer Recording Service frontend; supporting streaming of LiveTV, timers,
recordings & EPG.
%package -n kodi-pvr-filmon
Summary: Filmon PVR client for Kodi
Group: Applications/Multimedia
Requires: %{name}-common = %{version}-%{release}
%description -n kodi-pvr-filmon
Filmon frontend. Supports live TV, recordings, EPG. Requires a Filmon
subscription.
Before enabling:
(a) in Filmon set channels as favourite to see them in Kodi
(b) enter your username and password in this addon's settings.
Note: recordings can take several minutes to appear after timer is completed.
%package -n kodi-pvr-hts
Summary: Kodi's frontend for Tvheadend
Group: Applications/Multimedia
Requires: %{name}-common = %{version}-%{release}
Provides: bundled(sha1-niedermayer)
Provides: xbmc-pvr-hts = %{version}-%{release}
Obsoletes: xbmc-pvr-hts < 14.0
%description -n kodi-pvr-hts
Tvheadend frontend; supporting streaming of Live TV & recordings, EPG, timers.
%package -n kodi-pvr-iptvsimple
Summary: Kodi PVR addon for IPTV support
Group: Applications/Multimedia
Requires: %{name}-common = %{version}-%{release}
Provides: xbmc-pvr-iptvsimple = %{version}-%{release}
Obsoletes: xbmc-pvr-iptvsimple < 14.0
%description -n kodi-pvr-iptvsimple
IPTV Simple PVR Client support m3u playlists, streaming of Live TV for
multicast/unicast sources, listening to radio channels and EPG.
%package -n kodi-pvr-mediaportal-tvserver
Summary: Kodi frontend for the MediaPortal TV Server (ffmpeg + tsreader version)
Group: Applications/Multimedia
Requires: %{name}-common = %{version}-%{release}
Provides: xbmc-pvr-mediaportal = %{version}-%{release}
Obsoletes: xbmc-pvr-mediaportal < 14.0
%description -n kodi-pvr-mediaportal-tvserver
MediaPortal TV Server frontend for Kodi. Supports streaming of Live TV &
recordings, listening to radio channels, EPG and timers. This addon combines the
former ffmpeg and tsreader addons.
%package -n kodi-pvr-mythtv
Summary: Kodi frontend for MythTV
Group: Applications/Multimedia
Requires: %{name}-common = %{version}-%{release}
# mythtv-cmyth addon replaced by mythtv addon since XBMC/Kodi 14.0
Provides: xbmc-pvr-mythtv-cmyth = %{version}-%{release}
Obsoletes: xbmc-pvr-mythtv-cmyth < 14.0
%description -n kodi-pvr-mythtv
MythTV frontend (up to MythTV 0.28). Supports streaming of Live TV & recordings,
listening to radio channels, EPG and timers.
%package -n kodi-pvr-nextpvr
Summary: Kodi frontend for the NextPVR
Group: Applications/Multimedia
Requires: %{name}-common = %{version}-%{release}
Provides: bundled(md5-plumb)
Provides: xbmc-pvr-nextpvr = %{version}-%{release}
Obsoletes: xbmc-pvr-nextpvr < 14.0
%description -n kodi-pvr-nextpvr
NextPVR frontend for Kodi. Supports streaming of Live TV & recordings, listening
to radio channels and EPG.
%package -n kodi-pvr-njoy
Summary: Njoy N7 PVR Client for Kodi
Group: Applications/Multimedia
Requires: %{name}-common = %{version}-%{release}
Provides: xbmc-pvr-njoy = %{version}-%{release}
Obsoletes: xbmc-pvr-njoy < 14.0
%description -n kodi-pvr-njoy
%{summary}.
%package -n kodi-pvr-vdr-vnsi
Summary: PVR client to connect VDR to Kodi over the VNSI interface
Group: Applications/Multimedia
Requires: %{name}-common = %{version}-%{release}
Provides: xbmc-pvr-vdr-vnsi = %{version}-%{release}
Obsoletes: xbmc-pvr-vdr-vnsi < 14.0
%description -n kodi-pvr-vdr-vnsi
VDR frontend for Kodi; supporting streaming of Live TV & recordings, EPG, timers
over the VNSI plugin.
NOTE: this package requires the VNSI plugin (package vdr-vnsiserver on Fedora)
to be installed on the VDR backend.
%package -n kodi-pvr-vuplus
Summary: Kodi's frontend for VU+/Enigma2 based settop boxes
Group: Applications/Multimedia
Requires: %{name}-common = %{version}-%{release}
Provides: xbmc-pvr-vuplus = %{version}-%{release}
Obsoletes: xbmc-pvr-vuplus < 14.0
%description -n kodi-pvr-vuplus
VU+ frontend; supporting streaming of Live TV & recordings, EPG, timers.
%package -n kodi-pvr-wmc
Summary: Windows Media Center client for Kodi
Group: Applications/Multimedia
Requires: %{name}-common = %{version}-%{release}
Provides: xbmc-pvr-wmc = %{version}-%{release}
Obsoletes: xbmc-pvr-wmc < 14.0
%description -n kodi-pvr-wmc
A Kodi client to interface to Windows Media Center's record and EPG service.
%prep
%setup -q -n %{alt_name}-%{commit}
# %%setup -q -n %%{alt_name}-%%{tag}
%patch0 -p0 -b .use_external_cppmyth
%patch1 -p0 -b .use_external_jsoncpp
%patch2 -p0 -b .use_external_rapidxml
%patch3 -p0 -b .use_external_tinyxml
%patch4 -p0 -b .use_external_tinyxml2
%patch5 -p0 -b .use_external_xbmc
%patch6 -p1 -b .cppmyth_1.1.0
# Delete bundled libraries jsoncpp, rapidxml, and tinyxml2
rm -r lib/{cppmyth,jsoncpp,rapidxml,tinyxml2}/
# Delete bundled tinyxml, but keep wrapper files provided by Kodi developers
rm lib/tinyxml/{readme.txt,tiny*}
# Delete bundled Kodi headers
rm -r xbmc/{*.h,xbmc_stream_utils.hpp,NOTE}
# Fix permissions
chmod 0644 addons/pvr.demo/addon/{genre-numbers.txt,README.md}
%build
[ -f configure ] || ./bootstrap
%configure \
--enable-addons-with-dependencies \
--libdir=%{_libdir}/kodi/addons/ \
--datadir=%{_datadir}/kodi/addons/
make %{?_smp_mflags}
%install
%make_install
# Fix permissions at installation (see
# https://github.com/opdenkamp/xbmc-pvr-addons/pull/303)
find $RPM_BUILD_ROOT%{_datadir}/kodi/addons/ -type f -exec chmod 0644 {} \;
%files common
# TODO: add ChangeLog and NEWS if non-empty
%doc AUTHORS COPYING README
%files -n kodi-pvr-argustv
%doc addons/pvr.argustv/addon/changelog.txt
%{_libdir}/kodi/addons/pvr.argustv/
%{_datadir}/kodi/addons/pvr.argustv/
%files -n kodi-pvr-demo
%doc addons/pvr.demo/addon/{genre-numbers.txt,README.md}
%{_libdir}/kodi/addons/pvr.demo/
%{_datadir}/kodi/addons/pvr.demo/
%files -n kodi-pvr-dvblink
%doc addons/pvr.dvblink/addon/changelog.txt
%{_libdir}/kodi/addons/pvr.dvblink/
%{_datadir}/kodi/addons/pvr.dvblink/
%files -n kodi-pvr-dvbviewer
%doc addons/pvr.dvbviewer/addon/changelog.txt
%{_libdir}/kodi/addons/pvr.dvbviewer/
%{_datadir}/kodi/addons/pvr.dvbviewer/
%files -n kodi-pvr-filmon
%doc addons/pvr.filmon/addon/changelog.txt
%{_libdir}/kodi/addons/pvr.filmon/
%{_datadir}/kodi/addons/pvr.filmon/
%files -n kodi-pvr-hts
%doc addons/pvr.hts/addon/changelog.txt
%{_libdir}/kodi/addons/pvr.hts/
%{_datadir}/kodi/addons/pvr.hts/
%files -n kodi-pvr-iptvsimple
%doc addons/pvr.iptvsimple/addon/changelog.txt
%{_libdir}/kodi/addons/pvr.iptvsimple/
%{_datadir}/kodi/addons/pvr.iptvsimple/
%files -n kodi-pvr-mediaportal-tvserver
%doc addons/pvr.mediaportal.tvserver/{addon/changelog.txt,addon/LICENSE.txt,src/README}
%{_libdir}/kodi/addons/pvr.mediaportal.tvserver/
%{_datadir}/kodi/addons/pvr.mediaportal.tvserver/
%files -n kodi-pvr-mythtv
%doc addons/pvr.mythtv/addon/changelog.txt
%{_libdir}/kodi/addons/pvr.mythtv/
%{_datadir}/kodi/addons/pvr.mythtv/
%files -n kodi-pvr-nextpvr
%doc addons/pvr.nextpvr/addon/changelog.txt
%{_libdir}/kodi/addons/pvr.nextpvr/
%{_datadir}/kodi/addons/pvr.nextpvr/
%files -n kodi-pvr-njoy
%{_libdir}/kodi/addons/pvr.njoy/
%{_datadir}/kodi/addons/pvr.njoy/
%files -n kodi-pvr-vdr-vnsi
%{_libdir}/kodi/addons/pvr.vdr.vnsi/
%{_datadir}/kodi/addons/pvr.vdr.vnsi/
%files -n kodi-pvr-vuplus
%doc addons/pvr.vuplus/addon/changelog.txt
%{_libdir}/kodi/addons/pvr.vuplus/
%{_datadir}/kodi/addons/pvr.vuplus/
%files -n kodi-pvr-wmc
%doc addons/pvr.wmc/addon/changelog.txt
%{_libdir}/kodi/addons/pvr.wmc/
%{_datadir}/kodi/addons/pvr.wmc/
%changelog
* Mon Dec 29 2014 Mohamed El Morabity <melmorabity at fedoraproject.org> - 14.0-0.1.20140716git9f63d1b
- Sync with Kodi 14.0
- Rename to kodi-pvr-addons
* Wed Aug 06 2014 Mohamed El Morabity <melmorabity at fedoraproject.org> - 13.0-2.20140716gitbe12a8d
- Sync with XBMC 13.2 beta3
- Use bundled (and heavily patched!) version of dvblinkremote library
- Use system tinyxml2 library to build dvblinkremote instead of bundled one
* Tue May 13 2014 Mohamed El Morabity <melmorabity at fedoraproject.org> - 13.0-1
- Update to 13.0
- Drop empty M3U file provided by the iptvsimple addon
- Add upstream report links for each packaging issue in comments
- Add common subpackage for common license/documentation files
- Add missing license GPLv3
- Drop vdr-vnsiserver subpackage (now a separate project, packaged in Fedora)
* Fri May 09 2014 Mohamed El Morabity <melmorabity at fedoraproject.org> - 13.0-0.4.Gotham_rc1
- Fix build on Fedora 21 (thanks to Ken Dreyer)
- Fix license tag
- Spec cleanup
- Add Provides for bundled implementations of MD5 and SHA1 (copylibs)
* Fri May 02 2014 Mohamed El Morabity <melmorabity at fedoraproject.org> - 13.0-0.3.Gotham_rc1
- Sync with XBMC Gotham_rc1
* Mon Mar 24 2014 Mohamed El Morabity <melmorabity at fedoraproject.org> - 13.0-0.2.20140314git1d9e336
- Sync with XBMC Gotham_beta2
- Drop embedded dvblinkremote and tinyxml2 libraries
- Add new dvblink and wmc subpackages
* Tue Feb 11 2014 Mohamed El Morabity <melmorabity at fedoraproject.org> - 13.0-0.1.20130907git18597fd
- Initial RPM release
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/kodi-pvr-addons/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 30 Dec 2014 13:59:21 -0000 1.1
+++ .cvsignore 2 Jan 2015 00:42:04 -0000 1.2
@@ -0,0 +1 @@
+xbmc-pvr-addons-9f63d1b.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/kodi-pvr-addons/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 30 Dec 2014 13:59:21 -0000 1.1
+++ sources 2 Jan 2015 00:42:04 -0000 1.2
@@ -0,0 +1 @@
+9410396755337bc19bc57ce8c70cf386 xbmc-pvr-addons-9f63d1b.tar.gz
More information about the rpmfusion-commits
mailing list