[Pkg-gstreamer-commits] [SCM] UNNAMED PROJECT branch, master, updated. debian/0.10.2-1-1-g212328f

[George Kiagiadakis]

The following commit has been merged in the master branch:
commit 212328f62351c9ee29151083b2387415a0443a33
Author: George Kiagiadakis <kiagiadakis.george at gmail.com>
Date:   Sun Jun 10 14:47:16 2012 +0300

    Add patch include_path_multiarch.patch to fix the include path indicated by QtGStreamerConfig.cmake so that projects using cmake + QtGStreamer do not FTBFS (Closes: #676735).

diff --git a/debian/changelog b/debian/changelog
index 5d5c1a9..6978faf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+qt-gstreamer (0.10.2-2) unstable; urgency=low
+
+  * Add patch include_path_multiarch.patch to fix the include path
+    indicated by QtGStreamerConfig.cmake so that projects using
+    cmake + QtGStreamer do not FTBFS (Closes: #676735).
+
+ -- George Kiagiadakis <kiagiadakis.george at gmail.com>  Sun, 10 Jun 2012 14:32:21 +0300
+
 qt-gstreamer (0.10.2-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/patches/include_path_multiarch.patch b/debian/patches/include_path_multiarch.patch
new file mode 100644
index 0000000..2a503ac
--- /dev/null
+++ b/debian/patches/include_path_multiarch.patch
@@ -0,0 +1,30 @@
+Description: Take debian multiarch into account when defining the include path.
+Origin: upstream, http://cgit.freedesktop.org/gstreamer/qt-gstreamer/commit/?id=c741563913142aa8a4ba87d0ae3ae872b6487004
+
+diff --git a/cmake/modules/FindQtGStreamer.cmake b/cmake/modules/FindQtGStreamer.cmake
+index 4c7d3f4..54e75f6 100644
+--- a/cmake/modules/FindQtGStreamer.cmake
++++ b/cmake/modules/FindQtGStreamer.cmake
+@@ -60,14 +60,20 @@ else()
+                          QTGSTREAMER_UTILS_LIBRARY QTGSTREAMER_INCLUDE_DIR)
+     else()
+         # Targets file found. Use imported QtGStreamer target and relative include path.
+-        # We assume that this file has been installed in $PREFIX/lib/QtGStreamer/,
++        # We assume that this file has been installed in $PREFIX/lib(64)/QtGStreamer/,
++        # or $PREFIX/lib/<arch_triplet>/QtGStreamer, or $PREFIX/lib(64)/cmake/QtGStreamer/,
++        # or $PREFIX/lib/<arch_triplet>/cmake/QtGStreamer/,
+         # so the include path should evaluate to $PREFIX/include/QtGStreamer
+         include(${_QTGSTREAMER_TARGETS_FILE})
+         set(QTGLIB_LIBRARY QtGLib)
+         set(QTGSTREAMER_LIBRARY QtGStreamer)
+         set(QTGSTREAMER_UI_LIBRARY QtGStreamerUi)
+         set(QTGSTREAMER_UTILS_LIBRARY QtGStreamerUtils)
+-        get_filename_component(QTGSTREAMER_INCLUDE_DIR "${_QTGSTREAMER_CONFIG_DIR}/../../include/QtGStreamer" ABSOLUTE)
++        find_path(QTGSTREAMER_INCLUDE_DIR QGst/Global
++                  PATHS "${_QTGSTREAMER_CONFIG_DIR}/../../include/QtGStreamer"
++                        "${_QTGSTREAMER_CONFIG_DIR}/../../../include/QtGStreamer"
++                        "${_QTGSTREAMER_CONFIG_DIR}/../../../../include/QtGStreamer"
++                  NO_DEFAULT_PATH)
+     endif()
+ endif()
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..301b25b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+include_path_multiarch.patch

-- 
UNNAMED PROJECT