commit 7f952be969d48e77005c0905e255236ad1b6d7d8 Author: Mohamed El Morabity <melmorabity(a)fedoraproject.org&gt; Date: Tue Oct 3 14:33:06 2017 +0200 First import .gitignore | 1 + kodi-pvr-vbox-3.6.10-use_external_tinyxml2.patch | 149 +++++++++++++++++++++++ kodi-pvr-vbox.spec | 67 ++++++++++ sources | 1 + 4 files changed, 218 insertions(+) --- diff --git a/.gitignore b/.gitignore index e69de29..355bf68 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/kodi-pvr-vbox-adc6c34.tar.gz diff --git a/kodi-pvr-vbox-3.6.10-use_external_tinyxml2.patch b/kodi-pvr-vbox-3.6.10-use_external_tinyxml2.patch new file mode 100644 index 0000000..86dd9fe --- /dev/null +++ b/kodi-pvr-vbox-3.6.10-use_external_tinyxml2.patch @@ -0,0 +1,149 @@ +diff -up ./CMakeLists.txt.orig ./CMakeLists.txt +--- ./CMakeLists.txt.orig 2017-04-07 23:00:40.000000000 +0200 ++++ ./CMakeLists.txt 2017-04-29 01:13:03.211171351 +0200 +@@ -9,6 +9,13 @@ enable_language(CXX) + find_package(Kodi REQUIRED) + find_package(kodiplatform REQUIRED) + find_package(p8-platform REQUIRED) ++find_package(PkgConfig) ++pkg_check_modules(TINYXML2 REQUIRED tinyxml2) ++ ++set(CFLAGS ${TINYXML2_CFLAGS} ${TINYXML2_CFLAGS_OTHERS}) ++add_definitions(${CFLAGS}) ++set(LIBS ${TINYXML2_CFLAGS} ${TINYXML2_LIBRARIES}) ++link_libraries(${LIBS}) + + include_directories(${kodiplatform_INCLUDE_DIRS} + ${p8-platform_INCLUDE_DIRS} +@@ -87,13 +94,6 @@ source_group("Source Files\\vbox\\respon + source_group("Source Files\\timeshift" FILES ${VBOX_SOURCES_TIMESHIFT}) + source_group("Source Files\\xmltv" FILES ${VBOX_SOURCES_XMLTV}) + +-# Library files +-set(VBOX_LIBRARIES_TINYXML2 +- lib/tinyxml2/tinyxml2.h +- lib/tinyxml2/tinyxml2.cpp) +- +-source_group("Library Files\\tinyxml2" FILES ${VBOX_LIBRARIES_TINYXML2}) +- + # Resource files + set(VBOX_RESOURCES + README.md +@@ -113,8 +113,7 @@ list(APPEND VBOX_SOURCES + ${VBOX_SOURCES_VBOX_RESPONSE} + ${VBOX_SOURCES_TIMESHIFT} + ${VBOX_SOURCES_XMLTV} +- ${VBOX_RESOURCES} +- ${VBOX_LIBRARIES_TINYXML2}) ++ ${VBOX_RESOURCES}) + + set(DEPLIBS ${p8-platform_LIBRARIES}) + build_addon(pvr.vbox VBOX DEPLIBS) +diff -up ./src/vbox/CategoryGenreMapper.cpp.orig ./src/vbox/CategoryGenreMapper.cpp +--- ./src/vbox/CategoryGenreMapper.cpp.orig 2017-04-07 23:00:40.000000000 +0200 ++++ ./src/vbox/CategoryGenreMapper.cpp 2017-04-29 01:09:33.213743702 +0200 +@@ -20,7 +20,7 @@ + */ + #include "CategoryGenreMapper.h" + #include <algorithm> +-#include "lib/tinyxml2/tinyxml2.h" ++#include <tinyxml2.h> + #include "p8-platform/util/StringUtils.h" + #include "Utilities.h" + #include "Exceptions.h" +diff -up ./src/vbox/GuideChannelMapper.cpp.orig ./src/vbox/GuideChannelMapper.cpp +--- ./src/vbox/GuideChannelMapper.cpp.orig 2017-04-07 23:00:40.000000000 +0200 ++++ ./src/vbox/GuideChannelMapper.cpp 2017-04-29 01:09:33.213743702 +0200 +@@ -21,7 +21,7 @@ + + #include "GuideChannelMapper.h" + #include <memory> +-#include "lib/tinyxml2/tinyxml2.h" ++#include <tinyxml2.h> + #include "Exceptions.h" + #include "Utilities.h" + #include "../client.h" +diff -up ./src/vbox/Reminder.cpp.orig ./src/vbox/Reminder.cpp +--- ./src/vbox/Reminder.cpp.orig 2017-04-07 23:00:40.000000000 +0200 ++++ ./src/vbox/Reminder.cpp 2017-04-29 01:09:33.213743702 +0200 +@@ -21,7 +21,7 @@ + #include "ContentIdentifier.h" + #include "Reminder.h" + #include <algorithm> +-#include "lib/tinyxml2/tinyxml2.h" ++#include <tinyxml2.h> + #include "p8-platform/util/StringUtils.h" + #include "Utilities.h" + #include "Exceptions.h" +diff -up ./src/vbox/ReminderManager.cpp.orig ./src/vbox/ReminderManager.cpp +--- ./src/vbox/ReminderManager.cpp.orig 2017-04-07 23:00:40.000000000 +0200 ++++ ./src/vbox/ReminderManager.cpp 2017-04-29 01:09:33.213743702 +0200 +@@ -21,7 +21,7 @@ + #include "ContentIdentifier.h" + #include "ReminderManager.h" + #include <algorithm> +-#include "lib/tinyxml2/tinyxml2.h" ++#include <tinyxml2.h> + #include "p8-platform/util/StringUtils.h" + #include "Utilities.h" + #include "Exceptions.h" +diff -up ./src/vbox/response/Content.cpp.orig ./src/vbox/response/Content.cpp +--- ./src/vbox/response/Content.cpp.orig 2017-04-07 23:00:40.000000000 +0200 ++++ ./src/vbox/response/Content.cpp 2017-04-29 01:09:33.213743702 +0200 +@@ -21,7 +21,7 @@ + + #include "Content.h" + #include "xbmc_pvr_types.h" +-#include "lib/tinyxml2/tinyxml2.h" ++#include <tinyxml2.h> + #include "../Channel.h" + #include "../../xmltv/Utilities.h" + #include "../../xmltv/Guide.h" +diff -up ./src/vbox/response/Response.h.orig ./src/vbox/response/Response.h +--- ./src/vbox/response/Response.h.orig 2017-04-07 23:00:40.000000000 +0200 ++++ ./src/vbox/response/Response.h 2017-04-29 01:09:33.213743702 +0200 +@@ -22,7 +22,7 @@ + + #include <memory> + #include <string> +-#include "lib/tinyxml2/tinyxml2.h" ++#include <tinyxml2.h> + + namespace vbox { + namespace response { +diff -up ./src/xmltv/Guide.cpp.orig ./src/xmltv/Guide.cpp +--- ./src/xmltv/Guide.cpp.orig 2017-04-07 23:00:40.000000000 +0200 ++++ ./src/xmltv/Guide.cpp 2017-04-29 01:09:33.213743702 +0200 +@@ -23,7 +23,7 @@ + #include <algorithm> + #include "Channel.h" + #include "Utilities.h" +-#include "lib/tinyxml2/tinyxml2.h" ++#include <tinyxml2.h> + #include "p8-platform/util/StringUtils.h" + #include "../vbox/ContentIdentifier.h" + +diff -up ./src/xmltv/Programme.cpp.orig ./src/xmltv/Programme.cpp +--- ./src/xmltv/Programme.cpp.orig 2017-04-07 23:00:40.000000000 +0200 ++++ ./src/xmltv/Programme.cpp 2017-04-29 01:09:33.214743675 +0200 +@@ -21,7 +21,7 @@ + + #include "Programme.h" + #include "Utilities.h" +-#include "lib/tinyxml2/tinyxml2.h" ++#include <tinyxml2.h> + + using namespace xmltv; + using namespace tinyxml2; +diff -up ./src/xmltv/Utilities.cpp.orig ./src/xmltv/Utilities.cpp +--- ./src/xmltv/Utilities.cpp.orig 2017-04-07 23:00:40.000000000 +0200 ++++ ./src/xmltv/Utilities.cpp 2017-04-29 01:09:33.214743675 +0200 +@@ -21,7 +21,7 @@ + + #include "Utilities.h" + #include "../compat.h" +-#include "lib/tinyxml2/tinyxml2.h" ++#include <tinyxml2.h> + #include <algorithm> + #include <iterator> + #include <stdexcept> diff --git a/kodi-pvr-vbox.spec b/kodi-pvr-vbox.spec new file mode 100644 index 0000000..22c53f7 --- /dev/null +++ b/kodi-pvr-vbox.spec @@ -0,0 +1,67 @@ +%global commit adc6c346cc3570a232d336fcebfb0905eaaa9b96 +%global short_commit %(c=%{commit}; echo ${c:0:7}) +%global commit_date 20170407 + +%global kodi_addon pvr.vbox +%global kodi_version 17.0 + +Name: kodi-%(tr "." "-" <<<%{kodi_addon}) +Version: 3.6.10 +Release: 1%{?dist} +Summary: Kodi VBox TV Gateway PVR addon + +Group: Applications/Multimedia +License: GPLv2+ +URL: https://github.com/kodi-pvr/%{kodi_addon}/ +Source0: https://github.com/kodi-pvr/%{kodi_addon}/archive/%{short_commit}/%{name}... +# Use external tinyxml2 library +Patch0: %{name}-3.6.10-use_external_tinyxml2.patch + +BuildRequires: cmake +BuildRequires: gcc-c++ +BuildRequires: kodi-devel >= %{kodi_version} +BuildRequires: kodi-platform-devel >= %{kodi_version} +BuildRequires: pkgconfig(tinyxml2) +BuildRequires: platform-devel +Requires: kodi >= %{kodi_version} +ExclusiveArch: i686 x86_64 + +%description +This is a PVR addon for interfacing with VBox Communications' XTi TV +Gateways. It supports all the basic functionality you would expect, such as +watching, recording and timeshifting. Additionally, it supports augmenting the +over-the-air guide data with external XMLTV data. + + +%prep +%autosetup -n %{kodi_addon}-%{commit} -p0 + +# Drop bundled tinyxml2 library +rm -r lib/tinyxml2/ + + +%build +%cmake -DCMAKE_INSTALL_LIBDIR=%{_libdir}/kodi/ . +%make_build + + +%install +%make_install + + +%files +%doc README.md %{kodi_addon}/changelog.txt +%license LICENSE.md +%{_libdir}/kodi/addons/%{kodi_addon}/ +%{_datadir}/kodi/addons/%{kodi_addon}/ + + +%changelog +* Fri Apr 28 2017 Mohamed El Morabity <melmorabity(a)fedorapeople.org&gt; - 3.6.10-1 +- Update to latest stable release for Kodi 17 + +* Sat Jul 23 2016 Mohamed El Morabity <melmorabity(a)fedoraproject.org&gt; - 2.1.13-1 +- Update to latest stable release for Kodi 16 + +* Mon Aug 24 2015 Mohamed El Morabity <melmorabity(a)fedoraproject.org&gt; - 1:1.3.8-1 +- Initial RPM release diff --git a/sources b/sources index e69de29..56854a7 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +98255d5e92f8cae1931bc9590a397f3f kodi-pvr-vbox-adc6c34.tar.gz