[SCM] telepathy-qt4 packaging branch, master, updated. debian/0.9.6.1-2-2-g64bc424

[Diane Trout]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kde-telepathy/telepathy-qt4.git;a=commitdiff;h=64bc424

The following commit has been merged in the master branch:
commit 64bc42499be9d46834058b205417d9510e29561a
Author: Diane Trout <diane at ghic.org>
Date:   Tue Dec 1 12:16:58 2015 -0800

    add gstreamer-compatibility.patch to find gstreamer >= 1.6
---
 debian/changelog                             |  1 +
 debian/patches/gstreamer-compatibility.patch | 82 ++++++++++++++++++++++++++++
 debian/patches/series                        |  1 +
 3 files changed, 84 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 90094f2..e668071 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 telepathy-qt (0.9.6.1-3) unstable; urgency=medium
 
   * Update libssl depenency to libssl1.0.2 (Closes: #805555)
+  * add gstreamer-compatibility.patch to find gstreamer >= 1.6
 
  -- Diane Trout <diane at ghic.org>  Wed, 25 Nov 2015 23:27:51 -0800
 
diff --git a/debian/patches/gstreamer-compatibility.patch b/debian/patches/gstreamer-compatibility.patch
new file mode 100644
index 0000000..7472415
--- /dev/null
+++ b/debian/patches/gstreamer-compatibility.patch
@@ -0,0 +1,82 @@
+From: Niels Ole Salscheider <niels_ole at salscheider-online.de>
+Date: Tue, 29 Sep 2015 20:52:15 +0200
+Subject: [PATCH] Farstream: gst/gstconfig.h can be in LIBDIR, search for it
+ explicitly
+ Since GStreamer-1.5.1 config header file moved to LIBDIR.
+Reviewed-by: Alexandr Akulich <akulichalexander at gmail.com>
+---
+ TelepathyQt/Farstream/CMakeLists.txt |  2 +-
+ cmake/modules/FindGStreamer.cmake    | 25 ++++++++++++++++++++-----
+ 2 files changed, 21 insertions(+), 6 deletions(-)
+
+diff --git a/TelepathyQt/Farstream/CMakeLists.txt b/TelepathyQt/Farstream/CMakeLists.txt
+index 250bfdb..dd71430 100644
+--- a/TelepathyQt/Farstream/CMakeLists.txt
++++ b/TelepathyQt/Farstream/CMakeLists.txt
+@@ -2,7 +2,7 @@ if(FARSTREAM_COMPONENTS_FOUND)
+     include_directories(${TELEPATHY_FARSTREAM_INCLUDE_DIR}
+                         ${TELEPATHY_GLIB_INCLUDE_DIR}
+                         ${FARSTREAM_INCLUDE_DIR}
+-                        ${GSTREAMER_INCLUDE_DIR}
++                        ${GSTREAMER_INCLUDE_DIRS}
+                         ${GLIB2_INCLUDE_DIR}
+                         ${LIBXML2_INCLUDE_DIR}
+                         ${DBUS_INCLUDE_DIR})
+diff --git a/cmake/modules/FindGStreamer.cmake b/cmake/modules/FindGStreamer.cmake
+index 63fb41c..ffdd7a9 100644
+--- a/cmake/modules/FindGStreamer.cmake
++++ b/cmake/modules/FindGStreamer.cmake
+@@ -13,12 +13,12 @@
+ 
+ # TODO: Other versions --> GSTREAMER_X_Y_FOUND (Example: GSTREAMER_0_8_FOUND and GSTREAMER_0_10_FOUND etc)
+ 
+-IF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY)
++IF (GSTREAMER_INCLUDE_DIRS AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY)
+    # in cache already
+    SET(GSTREAMER_FIND_QUIETLY TRUE)
+-ELSE (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY)
++ELSE (GSTREAMER_INCLUDE_DIRS AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY)
+    SET(GSTREAMER_FIND_QUIETLY FALSE)
+-ENDIF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY)
++ENDIF (GSTREAMER_INCLUDE_DIRS AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY)
+ 
+ IF (NOT WIN32)
+    # use pkg-config to get the directories and then use these values
+@@ -38,6 +38,15 @@ FIND_PATH(GSTREAMER_INCLUDE_DIR gst/gst.h
+    PATH_SUFFIXES gstreamer-1.0
+    )
+ 
++FIND_PATH(GSTREAMER_CONF_INCLUDE_DIR gst/gstconfig.h
++   PATHS
++   ${PC_GSTREAMER_INCLUDEDIR}
++   ${PC_GSTREAMER_INCLUDE_DIRS}
++   PATH_SUFFIXES gstreamer-1.0
++   )
++
++SET(GSTREAMER_INCLUDE_DIRS ${GSTREAMER_INCLUDE_DIR} ${GSTREAMER_CONF_INCLUDE_DIR})
++
+ FIND_LIBRARY(GSTREAMER_LIBRARIES NAMES gstreamer-1.0
+    PATHS
+    ${PC_GSTREAMER_LIBDIR}
+@@ -57,6 +66,12 @@ ELSE (GSTREAMER_INCLUDE_DIR)
+    MESSAGE(STATUS "GStreamer: WARNING: include dir not found")
+ ENDIF (GSTREAMER_INCLUDE_DIR)
+ 
++IF (GSTREAMER_CONF_INCLUDE_DIR)
++	#MESSAGE(STATUS "DEBUG: Found GStreamer config include dir: ${GSTREAMER_CONF_INCLUDE_DIR}")
++ELSE (GSTREAMER_CONF_INCLUDE_DIR)
++   MESSAGE(STATUS "GStreamer: WARNING: config include dir not found")
++ENDIF (GSTREAMER_CONF_INCLUDE_DIR)
++
+ IF (GSTREAMER_LIBRARIES)
+    #MESSAGE(STATUS "DEBUG: Found GStreamer library: ${GSTREAMER_LIBRARIES}")
+ ELSE (GSTREAMER_LIBRARIES)
+@@ -65,6 +80,6 @@ ENDIF (GSTREAMER_LIBRARIES)
+ 
+ 
+ INCLUDE(FindPackageHandleStandardArgs)
+-FIND_PACKAGE_HANDLE_STANDARD_ARGS(GStreamer  DEFAULT_MSG  GSTREAMER_LIBRARIES GSTREAMER_INCLUDE_DIR GSTREAMER_BASE_LIBRARY)
++FIND_PACKAGE_HANDLE_STANDARD_ARGS(GStreamer  DEFAULT_MSG  GSTREAMER_LIBRARIES GSTREAMER_INCLUDE_DIRS GSTREAMER_BASE_LIBRARY)
+ 
+-MARK_AS_ADVANCED(GSTREAMER_INCLUDE_DIR GSTREAMER_LIBRARIES GSTREAMER_BASE_LIBRARY)
++MARK_AS_ADVANCED(GSTREAMER_INCLUDE_DIRS GSTREAMER_LIBRARIES GSTREAMER_BASE_LIBRARY)
diff --git a/debian/patches/series b/debian/patches/series
index b9b2d35..c9d257a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+gstreamer-compatibility.patch
 improve-doxygen-build.patch
 update-doxygen.patch

-- 
telepathy-qt4 packaging