rpms/xbmc-pvr-addons/devel xbmc-pvr-addons-13.0-snprintf.patch, NONE, 1.1 xbmc-pvr-addons-13.0-use_external_dvblinkremote.patch, NONE, 1.1 xbmc-pvr-addons-13.0-use_external_jsoncpp.patch, NONE, 1.1 xbmc-pvr-addons-13.0-use_external_rapidxml.patch, NONE, 1.1 xbmc-pvr-addons-13.0-use_external_tinyxml.patch, NONE, 1.1 xbmc-pvr-addons-13.0-use_external_xbmc.patch, NONE, 1.1 xbmc-pvr-addons.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Mohamed ElMorabity melmorabity at rpmfusion.org
Thu May 29 01:00:42 CEST 2014 

Author: melmorabity

Update of /cvs/free/rpms/xbmc-pvr-addons/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv32162/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xbmc-pvr-addons-13.0-snprintf.patch 
	xbmc-pvr-addons-13.0-use_external_dvblinkremote.patch 
	xbmc-pvr-addons-13.0-use_external_jsoncpp.patch 
	xbmc-pvr-addons-13.0-use_external_rapidxml.patch 
	xbmc-pvr-addons-13.0-use_external_tinyxml.patch 
	xbmc-pvr-addons-13.0-use_external_xbmc.patch 
	xbmc-pvr-addons.spec 
Log Message:
First import


xbmc-pvr-addons-13.0-snprintf.patch:
 pvr2wmc.cpp |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

--- NEW FILE xbmc-pvr-addons-13.0-snprintf.patch ---
>From 861d28549f972e07f43838d56175e130810d7823 Mon Sep 17 00:00:00 2001
From: Ken Dreyer <ktdreyer at ktdreyer.com>
Date: Thu, 8 May 2014 15:32:46 -0600
Subject: [PATCH] [pvr.wmc] use safe format arg to snprintf

Prior to this commit, the wmc PVR addon failed to build if
-Werror=format-security was used. The compiler could not examine the
contents of the results array.

Adjust the snprintf calls so that the format string is a string literal.

Fedora recently enabled this compiler option in their RPM builds, so
this fixes the build on Fedora 21.
---
 addons/pvr.wmc/src/pvr2wmc.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/pvr.wmc/src/pvr2wmc.cpp b/addons/pvr.wmc/src/pvr2wmc.cpp
index 094f930..74db379 100644
--- a/addons/pvr.wmc/src/pvr2wmc.cpp
+++ b/addons/pvr.wmc/src/pvr2wmc.cpp
@@ -1087,11 +1087,11 @@ PVR_ERROR Pvr2Wmc::SignalStatus(PVR_SIGNAL_STATUS &signalStatus)
 			if (results.size() >= 9)
 			{
 				memset(&cachedSignalStatus, 0, sizeof(cachedSignalStatus));
-				snprintf(signalStatus.strAdapterName, sizeof(signalStatus.strAdapterName), results[0]);
-				snprintf(signalStatus.strAdapterStatus, sizeof(signalStatus.strAdapterStatus), results[1]);
-				snprintf(signalStatus.strProviderName, sizeof(signalStatus.strProviderName), results[2]);
-				snprintf(signalStatus.strServiceName, sizeof(signalStatus.strServiceName), results[3]);
-				snprintf(signalStatus.strMuxName, sizeof(signalStatus.strMuxName), results[4]);
+				snprintf(signalStatus.strAdapterName, sizeof(signalStatus.strAdapterName), "%s", results[0].c_str());
+				snprintf(signalStatus.strAdapterStatus, sizeof(signalStatus.strAdapterStatus), "%s", results[1].c_str());
+				snprintf(signalStatus.strProviderName, sizeof(signalStatus.strProviderName), "%s", results[2].c_str());
+				snprintf(signalStatus.strServiceName, sizeof(signalStatus.strServiceName), "%s", results[3].c_str());
+				snprintf(signalStatus.strMuxName, sizeof(signalStatus.strMuxName), "%s", results[4].c_str());
 				signalStatus.iSignal = atoi(results[5]) * 655.35;
 				signalStatus.dVideoBitrate = atof(results[6]);
 				signalStatus.dAudioBitrate = atof(results[7]);
-- 
1.9.1


xbmc-pvr-addons-13.0-use_external_dvblinkremote.patch:
 addons/pvr.dvblink/Makefile.am |    2 +-
 configure.ac                   |    2 --
 lib/Makefile.am                |    2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

--- NEW FILE xbmc-pvr-addons-13.0-use_external_dvblinkremote.patch ---
diff -up ./addons/pvr.dvblink/Makefile.am.orig ./addons/pvr.dvblink/Makefile.am
--- ./addons/pvr.dvblink/Makefile.am.orig	2014-03-14 11:52:32.000000000 +0100
+++ ./addons/pvr.dvblink/Makefile.am	2014-03-24 01:32:58.870000000 +0100
@@ -10,7 +10,7 @@ ADDONNAME       = pvr.dvblink
 LIBNAME         = libdvblink-addon
 lib_LTLIBRARIES = libdvblink-addon.la
 
-LIBS            = @abs_top_srcdir@/lib/libdvblinkremote/libdvblinkremote.la
+LIBS            = -ldvblinkremote
 
 include ../Makefile.include.am
 
diff -up ./configure.ac.orig ./configure.ac
--- ./configure.ac.orig	2014-03-22 05:37:02.727000000 +0100
+++ ./configure.ac	2014-03-24 01:27:17.645000000 +0100
@@ -269,8 +269,6 @@ AC_CONFIG_FILES([Makefile \
                  lib/cmyth/Makefile \
                  lib/cmyth/libcmyth/Makefile \
                  lib/cmyth/librefmem/Makefile \
-                 lib/tinyxml2/Makefile \
-                 lib/libdvblinkremote/Makefile \
                  addons/Makefile \
                  addons/pvr.demo/Makefile \
                  addons/pvr.dvbviewer/Makefile \
diff -up ./lib/Makefile.am.orig ./lib/Makefile.am
--- ./lib/Makefile.am.orig	2014-03-22 05:40:03.030000000 +0100
+++ ./lib/Makefile.am	2014-03-24 02:07:17.832000000 +0100
@@ -2,7 +2,7 @@ if ADDON_MYTHTV
           ADDITIONAL_SUBDIRS = cmyth
 endif
 
-SUBDIRS = libhts tinyxml2 libdvblinkremote $(ADDITIONAL_SUBDIRS)
+SUBDIRS = libhts $(ADDITIONAL_SUBDIRS)
 
 zip:
 

xbmc-pvr-addons-13.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 xbmc-pvr-addons-13.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-03-14 11:52:32.000000000 +0100
+++ ./addons/pvr.argustv/Makefile.am	2014-03-22 05:27:06.543000000 +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-03-14 11:52:32.000000000 +0100
+++ ./configure.ac	2014-03-22 05:27:54.844000000 +0100
@@ -265,7 +265,6 @@ AC_SUBST(DATADIR)
 
 AC_CONFIG_FILES([Makefile \
                  lib/Makefile \
-                 lib/jsoncpp/Makefile \
                  lib/libhts/Makefile \
                  lib/tinyxml/Makefile \
                  lib/cmyth/Makefile \
diff -up ./lib/Makefile.am.orig ./lib/Makefile.am
--- ./lib/Makefile.am.orig	2014-03-14 11:52:32.000000000 +0100
+++ ./lib/Makefile.am	2014-03-22 05:28:17.299000000 +0100
@@ -2,7 +2,7 @@ if ADDON_MYTHTV
           ADDITIONAL_SUBDIRS = cmyth
 endif
 
-SUBDIRS = libhts tinyxml tinyxml2 jsoncpp libdvblinkremote $(ADDITIONAL_SUBDIRS)
+SUBDIRS = libhts tinyxml tinyxml2 libdvblinkremote $(ADDITIONAL_SUBDIRS)
 
 zip:
 

xbmc-pvr-addons-13.0-use_external_rapidxml.patch:
 PVRIptvData.cpp |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE xbmc-pvr-addons-13.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-03-14 11:52:32.000000000 +0100
+++ ./addons/pvr.iptvsimple/src/PVRIptvData.cpp	2014-03-24 03:23:17.168000000 +0100
@@ -27,7 +27,7 @@
 #include <fstream>
 #include <map>
 #include "zlib.h"
-#include "rapidxml/rapidxml.hpp"
+#include "rapidxml.h"
 #include "PVRIptvData.h"
 
 #define M3U_START_MARKER        "#EXTM3U"
@@ -1004,4 +1004,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
+}

xbmc-pvr-addons-13.0-use_external_tinyxml.patch:
 addons/pvr.demo/Makefile.am                        |    2 +-
 addons/pvr.dvbviewer/Makefile.am                   |    2 +-
 addons/pvr.dvbviewer/src/DvbData.cpp               |    2 +-
 addons/pvr.mediaportal.tvserver/Makefile.am        |    2 +-
 addons/pvr.mediaportal.tvserver/src/GenreTable.cpp |    2 +-
 addons/pvr.nextpvr/Makefile.am                     |    2 +-
 addons/pvr.nextpvr/src/pvrclient-nextpvr.cpp       |    2 +-
 addons/pvr.njoy/Makefile.am                        |    2 +-
 addons/pvr.njoy/src/N7Xml.cpp                      |    2 +-
 addons/pvr.vuplus/Makefile.am                      |    2 +-
 addons/pvr.vuplus/src/VuData.h                     |    2 +-
 addons/pvr.wmc/Makefile.am                         |    2 +-
 configure.ac                                       |    1 -
 lib/Makefile.am                                    |    2 +-
 14 files changed, 13 insertions(+), 14 deletions(-)

--- NEW FILE xbmc-pvr-addons-13.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-05-07 01:53:24.000000000 +0200
+++ ./addons/pvr.demo/Makefile.am	2014-05-13 14:47:04.295458751 +0200
@@ -10,7 +10,7 @@ ADDONNAME       = pvr.demo
 LIBNAME         = libpvrdemo-addon
 lib_LTLIBRARIES = libpvrdemo-addon.la
 
-LIBS            = @abs_top_srcdir@/lib/tinyxml/libtinyxml.la
+LIBS            = -ltinyxml
 
 include ../Makefile.include.am
 
diff -up ./addons/pvr.dvbviewer/Makefile.am.orig ./addons/pvr.dvbviewer/Makefile.am
--- ./addons/pvr.dvbviewer/Makefile.am.orig	2014-05-07 01:53:24.000000000 +0200
+++ ./addons/pvr.dvbviewer/Makefile.am	2014-05-13 14:52:41.261469200 +0200
@@ -10,7 +10,7 @@ ADDONNAME       = pvr.dvbviewer
 LIBNAME         = libdvbviewer-addon
 lib_LTLIBRARIES = libdvbviewer-addon.la
 
-LIBS            = @abs_top_srcdir@/lib/tinyxml/libtinyxml.la
+LIBS            = -ltinyxml
 
 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-05-07 01:53:24.000000000 +0200
+++ ./addons/pvr.dvbviewer/src/DvbData.cpp	2014-05-13 14:47:43.566459969 +0200
@@ -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-05-07 01:53:24.000000000 +0200
+++ ./addons/pvr.mediaportal.tvserver/Makefile.am	2014-05-13 14:47:04.296458751 +0200
@@ -10,7 +10,7 @@ ADDONNAME       = pvr.mediaportal.tvserv
 LIBNAME         = libmediaportal-addon
 lib_LTLIBRARIES = libmediaportal-addon.la
 
-LIBS            = @abs_top_srcdir@/lib/tinyxml/libtinyxml.la
+LIBS            = -ltinyxml
 
 include ../Makefile.include.am
 
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-05-07 01:53:24.000000000 +0200
+++ ./addons/pvr.mediaportal.tvserver/src/GenreTable.cpp	2014-05-13 14:47:04.296458751 +0200
@@ -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-05-07 01:53:24.000000000 +0200
+++ ./addons/pvr.nextpvr/Makefile.am	2014-05-13 14:47:04.297458751 +0200
@@ -10,7 +10,7 @@ ADDONNAME       = pvr.nextpvr
 LIBNAME         = libnextpvr-addon
 lib_LTLIBRARIES = libnextpvr-addon.la
 
-LIBS            = @abs_top_srcdir@/lib/tinyxml/libtinyxml.la
+LIBS            = -ltinyxml
 
 include ../Makefile.include.am
 
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-05-07 01:53:24.000000000 +0200
+++ ./addons/pvr.nextpvr/src/pvrclient-nextpvr.cpp	2014-05-13 14:47:04.298458751 +0200
@@ -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-05-07 01:53:24.000000000 +0200
+++ ./addons/pvr.njoy/Makefile.am	2014-05-13 14:47:04.299458751 +0200
@@ -10,7 +10,7 @@ ADDONNAME       = pvr.njoy
 LIBNAME         = libpvrnjoy-addon
 lib_LTLIBRARIES = libpvrnjoy-addon.la
 
-LIBS            = @abs_top_srcdir@/lib/tinyxml/libtinyxml.la
+LIBS            = -ltinyxml
 
 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-05-07 01:53:24.000000000 +0200
+++ ./addons/pvr.njoy/src/N7Xml.cpp	2014-05-13 14:47:04.299458751 +0200
@@ -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-05-07 01:53:24.000000000 +0200
+++ ./addons/pvr.vuplus/Makefile.am	2014-05-13 14:47:04.300458751 +0200
@@ -10,7 +10,7 @@ ADDONNAME       = pvr.vuplus
 LIBNAME         = libvuplus-addon
 lib_LTLIBRARIES = libvuplus-addon.la
 
-LIBS            = @abs_top_srcdir@/lib/tinyxml/libtinyxml.la
+LIBS            = -ltinyxml
 
 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-05-07 01:53:24.000000000 +0200
+++ ./addons/pvr.vuplus/src/VuData.h	2014-05-13 14:47:04.301458751 +0200
@@ -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-05-07 01:53:24.000000000 +0200
+++ ./addons/pvr.wmc/Makefile.am	2014-05-13 14:47:04.302458751 +0200
@@ -10,7 +10,7 @@ ADDONNAME       = pvr.wmc
 LIBNAME         = libpvrwmc-addon
 lib_LTLIBRARIES = libpvrwmc-addon.la
 
-LIBS            = @abs_top_srcdir@/lib/tinyxml/libtinyxml.la
+LIBS            = -ltinyxml
 
 include ../Makefile.include.am
 
diff -up ./configure.ac.orig ./configure.ac
--- ./configure.ac.orig	2014-05-13 14:45:39.950456136 +0200
+++ ./configure.ac	2014-05-13 14:47:04.303458751 +0200
@@ -266,7 +266,6 @@ AC_SUBST(DATADIR)
 AC_CONFIG_FILES([Makefile \
                  lib/Makefile \
                  lib/libhts/Makefile \
-                 lib/tinyxml/Makefile \
                  lib/cmyth/Makefile \
                  lib/cmyth/libcmyth/Makefile \
                  lib/cmyth/librefmem/Makefile \
diff -up ./lib/Makefile.am.orig ./lib/Makefile.am
--- ./lib/Makefile.am.orig	2014-05-13 14:45:39.951456136 +0200
+++ ./lib/Makefile.am	2014-05-13 14:47:04.303458751 +0200
@@ -2,7 +2,7 @@ if ADDON_MYTHTV
           ADDITIONAL_SUBDIRS = cmyth
 endif
 
-SUBDIRS = libhts tinyxml tinyxml2 libdvblinkremote $(ADDITIONAL_SUBDIRS)
+SUBDIRS = libhts tinyxml2 libdvblinkremote $(ADDITIONAL_SUBDIRS)
 
 zip:
 

xbmc-pvr-addons-13.0-use_external_xbmc.patch:
 Makefile.include.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xbmc-pvr-addons-13.0-use_external_xbmc.patch ---
diff -up ./addons/Makefile.include.am.orig ./addons/Makefile.include.am
--- ./addons/Makefile.include.am.orig	2014-03-14 11:52:32.000000000 +0100
+++ ./addons/Makefile.include.am	2014-03-24 02:37:18.045000000 +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/xbmc -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 xbmc-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 XBMC version
# available in RPMFusion. It can be found in the XBMC source tree like so:
#   grep ^VERSION tools/depends/target/xbmc-pvr-addons/Makefile
#global commit 2955e1dd62f4047b2782cb927f7671ae209f20d8
#global short_commit %%(c=%%{commit}; echo ${c:0:7})
#global commit_date 20140462
#global prerelease %%{commit_date}git%%{short_commit}
%global tag 13.0-Gotham

# Minimum supported version of XBMC
%global xbmc_version 13.0-0.14.Gotham_rc1

Name:           xbmc-pvr-addons
Version:        13.0
Release:        1%{?dist}
Summary:        XBMC PVR add-ons

Group:          Applications/Multimedia
# Entire package is GPLv3 (see COPYING). All the PVR addons are GPLv2+. Portions
# of lib/libhts and lib/cmyth are LGPLv2+
License:        GPLv3 and GPLv2+ and LGPLv2+
URL:            https://github.com/opdenkamp/xbmc-pvr-addons
Source0:        https://github.com/opdenkamp/%{name}/archive/%{tag}/%{name}-%{tag}.tar.gz
# Use system jsoncpp library
Patch0:         %{name}-13.0-use_external_jsoncpp.patch
# Use system rapidxml library
Patch1:         %{name}-13.0-use_external_rapidxml.patch
# Use system tinyxml library
Patch2:         %{name}-13.0-use_external_tinyxml.patch
# Use system dvblinkremote library
Patch3:         %{name}-13.0-use_external_dvblinkremote.patch
# Use system XBMC headers
Patch4:         %{name}-13.0-use_external_xbmc.patch
# Use safe format arg to snprintf to fix build on Fedora 21 (see
# https://github.com/opdenkamp/xbmc-pvr-addons/pull/296)
Patch5:         %{name}-13.0-snprintf.patch

BuildRequires:  boost-devel
BuildRequires:  dvblinkremote-devel
BuildRequires:  jsoncpp-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:  vdr-devel
BuildRequires:  xbmc-devel >= %{xbmc_version}
BuildRequires:  zlib-devel

%description
%{summary}.


%package        common
Summary:        Files common to XBMC PVR addons
Group:          Applications/Multimedia
BuildArch:      noarch

%description    common
This package contains files common to XBMC PVR addons.


%package -n     xbmc-pvr-argustv
Summary:        XBMC frontend for the ARGUS TV PVR
Group:          Applications/Multimedia
Requires:       %{name}-common = %{version}-%{release}
Requires:       xbmc >= %{xbmc_version}


%description -n xbmc-pvr-argustv
ARGUS TV PVR frontend for XBMC. Supports streaming of Live TV & recordings,
listening to radio channels, EPG and schedules.


%package -n     xbmc-pvr-demo
Summary:        Demo PVR Client for XBMC
Group:          Applications/Multimedia
Requires:       %{name}-common = %{version}-%{release}
Requires:       xbmc >= %{xbmc_version}


%description -n xbmc-pvr-demo
%{summary}.


%package -n     xbmc-pvr-dvblink
Summary:        XBMC PVR Plugin for DVBLink
Group:          Applications/Multimedia
Requires:       %{name}-common = %{version}-%{release}
Requires:       xbmc >= %{xbmc_version}


%description -n xbmc-pvr-dvblink
PVR Plugin for DVBLink from DvbLogic.com for XBMC; supporting streaming of Live
TV & recordings, EPG, timers.


%package -n     xbmc-pvr-dvbviewer
Summary:        XBMC's frontend for DVBViewer
Group:          Applications/Multimedia
Requires:       %{name}-common = %{version}-%{release}
Requires:       xbmc >= %{xbmc_version}


%description -n xbmc-pvr-dvbviewer
DVBViewer Recording Service frontend; supporting streaming of LiveTV, timers,
recordings & EPG.


%package -n     xbmc-pvr-hts
Summary:        XBMC's frontend for Tvheadend
Group:          Applications/Multimedia
Requires:       %{name}-common = %{version}-%{release}
Requires:       xbmc >= %{xbmc_version}

Provides:       bundled(sha1-niedermayer)

%description -n xbmc-pvr-hts
Tvheadend frontend; supporting streaming of Live TV & recordings, EPG, timers.


%package -n     xbmc-pvr-iptvsimple
Summary:        XBMC PVR addon for IPTV support
Group:          Applications/Multimedia
Requires:       %{name}-common = %{version}-%{release}
Requires:       xbmc >= %{xbmc_version}


%description -n xbmc-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     xbmc-pvr-mediaportal-tvserver
Summary:        XBMC frontend for the MediaPortal TV Server (ffmpeg + tsreader version)
Group:          Applications/Multimedia
Requires:       %{name}-common = %{version}-%{release}
Requires:       xbmc >= %{xbmc_version}


%description -n xbmc-pvr-mediaportal-tvserver
MediaPortal TV Server frontend for XBMC. Supports streaming of Live TV &
recordings, listening to radio channels, EPG and timers. This addon combines the
former ffmpeg and tsreader addons.


%package -n     xbmc-pvr-mythtv-cmyth
Summary:        XBMC frontend for MythTV (using libcmyth)
Group:          Applications/Multimedia
Requires:       %{name}-common = %{version}-%{release}
Requires:       xbmc >= %{xbmc_version}


%description -n xbmc-pvr-mythtv-cmyth
MythTV frontend (up to MythTV 0.27). Supports streaming of Live TV & recordings,
listening to radio channels, EPG and timers.


%package -n     xbmc-pvr-nextpvr
Summary:        XBMC frontend for the NextPVR
Group:          Applications/Multimedia
Requires:       %{name}-common = %{version}-%{release}
Requires:       xbmc >= %{xbmc_version}

Provides:       bundled(md5-plumb)

%description -n xbmc-pvr-nextpvr
NextPVR frontend for XBMC. Supports streaming of Live TV & recordings, listening
to radio channels and EPG.


%package -n     xbmc-pvr-njoy
Summary:        Njoy N7 PVR Client for XBMC
Group:          Applications/Multimedia
Requires:       %{name}-common = %{version}-%{release}
Requires:       xbmc >= %{xbmc_version}


%description -n xbmc-pvr-njoy
%{summary}.


%package -n     xbmc-pvr-vdr-vnsi
Summary:        PVR client to connect VDR to XBMC over the VNSI interface
Group:          Applications/Multimedia
Requires:       %{name}-common = %{version}-%{release}
Requires:       xbmc >= %{xbmc_version}


%description -n xbmc-pvr-vdr-vnsi
VDR frontend for XBMC; 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     xbmc-pvr-vuplus
Summary:        XBMC's frontend for VU+ / Enigma2 based settop boxes
Group:          Applications/Multimedia
Requires:       %{name}-common = %{version}-%{release}
Requires:       xbmc >= %{xbmc_version}


%description -n xbmc-pvr-vuplus
VU+ frontend; supporting streaming of Live TV & recordings, EPG, timers.


%package -n     xbmc-pvr-wmc
Summary:        Windows Media Center client for XBMC
Group:          Applications/Multimedia
Requires:       %{name}-common = %{version}-%{release}
Requires:       xbmc >= %{xbmc_version}


%description -n xbmc-pvr-wmc
An XBMC client to interface to Windows Media Center's record and EPG service.


%prep
%setup -q -n %{name}-%{tag}
%patch0 -p0 -b .use_external_jsoncpp
%patch1 -p0 -b .use_external_rapidxml
%patch2 -p0 -b .use_external_tinyxml
%patch3 -p0 -b .use_external_dvblinkremote
%patch4 -p0 -b .use_external_xbmc
%patch5 -p1 -b .snprintf

# Delete bundled libraries dvblinkremote, jsoncpp, rapidxml, and tinyxml2
rm -r lib/{jsoncpp,libdvblinkremote,rapidxml,tinyxml2}/
# Delete bundled tinyxml, but keep wrapper headers provided by XBMC developers
rm lib/tinyxml/{Makefile.am,readme.txt,tiny*}
# Delete bundled XBMC headers
rm -r xbmc/{*.h,xbmc_stream_utils.hpp}

# Delete empty M3U file provided by the iptvsimple addon (see
# https://github.com/opdenkamp/xbmc-pvr-addons/pull/298)
rm addons/pvr.iptvsimple/addon/iptv.m3u


%build
[ -f configure ] || ./bootstrap
%configure \
  --enable-addons-with-dependencies \
  --libdir=%{_libdir}/xbmc/addons/ \
  --datadir=%{_datadir}/xbmc/addons/
make %{?_smp_mflags}


%install
%make_install

# Fix permissions (see https://github.com/opdenkamp/xbmc-pvr-addons/pull/303)
find $RPM_BUILD_ROOT%{_datadir}/xbmc/addons/ -type f -exec chmod 0644 {} \;

# Delete useless files (see
# https://github.com/opdenkamp/xbmc-pvr-addons/pull/301)
rm $RPM_BUILD_ROOT%{_datadir}/xbmc/addons/*/*.in


%files common
# TODO: add ChangeLog and NEWS if non-empty
%doc AUTHORS COPYING README


%files -n xbmc-pvr-argustv
%doc addons/pvr.argustv/addon/changelog.txt
%{_libdir}/xbmc/addons/pvr.argustv/
%{_datadir}/xbmc/addons/pvr.argustv/


%files -n xbmc-pvr-demo
%{_libdir}/xbmc/addons/pvr.demo/
%{_datadir}/xbmc/addons/pvr.demo/


%files -n xbmc-pvr-dvblink
%doc addons/pvr.dvblink/addon/changelog.txt
%{_libdir}/xbmc/addons/pvr.dvblink/
%{_datadir}/xbmc/addons/pvr.dvblink/


%files -n xbmc-pvr-dvbviewer
%doc addons/pvr.dvbviewer/addon/changelog.txt
%{_libdir}/xbmc/addons/pvr.dvbviewer/
%{_datadir}/xbmc/addons/pvr.dvbviewer/


%files -n xbmc-pvr-hts
%doc addons/pvr.hts/addon/changelog.txt
%{_libdir}/xbmc/addons/pvr.hts/
%{_datadir}/xbmc/addons/pvr.hts/


%files -n xbmc-pvr-iptvsimple
%doc addons/pvr.iptvsimple/addon/changelog.txt
%{_libdir}/xbmc/addons/pvr.iptvsimple/
%{_datadir}/xbmc/addons/pvr.iptvsimple/


%files -n xbmc-pvr-mediaportal-tvserver
%doc addons/pvr.mediaportal.tvserver/{addon/changelog.txt,addon/LICENSE.txt,src/README}
%{_libdir}/xbmc/addons/pvr.mediaportal.tvserver/
%{_datadir}/xbmc/addons/pvr.mediaportal.tvserver/


%files -n xbmc-pvr-mythtv-cmyth
%doc addons/pvr.mythtv.cmyth/addon/changelog.txt
%{_libdir}/xbmc/addons/pvr.mythtv.cmyth/
%{_datadir}/xbmc/addons/pvr.mythtv.cmyth/


%files -n xbmc-pvr-nextpvr
%doc addons/pvr.nextpvr/addon/changelog.txt
%{_libdir}/xbmc/addons/pvr.nextpvr/
%{_datadir}/xbmc/addons/pvr.nextpvr/


%files -n xbmc-pvr-njoy
%{_libdir}/xbmc/addons/pvr.njoy/
%{_datadir}/xbmc/addons/pvr.njoy/


%files -n xbmc-pvr-vdr-vnsi
%{_libdir}/xbmc/addons/pvr.vdr.vnsi/
%{_datadir}/xbmc/addons/pvr.vdr.vnsi/


%files -n xbmc-pvr-vuplus
%doc addons/pvr.vuplus/addon/changelog.txt
%{_libdir}/xbmc/addons/pvr.vuplus/
%{_datadir}/xbmc/addons/pvr.vuplus/


%files -n xbmc-pvr-wmc
%{_libdir}/xbmc/addons/pvr.wmc/
%{_datadir}/xbmc/addons/pvr.wmc/


%changelog
* 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/xbmc-pvr-addons/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 May 2014 18:15:19 -0000	1.1
+++ .cvsignore	28 May 2014 23:00:42 -0000	1.2
@@ -0,0 +1 @@
+xbmc-pvr-addons-13.0-Gotham.tar.gz


Index: sources
===================================================================
RCS file: /cvs/free/rpms/xbmc-pvr-addons/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 May 2014 18:15:20 -0000	1.1
+++ sources	28 May 2014 23:00:42 -0000	1.2
@@ -0,0 +1 @@
+63f5863393ca869eb6f357a62de76378  xbmc-pvr-addons-13.0-Gotham.tar.gz

More information about the rpmfusion-commits mailing list