Hello community,
here is the log from the commit of package libqt5-qtmultimedia for
openSUSE:Factory checked in at 2015-03-01 15:22:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtmultimedia (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtmultimedia.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtmultimedia"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qtmultimedia/libqt5-qtmultimedia.changes
2014-12-21 11:56:22.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.libqt5-qtmultimedia.new/libqt5-qtmultimedia.changes
2015-03-01 15:22:25.000000000 +0100
@@ -1,0 +2,7 @@
+Tue Feb 24 16:10:21 UTC 2015 - hrvoje.sen...@gmail.com
+
+- Update to 5.4.1
+ * For more details please see:
+ http://blog.qt.io/blog/2015/02/24/qt-5-4-1-released/
+
+-------------------------------------------------------------------
Old:
----
qtmultimedia-opensource-src-5.4.0.tar.xz
New:
----
qtmultimedia-opensource-src-5.4.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtmultimedia.spec ++++++
--- /var/tmp/diff_new_pack.vXeRqK/_old 2015-03-01 15:22:26.000000000 +0100
+++ /var/tmp/diff_new_pack.vXeRqK/_new 2015-03-01 15:22:26.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libqt5-qtmultimedia
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -26,15 +26,15 @@
%endif
Name: libqt5-qtmultimedia
-Version: 5.4.0
+Version: 5.4.1
Release: 0
Summary: Qt 5 Multimedia Library
License: SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0
Group: Development/Libraries/X11
Url: http://qt.digia.com
%define base_name libqt5
-%define real_version 5.4.0
-%define so_version 5.4.0
+%define real_version 5.4.1
+%define so_version 5.4.1
%define tar_version qtmultimedia-opensource-src-%{real_version}
Source: %{tar_version}.tar.xz
Source1: baselibs.conf
++++++ 0001-GStreamer-port-to-1.0.patch ++++++
--- /var/tmp/diff_new_pack.vXeRqK/_old 2015-03-01 15:22:26.000000000 +0100
+++ /var/tmp/diff_new_pack.vXeRqK/_new 2015-03-01 15:22:26.000000000 +0100
@@ -1,4 +1,4 @@
-From b4963972ec297d3be2c9fe02ce71e7e6c7dbeb1e Mon Sep 17 00:00:00 2001
+From 3da9fe0bcfd5c19a668145de7d546b7b05a03aea Mon Sep 17 00:00:00 2001
From: Yoann Lopes <yoann.lo...@theqtcompany.com>
Date: Thu, 20 Nov 2014 17:54:18 +0100
Subject: [PATCH 1/1] GStreamer: port to 1.0.
@@ -16,6 +16,9 @@
Change-Id: I72a46d1170a8794a149bdb5e20767afcc5b7587c
Reviewed-by: Andrew den Exter <andrew.den.ex...@qinetic.com.au>
(cherry picked from commit 108dda7a90bd0f0337358b0db47ae55acd16dea6)
+
+Conflicts:
+ src/plugins/gstreamer/camerabin/camerabinsession.cpp
---
config.tests/gstreamer/gstreamer.pro | 11 +-
config.tests/gstreamer_appsrc/gstreamer_appsrc.pro | 13 +-
@@ -68,7 +71,7 @@
.../gstreamer/camerabin/camerabinmetadata.cpp | 5 +-
.../gstreamer/camerabin/camerabinrecorder.cpp | 9 +-
.../gstreamer/camerabin/camerabinservice.cpp | 7 +-
- .../gstreamer/camerabin/camerabinsession.cpp | 339 ++++-----
+ .../gstreamer/camerabin/camerabinsession.cpp | 352 ++++-----
src/plugins/gstreamer/common.pri | 22 +-
src/plugins/gstreamer/gstreamer.pro | 4 +-
.../gstreamer/mediacapture/mediacapturecamera.json | 2 +-
@@ -88,7 +91,7 @@
.../mediaplayer/qgstreamerplayersession.h | 19 +-
.../qcamerabackend/tst_qcamerabackend.cpp | 10 +-
.../tst_qmediaplayerbackend.cpp | 4 +-
- 71 files changed, 3661 insertions(+), 1374 deletions(-)
+ 71 files changed, 3668 insertions(+), 1380 deletions(-)
create mode 100644 src/gsttools/qgstreamerbufferprobe.cpp
create mode 100644 src/gsttools/qgstreamermirtexturerenderer.cpp
create mode 100644 src/gsttools/qgstvideorendererplugin.cpp
@@ -380,7 +383,7 @@
config_linux_v4l: DEFINES += USE_V4L
diff --git a/src/gsttools/qgstappsrc.cpp b/src/gsttools/qgstappsrc.cpp
-index
148366b3e11eedab07e8b1db4bbea566df6792f3..57eaacdb7504b39776492357221ac73f5db96386
100644
+index
561a96fc823dd834e8d1230307588cc15a3fe3c7..178e11805f1317b1689e9ccb7385b9a598326a1d
100644
--- a/src/gsttools/qgstappsrc.cpp
+++ b/src/gsttools/qgstappsrc.cpp
@@ -147,23 +147,44 @@ void QGstAppSrc::pushDataToAppSrc()
@@ -1513,7 +1516,7 @@
GstElement *QGstreamerVideoWindow::videoSink()
diff --git a/src/gsttools/qgstutils.cpp b/src/gsttools/qgstutils.cpp
-index
556fc03cce6ef3eb4284bddc743913d1d9ba9881..65124c931cb2f6fa4c666e761c9ad87de3e17d05
100644
+index
1281d3fc54eca0802792d88a38bb21b0d4384c5d..86d94045852946eb4e2e44920ee5bf37d871350d
100644
--- a/src/gsttools/qgstutils.cpp
+++ b/src/gsttools/qgstutils.cpp
@@ -40,7 +40,14 @@
@@ -1710,7 +1713,7 @@
}
void QGstUtils::initializeGst()
-@@ -576,10 +682,629 @@ QByteArray QGstUtils::cameraDriver(const QString
&device, GstElementFactory *fac
+@@ -578,10 +684,629 @@ QByteArray QGstUtils::cameraDriver(const QString
&device, GstElementFactory *fac
return QByteArray();
}
@@ -2341,7 +2344,7 @@
gst_object_ref_sink(object);
#else
g_return_if_fail (GST_IS_OBJECT(object));
-@@ -595,4 +1320,50 @@ void qt_gst_object_ref_sink(gpointer object)
+@@ -597,4 +1322,50 @@ void qt_gst_object_ref_sink(gpointer object)
#endif
}
@@ -5249,7 +5252,7 @@
gst_object_unref(GST_OBJECT(factory));
return true;
diff --git a/src/plugins/gstreamer/camerabin/camerabinsession.cpp
b/src/plugins/gstreamer/camerabin/camerabinsession.cpp
-index
a4038c589d1e3adcfe4c1e2604f1cc355a544621..f916b58c7e14b4ed5854fdf13134be40fac130c1
100644
+index
1ed663b9b41e0a62d30ed6b47ead05eeecd8459f..87d9881568cdf1e107dd8af551b028164603ad82
100644
--- a/src/plugins/gstreamer/camerabin/camerabinsession.cpp
+++ b/src/plugins/gstreamer/camerabin/camerabinsession.cpp
@@ -140,8 +140,8 @@ CameraBinSession::CameraBinSession(GstElementFactory
*sourceFactory, QObject *pa
@@ -5367,7 +5370,7 @@
}
return caps;
-@@ -314,40 +289,40 @@ static GstCaps *resolutionToCaps(const QSize
&resolution, const QPair<int, int>
+@@ -314,28 +289,14 @@ static GstCaps *resolutionToCaps(const QSize
&resolution, const QPair<int, int>
void CameraBinSession::setupCaptureResolution()
{
QSize resolution = m_imageEncodeControl->imageSettings().resolution();
@@ -5382,24 +5385,16 @@
- gst_caps_unref(caps);
- } else {
- g_object_set(m_camerabin, IMAGE_CAPTURE_CAPS_PROPERTY, NULL, NULL);
-+ if (caps)
-+ gst_caps_unref(caps);
- }
-
-+ const QSize viewfinderResolution =
m_viewfinderSettingsControl->resolution();
- resolution = m_videoEncodeControl->actualVideoSettings().resolution();
+- }
+-
+- resolution = m_videoEncodeControl->actualVideoSettings().resolution();
- //qreal framerate = m_videoEncodeControl->videoSettings().frameRate();
- if (!resolution.isEmpty()) {
- GstCaps *caps = resolutionToCaps(resolution /*, framerate*/);
//convert to rational
-+ qreal framerate = m_videoEncodeControl->videoSettings().frameRate();
-+ {
-+ GstCaps *caps = resolutionToCaps(
-+ !resolution.isEmpty() ? resolution :
viewfinderResolution, framerate);
- #if CAMERABIN_DEBUG
+-#if CAMERABIN_DEBUG
- qDebug() << Q_FUNC_INFO << "set video resolution" << resolution <<
gst_caps_to_string(caps);
-+ qDebug() << Q_FUNC_INFO << "set video resolution" << resolution <<
caps;
- #endif
- g_object_set(m_camerabin, VIDEO_CAPTURE_CAPS_PROPERTY, caps, NULL);
+-#endif
+- g_object_set(m_camerabin, VIDEO_CAPTURE_CAPS_PROPERTY, caps, NULL);
- gst_caps_unref(caps);
- } else {
- g_object_set(m_camerabin, VIDEO_CAPTURE_CAPS_PROPERTY, NULL, NULL);
@@ -5407,8 +5402,27 @@
+ gst_caps_unref(caps);
}
+ GstElement *mfw_v4lsrc = 0;
+@@ -349,14 +310,30 @@ void CameraBinSession::setupCaptureResolution()
+ }
+ }
+
- resolution = m_viewfinderSettingsControl->resolution();
- if (!resolution.isEmpty()) {
++ const QSize viewfinderResolution =
m_viewfinderSettingsControl->resolution();
++ resolution = m_videoEncodeControl->actualVideoSettings().resolution();
++ qreal framerate = m_videoEncodeControl->videoSettings().frameRate();
++ {
++ GstCaps *caps = resolutionToCaps(
++ !resolution.isEmpty() ? resolution :
viewfinderResolution, framerate);
++#if CAMERABIN_DEBUG
++ qDebug() << Q_FUNC_INFO << "set video resolution" << resolution <<
caps;
++#endif
++ g_object_set(m_camerabin, VIDEO_CAPTURE_CAPS_PROPERTY, caps, NULL);
++ if (caps)
++ gst_caps_unref(caps);
++ }
++
+ if (!viewfinderResolution.isEmpty())
+ resolution = viewfinderResolution;
+ {
@@ -5419,14 +5433,22 @@
#endif
g_object_set(m_camerabin, VIEWFINDER_CAPS_PROPERTY, caps, NULL);
- gst_caps_unref(caps);
-- } else {
-- g_object_set(m_camerabin, VIEWFINDER_CAPS_PROPERTY, NULL, NULL);
+ if (caps)
+ gst_caps_unref(caps);
+
+ if (mfw_v4lsrc) {
+ int capMode = 0;
+@@ -372,8 +349,7 @@ void CameraBinSession::setupCaptureResolution()
+ capMode = 5;
+ g_object_set(G_OBJECT(mfw_v4lsrc), "capture-mode", capMode, NULL);
+ }
+- } else {
+- g_object_set(m_camerabin, VIEWFINDER_CAPS_PROPERTY, NULL, NULL);
++
}
- if (m_videoEncoder)
-@@ -363,13 +338,17 @@ void CameraBinSession::setAudioCaptureCaps()
+ const qreal maxFps = m_viewfinderSettingsControl->maximumFrameRate();
+@@ -399,13 +375,17 @@ void CameraBinSession::setAudioCaptureCaps()
if (sampleRate == -1 && channelCount == -1)
return;
@@ -5445,7 +5467,7 @@
if (sampleRate != -1)
gst_structure_set(structure, "rate", G_TYPE_INT, sampleRate, NULL);
if (channelCount != -1)
-@@ -760,7 +739,7 @@ qint64 CameraBinSession::duration() const
+@@ -796,7 +776,7 @@ qint64 CameraBinSession::duration() const
if (fileSink) {
GstFormat format = GST_FORMAT_TIME;
gint64 duration = 0;
@@ -5454,7 +5476,7 @@
gst_object_unref(GST_OBJECT(fileSink));
if (ret)
return duration / 1000000;
-@@ -795,129 +774,57 @@ void CameraBinSession::setMetaData(const
QMap<QByteArray, QVariant> &data)
+@@ -831,129 +811,57 @@ void CameraBinSession::setMetaData(const
QMap<QByteArray, QVariant> &data)
{
m_metaData = data;
@@ -5623,7 +5645,7 @@
m_cameraFocusControl->handleFocusMessage(gm);
#endif
}
-@@ -1109,20 +1016,12 @@ QList< QPair<int,int> >
CameraBinSession::supportedFrameRates(const QSize &frame
+@@ -1145,20 +1053,12 @@ QList< QPair<int,int> >
CameraBinSession::supportedFrameRates(const QSize &frame
if (frameSize.isEmpty()) {
caps = gst_caps_copy(supportedCaps);
} else {
@@ -5650,7 +5672,7 @@
caps = gst_caps_intersect(supportedCaps, filter);
gst_caps_unref(filter);
-@@ -1133,7 +1032,7 @@ QList< QPair<int,int> >
CameraBinSession::supportedFrameRates(const QSize &frame
+@@ -1169,7 +1069,7 @@ QList< QPair<int,int> >
CameraBinSession::supportedFrameRates(const QSize &frame
caps = gst_caps_make_writable(caps);
for (uint i=0; i<gst_caps_get_size(caps); i++) {
GstStructure *structure = gst_caps_get_structure(caps, i);
@@ -5659,7 +5681,7 @@
const GValue *oldRate = gst_structure_get_value(structure,
"framerate");
GValue rate;
memset(&rate, 0, sizeof(rate));
-@@ -1142,8 +1041,11 @@ QList< QPair<int,int> >
CameraBinSession::supportedFrameRates(const QSize &frame
+@@ -1178,8 +1078,11 @@ QList< QPair<int,int> >
CameraBinSession::supportedFrameRates(const QSize &frame
gst_structure_remove_all_fields(structure);
gst_structure_set_value(structure, "framerate", &rate);
}
@@ -5672,7 +5694,7 @@
for (uint i=0; i<gst_caps_get_size(caps); i++) {
GstStructure *structure = gst_caps_get_structure(caps, i);
-@@ -1154,7 +1056,7 @@ QList< QPair<int,int> >
CameraBinSession::supportedFrameRates(const QSize &frame
+@@ -1190,7 +1093,7 @@ QList< QPair<int,int> >
CameraBinSession::supportedFrameRates(const QSize &frame
qSort(res.begin(), res.end(), rateLessThan);
#if CAMERABIN_DEBUG
@@ -5681,7 +5703,7 @@
qDebug() << res;
#endif
-@@ -1213,31 +1115,24 @@ QList<QSize>
CameraBinSession::supportedResolutions(QPair<int,int> rate,
+@@ -1249,31 +1152,24 @@ QList<QSize>
CameraBinSession::supportedResolutions(QPair<int,int> rate,
SUPPORTED_IMAGE_CAPTURE_CAPS_PROPERTY :
SUPPORTED_VIDEO_CAPTURE_CAPS_PROPERTY,
&supportedCaps, NULL);
@@ -5722,7 +5744,7 @@
caps = gst_caps_intersect(supportedCaps, filter);
gst_caps_unref(filter);
}
-@@ -1247,7 +1142,7 @@ QList<QSize>
CameraBinSession::supportedResolutions(QPair<int,int> rate,
+@@ -1283,7 +1179,7 @@ QList<QSize>
CameraBinSession::supportedResolutions(QPair<int,int> rate,
caps = gst_caps_make_writable(caps);
for (uint i=0; i<gst_caps_get_size(caps); i++) {
GstStructure *structure = gst_caps_get_structure(caps, i);
@@ -5731,7 +5753,7 @@
const GValue *oldW = gst_structure_get_value(structure, "width");
const GValue *oldH = gst_structure_get_value(structure, "height");
GValue w;
-@@ -1262,7 +1157,13 @@ QList<QSize>
CameraBinSession::supportedResolutions(QPair<int,int> rate,
+@@ -1298,7 +1194,13 @@ QList<QSize>
CameraBinSession::supportedResolutions(QPair<int,int> rate,
gst_structure_set_value(structure, "width", &w);
gst_structure_set_value(structure, "height", &h);
}
@@ -7645,5 +7667,5 @@
QCOMPARE(frame.width(), 160);
QCOMPARE(frame.height(), 120);
--
-2.1.3
+2.2.1
++++++ qtmultimedia-opensource-src-5.4.0.tar.xz ->
qtmultimedia-opensource-src-5.4.1.tar.xz ++++++
++++ 2018 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
