rpms/xbmc-pvr-addons/devel xbmc-pvr-addons-13.0-use_external_tinyxml2.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xbmc-pvr-addons.spec, 1.1, 1.2 xbmc-pvr-addons-13.0-use_external_dvblinkremote.patch, 1.1, NONE

Author: melmorabity Update of /cvs/free/rpms/xbmc-pvr-addons/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv29978/devel Modified Files: .cvsignore sources xbmc-pvr-addons.spec Added Files: xbmc-pvr-addons-13.0-use_external_tinyxml2.patch Removed Files: xbmc-pvr-addons-13.0-use_external_dvblinkremote.patch Log Message: Sync with XBMC 13.2 beta3 xbmc-pvr-addons-13.0-use_external_tinyxml2.patch: configure.ac | 1 - lib/Makefile.am | 2 +- lib/libdvblinkremote/Makefile.am | 6 +++--- lib/libdvblinkremote/util.h | 4 ++-- lib/libdvblinkremote/xml_object_serializer.h | 2 +- 5 files changed, 7 insertions(+), 8 deletions(-) --- NEW FILE xbmc-pvr-addons-13.0-use_external_tinyxml2.patch --- diff -up ./configure.ac.orig ./configure.ac --- ./configure.ac.orig 2014-08-06 11:53:17.249673317 +0200 +++ ./configure.ac 2014-08-06 11:53:56.682576564 +0200 @@ -269,7 +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 \ diff -up ./lib/libdvblinkremote/Makefile.am.orig ./lib/libdvblinkremote/Makefile.am --- ./lib/libdvblinkremote/Makefile.am.orig 2014-07-16 11:22:26.000000000 +0200 +++ ./lib/libdvblinkremote/Makefile.am 2014-08-06 11:58:40.235690060 +0200 @@ -26,10 +26,10 @@ libdvblinkremote_la_SOURCES = channel.cp util.cpp \ xml_object_serializer_factory.cpp -LIBS= @abs_top_srcdir(a)/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-07-16 11:22:26.000000000 +0200 +++ ./lib/libdvblinkremote/util.h 2014-08-06 12:00:07.757255810 +0200 @@ -27,7 +27,7 @@ #include <sstream> #include <iostream> #include <cstdio> -#include "tinyxml2/tinyxml2.h" +#include "tinyxml2.h" namespace dvblinkremote { class Util { @@ -53,4 +53,4 @@ namespace dvblinkremote { template <class T> static bool from_string(T& t, const std::string& s, std::ios_base& (*f)(std::ios_base&)); template <class T> static bool to_string(const T& t, std::string& s); }; -} \ Pas de fin de ligne à la fin du fichier +} diff -up ./lib/libdvblinkremote/xml_object_serializer.h.orig ./lib/libdvblinkremote/xml_object_serializer.h --- ./lib/libdvblinkremote/xml_object_serializer.h.orig 2014-07-16 11:22:26.000000000 +0200 +++ ./lib/libdvblinkremote/xml_object_serializer.h 2014-08-06 11:59:57.446542583 +0200 @@ -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-08-06 11:53:17.249673317 +0200 +++ ./lib/Makefile.am 2014-08-06 11:54:25.863764943 +0200 @@ -2,7 +2,7 @@ if ADDON_MYTHTV ADDITIONAL_SUBDIRS = cmyth endif -SUBDIRS = libhts tinyxml2 libdvblinkremote $(ADDITIONAL_SUBDIRS) +SUBDIRS = libhts libdvblinkremote $(ADDITIONAL_SUBDIRS) zip: Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/xbmc-pvr-addons/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 28 May 2014 23:00:42 -0000 1.2 +++ .cvsignore 7 Aug 2014 13:09:31 -0000 1.3 @@ -1 +1 @@ -xbmc-pvr-addons-13.0-Gotham.tar.gz +xbmc-pvr-addons-be12a8d.tar.gz Index: sources =================================================================== RCS file: /cvs/free/rpms/xbmc-pvr-addons/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 28 May 2014 23:00:42 -0000 1.2 +++ sources 7 Aug 2014 13:09:31 -0000 1.3 @@ -1 +1 @@ -63f5863393ca869eb6f357a62de76378 xbmc-pvr-addons-13.0-Gotham.tar.gz +6a9889c01d333ffe9c0d80ebeb4bafa8 xbmc-pvr-addons-be12a8d.tar.gz Index: xbmc-pvr-addons.spec =================================================================== RCS file: /cvs/free/rpms/xbmc-pvr-addons/devel/xbmc-pvr-addons.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xbmc-pvr-addons.spec 28 May 2014 23:00:42 -0000 1.1 +++ xbmc-pvr-addons.spec 7 Aug 2014 13:09:31 -0000 1.2 @@ -2,34 +2,36 @@ # 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 +%global commit be12a8da2072e9c3ddad54892df2f85b759d4e9a +%global short_commit %(c=%{commit}; echo ${c:0:7}) +%global commit_date 20140716 +%global snapshot_release %{commit_date}git%{short_commit} +# %%global tag 13.0-Gotham # Minimum supported version of XBMC -%global xbmc_version 13.0-0.14.Gotham_rc1 +%global xbmc_version 13.2-0.3.beta3 Name: xbmc-pvr-addons Version: 13.0 -Release: 1%{?dist} +Release: 2.%{snapshot_release}%{?dist} +# 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+ +# of lib/libhts and lib/cmyth 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/%{name}/archive/%{tag}/%{name}-%{tag}.tar.gz +Source0: https://github.com/opdenkamp/%{name}/archive/%{short_commit}/%{name}-%{sh... +# Source0: https://github.com/opdenkamp/%%{name}/archive/%%{tag}/%%{name}-%%{tag}.ta... # 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 tinyxml2 library +Patch3: %{name}-13.0-use_external_tinyxml2.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 @@ -37,7 +39,6 @@ Patch5: %{name}-13.0-snprintf.patch BuildRequires: boost-devel -BuildRequires: dvblinkremote-devel BuildRequires: jsoncpp-devel BuildRequires: libtool BuildRequires: mariadb-devel @@ -46,6 +47,7 @@ BuildRequires: mesa-libGLES-devel BuildRequires: rapidxml-devel BuildRequires: tinyxml-devel +BuildRequires: tinyxml2-devel BuildRequires: vdr-devel BuildRequires: xbmc-devel >= %{xbmc_version} BuildRequires: zlib-devel @@ -221,16 +223,17 @@ %prep -%setup -q -n %{name}-%{tag} +%setup -q -n %{name}-%{commit} +# %%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 +%patch3 -p0 -b .use_external_tinyxml2 %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 libraries jsoncpp, rapidxml, and tinyxml2 +rm -r lib/{jsoncpp,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 @@ -341,6 +344,12 @@ %changelog +* Wed Aug 06 2014 Mohamed El Morabity <melmorabity(a)fedoraproject.org&gt; - 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(a)fedoraproject.org&gt; - 13.0-1 - Update to 13.0 - Drop empty M3U file provided by the iptvsimple addon --- xbmc-pvr-addons-13.0-use_external_dvblinkremote.patch DELETED ---