commit gstreamer-plugins-qt for openSUSE:Factory
Hello community, here is the log from the commit of package gstreamer-plugins-qt for openSUSE:Factory checked in at 2017-02-10 09:49:51 Comparing /work/SRC/openSUSE:Factory/gstreamer-plugins-qt (Old) and /work/SRC/openSUSE:Factory/.gstreamer-plugins-qt.new (New) Package is "gstreamer-plugins-qt" Changes: --- /work/SRC/openSUSE:Factory/gstreamer-plugins-qt/gstreamer-plugins-qt.changes 2016-01-07 00:19:44.0 +0100 +++ /work/SRC/openSUSE:Factory/.gstreamer-plugins-qt.new/gstreamer-plugins-qt.changes 2017-02-10 09:50:17.315120727 +0100 @@ -1,0 +2,5 @@ +Wed Feb 1 11:17:02 UTC 2017 - adam.ma...@suse.de + +- use individual libboost-*-devel packages instead of boost-devel + +--- Other differences: -- ++ gstreamer-plugins-qt.spec ++ --- /var/tmp/diff_new_pack.v38Imj/_old 2017-02-10 09:50:17.919035338 +0100 +++ /var/tmp/diff_new_pack.v38Imj/_new 2017-02-10 09:50:17.923034773 +0100 @@ -1,7 +1,7 @@ # # spec file for package gstreamer-plugins-qt # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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 @@ -35,7 +35,11 @@ # PATCH-FIX-UPSTREAM fix-boost-moc.patch idon...@suse.com -- Fix build with boost 1.60 Patch2: fix-boost-moc.patch BuildRequires: bison +%if 0%{?suse_version} > 1325 +BuildRequires: libboost_headers-devel +%else BuildRequires: boost-devel +%endif BuildRequires: cmake >= 2.8.9 BuildRequires: doxygen BuildRequires: flex @@ -83,7 +87,11 @@ Summary:Include files and libraries mandatory for development Group: Development/Libraries/C and C++ Requires: %{name} = %{version} +%if 0%{?suse_version} > 1325 +Requires: libboost_headers-devel +%else Requires: boost-devel +%endif Requires: pkgconfig(QtCore) Requires: pkgconfig(QtDeclarative) Requires: pkgconfig(QtGui)
commit gstreamer-plugins-qt for openSUSE:Factory
Hello community, here is the log from the commit of package gstreamer-plugins-qt for openSUSE:Factory checked in at 2016-01-07 00:19:38 Comparing /work/SRC/openSUSE:Factory/gstreamer-plugins-qt (Old) and /work/SRC/openSUSE:Factory/.gstreamer-plugins-qt.new (New) Package is "gstreamer-plugins-qt" Changes: --- /work/SRC/openSUSE:Factory/gstreamer-plugins-qt/gstreamer-plugins-qt.changes 2015-11-24 22:29:44.0 +0100 +++ /work/SRC/openSUSE:Factory/.gstreamer-plugins-qt.new/gstreamer-plugins-qt.changes 2016-01-07 00:19:44.0 +0100 @@ -1,0 +2,6 @@ +Tue Jan 5 09:16:25 UTC 2016 - idon...@suse.com + +- Add fix-boost-moc.patch from upstream to fix compilation with + boost 1.60 bgo#739752 + +--- New: fix-boost-moc.patch Other differences: -- ++ gstreamer-plugins-qt.spec ++ --- /var/tmp/diff_new_pack.xjA6Xb/_old 2016-01-07 00:19:45.0 +0100 +++ /var/tmp/diff_new_pack.xjA6Xb/_new 2016-01-07 00:19:45.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package gstreamer-plugins-qt # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -32,6 +32,8 @@ Patch0: qt-gstreamer-fix-memleak.patch # PATCH-FIX-UPSTREAM qt-gstreamer-fixbuild-gst_1-6.patch zai...@opensuse.org -- Fix build with gst 1.5 and newer. Patch1: qt-gstreamer-fixbuild-gst_1-6.patch +# PATCH-FIX-UPSTREAM fix-boost-moc.patch idon...@suse.com -- Fix build with boost 1.60 +Patch2: fix-boost-moc.patch BuildRequires: bison BuildRequires: boost-devel BuildRequires: cmake >= 2.8.9 @@ -75,6 +77,7 @@ %setup -q -n qt-gstreamer-%{version} %patch0 -p1 %patch1 -p1 +%patch2 -p1 %package devel Summary:Include files and libraries mandatory for development ++ fix-boost-moc.patch ++ Index: qt-gstreamer-1.2.0/src/QGlib/connect.cpp === --- qt-gstreamer-1.2.0.orig/src/QGlib/connect.cpp +++ qt-gstreamer-1.2.0/src/QGlib/connect.cpp @@ -20,10 +20,13 @@ #include #include #include + +#ifndef Q_MOC_RUN #include #include #include #include +#endif namespace QGlib { namespace Private { Index: qt-gstreamer-1.2.0/src/QGlib/connect.h === --- qt-gstreamer-1.2.0.orig/src/QGlib/connect.h +++ qt-gstreamer-1.2.0/src/QGlib/connect.h @@ -25,8 +25,11 @@ #include #include #include + +#ifndef Q_MOC_RUN #include #include +#endif namespace QGlib { Index: qt-gstreamer-1.2.0/src/QGlib/connectimpl.h === --- qt-gstreamer-1.2.0.orig/src/QGlib/connectimpl.h +++ qt-gstreamer-1.2.0/src/QGlib/connectimpl.h @@ -26,8 +26,9 @@ # include "refpointer.h" # include # include +#ifndef Q_MOC_RUN # include - +#endif namespace QGlib { namespace Private { Index: qt-gstreamer-1.2.0/src/QGlib/emitimpl.h === --- qt-gstreamer-1.2.0.orig/src/QGlib/emitimpl.h +++ qt-gstreamer-1.2.0/src/QGlib/emitimpl.h @@ -125,7 +125,9 @@ R emitWithDetail(void *instance, const c # else //QGLIB_HAVE_CXX0X +#ifndef Q_MOC_RUN # include +#endif // include the second part of this file as many times as QGLIB_SIGNAL_MAX_ARGS specifies # define BOOST_PP_ITERATION_PARAMS_1 (3,(0, QGLIB_SIGNAL_MAX_ARGS, "QGlib/emitimpl.h")) Index: qt-gstreamer-1.2.0/src/QGlib/global.h === --- qt-gstreamer-1.2.0.orig/src/QGlib/global.h +++ qt-gstreamer-1.2.0/src/QGlib/global.h @@ -17,13 +17,10 @@ #ifndef QGLIB_GLOBAL_H #define QGLIB_GLOBAL_H -// workaround for https://bugreports.qt-project.org/browse/QTBUG-22829 -#if defined(Q_MOC_RUN) && !defined(BOOST_TT_HAS_OPERATOR_HPP_INCLUDED) -#define BOOST_TT_HAS_OPERATOR_HPP_INCLUDED -#endif - #include +#ifndef Q_MOC_RUN #include +#endif /* defined by cmake when building this library */ #if defined(QtGLib_EXPORTS) || defined(Qt5GLib_EXPORTS) Index: qt-gstreamer-1.2.0/src/QGlib/refpointer.h === --- qt-gstreamer-1.2.0.orig/src/QGlib/refpointer.h +++ qt-gstreamer-1.2.0/src/QGlib/refpointer.h @@ -23,8 +23,10 @@ #include "type.h" #include "wrap.h" #include +#ifndef Q_MOC_RUN #include #include +#endif #include namespace QGlib { Index: qt-gstreamer-1.2.0/src/QGlib/type.h === --
commit gstreamer-plugins-qt for openSUSE:Factory
Hello community, here is the log from the commit of package gstreamer-plugins-qt for openSUSE:Factory checked in at 2015-11-24 22:29:41 Comparing /work/SRC/openSUSE:Factory/gstreamer-plugins-qt (Old) and /work/SRC/openSUSE:Factory/.gstreamer-plugins-qt.new (New) Package is "gstreamer-plugins-qt" Changes: --- /work/SRC/openSUSE:Factory/gstreamer-plugins-qt/gstreamer-plugins-qt.changes 2014-09-03 19:55:43.0 +0200 +++ /work/SRC/openSUSE:Factory/.gstreamer-plugins-qt.new/gstreamer-plugins-qt.changes 2015-11-24 22:29:44.0 +0100 @@ -1,0 +2,8 @@ +Sat Nov 21 08:35:38 UTC 2015 - zai...@opensuse.org + +- Add qt-gstreamer-fix-memleak.patch: Fix a mem leak and sync + issues, patch from upstream git. +- Add qt-gstreamer-fixbuild-gst_1-6.patch: Fix build with gstreamer + 1.5 and newer, patch from upstream git. + +--- New: qt-gstreamer-fix-memleak.patch qt-gstreamer-fixbuild-gst_1-6.patch Other differences: -- ++ gstreamer-plugins-qt.spec ++ --- /var/tmp/diff_new_pack.A1JAUG/_old 2015-11-24 22:29:45.0 +0100 +++ /var/tmp/diff_new_pack.A1JAUG/_new 2015-11-24 22:29:45.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package gstreamer-plugins-qt # -# 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 @@ -28,6 +28,10 @@ Group: Productivity/Multimedia/Other Url:http://gstreamer.freedesktop.org/wiki/QtGStreamer Source: http://gstreamer.freedesktop.org/src/qt-gstreamer/qt-gstreamer-%{version}.tar.xz +# PATCH-FIX-UPSTREAM qt-gstreamer-fix-memleak.patch zai...@opensuse.org -- Fix a memleak and sync issues +Patch0: qt-gstreamer-fix-memleak.patch +# PATCH-FIX-UPSTREAM qt-gstreamer-fixbuild-gst_1-6.patch zai...@opensuse.org -- Fix build with gst 1.5 and newer. +Patch1: qt-gstreamer-fixbuild-gst_1-6.patch BuildRequires: bison BuildRequires: boost-devel BuildRequires: cmake >= 2.8.9 @@ -69,6 +73,8 @@ %prep %setup -q -n qt-gstreamer-%{version} +%patch0 -p1 +%patch1 -p1 %package devel Summary:Include files and libraries mandatory for development ++ qt-gstreamer-fix-memleak.patch ++ >From fe3e8979697773c69d98d172f3eea0bf0dd37287 Mon Sep 17 00:00:00 2001 From: George Kiagiadakis Date: Tue, 30 Sep 2014 01:11:58 +0300 Subject: gstqtvideosink: fix memory leak and synchronization issue related to buffer reference counting https://bugzilla.gnome.org/show_bug.cgi?id=736758 diff --git a/elements/gstqtvideosink/delegates/basedelegate.cpp b/elements/gstqtvideosink/delegates/basedelegate.cpp index 82b465e..7dde59c 100644 --- a/elements/gstqtvideosink/delegates/basedelegate.cpp +++ b/elements/gstqtvideosink/delegates/basedelegate.cpp @@ -181,7 +181,7 @@ bool BaseDelegate::event(QEvent *event) { GST_LOG_OBJECT(m_sink, "Received deactivate event"); -g_clear_pointer(&m_buffer, gst_buffer_unref); +gst_buffer_replace (&m_buffer, NULL); update(); return true; diff --git a/elements/gstqtvideosink/painters/videomaterial.cpp b/elements/gstqtvideosink/painters/videomaterial.cpp index bda535c..3073e6d 100644 --- a/elements/gstqtvideosink/painters/videomaterial.cpp +++ b/elements/gstqtvideosink/painters/videomaterial.cpp @@ -252,6 +252,7 @@ VideoMaterial::~VideoMaterial() { if (!m_textureSize.isEmpty()) glDeleteTextures(m_textureCount, m_textureIds); +gst_buffer_replace(&m_frame, NULL); } int VideoMaterial::compare(const QSGMaterial *other) const -- cgit v0.10.2 ++ qt-gstreamer-fixbuild-gst_1-6.patch ++ >From e2ca8094aa8d0eac1c3a98df66fe94ce0c754088 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Manuel=20Santamar=C3=ADa?= Date: Fri, 2 Oct 2015 15:00:29 +0300 Subject: Fix compilation with GStreamer >= 1.5.1 apply gstreamer pkg-config definitions To ensure gstreamer builds correctly, pick up its cflags in FindGstreamer and apply them to the build as definitions https://lists.ubuntu.com/archives/kubuntu-devel/2015-August/009819.html https://bugzilla.gnome.org/show_bug.cgi?id=751382 diff --git a/CMakeLists.txt b/CMakeLists.txt index 4d3e7dd..5744015 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -106,6 +106,7 @@ find_package(GObject) macro_log_feature(GOBJECT_FOUND "GObject" "Required to build QtGLib" "http://www.gtk.org/"; TRUE) set(CMAKE_REQUIRED_INCLUDES ${QTGSTREAMER_INCLUDES}) +add_definitions(${GSTREAMER_DEFINITIONS}) include(CheckCXXSourceCompiles) check_cxx_source_comp
commit gstreamer-plugins-qt for openSUSE:Factory
Hello community, here is the log from the commit of package gstreamer-plugins-qt for openSUSE:Factory checked in at 2014-09-03 18:22:04 Comparing /work/SRC/openSUSE:Factory/gstreamer-plugins-qt (Old) and /work/SRC/openSUSE:Factory/.gstreamer-plugins-qt.new (New) Package is "gstreamer-plugins-qt" Changes: --- /work/SRC/openSUSE:Factory/gstreamer-plugins-qt/gstreamer-plugins-qt.changes 2014-07-25 09:09:06.0 +0200 +++ /work/SRC/openSUSE:Factory/.gstreamer-plugins-qt.new/gstreamer-plugins-qt.changes 2014-09-03 19:55:43.0 +0200 @@ -1,0 +2,7 @@ +Wed Aug 27 21:07:35 UTC 2014 - hrvoje.sen...@gmail.com + +- Merge all subpackage to gstreamer-plugins-qt and + gstreamer-plugins-qt-devel subpackage to fix unresolvable in Factory +- Obsolete old packages (and 0.10 variant) + +--- Other differences: -- ++ gstreamer-plugins-qt.spec ++ --- /var/tmp/diff_new_pack.FUCaN2/_old 2014-09-03 19:55:44.0 +0200 +++ /var/tmp/diff_new_pack.FUCaN2/_new 2014-09-03 19:55:44.0 +0200 @@ -47,7 +47,14 @@ BuildRequires: pkgconfig(gstreamer-pbutils-1.0) BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) BuildRequires: pkgconfig(gstreamer-video-1.0) -Conflicts: gstreamer-0_10-plugins-qt +Obsoletes: gstreamer-0_10-plugins-qt +Obsoletes: libQtGStreamer-0_10-0 +Provides: libQtGLib-2_0-0 = %{version} +# FIXME drop the '<' on next version bump +Obsoletes: libQtGLib-2_0-0 <= %{version} +Provides: libQtGStreamer-1.0-0 = %{version} +# FIXME drop the '<' on next version bump +Obsoletes: libQtGStreamer-1.0-0 <= %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -67,14 +74,13 @@ Summary:Include files and libraries mandatory for development Group: Development/Libraries/C and C++ Requires: %{name} = %{version} -Requires: libQtGLib-devel = %{version} -Requires: libQtGStreamer-%{gstnum}-%{gstmin} = %{version} +Requires: boost-devel Requires: pkgconfig(QtCore) Requires: pkgconfig(QtDeclarative) Requires: pkgconfig(QtGui) -Conflicts: gstreamer-0_10-plugins-qt-devel -Provides: libQtGStreamer-%{gstnum}-devel = %{version} -Obsoletes: libQtGStreamer-%{gstnum}-devel < %{version} +Provides: libQtGLib-devel = %{version} +# FIXME drop the '<' on next version bump +Obsoletes: libQtGLib-devel <= %{version} %description devel GStreamer is a streaming-media framework, based on graphs of filters @@ -87,47 +93,6 @@ This package contains development files and headers for the C++/Qt bindings for GStreamer. -%package -n libQtGLib-devel -Summary:C++/Qt bindings for GLib -Group: Development/Libraries/C and C++ -Requires: boost-devel -Requires: libQtGLib-%{glibnum}-%{glibmin} = %{version} -Requires: pkgconfig(QtCore) - -%description -n libQtGLib-devel -GLib is a general-purpose utility library, which provides many useful -data types, macros, type conversions, string utilities, file utilities, -a main loop abstraction, and so on. - -%package -n libQtGLib-%{glibnum}-%{glibmin} -Summary:C++/Qt bindings for GLib -Group: System/Libraries - -%description -n libQtGLib-%{glibnum}-%{glibmin} -GLib is a general-purpose utility library, which provides many useful -data types, macros, type conversions, string utilities, file utilities, -a main loop abstraction, and so on. - -This package contains C++/Qt bindings for GLib. - -This package contains development files and headers for the C++/Qt -bindings for GLib. - -%package -n libQtGStreamer-%{gstnum}-%{gstmin} -Summary:C++/Qt bindings for GStreamer -Group: Productivity/Multimedia/Other -Requires: %{name} - -%description -n libQtGStreamer-%{gstnum}-%{gstmin} -GStreamer is a streaming-media framework, based on graphs of filters -which operate on media data. Applications using this library can do -anything from real-time sound processing to playing videos, and just -about anything else media-related. Its plug-in-based architecture -means that new data types or processing capabilities can be added by -installing new plug-ins. - -This package contains C++/Qt bindings for GStreamer. - %build %cmake_kde4 -d build -- -DQTGSTREAMER_STATIC=OFF -DQTGSTREAMER_EXAMPLES=OFF %make_jobs @@ -135,11 +100,8 @@ %install %kde4_makeinstall -C build -%post -n libQtGLib-%{glibnum}-%{glibmin} -p /sbin/ldconfig -%postun -n libQtGLib-%{glibnum}-%{glibmin} -p /sbin/ldconfig - -%post -n libQtGStreamer-%{gstnum}-%{gstmin} -p /sbin/ldconfig -%postun -n libQtGStreamer-%{gstnum}-%{gstmin} -p /sbin/ldconfig +%post -p /sbin/ldconfig +%postun
commit gstreamer-plugins-qt for openSUSE:Factory
Hello community, here is the log from the commit of package gstreamer-plugins-qt for openSUSE:Factory checked in at 2014-07-25 09:09:03 Comparing /work/SRC/openSUSE:Factory/gstreamer-plugins-qt (Old) and /work/SRC/openSUSE:Factory/.gstreamer-plugins-qt.new (New) Package is "gstreamer-plugins-qt" Changes: --- /work/SRC/openSUSE:Factory/gstreamer-plugins-qt/gstreamer-plugins-qt.changes 2014-06-25 21:20:09.0 +0200 +++ /work/SRC/openSUSE:Factory/.gstreamer-plugins-qt.new/gstreamer-plugins-qt.changes 2014-07-25 09:09:06.0 +0200 @@ -1,0 +2,9 @@ +Thu Jul 24 01:36:42 UTC 2014 - hrvoje.sen...@gmail.com + +- Update to 1.2.0 + * No changes since rc +- Make devel subpackage require libQtGLib-devel, instead of + pkgconfig(...) provides +- Add Source URL + +--- Old: qt-gstreamer-1.1.90.tar.xz New: qt-gstreamer-1.2.0.tar.xz Other differences: -- ++ gstreamer-plugins-qt.spec ++ --- /var/tmp/diff_new_pack.8X2soM/_old 2014-07-25 09:09:07.0 +0200 +++ /var/tmp/diff_new_pack.8X2soM/_new 2014-07-25 09:09:07.0 +0200 @@ -21,13 +21,13 @@ %define gstmin 0 %define glibmin 0 Name: gstreamer-plugins-qt -Version:1.1.90 +Version:1.2.0 Release:0 Summary:C++/Qt bindings for GStreamer License:LGPL-2.1+ Group: Productivity/Multimedia/Other Url:http://gstreamer.freedesktop.org/wiki/QtGStreamer -Source: qt-gstreamer-%{version}.tar.xz +Source: http://gstreamer.freedesktop.org/src/qt-gstreamer/qt-gstreamer-%{version}.tar.xz BuildRequires: bison BuildRequires: boost-devel BuildRequires: cmake >= 2.8.9 @@ -67,10 +67,10 @@ Summary:Include files and libraries mandatory for development Group: Development/Libraries/C and C++ Requires: %{name} = %{version} +Requires: libQtGLib-devel = %{version} Requires: libQtGStreamer-%{gstnum}-%{gstmin} = %{version} Requires: pkgconfig(QtCore) Requires: pkgconfig(QtDeclarative) -Requires: pkgconfig(QtGLib-2.0) >= 0.99.0.1 Requires: pkgconfig(QtGui) Conflicts: gstreamer-0_10-plugins-qt-devel Provides: libQtGStreamer-%{gstnum}-devel = %{version} ++ qt-gstreamer-1.1.90.tar.xz -> qt-gstreamer-1.2.0.tar.xz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt-gstreamer-1.1.90/CMakeLists.txt new/qt-gstreamer-1.2.0/CMakeLists.txt --- old/qt-gstreamer-1.1.90/CMakeLists.txt 2014-06-24 13:10:20.0 +0200 +++ new/qt-gstreamer-1.2.0/CMakeLists.txt 2014-07-08 20:38:36.0 +0200 @@ -7,7 +7,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules) -set(QTGSTREAMER_VERSION 1.1.90) +set(QTGSTREAMER_VERSION 1.2.0) option(QTGSTREAMER_STATIC "Build QtGStreamer as a static library" OFF) option(QTGSTREAMER_TESTS "Build QtGStreamer's tests" OFF) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt-gstreamer-1.1.90/NEWS new/qt-gstreamer-1.2.0/NEWS --- old/qt-gstreamer-1.1.90/NEWS2014-06-24 13:10:20.0 +0200 +++ new/qt-gstreamer-1.2.0/NEWS 2014-07-08 20:38:36.0 +0200 @@ -1,5 +1,5 @@ -qt-gstreamer 1.2.0~rc1 (2014-06-24) -=== +qt-gstreamer 1.2.0 (2014-07-08) +=== * Initial port to the GStreamer 1.0 series (BREAKS API & ABI) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt-gstreamer-1.1.90/src/QGst/allocator.cpp new/qt-gstreamer-1.2.0/src/QGst/allocator.cpp --- old/qt-gstreamer-1.1.90/src/QGst/allocator.cpp 2014-06-24 13:10:20.0 +0200 +++ new/qt-gstreamer-1.2.0/src/QGst/allocator.cpp 2014-07-08 20:38:36.0 +0200 @@ -16,9 +16,7 @@ */ #include "allocator.h" -#include -#include -#include +#include namespace QGst { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt-gstreamer-1.1.90/src/QGst/bin.cpp new/qt-gstreamer-1.2.0/src/QGst/bin.cpp --- old/qt-gstreamer-1.1.90/src/QGst/bin.cpp2014-06-24 13:10:20.0 +0200 +++ new/qt-gstreamer-1.2.0/src/QGst/bin.cpp 2014-07-08 20:38:36.0 +0200 @@ -17,8 +17,7 @@ #include "bin.h" #include "pad.h" #include "../QGlib/error.h" -#include -#include +#include namespace QGst { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt-gstreamer-1.1.90/src/QGst/bufferlist.cpp new/qt-gstreamer-1.2.0/src/QGst/bufferlist.cpp --- old/qt-gstreamer-1.1.90/src/QGst/bufferlist.cpp 2014-