[SCM] kamoso packaging branch, master, updated. 1956296da39ee74320db2aa5b244d999ec6c88e8

[Diane Trout]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kamoso.git;a=commitdiff;h=1956296

The following commit has been merged in the master branch:
commit 1956296da39ee74320db2aa5b244d999ec6c88e8
Author: Diane Trout <diane at ghic.org>
Date:   Wed May 27 20:07:27 2015 -0700

    Add fix-qt-gstreamer-1.0.diff to apply a few hacks to get the pipeline actually opent the webcam and write files.
---
 debian/changelog                         |  2 ++
 debian/patches/fix-qt-gstreamer-1.0.diff | 49 ++++++++++++++++++++++++++++++++
 debian/patches/series                    |  1 +
 3 files changed, 52 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e4cf6bb..b790569 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ kamoso (2.0.2-3) UNRELEASED; urgency=medium
     to build against QtGstreamer 1.0 API
   * Change qt-gstreamer build and installation depends to 1.0 API.
   * Bump Standards-Version to 3.9.6, no changes required.
+  * Add fix-qt-gstreamer-1.0.diff to apply a few hacks to
+    get the pipeline actually opent the webcam and write files.
 
  -- Diane Trout <diane at ghic.org>  Tue, 26 May 2015 19:20:12 -0700
 
diff --git a/debian/patches/fix-qt-gstreamer-1.0.diff b/debian/patches/fix-qt-gstreamer-1.0.diff
new file mode 100644
index 0000000..62309f9
--- /dev/null
+++ b/debian/patches/fix-qt-gstreamer-1.0.diff
@@ -0,0 +1,49 @@
+Author: Diane Trout <diane at ghic.org>
+Description: Make slight modifications to properly capture via the webcam.
+ For some reason the upstream patch didn't quite work for me, and I
+ needed to copy the following few things from my initial port to get
+ it to work.
+ .
+ This should only be temporary as upstream has moved on to a kf5 version
+ that should replace this soon.
+--- a/src/webcamwidget.cpp
++++ b/src/webcamwidget.cpp
+@@ -131,7 +131,8 @@
+     QByteArray pipe = basicPipe();
+ 
+     //Set the right colorspace to convert to QImage
+-    pipe += " ! videoconvert"
++    pipe += " ! videoconvert ! "
++            GST_VIDEO_CAPS_MAKE("RGB")
+             " ! fakesink name=fakesink";
+ 
+     kDebug() << "================ PIPELINE ================";
+@@ -247,11 +248,12 @@
+             kDebug() << "Not I420";
+         }
+ 
+-    } else if (qstrcmp(structure.data()->name().toLatin1(), "video/x-raw-rgb") == 0) {
++    } else if (format == "RGB") {
+         kDebug() << "RGB name";
+         QImage::Format format = QImage::Format_Invalid;
+         int bpp = structure.data()->value("bpp").get<int>();
+ 
++        bpp = 24;  // FIXME: HACK
+         if (bpp == 24)
+             format = QImage::Format_RGB888;
+         else if (bpp == 32)
+@@ -399,10 +401,10 @@
+     //Accepted capabilities
+     pipe +=
+     " ! videoconvert"
+-    " ! video/x-raw, format=RGB, width=640, height=480, framerate=15/1;"
+-    " video/x-raw, format=RGB, width=640, height=480, framerate=24/1;"
+-    " video/x-raw, format=RGB, width=640, height=480, framerate=30/1;"
+-    " video/x-raw, format=RGB, width=352, height=288, framerate=15/1"
++    " ! video/x-raw, width=640, height=480, framerate=15/1;"
++    " video/x-raw, width=640, height=480, framerate=24/1;"
++    " video/x-raw, width=640, height=480, framerate=30/1;"
++    " video/x-raw, width=352, height=288, framerate=15/1"
+ 
+     //Basic plug-in for video controls
+     " ! gamma name=gamma"
diff --git a/debian/patches/series b/debian/patches/series
index e9b973d..0ff2272 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ upstream_add-include.patch
 upstream_libkipi-2.x.diff
 upstream_rename-icons.diff
 qt-gstreamer-1.0.diff
+fix-qt-gstreamer-1.0.diff

-- 
kamoso packaging