[SCM] qtmultimedia packaging branch, experimental, updated. debian/5.3.1-4-5-geba790b
Lisandro Damián Nicanor Pérez
lisandro at moszumanska.debian.org
Wed Sep 17 23:11:13 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtmultimedia.git;a=commitdiff;h=eba790b
The following commit has been merged in the experimental branch:
commit eba790b1e9718bc27560c642bbd6a81016cd6d32
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date: Wed Sep 17 20:10:55 2014 -0300
Remove test_v4l.patch, applied upstream.
---
debian/changelog | 1 +
debian/patches/series | 1 -
debian/patches/test_v4l.patch | 320 ------------------------------------------
3 files changed, 1 insertion(+), 321 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 38335e7..7ed54bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ qtmultimedia-opensource-src (5.3.2-1) UNRELEASED; urgency=medium
* New upstream release.
* Bump Qt build dependencies.
* Update symbols files with buildds' logs.
+ * Remove test_v4l.patch, applied upstream.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Wed, 17 Sep 2014 19:56:17 -0300
diff --git a/debian/patches/series b/debian/patches/series
index b7923b6..1662367 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
rpath_nonlinux.diff
-test_v4l.patch
diff --git a/debian/patches/test_v4l.patch b/debian/patches/test_v4l.patch
deleted file mode 100644
index c50ac29..0000000
--- a/debian/patches/test_v4l.patch
+++ /dev/null
@@ -1,320 +0,0 @@
-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
---- /dev/null
-+++ b/config.tests/linux_v4l/linux_v4l.pro
-@@ -0,0 +1 @@
-+SOURCES += main.cpp
-diff --git a/config.tests/linux_v4l/main.cpp b/config.tests/linux_v4l/main.cpp
-new file mode 100644
-index 0000000..3fcca4f
---- /dev/null
-+++ b/config.tests/linux_v4l/main.cpp
-@@ -0,0 +1,47 @@
-+/****************************************************************************
-+**
-+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-+** Contact: http://www.qt-project.org/legal
-+**
-+** This file is part of the Qt Toolkit.
-+**
-+** $QT_BEGIN_LICENSE:LGPL$
-+** Commercial License Usage
-+** Licensees holding valid commercial Qt licenses may use this file in
-+** accordance with the commercial license agreement provided with the
-+** Software or, alternatively, in accordance with the terms contained in
-+** a written agreement between you and Digia. For licensing terms and
-+** conditions see http://qt.digia.com/licensing. For further information
-+** use the contact form at http://qt.digia.com/contact-us.
-+**
-+** GNU Lesser General Public License Usage
-+** Alternatively, this file may be used under the terms of the GNU Lesser
-+** General Public License version 2.1 as published by the Free Software
-+** Foundation and appearing in the file LICENSE.LGPL included in the
-+** packaging of this file. Please review the following information to
-+** ensure the GNU Lesser General Public License version 2.1 requirements
-+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-+**
-+** In addition, as a special exception, Digia gives you certain additional
-+** rights. These rights are described in the Digia Qt LGPL Exception
-+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-+**
-+** GNU General Public License Usage
-+** Alternatively, this file may be used under the terms of the GNU
-+** General Public License version 3.0 as published by the Free Software
-+** Foundation and appearing in the file LICENSE.GPL included in the
-+** packaging of this file. Please review the following information to
-+** ensure the GNU General Public License version 3.0 requirements will be
-+** met: http://www.gnu.org/copyleft/gpl.html.
-+**
-+**
-+** $QT_END_LICENSE$
-+**
-+****************************************************************************/
-+
-+#include <linux/videodev2.h>
-+
-+int main(int argc, char** argv)
-+{
-+ return 0;
-+}
-diff --git a/qtmultimedia.pro b/qtmultimedia.pro
-index c7f093c..bec5925 100644
---- a/qtmultimedia.pro
-+++ b/qtmultimedia.pro
-@@ -25,6 +25,7 @@ win32 {
- qtCompileTest(gstreamer_photography)
- qtCompileTest(gstreamer_encodingprofiles)
- qtCompileTest(gstreamer_appsrc)
-+ qtCompileTest(linux_v4l)
- }
- qtCompileTest(resourcepolicy)
- qtCompileTest(gpu_vivante)
-diff --git a/src/gsttools/gsttools.pro b/src/gsttools/gsttools.pro
-index 15edd04..7c809a7 100644
---- a/src/gsttools/gsttools.pro
-+++ b/src/gsttools/gsttools.pro
-@@ -100,6 +100,8 @@ config_gstreamer_appsrc {
- LIBS_PRIVATE += -lgstapp-0.10
- }
-
-+config_linux_v4l: DEFINES += USE_V4L
-+
- HEADERS += $$PRIVATE_HEADERS
-
- DESTDIR = $$QT.multimedia.libs
-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..5baa0fd 100644
---- a/src/plugins/gstreamer/mediacapture/mediacapture.pro
-+++ b/src/plugins/gstreamer/mediacapture/mediacapture.pro
-@@ -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 \
-@@ -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 \
-@@ -37,13 +35,18 @@ SOURCES += $$PWD/qgstreamercaptureservice.cpp \
- # Camera usage with gstreamer needs to have
- #CONFIG += use_gstreamer_camera
-
--use_gstreamer_camera {
--DEFINES += USE_GSTREAMER_CAMERA
-+use_gstreamer_camera:config_linux_v4l {
-+ DEFINES += USE_GSTREAMER_CAMERA
-+
-+ 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..2278f92 100644
---- a/src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.cpp
-+++ b/src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.cpp
-@@ -48,9 +48,12 @@
- #include "qgstreamerimageencode.h"
- #include "qgstreamercameracontrol.h"
- #include <private/qgstreamerbushelper_p.h>
--#include "qgstreamerv4l2input.h"
- #include "qgstreamercapturemetadatacontrol.h"
-
-+#if defined(USE_GSTREAMER_CAMERA)
-+#include "qgstreamerv4l2input.h"
-+#endif
-+
- #include "qgstreamerimagecapturecontrol.h"
- #include <private/qgstreameraudioinputselector_p.h>
- #include <private/qgstreamervideoinputdevicecontrol_p.h>
-@@ -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);
- }
-
-+#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 +117,7 @@ QGstreamerCaptureService::QGstreamerCaptureService(const QString &service, QObje
- #endif
- m_imageCaptureControl = new QGstreamerImageCaptureControl(m_captureSession);
- }
-+#endif
-
- m_audioInputSelector = new QGstreamerAudioInputSelector(this);
- connect(m_audioInputSelector, SIGNAL(activeInputChanged(QString)), m_captureSession, SLOT(setCaptureDevice(QString)));
-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:
-
- 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