[SCM] qtmultimedia packaging branch, master, updated. debian/5.3.1-3-4-g614964f
Lisandro Damián Nicanor Pérez
lisandro at moszumanska.debian.org
Wed Jul 23 22:13:05 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtmultimedia.git;a=commitdiff;h=614964f
The following commit has been merged in the master branch:
commit 614964f5355d186c2b7e57c33c1b669b35fc238b
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date: Wed Jul 23 19:12:53 2014 -0300
Update patch.
---
debian/patches/test_v4l.patch | 267 ++++++++++++++++++++++++++++--------------
1 file changed, 182 insertions(+), 85 deletions(-)
diff --git a/debian/patches/test_v4l.patch b/debian/patches/test_v4l.patch
index 68b7b85..c50ac29 100644
--- a/debian/patches/test_v4l.patch
+++ b/debian/patches/test_v4l.patch
@@ -1,7 +1,28 @@
Description: Do not build V4L stuff if there is no V4L support
+ Do not build related stuff if not found.
+ Makes GStreamer support available on Hurd.
Author: Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
Forwarded-Upstream: https://codereview.qt-project.org/89649
+Task-number: QTBUG-39762
+Change-Id: I1f70b6975e5bef99ab2441aac4d90508bc8b64bd
+---
+ config.tests/linux_v4l/linux_v4l.pro | 1 +
+ config.tests/linux_v4l/main.cpp | 47 ++++++++++++++++++++++
+ qtmultimedia.pro | 1 +
+ src/gsttools/gsttools.pro | 2 +
+ src/gsttools/qgstreamervideoinputdevicecontrol.cpp | 5 +++
+ src/plugins/gstreamer/camerabin/camerabin.pro | 2 +
+ .../gstreamer/camerabin/camerabinserviceplugin.cpp | 5 +++
+ .../gstreamer/mediacapture/mediacapture.pro | 21 +++++-----
+ .../mediacapture/qgstreamercaptureservice.cpp | 9 ++++-
+ .../mediacapture/qgstreamercaptureservice.h | 2 +
+ .../qgstreamercaptureserviceplugin.cpp | 3 ++
+ src/plugins/plugins.pro | 4 +-
+ 12 files changed, 91 insertions(+), 11 deletions(-)
+ create mode 100644 config.tests/linux_v4l/linux_v4l.pro
+ create mode 100644 config.tests/linux_v4l/main.cpp
+
diff --git a/config.tests/linux_v4l/linux_v4l.pro b/config.tests/linux_v4l/linux_v4l.pro
new file mode 100644
index 0000000..28dcadc
@@ -75,98 +96,139 @@ index c7f093c..bec5925 100644
qtCompileTest(resourcepolicy)
qtCompileTest(gpu_vivante)
diff --git a/src/gsttools/gsttools.pro b/src/gsttools/gsttools.pro
-index 15edd04..c8519db 100644
+index 15edd04..7c809a7 100644
--- a/src/gsttools/gsttools.pro
+++ b/src/gsttools/gsttools.pro
-@@ -45,7 +45,6 @@ PRIVATE_HEADERS += \
- qgstreamervideorendererinterface_p.h \
- qgstreameraudioinputselector_p.h \
- qgstreamervideorenderer_p.h \
-- qgstreamervideoinputdevicecontrol_p.h \
- gstvideoconnector_p.h \
- qgstcodecsinfo_p.h \
- qgstreamervideoprobecontrol_p.h \
-@@ -62,7 +61,6 @@ SOURCES += \
- qgstreamervideorendererinterface.cpp \
- qgstreameraudioinputselector.cpp \
- qgstreamervideorenderer.cpp \
-- qgstreamervideoinputdevicecontrol.cpp \
- qgstcodecsinfo.cpp \
- gstvideoconnector.c \
- qgstreamervideoprobecontrol.cpp \
-@@ -100,6 +98,11 @@ config_gstreamer_appsrc {
+@@ -100,6 +100,8 @@ config_gstreamer_appsrc {
LIBS_PRIVATE += -lgstapp-0.10
}
-+config_linux_v4l {
-+ HEADERS += qgstreamervideoinputdevicecontrol_p.h
-+ SOURCES += qgstreamervideoinputdevicecontrol.cpp
-+}
++config_linux_v4l: DEFINES += USE_V4L
+
HEADERS += $$PRIVATE_HEADERS
DESTDIR = $$QT.multimedia.libs
-diff --git a/src/plugins/gstreamer/gstreamer.pro b/src/plugins/gstreamer/gstreamer.pro
-index 7649010..5419007 100644
---- a/src/plugins/gstreamer/gstreamer.pro
-+++ b/src/plugins/gstreamer/gstreamer.pro
-@@ -5,7 +5,7 @@ SUBDIRS += \
- mediacapture \
- mediaplayer
-
--config_gstreamer_encodingprofiles {
-+config_gstreamer_encodingprofiles:config_linux_v4l {
- SUBDIRS += camerabin
+diff --git a/src/gsttools/qgstreamervideoinputdevicecontrol.cpp b/src/gsttools/qgstreamervideoinputdevicecontrol.cpp
+index e4e202c..dc00871 100644
+--- a/src/gsttools/qgstreamervideoinputdevicecontrol.cpp
++++ b/src/gsttools/qgstreamervideoinputdevicecontrol.cpp
+@@ -45,7 +45,10 @@
+ #include <QtCore/QDebug>
+
+ #include <private/qcore_unix_p.h>
++
++#if defined(USE_V4L)
+ #include <linux/videodev2.h>
++#endif
+
+ QGstreamerVideoInputDeviceControl::QGstreamerVideoInputDeviceControl(QObject *parent)
+ :QVideoDeviceSelectorControl(parent), m_source(0), m_selectedDevice(0)
+@@ -118,6 +121,7 @@ void QGstreamerVideoInputDeviceControl::update()
+ return;
+ }
+
++#if defined(USE_V4L)
+ QDir devDir("/dev");
+ devDir.setFilter(QDir::System);
+
+@@ -158,4 +162,5 @@ void QGstreamerVideoInputDeviceControl::update()
+ }
+ qt_safe_close(fd);
+ }
++#endif
+ }
+diff --git a/src/plugins/gstreamer/camerabin/camerabin.pro b/src/plugins/gstreamer/camerabin/camerabin.pro
+index 9efa081..9ed821c 100644
+--- a/src/plugins/gstreamer/camerabin/camerabin.pro
++++ b/src/plugins/gstreamer/camerabin/camerabin.pro
+@@ -81,6 +81,8 @@ config_gstreamer_photography {
+ DEFINES += GST_USE_UNSTABLE_API #prevents warnings because of unstable photography API
+ }
+
++config_linux_v4l: DEFINES += USE_V4L
++
+ OTHER_FILES += \
+ camerabin.json
+
+diff --git a/src/plugins/gstreamer/camerabin/camerabinserviceplugin.cpp b/src/plugins/gstreamer/camerabin/camerabinserviceplugin.cpp
+index 3decd60..5fb419a 100644
+--- a/src/plugins/gstreamer/camerabin/camerabinserviceplugin.cpp
++++ b/src/plugins/gstreamer/camerabin/camerabinserviceplugin.cpp
+@@ -51,7 +51,10 @@
+ #include <private/qgstutils_p.h>
+
+ #include <private/qcore_unix_p.h>
++
++#if defined(USE_V4L)
+ #include <linux/videodev2.h>
++#endif
+
+ QT_BEGIN_NAMESPACE
+
+@@ -132,6 +135,7 @@ void CameraBinServicePlugin::updateDevices() const
+ m_cameraDevices.clear();
+ m_cameraDescriptions.clear();
+
++#if defined(USE_V4L)
+ QDir devDir("/dev");
+ devDir.setFilter(QDir::System);
+
+@@ -173,6 +177,7 @@ void CameraBinServicePlugin::updateDevices() const
+
+ if (!m_cameraDevices.isEmpty())
+ m_defaultCameraDevice = m_cameraDevices.first();
++#endif
}
+ QT_END_NAMESPACE
diff --git a/src/plugins/gstreamer/mediacapture/mediacapture.pro b/src/plugins/gstreamer/mediacapture/mediacapture.pro
-index e8d039f..8c05552 100644
+index e8d039f..5baa0fd 100644
--- a/src/plugins/gstreamer/mediacapture/mediacapture.pro
+++ b/src/plugins/gstreamer/mediacapture/mediacapture.pro
-@@ -15,11 +15,9 @@ HEADERS += $$PWD/qgstreamercaptureservice.h \
+@@ -15,7 +15,6 @@ HEADERS += $$PWD/qgstreamercaptureservice.h \
$$PWD/qgstreamerrecordercontrol.h \
$$PWD/qgstreamermediacontainercontrol.h \
$$PWD/qgstreamercameracontrol.h \
- $$PWD/qgstreamerv4l2input.h \
$$PWD/qgstreamercapturemetadatacontrol.h \
$$PWD/qgstreamerimagecapturecontrol.h \
-- $$PWD/qgstreamerimageencode.h \
-- $$PWD/qgstreamercaptureserviceplugin.h
-+ $$PWD/qgstreamerimageencode.h
-
- SOURCES += $$PWD/qgstreamercaptureservice.cpp \
- $$PWD/qgstreamercapturesession.cpp \
-@@ -28,11 +26,9 @@ SOURCES += $$PWD/qgstreamercaptureservice.cpp \
+ $$PWD/qgstreamerimageencode.h \
+@@ -28,7 +27,6 @@ SOURCES += $$PWD/qgstreamercaptureservice.cpp \
$$PWD/qgstreamerrecordercontrol.cpp \
$$PWD/qgstreamermediacontainercontrol.cpp \
$$PWD/qgstreamercameracontrol.cpp \
- $$PWD/qgstreamerv4l2input.cpp \
$$PWD/qgstreamercapturemetadatacontrol.cpp \
$$PWD/qgstreamerimagecapturecontrol.cpp \
-- $$PWD/qgstreamerimageencode.cpp \
-- $$PWD/qgstreamercaptureserviceplugin.cpp
-+ $$PWD/qgstreamerimageencode.cpp
-
+ $$PWD/qgstreamerimageencode.cpp \
+@@ -37,13 +35,18 @@ SOURCES += $$PWD/qgstreamercaptureservice.cpp \
# Camera usage with gstreamer needs to have
#CONFIG += use_gstreamer_camera
-@@ -47,3 +43,15 @@ OTHER_FILES += \
- mediacapture.json
- }
-+config_linux_v4l {
-+DEFINES += USE_V4L
+-use_gstreamer_camera {
+-DEFINES += USE_GSTREAMER_CAMERA
++use_gstreamer_camera:config_linux_v4l {
++ DEFINES += USE_GSTREAMER_CAMERA
+
-+HEADERS += \
-+ $$PWD/qgstreamerv4l2input.h \
-+ $$PWD/qgstreamercaptureserviceplugin.h
-+
-+SOURCES += \
-+ $$PWD/qgstreamerv4l2input.cpp \
-+ $$PWD/qgstreamercaptureserviceplugin.cpp
-+}
++ OTHER_FILES += \
++ mediacapturecamera.json
+
++ HEADERS += \
++ $$PWD/qgstreamerv4l2input.h
++ SOURCES += \
++ $$PWD/qgstreamerv4l2input.cpp
+
+-OTHER_FILES += \
+- mediacapturecamera.json
+ } else {
+-OTHER_FILES += \
+- mediacapture.json
++ OTHER_FILES += \
++ mediacapture.json
+ }
+-
diff --git a/src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.cpp b/src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.cpp
-index 92b362f..b8a73e7 100644
+index 92b362f..2278f92 100644
--- a/src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.cpp
+++ b/src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.cpp
@@ -48,9 +48,12 @@
@@ -176,22 +238,32 @@ index 92b362f..b8a73e7 100644
-#include "qgstreamerv4l2input.h"
#include "qgstreamercapturemetadatacontrol.h"
-+#ifdef USE_V4L
++#if defined(USE_GSTREAMER_CAMERA)
+#include "qgstreamerv4l2input.h"
+#endif
+
#include "qgstreamerimagecapturecontrol.h"
#include <private/qgstreameraudioinputselector_p.h>
#include <private/qgstreamervideoinputdevicecontrol_p.h>
-@@ -90,6 +93,7 @@ QGstreamerCaptureService::QGstreamerCaptureService(const QString &service, QObje
+@@ -74,7 +77,9 @@ QGstreamerCaptureService::QGstreamerCaptureService(const QString &service, QObje
+ m_cameraControl = 0;
+ m_metaDataControl = 0;
+
++#if defined(USE_GSTREAMER_CAMERA)
+ m_videoInput = 0;
++#endif
+ m_audioInputSelector = 0;
+ m_videoInputDevice = 0;
+
+@@ -90,6 +95,7 @@ QGstreamerCaptureService::QGstreamerCaptureService(const QString &service, QObje
m_captureSession = new QGstreamerCaptureSession(QGstreamerCaptureSession::Audio, this);
}
-+#ifdef USE_V4L
++#if defined(USE_GSTREAMER_CAMERA)
if (service == Q_MEDIASERVICE_CAMERA) {
m_captureSession = new QGstreamerCaptureSession(QGstreamerCaptureSession::AudioAndVideo, this);
m_cameraControl = new QGstreamerCameraControl(m_captureSession);
-@@ -111,6 +115,7 @@ QGstreamerCaptureService::QGstreamerCaptureService(const QString &service, QObje
+@@ -111,6 +117,7 @@ QGstreamerCaptureService::QGstreamerCaptureService(const QString &service, QObje
#endif
m_imageCaptureControl = new QGstreamerImageCaptureControl(m_captureSession);
}
@@ -199,25 +271,50 @@ index 92b362f..b8a73e7 100644
m_audioInputSelector = new QGstreamerAudioInputSelector(this);
connect(m_audioInputSelector, SIGNAL(activeInputChanged(QString)), m_captureSession, SLOT(setCaptureDevice(QString)));
-diff --git a/src/plugins/v4l/radio/radio.pri b/src/plugins/v4l/radio/radio.pri
-index b8a9f75..af857cd 100644
---- a/src/plugins/v4l/radio/radio.pri
-+++ b/src/plugins/v4l/radio/radio.pri
-@@ -1,9 +1,11 @@
- INCLUDEPATH += $$PWD
-
--HEADERS += \
-- $$PWD/v4lradiocontrol.h \
-- $$PWD/v4lradioservice.h
-+config_linux_v4l {
-+ HEADERS += \
-+ $$PWD/v4lradiocontrol.h \
-+ $$PWD/v4lradioservice.h
+diff --git a/src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.h b/src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.h
+index fc29b4f..563c48c 100644
+--- a/src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.h
++++ b/src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.h
+@@ -78,7 +78,9 @@ private:
--SOURCES += \
-- $$PWD/v4lradiocontrol.cpp \
-- $$PWD/v4lradioservice.cpp
-+ SOURCES += \
-+ $$PWD/v4lradiocontrol.cpp \
-+ $$PWD/v4lradioservice.cpp
-+}
+ QGstreamerCaptureSession *m_captureSession;
+ QGstreamerCameraControl *m_cameraControl;
++#if defined(USE_GSTREAMER_CAMERA)
+ QGstreamerV4L2Input *m_videoInput;
++#endif
+ QGstreamerCaptureMetaDataControl *m_metaDataControl;
+
+ QAudioInputSelectorControl *m_audioInputSelector;
+diff --git a/src/plugins/gstreamer/mediacapture/qgstreamercaptureserviceplugin.cpp b/src/plugins/gstreamer/mediacapture/qgstreamercaptureserviceplugin.cpp
+index 8b88fbb..77a6c36 100644
+--- a/src/plugins/gstreamer/mediacapture/qgstreamercaptureserviceplugin.cpp
++++ b/src/plugins/gstreamer/mediacapture/qgstreamercaptureserviceplugin.cpp
+@@ -52,7 +52,10 @@
+ #include <private/qgstutils_p.h>
+
+ #include <private/qcore_unix_p.h>
++
++#if defined(USE_GSTREAMER_CAMERA)
+ #include <linux/videodev2.h>
++#endif
+
+ QMediaService* QGstreamerCaptureServicePlugin::create(const QString &key)
+ {
+diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
+index 2677e26..6a23fd2 100644
+--- a/src/plugins/plugins.pro
++++ b/src/plugins/plugins.pro
+@@ -43,7 +43,9 @@ unix:!mac:!android {
+ }
+
+ # v4l is turned off because it is not supported in Qt 5
+- # !maemo*:SUBDIRS += v4l
++ # config_linux_v4l {
++ # !maemo*:SUBDIRS += v4l
++ # }
+ }
+
+ mac:!simulator {
+--
+2.0.1
+
--
qtmultimedia packaging
More information about the pkg-kde-commits
mailing list