[SCM] kodi-pvr-iptvsimple/master: Drop obsoleted patches

rbalint at users.alioth.debian.org rbalint at users.alioth.debian.org
Thu Nov 3 21:51:35 UTC 2016


The following commit has been merged in the master branch:
commit c6bd430c2c877cf21b92664ae4020a8420895abd
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Mon Oct 24 23:32:59 2016 +0200

    Drop obsoleted patches

diff --git a/debian/patches/0001-src-Update-to-p8-platform.patch b/debian/patches/0001-src-Update-to-p8-platform.patch
deleted file mode 100644
index 7ca994e..0000000
--- a/debian/patches/0001-src-Update-to-p8-platform.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 3c722e6cadd627c8b8493eb37fac092bdd074ecc Mon Sep 17 00:00:00 2001
-From: "h.udo" <hudokkow at gmail.com>
-Date: Wed, 6 Jan 2016 15:08:48 +0000
-Subject: [PATCH 1/2] [src] Update to p8-platform
-
----
- src/PVRIptvData.cpp | 2 +-
- src/PVRIptvData.h   | 6 +++---
- src/client.cpp      | 2 +-
- 3 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/PVRIptvData.cpp b/src/PVRIptvData.cpp
-index 7fb1b51..662aad3 100644
---- a/src/PVRIptvData.cpp
-+++ b/src/PVRIptvData.cpp
-@@ -30,7 +30,7 @@
- #include "zlib.h"
- #include "rapidxml/rapidxml.hpp"
- #include "PVRIptvData.h"
--#include "platform/util/StringUtils.h"
-+#include "p8-platform/util/StringUtils.h"
- 
- #define M3U_START_MARKER        "#EXTM3U"
- #define M3U_INFO_MARKER         "#EXTINF"
-diff --git a/src/PVRIptvData.h b/src/PVRIptvData.h
-index 2149297..b147650 100644
---- a/src/PVRIptvData.h
-+++ b/src/PVRIptvData.h
-@@ -24,9 +24,9 @@
-  */
- 
- #include <vector>
--#include "platform/util/StdString.h"
-+#include "p8-platform/util/StdString.h"
- #include "client.h"
--#include "platform/threads/threads.h"
-+#include "p8-platform/threads/threads.h"
- 
- struct PVRIptvEpgEntry
- {
-@@ -81,7 +81,7 @@ struct PVRIptvEpgGenre
-   std::string       strGenre;
- };
- 
--class PVRIptvData : public PLATFORM::CThread
-+class PVRIptvData : public P8PLATFORM::CThread
- {
- public:
-   PVRIptvData(void);
-diff --git a/src/client.cpp b/src/client.cpp
-index 84c2aa1..6dea758 100644
---- a/src/client.cpp
-+++ b/src/client.cpp
-@@ -26,7 +26,7 @@
- #include "kodi/xbmc_pvr_dll.h"
- #include "kodi/libKODI_guilib.h"
- #include "PVRIptvData.h"
--#include "platform/util/util.h"
-+#include "p8-platform/util/util.h"
- 
- using namespace ADDON;
- 
--- 
-2.1.4
-
diff --git a/debian/patches/0002-cmake-Update-to-p8-platform.patch b/debian/patches/0002-cmake-Update-to-p8-platform.patch
deleted file mode 100644
index cbd6b5f..0000000
--- a/debian/patches/0002-cmake-Update-to-p8-platform.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 3f834bcc4804d6f2eade30ffe2d1d0b704f83352 Mon Sep 17 00:00:00 2001
-From: "h.udo" <hudokkow at gmail.com>
-Date: Wed, 6 Jan 2016 15:21:33 +0000
-Subject: [PATCH 2/2] [cmake] Update to p8-platform
-
----
- CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 43103db..cb77e20 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -6,11 +6,11 @@ enable_language(CXX)
- 
- find_package(kodi REQUIRED)
- find_package(kodiplatform REQUIRED)
--find_package(platform REQUIRED)
-+find_package(p8-platform REQUIRED)
- find_package(ZLIB REQUIRED)
- 
- include_directories(${kodiplatform_INCLUDE_DIRS}
--                    ${platform_INCLUDE_DIRS}
-+                    ${p8-platform_INCLUDE_DIRS}
-                     ${KODI_INCLUDE_DIR}
-                     ${ZLIB_INCLUDE_DIRS}
-                     ${PROJECT_SOURCE_DIR}/lib)
--- 
-2.1.4
-
diff --git a/debian/patches/0003-Fix-build-after-rename-of-p8-platform.patch b/debian/patches/0003-Fix-build-after-rename-of-p8-platform.patch
deleted file mode 100644
index a3b4f5c..0000000
--- a/debian/patches/0003-Fix-build-after-rename-of-p8-platform.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 6ccfebd93d24ba4999d78129c7b9aee63f02db11 Mon Sep 17 00:00:00 2001
-From: "h.udo" <hudokkow at gmail.com>
-Date: Sat, 23 Jan 2016 18:00:00 +0000
-Subject: [PATCH] Fix build after rename of p8-platform
-
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index cb77e20..9c9af44 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -15,7 +15,7 @@ include_directories(${kodiplatform_INCLUDE_DIRS}
-                     ${ZLIB_INCLUDE_DIRS}
-                     ${PROJECT_SOURCE_DIR}/lib)
- 
--set(DEPLIBS ${platform_LIBRARIES}
-+set(DEPLIBS ${p8-platform_LIBRARIES}
-             ${ZLIB_LIBRARIES})
- 
- message(STATUS "ZLIB_LIBRARIES: ${ZLIB_LIBRARIES}")
--- 
-2.1.4
-
diff --git a/debian/patches/series b/debian/patches/series
index 1b8728c..8b13789 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-0001-src-Update-to-p8-platform.patch
-0002-cmake-Update-to-p8-platform.patch
-0003-Fix-build-after-rename-of-p8-platform.patch
+

-- 
kodi-pvr-iptvsimple packaging



More information about the pkg-multimedia-commits mailing list