Hello community, here is the log from the commit of package libqt5-qtmultimedia for openSUSE:Factory checked in at 2015-06-06 09:51:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2015-03-18 13:07:55.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libqt5-qtmultimedia.new/libqt5-qtmultimedia.changes 2015-06-06 09:51:16.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Jun 3 22:56:24 UTC 2015 - hrvoje.senjan@gmail.com + +- Update to 5.4.2 + * Bugfix release, for more details please see: + http://blog.qt.io/blog/2015/06/02/qt-5-4-2-released/ + +------------------------------------------------------------------- Old: ---- qtmultimedia-opensource-src-5.4.1.tar.xz New: ---- qtmultimedia-opensource-src-5.4.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qtmultimedia.spec ++++++ --- /var/tmp/diff_new_pack.oFXMgR/_old 2015-06-06 09:51:17.000000000 +0200 +++ /var/tmp/diff_new_pack.oFXMgR/_new 2015-06-06 09:51:17.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libqt5-qtmultimedia # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products 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.1 +Version: 5.4.2 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.1 -%define so_version 5.4.1 +%define real_version 5.4.2 +%define so_version 5.4.2 %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.oFXMgR/_old 2015-06-06 09:51:17.000000000 +0200 +++ /var/tmp/diff_new_pack.oFXMgR/_new 2015-06-06 09:51:17.000000000 +0200 @@ -17,8 +17,6 @@ Reviewed-by: Andrew den Exter <andrew.den.exter@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 +- @@ -35,7 +33,7 @@ src/gsttools/qgstreamermirtexturerenderer.cpp | 351 +++++++++ src/gsttools/qgstreamervideoprobecontrol.cpp | 58 +- src/gsttools/qgstreamervideorenderer.cpp | 3 +- - src/gsttools/qgstreamervideowidget.cpp | 29 +- + src/gsttools/qgstreamervideowidget.cpp | 27 +- src/gsttools/qgstreamervideowindow.cpp | 105 ++- src/gsttools/qgstutils.cpp | 785 ++++++++++++++++++++- src/gsttools/qgstvideobuffer.cpp | 70 +- @@ -70,7 +68,7 @@ .../gstreamer/camerabin/camerabinimageprocessing.h | 7 +- .../gstreamer/camerabin/camerabinmetadata.cpp | 5 +- .../gstreamer/camerabin/camerabinrecorder.cpp | 9 +- - .../gstreamer/camerabin/camerabinservice.cpp | 7 +- + .../gstreamer/camerabin/camerabinservice.cpp | 6 +- .../gstreamer/camerabin/camerabinsession.cpp | 352 ++++----- src/plugins/gstreamer/common.pri | 22 +- src/plugins/gstreamer/gstreamer.pro | 4 +- @@ -91,7 +89,7 @@ .../mediaplayer/qgstreamerplayersession.h | 19 +- .../qcamerabackend/tst_qcamerabackend.cpp | 10 +- .../tst_qmediaplayerbackend.cpp | 4 +- - 71 files changed, 3668 insertions(+), 1380 deletions(-) + 71 files changed, 3668 insertions(+), 1377 deletions(-) create mode 100644 src/gsttools/qgstreamerbufferprobe.cpp create mode 100644 src/gsttools/qgstreamermirtexturerenderer.cpp create mode 100644 src/gsttools/qgstvideorendererplugin.cpp @@ -203,13 +201,13 @@ } diff --git a/qtmultimedia.pro b/qtmultimedia.pro -index 3cec526e84d6c16e94ecf5f87adf007c257eec9a..84f254861ac0ce5e13fadc42f1781221b64c3e32 100644 +index cf97e64236b5f1e37d926f59d54df6a6d7ca856b..cf58d63fc6fa2bb28d2b50892a785161de75f119 100644 --- a/qtmultimedia.pro +++ b/qtmultimedia.pro @@ -17,11 +17,27 @@ win32 { } else { - qtCompileTest(alsa) - qtCompileTest(pulseaudio) + contains(QT_CONFIG, alsa):qtCompileTest(alsa) + contains(QT_CONFIG, pulseaudio):qtCompileTest(pulseaudio) - qtCompileTest(gstreamer) { - qtCompileTest(gstreamer_photography) - qtCompileTest(gstreamer_encodingprofiles) @@ -1226,7 +1224,7 @@ #include <gst/gst.h> diff --git a/src/gsttools/qgstreamervideowidget.cpp b/src/gsttools/qgstreamervideowidget.cpp -index aa2e2a303fc8086c625b1c267d595bd7e405aa5b..1ae57a0e92b2cd654c70feb19d46890290a3910c 100644 +index 4960187482cee553aa931c6744b5b8ef7eaf5c68..ea2af30b40445cf3fdb8c180ec7e67e758d4d368 100644 --- a/src/gsttools/qgstreamervideowidget.cpp +++ b/src/gsttools/qgstreamervideowidget.cpp @@ -40,8 +40,13 @@ @@ -1243,16 +1241,7 @@ QT_BEGIN_NAMESPACE -@@ -130,8 +135,6 @@ void QGstreamerVideoWidgetControl::createVideoWidget() - m_videoSink = gst_element_factory_make ("ximagesink", NULL); - - qt_gst_object_ref_sink(GST_OBJECT (m_videoSink)); //Take ownership -- -- - } - - GstElement *QGstreamerVideoWidgetControl::videoSink() -@@ -169,9 +172,13 @@ bool QGstreamerVideoWidgetControl::processSyncMessage(const QGstreamerMessage &m +@@ -164,9 +169,13 @@ bool QGstreamerVideoWidgetControl::processSyncMessage(const QGstreamerMessage &m { GstMessage* gm = message.rawMessage(); @@ -1267,7 +1256,7 @@ setOverlay(); QMetaObject::invokeMethod(this, "updateNativeVideoSize", Qt::QueuedConnection); return true; -@@ -199,17 +206,24 @@ bool QGstreamerVideoWidgetControl::processBusMessage(const QGstreamerMessage &me +@@ -194,17 +203,24 @@ bool QGstreamerVideoWidgetControl::processBusMessage(const QGstreamerMessage &me void QGstreamerVideoWidgetControl::setOverlay() { @@ -1294,7 +1283,7 @@ gst_object_unref(GST_OBJECT(pad)); if (caps) { -@@ -225,8 +239,13 @@ void QGstreamerVideoWidgetControl::updateNativeVideoSize() +@@ -220,8 +236,13 @@ void QGstreamerVideoWidgetControl::updateNativeVideoSize() void QGstreamerVideoWidgetControl::windowExposed() { @@ -1516,15 +1505,16 @@ GstElement *QGstreamerVideoWindow::videoSink() diff --git a/src/gsttools/qgstutils.cpp b/src/gsttools/qgstutils.cpp -index 1281d3fc54eca0802792d88a38bb21b0d4384c5d..86d94045852946eb4e2e44920ee5bf37d871350d 100644 +index 465f43989e1cdff1d166683817a2f10404f1692b..1301552b545ea6543e4e11cb408e781320e5e210 100644 --- a/src/gsttools/qgstutils.cpp +++ b/src/gsttools/qgstutils.cpp -@@ -40,7 +40,14 @@ +@@ -40,8 +40,15 @@ #include <QtCore/qsize.h> #include <QtCore/qset.h> #include <QtCore/qstringlist.h> +#include <QtGui/qimage.h> #include <qaudioformat.h> + #include <QtCore/qelapsedtimer.h> +#include <QtMultimedia/qvideosurfaceformat.h> + +#include <gst/audio/audio.h> @@ -1534,7 +1524,7 @@ #ifdef USE_V4L # include <private/qcore_unix_p.h> -@@ -82,15 +89,24 @@ static void addTagToMap(const GstTagList *list, +@@ -83,15 +90,24 @@ static void addTagToMap(const GstTagList *list, map->insert(QByteArray(tag), g_value_get_boolean(&val)); break; case G_TYPE_CHAR: @@ -1559,7 +1549,7 @@ if (g_date_valid(date)) { int year = g_date_get_year(date); int month = g_date_get_month(date); -@@ -169,6 +185,42 @@ QSize QGstUtils::capsCorrectedResolution(const GstCaps *caps) +@@ -170,6 +186,42 @@ QSize QGstUtils::capsCorrectedResolution(const GstCaps *caps) return size; } @@ -1602,7 +1592,7 @@ /*! Returns audio format for caps. If caps doesn't have a valid audio format, an empty QAudioFormat is returned. -@@ -176,9 +228,26 @@ QSize QGstUtils::capsCorrectedResolution(const GstCaps *caps) +@@ -177,9 +229,26 @@ QSize QGstUtils::capsCorrectedResolution(const GstCaps *caps) QAudioFormat QGstUtils::audioFormatForCaps(const GstCaps *caps) { @@ -1631,7 +1621,7 @@ if (qstrcmp(gst_structure_get_name(structure), "audio/x-raw-int") == 0) { -@@ -249,16 +318,28 @@ QAudioFormat QGstUtils::audioFormatForCaps(const GstCaps *caps) +@@ -250,16 +319,28 @@ QAudioFormat QGstUtils::audioFormatForCaps(const GstCaps *caps) } else { return QAudioFormat(); } @@ -1662,7 +1652,7 @@ QAudioFormat QGstUtils::audioFormatForBuffer(GstBuffer *buffer) { GstCaps* caps = gst_buffer_get_caps(buffer); -@@ -269,7 +350,7 @@ QAudioFormat QGstUtils::audioFormatForBuffer(GstBuffer *buffer) +@@ -270,7 +351,7 @@ QAudioFormat QGstUtils::audioFormatForBuffer(GstBuffer *buffer) gst_caps_unref(caps); return format; } @@ -1671,7 +1661,7 @@ /*! Builds GstCaps for an audio format. -@@ -277,8 +358,32 @@ QAudioFormat QGstUtils::audioFormatForBuffer(GstBuffer *buffer) +@@ -278,8 +359,32 @@ QAudioFormat QGstUtils::audioFormatForBuffer(GstBuffer *buffer) Caller must unref GstCaps. */ @@ -1705,7 +1695,7 @@ GstStructure *structure = 0; if (format.isValid()) { -@@ -313,6 +418,7 @@ GstCaps *QGstUtils::capsForAudioFormat(QAudioFormat format) +@@ -314,6 +419,7 @@ GstCaps *QGstUtils::capsForAudioFormat(QAudioFormat format) } return caps; @@ -1713,7 +1703,7 @@ } void QGstUtils::initializeGst() -@@ -578,10 +684,629 @@ QByteArray QGstUtils::cameraDriver(const QString &device, GstElementFactory *fac +@@ -585,10 +691,629 @@ QByteArray QGstUtils::cameraDriver(const QString &device, GstElementFactory *fac return QByteArray(); } @@ -2344,7 +2334,7 @@ gst_object_ref_sink(object); #else g_return_if_fail (GST_IS_OBJECT(object)); -@@ -597,4 +1322,50 @@ void qt_gst_object_ref_sink(gpointer object) +@@ -604,4 +1329,50 @@ void qt_gst_object_ref_sink(gpointer object) #endif } @@ -5209,7 +5199,7 @@ QAudioEncoderSettings audioSettings = audioEncoderControl->audioSettings(); diff --git a/src/plugins/gstreamer/camerabin/camerabinservice.cpp b/src/plugins/gstreamer/camerabin/camerabinservice.cpp -index 969955f8a35506dd41af7d413c1030313d366ec5..388f2fdd5e164b431f1f2b0cf437a2f03efae695 100644 +index e4aa594d5c0a05f4d21d3ef27ccd56504f09763f..e669a57ac2c4c43374fde3a7a0ea631ed742d193 100644 --- a/src/plugins/gstreamer/camerabin/camerabinservice.cpp +++ b/src/plugins/gstreamer/camerabin/camerabinservice.cpp @@ -56,11 +56,11 @@ @@ -5225,15 +5215,7 @@ #if defined(HAVE_WIDGETS) #include <private/qgstreamervideowidget_p.h> #endif -@@ -121,7 +121,6 @@ CameraBinService::CameraBinService(GstElementFactory *sourceFactory, QObject *pa - #else - m_videoWindow = new QGstreamerVideoWindow(this); - #endif -- - #if defined(HAVE_WIDGETS) - m_videoWidgetControl = new QGstreamerVideoWidgetControl(this); - #endif -@@ -150,8 +149,6 @@ QMediaControl *CameraBinService::requestControl(const char *name) +@@ -164,8 +164,6 @@ QMediaControl *CameraBinService::requestControl(const char *name) if (!m_captureSession) return 0; @@ -5242,7 +5224,7 @@ if (!m_videoOutput) { if (qstrcmp(name, QVideoRendererControl_iid) == 0) { m_videoOutput = m_videoRenderer; -@@ -249,7 +246,7 @@ void CameraBinService::releaseControl(QMediaControl *control) +@@ -263,7 +261,7 @@ void CameraBinService::releaseControl(QMediaControl *control) bool CameraBinService::isCameraBinAvailable() { @@ -5855,7 +5837,7 @@ if (m_audioSettings.sampleRate() > 0) gst_structure_set(structure, "rate", G_TYPE_INT, m_audioSettings.sampleRate(), NULL ); diff --git a/src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.cpp b/src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.cpp -index 97a165dca73358ede0efe5a833fba64c1edae95f..1ab98cd4afffd7619f1a7875e1ba3f044c085d84 100644 +index e77feebc5fae469554d7f4826e7c36d3bd339792..04e2966a9fd82bb9accb02b0de72afd72a200ec6 100644 --- a/src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.cpp +++ b/src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.cpp @@ -62,27 +62,25 @@ @@ -5901,7 +5883,7 @@ if (service == Q_MEDIASERVICE_AUDIOSOURCE) { m_captureSession = new QGstreamerCaptureSession(QGstreamerCaptureSession::Audio, this); } -@@ -163,12 +161,12 @@ QMediaControl *QGstreamerCaptureService::requestControl(const char *name) +@@ -178,12 +176,12 @@ QMediaControl *QGstreamerCaptureService::requestControl(const char *name) return m_imageCaptureControl; if (qstrcmp(name,QMediaAudioProbeControl_iid) == 0) { @@ -5919,7 +5901,7 @@ } if (!m_videoOutput) { -@@ -194,17 +192,15 @@ QMediaControl *QGstreamerCaptureService::requestControl(const char *name) +@@ -209,17 +207,15 @@ QMediaControl *QGstreamerCaptureService::requestControl(const char *name) void QGstreamerCaptureService::releaseControl(QMediaControl *control) { @@ -5945,7 +5927,7 @@ } diff --git a/src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.h b/src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.h -index 7ff8ce253a9a346edc3d114a72b3ad3a8fc0007c..e0cf4ee42f87d6b83e9f932adba8b1d33fd07260 100644 +index e5166d13baca4053d3b33782b4fcc97b79410d1e..d6a58432b72b6748d60e539d46d806eec76e725e 100644 --- a/src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.h +++ b/src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.h @@ -43,6 +43,7 @@ QT_BEGIN_NAMESPACE @@ -5956,8 +5938,8 @@ class QGstreamerCaptureSession; class QGstreamerCameraControl; class QGstreamerMessage; -@@ -86,6 +87,8 @@ private: - QMediaControl *m_videoWidgetControl; +@@ -87,6 +88,8 @@ private: + QGstreamerVideoWidgetControl *m_videoWidgetControl; #endif QGstreamerImageCaptureControl *m_imageCaptureControl; + @@ -6655,7 +6637,7 @@ if (!request.url().isEmpty() || userStreamValid) { #else diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.cpp b/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.cpp -index ce267d7377faff4bcafe2b1fcb309973567c586e..84805b67a0e973972956b259aa2ebc1768516f7b 100644 +index ddc828eb2b2ba082c892fd446c5ae5afebe37b01..1fee6bf1566000ace17f9496d8f899f17c404143 100644 --- a/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.cpp +++ b/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.cpp @@ -51,7 +51,11 @@ @@ -6689,7 +6671,7 @@ #else m_videoRenderer = new QGstreamerVideoRenderer(this); #endif -@@ -115,23 +123,23 @@ QMediaControl *QGstreamerPlayerService::requestControl(const char *name) +@@ -129,23 +137,23 @@ QMediaControl *QGstreamerPlayerService::requestControl(const char *name) if (qstrcmp(name, QMediaAvailabilityControl_iid) == 0) return m_availabilityControl; @@ -6725,7 +6707,7 @@ } if (!m_videoOutput) { -@@ -156,28 +164,21 @@ QMediaControl *QGstreamerPlayerService::requestControl(const char *name) +@@ -170,28 +178,21 @@ QMediaControl *QGstreamerPlayerService::requestControl(const char *name) void QGstreamerPlayerService::releaseControl(QMediaControl *control) { @@ -6767,11 +6749,11 @@ } diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.h b/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.h -index f3081e986b3dfbd3cff2e6f0a24ec5a096ed89f3..22be262abb8141dda3326bdb19b8c49c7d14edb0 100644 +index 0c5b406414c597bb78abfab251004e8d8e0e0d57..a5dbe984c9051170fb8484ee2a2ccf87f80e4b9c 100644 --- a/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.h +++ b/src/plugins/gstreamer/mediaplayer/qgstreamerplayerservice.h -@@ -52,6 +52,8 @@ class QGstreamerStreamsControl; - class QGstreamerVideoRenderer; +@@ -53,6 +53,8 @@ class QGstreamerVideoRenderer; + class QGstreamerVideoWindow; class QGstreamerVideoWidgetControl; class QGStreamerAvailabilityControl; +class QGstreamerAudioProbeControl; @@ -6779,7 +6761,7 @@ class QGstreamerPlayerService : public QMediaService { -@@ -70,6 +72,9 @@ private: +@@ -71,6 +73,9 @@ private: QGstreamerStreamsControl *m_streamsControl; QGStreamerAvailabilityControl *m_availabilityControl; @@ -6788,7 +6770,7 @@ + QMediaControl *m_videoOutput; QMediaControl *m_videoRenderer; - QMediaControl *m_videoWindow; + QGstreamerVideoWindow *m_videoWindow; diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerplayerserviceplugin.cpp b/src/plugins/gstreamer/mediaplayer/qgstreamerplayerserviceplugin.cpp index 7d20b6d921d0deec796f6ccb31af19c1af380a49..f1fd4211c3fba389ef29129aa3fda41bc658dafc 100644 --- a/src/plugins/gstreamer/mediaplayer/qgstreamerplayerserviceplugin.cpp @@ -7667,5 +7649,5 @@ QCOMPARE(frame.width(), 160); QCOMPARE(frame.height(), 120); -- -2.2.1 +2.3.0 ++++++ qtmultimedia-opensource-src-5.4.1.tar.xz -> qtmultimedia-opensource-src-5.4.2.tar.xz ++++++ ++++ 162450 lines of diff (skipped)