[kamoso] build fixes for API changes in QtGStreamer 1
Kevin Kofler
kkofler at fedoraproject.org
Wed Jul 23 21:01:43 UTC 2014
commit 5b432f41f3ab98563c894307356a3c080b6f1f41
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date: Wed Jul 23 23:01:32 2014 +0200
build fixes for API changes in QtGStreamer 1
kamoso-2.0.2-gstreamer1-fix-build.patch | 39 +++++++++++++++++++++++++++++++
kamoso.spec | 5 ++++
2 files changed, 44 insertions(+), 0 deletions(-)
---
diff --git a/kamoso-2.0.2-gstreamer1-fix-build.patch b/kamoso-2.0.2-gstreamer1-fix-build.patch
new file mode 100644
index 0000000..6f7dfcb
--- /dev/null
+++ b/kamoso-2.0.2-gstreamer1-fix-build.patch
@@ -0,0 +1,39 @@
+diff -ur kamoso-2.0.2-gstreamer1/src/webcamwidget.cpp kamoso-2.0.2-gstreamer1-fix-build/src/webcamwidget.cpp
+--- kamoso-2.0.2-gstreamer1/src/webcamwidget.cpp 2014-07-23 22:55:32.000000000 +0200
++++ kamoso-2.0.2-gstreamer1-fix-build/src/webcamwidget.cpp 2014-07-23 22:56:38.000000000 +0200
+@@ -158,7 +158,7 @@
+ setVideoSettings();
+
+ kDebug() << "================ Capabilities ================";
+- //kDebug() << d->m_pipeline->getElementByName("v4l2src")->getStaticPad("src")->caps()->toString();
++ //kDebug() << d->m_pipeline->getElementByName("v4l2src")->getStaticPad("src")->currentCaps()->toString();
+ d->m_pipeline->setState(QGst::StatePlaying);
+ }
+
+@@ -194,7 +194,7 @@
+ kDebug();
+
+ QImage img;
+- QGst::CapsPtr caps = pad->caps();
++ QGst::CapsPtr caps = pad->currentCaps();
+
+ const QGst::StructurePtr structure = caps->internalStructure(0);
+ int width, height;
+@@ -215,7 +215,7 @@
+ img = QImage(width/2, height/2, QImage::Format_RGB32);
+
+ if (buffer->map(memory_info, QGst::MapRead)) {
+- const uchar *data = (const uchar *)memory_info.data;
++ const uchar *data = (const uchar *)memory_info.data();
+
+ for (int y=0; y<height; y+=2) {
+ const uchar *yLine = data + y*width;
+@@ -254,7 +254,7 @@
+ if (format != QImage::Format_Invalid) {
+ QGst::MapInfo memory_info;
+ if (buffer->map(memory_info, QGst::MapRead)) {
+- img = QImage((const uchar *)memory_info.data,
++ img = QImage((const uchar *)memory_info.data(),
+ width,
+ height,
+ format);
diff --git a/kamoso.spec b/kamoso.spec
index e1d72e3..7fa7928 100644
--- a/kamoso.spec
+++ b/kamoso.spec
@@ -7,6 +7,10 @@ License: GPLv2+
URL: https://projects.kde.org/projects/extragear/multimedia/kamoso/
Source0: http://download.kde.org/stable/kamoso/%{version}/src/%{name}-%{version}.tar.bz2
+# build fixes for API changes in QtGStreamer 1
+# needs to be applied after the patches from the 2xx series below
+Patch0: kamoso-2.0.2-gstreamer1-fix-build.patch
+
## upstream patches
Patch105: 0005-Make-the-About-dialog-work.patch
Patch121: 0021-add-include.patch
@@ -69,6 +73,7 @@ Kamoso is an application to take pictures and videos out of your webcam.
%patch207 -p1 -b .gstreamer1-0007
%patch208 -p1 -b .gstreamer1-0008
%patch209 -p1 -b .gstreamer1-0009
+%patch0 -p1 -b .gstreamer1-fix-build
%endif
# rename some icons that conflict with kdeplasma-addons
More information about the scm-commits
mailing list