[SCM] kodi-pvr-mediaportal-tvserver/master: Use system's Live555 libraries

[rbalint at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 76807fe6bcb688cd920a6b086dc57c8b062ecaf3
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Fri Nov 4 16:46:45 2016 +0100

    Use system's Live555 libraries

diff --git a/debian/control b/debian/control
index ef0e6b6..8a89f01 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: kodi-pvr-mediaportal-tvserver
 Priority: extra
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 Uploaders: Balint Reczey <balint at balintreczey.hu>
-Build-Depends: debhelper (>= 9.0.0), cmake, libtinyxml-dev,
+Build-Depends: debhelper (>= 9.0.0), cmake, libtinyxml-dev, liblivemedia-dev, pkg-config,
                libkodiplatform-dev (>= 17.1.0), kodi-addons-dev (>= 17.0~beta3+dfsg1-2)
 Standards-Version: 3.9.7
 Section: libs
diff --git a/debian/patches/0001-Use-system-s-Live555-libraries-when-they-are-availab.patch b/debian/patches/0001-Use-system-s-Live555-libraries-when-they-are-availab.patch
new file mode 100644
index 0000000..2af406f
--- /dev/null
+++ b/debian/patches/0001-Use-system-s-Live555-libraries-when-they-are-availab.patch
@@ -0,0 +1,93 @@
+From b70abbb26e54f3037e360f03302fedde47763315 Mon Sep 17 00:00:00 2001
+From: Balint Reczey <balint at balintreczey.hu>
+Date: Fri, 4 Nov 2016 16:37:59 +0100
+Subject: [PATCH] Use system's Live555 libraries when they are available
+
+---
+ CMakeLists.txt | 48 +++++++++++++++++++++++++++++++-----------------
+ 1 file changed, 31 insertions(+), 17 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 00110aa..87eb0dd 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -11,6 +11,9 @@ find_package(kodiplatform REQUIRED)
+ find_package(p8-platform REQUIRED)
+ find_package(TinyXML REQUIRED)
+ 
++find_package(PkgConfig)
++pkg_check_modules(LIVE555 live555)
++
+ # Grab the addon version info from the addon.xml file
+ FILE(READ ${PROJECT_NAME}/addon.xml.in MPTV_ADDONXML)
+ STRING(REGEX MATCH "<addon[^>]*version.?=.?.[0-9\\.]+" MPTV_VERSION_STRING ${MPTV_ADDONXML})
+@@ -19,26 +22,30 @@ STRING(REGEX REPLACE ".*version=.([0-9\\.]+).*" "\\1" MPTV_VERSION ${MPTV_VERSIO
+ # Generate an addon_version.h header with the version information
+ configure_file(src/addon_version.h.in addon_version.h)
+ 
+-set(LIVE555_INCLUDE_DIR
+-  src/lib/live555/liveMedia/include
+-  src/lib/live555/BasicUsageEnvironment/include
+-  src/lib/live555/UsageEnvironment/include
+-  src/lib/live555/groupsock/include
+-  src/lib/live555/
++set(MPTV_INCLUDE_DIRS ${kodiplatform_INCLUDE_DIRS}
++                      ${p8-platform_INCLUDE_DIRS}
++                      ${TINYXML_INCLUDE_DIR}
++                      ${KODI_INCLUDE_DIR}
++                      ${PROJECT_SOURCE_DIR}/src
++                      ${PROJECT_BINARY_DIR}
+ )
+ 
+-set(LIVE555_DEFINES -DLIVE555 -DSOCKLEN_T=socklen_t -DBSD=1)
++if (NOT LIVE555_FOUND)
++  set(LIVE555_INCLUDE_DIR
++    src/lib/live555/liveMedia/include
++    src/lib/live555/BasicUsageEnvironment/include
++    src/lib/live555/UsageEnvironment/include
++    src/lib/live555/groupsock/include
++    src/lib/live555/
++  )
+ 
+-include_directories(${kodiplatform_INCLUDE_DIRS}
+-                    ${p8-platform_INCLUDE_DIRS}
+-                    ${TINYXML_INCLUDE_DIR}
+-                    ${KODI_INCLUDE_DIR}
+-                    ${PROJECT_SOURCE_DIR}/src
+-                    ${PROJECT_BINARY_DIR}
+-                    ${LIVE555_INCLUDE_DIR}
+-)
++  set(LIVE555_DEFINES -DLIVE555 -DSOCKLEN_T=socklen_t -DBSD=1)
++
++  add_definitions(-D__STDC_FORMAT_MACROS ${LIVE555_DEFINES})
++  set(MPTV_INCLUDE_DIRS ${MPTV_INCLUDE_DIRS} ${LIVE555_INCLUDE_DIR})
++endif()
+ 
+-add_definitions(-D__STDC_FORMAT_MACROS ${LIVE555_DEFINES})
++include_directories(${MPTV_INCLUDE_DIRS})
+ 
+ if (NOT WIN32)
+   add_options(ALL_LANGUAGES ALL_BUILDS "-fPIC")
+@@ -236,11 +243,18 @@ SET(LIVE555_HEADERS
+ source_group("Header Files\\lib\\live555" FILES ${LIVE555_HEADERS})
+ 
+ # Make sure that CMake adds all files to the MSVC project
+-list(APPEND MPTV_SOURCES ${MPTV_HEADERS} ${TSREADER_SOURCES} ${TSREADER_HEADERS} ${RESOURCE_FILES} ${LIVE555_SOURCES} ${LIVE555_HEADERS})
++list(APPEND MPTV_SOURCES ${MPTV_HEADERS} ${TSREADER_SOURCES} ${TSREADER_HEADERS} ${RESOURCE_FILES})
++if (NOT LIVE555_FOUND)
++  list(APPEND MPTV_SOURCES ${LIVE555_SOURCES} ${LIVE555_HEADERS})
++endif()
+ 
+ set(DEPLIBS ${p8-platform_LIBRARIES}
+             ${TINYXML_LIBRARIES})
+ 
++if (LIVE555_FOUND)
++  set(DEPLIBS ${LIVE555_LIBRARIES} ${DEPLIBS})
++endif()
++
+ if(WIN32)
+   list(APPEND DEPLIBS ws2_32)
+ endif(WIN32)
+-- 
+2.1.4
+
diff --git a/debian/patches/series b/debian/patches/series
index 8b13789..a467f84 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-
+0001-Use-system-s-Live555-libraries-when-they-are-availab.patch

-- 
kodi-pvr-mediaportal-tvserver packaging