Hello community, here is the log from the commit of package phonon4qt5-backend-gstreamer for openSUSE:Factory checked in at 2014-06-23 09:24:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/phonon4qt5-backend-gstreamer (Old) and /work/SRC/openSUSE:Factory/.phonon4qt5-backend-gstreamer.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "phonon4qt5-backend-gstreamer" Changes: -------- --- /work/SRC/openSUSE:Factory/phonon4qt5-backend-gstreamer/phonon4qt5-backend-gstreamer.changes 2014-05-14 20:28:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.phonon4qt5-backend-gstreamer.new/phonon4qt5-backend-gstreamer.changes 2014-06-23 09:24:31.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Jun 20 22:12:56 UTC 2014 - hrvoje.sen...@gmail.com + +- Install license +- Update tarball to latest snapshot + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ phonon4qt5-backend-gstreamer.spec ++++++ --- /var/tmp/diff_new_pack.41tgj1/_old 2014-06-23 09:24:32.000000000 +0200 +++ /var/tmp/diff_new_pack.41tgj1/_new 2014-06-23 09:24:32.000000000 +0200 @@ -79,6 +79,7 @@ %files %defattr(-,root,root) +%doc COPYING* %dir %{_kf5_plugindir}/phonon4qt5_backend %{_kf5_plugindir}/phonon4qt5_backend/phonon_gstreamer.so ++++++ phonon-backend-gstreamer-4.7.2git.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-backend-gstreamer-4.7.2git/gstreamer/videowidget.cpp new/phonon-backend-gstreamer-4.7.2git/gstreamer/videowidget.cpp --- old/phonon-backend-gstreamer-4.7.2git/gstreamer/videowidget.cpp 2014-04-02 17:35:01.000000000 +0200 +++ new/phonon-backend-gstreamer-4.7.2git/gstreamer/videowidget.cpp 2014-04-08 20:10:01.000000000 +0200 @@ -18,6 +18,7 @@ #include "videowidget.h" #include <QtCore/QEvent> +#include <QtCore/QThread> #include <QtGui/QResizeEvent> #include <QtGui/QPalette> #include <QtGui/QImage> @@ -89,6 +90,18 @@ render->setOverlay(); } +void Gstreamer::VideoWidget::syncX() +{ + Q_ASSERT(QThread::currentThread() == QApplication::instance()->thread()); + +#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) +#warning syncx +// QApplication::syncX(); +#else + QApplication::syncX(); +#endif +} + void VideoWidget::finalizeLink() { connect(root()->pipeline(), SIGNAL(mouseOverActive(bool)), this, SLOT(mouseOverActive(bool))); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-backend-gstreamer-4.7.2git/gstreamer/videowidget.h new/phonon-backend-gstreamer-4.7.2git/gstreamer/videowidget.h --- old/phonon-backend-gstreamer-4.7.2git/gstreamer/videowidget.h 2014-04-02 17:35:01.000000000 +0200 +++ new/phonon-backend-gstreamer-4.7.2git/gstreamer/videowidget.h 2014-04-08 20:10:01.000000000 +0200 @@ -87,6 +87,7 @@ public slots: void setMovieSize(const QSize &size); void mouseOverActive(bool active); + void syncX(); protected: virtual void keyPressEvent(QKeyEvent *event); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phonon-backend-gstreamer-4.7.2git/gstreamer/x11renderer.cpp new/phonon-backend-gstreamer-4.7.2git/gstreamer/x11renderer.cpp --- old/phonon-backend-gstreamer-4.7.2git/gstreamer/x11renderer.cpp 2014-04-02 17:35:01.000000000 +0200 +++ new/phonon-backend-gstreamer-4.7.2git/gstreamer/x11renderer.cpp 2014-04-08 20:10:01.000000000 +0200 @@ -176,14 +176,7 @@ #endif ) { WId windowId = m_renderWidget->winId(); - // Even if we have created a winId at this point, other X applications - // need to be aware of it. -#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) -#warning syncx -// QApplication::syncX(); -#else - QApplication::syncX(); -#endif // QT_VERSION + #if GST_VERSION >= GST_VERSION_CHECK (1,0,0,0) gst_video_overlay_set_window_handle(GST_VIDEO_OVERLAY(m_videoSink), windowId); #elif GST_VERSION >= GST_VERSION_CHECK(0,10,31,0) @@ -198,12 +191,11 @@ void X11Renderer::windowExposed() { -#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) -#warning syncx -// QApplication::syncX(); -#else - QApplication::syncX(); -#endif //QT_VERSION + // This can be invoked within a callchain in an arbitrary thread, so make + // sure we call syncX() from the main thread + QMetaObject::invokeMethod(m_videoWidget, "syncX", + Qt::QueuedConnection); + if (m_videoSink && #if GST_VERSION < GST_VERSION_CHECK (1,0,0,0) GST_IS_X_OVERLAY(m_videoSink) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org