[SCM] Phonon GStreamer backend packaging branch, master, updated. debian/4.8.2-1-4-g1517286

[Diane Trout]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/phonon-backend-gstreamer.git;a=commitdiff;h=0923cdd

The following commit has been merged in the master branch:
commit 0923cdd484aeb6c9e1df8638fd761bdb22c547fc
Author: Diane Trout <diane at debian.org>
Date:   Mon Oct 19 14:40:11 2015 -0700

    Create gstreamer-compatibility.patch (Closes: #802107)
---
 debian/changelog                             |  1 +
 debian/patches/gstreamer-compatibility.patch | 45 ++++++++++++++++++++++++++++
 debian/patches/series                        |  1 +
 3 files changed, 47 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2e56246..b0f375e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ phonon-backend-gstreamer (4:4.8.2-2) UNRELEASED; urgency=medium
 
   * Fix Diane Trout's email address
   * Fix ordering in copyright file.
+  * Create gstreamer-compatibility.patch (Closes: #802107)
 
  -- Diane Trout <diane at debian.org>  Mon, 19 Oct 2015 13:45:50 -0700
 
diff --git a/debian/patches/gstreamer-compatibility.patch b/debian/patches/gstreamer-compatibility.patch
new file mode 100644
index 0000000..76f397a
--- /dev/null
+++ b/debian/patches/gstreamer-compatibility.patch
@@ -0,0 +1,45 @@
+Author: Alex Merry
+Description: Fix finding recent version of gstreamer
+Commit: https://git.reviewboard.kde.org/r/125690/
+--- a/cmake/FindGStreamer.cmake
++++ b/cmake/FindGStreamer.cmake
+@@ -36,6 +36,27 @@ FIND_PATH(GSTREAMER_INCLUDE_DIR gst/gst.h
+    PATH_SUFFIXES gstreamer-1.0
+    )
+ 
++IF (NOT GSTREAMER_INCLUDE_DIR)
++   MESSAGE(STATUS "GStreamer: WARNING: include dir not found")
++ENDIF (NOT GSTREAMER_INCLUDE_DIR)
++
++# Newer versions of GStreamer put gst-config.h under lib/gstreamer-1.0/include
++FIND_PATH(GSTREAMER_CONF_INCLUDE_DIR gst/gstconfig.h
++   PATHS
++   ${PKG_GSTREAMER_INCLUDE_DIRS}
++   PATH_SUFFIXES gstreamer-1.0
++   )
++
++IF (NOT GSTREAMER_CONF_INCLUDE_DIR)
++   MESSAGE(STATUS "GStreamer: WARNING: gstconfig.h not found")
++ENDIF (NOT GSTREAMER_CONF_INCLUDE_DIR)
++
++IF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_CONF_INCLUDE_DIR)
++   IF (NOT GSTREAMER_CONF_INCLUDE_DIR STREQUAL GSTREAMER_INCLUDE_DIR)
++      LIST(APPEND GSTREAMER_INCLUDE_DIR "${GSTREAMER_CONF_INCLUDE_DIR}")
++   ENDIF()
++ENDIF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_CONF_INCLUDE_DIR)
++
+ FIND_LIBRARY(GSTREAMER_LIBRARIES NAMES gstreamer-1.0
+    PATHS
+    ${PKG_GSTREAMER_LIBRARY_DIRS}
+@@ -51,11 +72,6 @@ FIND_LIBRARY(GSTREAMER_APP_LIBRARY NAMES gstapp-1.0
+    ${PKG_GSTREAMER_LIBRARY_DIRS}
+    )
+ 
+-IF (GSTREAMER_INCLUDE_DIR)
+-ELSE (GSTREAMER_INCLUDE_DIR)
+-   MESSAGE(STATUS "GStreamer: WARNING: include dir not found")
+-ENDIF (GSTREAMER_INCLUDE_DIR)
+-
+ IF (GSTREAMER_LIBRARIES)
+ ELSE (GSTREAMER_LIBRARIES)
+    MESSAGE(STATUS "GStreamer: WARNING: library not found")
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..f9149b1
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+gstreamer-compatibility.patch

-- 
Phonon GStreamer backend packaging