Merge pull request #7227 from Rmys/master

qt5-5.13.2:ver.bump
This commit is contained in:
Rmys
2019-11-03 18:15:38 +03:00
committed by GitHub
3 changed files with 74 additions and 33 deletions
+33 -26
View File
@@ -12,40 +12,40 @@
<Summary>A cross-platform application and UI framework (Documentation)</Summary>
<Description>A cross-platform application and UI framework (Documentation)</Description>
<License>LGPLv2.1-linking-exception</License>
<Archive sha1sum="1da62675933b52497e543c6607d5937cccc635eb" type="tarxz">http://download.qt.io/official_releases/qt/5.13/5.13.1/submodules/qtdoc-everywhere-src-5.13.1.tar.xz</Archive>
<Archive sha1sum="f05a380a5f6ea8ad9cfac174236d2af5bd0ffe2e" type="tarxz">http://download.qt.io/official_releases/qt/5.13/5.13.2/submodules/qtdoc-everywhere-src-5.13.2.tar.xz</Archive>
<BuildDependencies>
<Dependency versionFrom="5.13.1">qt5-base-devel</Dependency>
<Dependency versionFrom="5.13.1">qt5-sql-sqlite</Dependency>
<Dependency versionFrom="5.13.1">qt5-assistant</Dependency>
<Dependency versionFrom="5.13.1">qt5-multimedia-docs</Dependency>
<Dependency versionFrom="5.13.1">qt5-quickcontrols-docs</Dependency>
<Dependency versionFrom="5.13.1">qt5-quickcontrols2-docs</Dependency>
<Dependency versionFrom="5.13.1">qt5-x11extras-docs</Dependency>
<Dependency versionFrom="5.13.1">qt5-webchannel-docs</Dependency>
<Dependency versionFrom="5.13.2">qt5-base-devel</Dependency>
<Dependency versionFrom="5.13.2">qt5-sql-sqlite</Dependency>
<Dependency versionFrom="5.13.2">qt5-assistant</Dependency>
<Dependency versionFrom="5.13.2">qt5-multimedia-docs</Dependency>
<Dependency versionFrom="5.13.2">qt5-quickcontrols-docs</Dependency>
<Dependency versionFrom="5.13.2">qt5-quickcontrols2-docs</Dependency>
<Dependency versionFrom="5.13.2">qt5-x11extras-docs</Dependency>
<Dependency versionFrom="5.13.2">qt5-webchannel-docs</Dependency>
<Dependency versionFrom="5.7.1">qt5-webkit-docs</Dependency>
<Dependency versionFrom="5.13.1">qt5-xmlpatterns-docs</Dependency>
<Dependency versionFrom="5.13.1">qt5-svg-docs</Dependency>
<Dependency versionFrom="5.13.1">qt5-script-docs</Dependency>
<Dependency versionFrom="5.13.1">qt5-sensors-docs</Dependency>
<Dependency versionFrom="5.13.1">qt5-translations</Dependency>
<Dependency versionFrom="5.13.1">qt5-graphicaleffects-docs</Dependency>
<Dependency versionFrom="5.13.1">qt5-imageformats-docs</Dependency>
<Dependency versionFrom="5.13.1">qt5-websockets-docs</Dependency>
<Dependency versionFrom="5.13.1">qt5-serialport-docs</Dependency>
<Dependency versionFrom="5.13.1">qt5-location-docs</Dependency>
<Dependency versionFrom="5.13.1">qt5-connectivity-docs</Dependency>
<Dependency versionFrom="5.13.2">qt5-xmlpatterns-docs</Dependency>
<Dependency versionFrom="5.13.2">qt5-svg-docs</Dependency>
<Dependency versionFrom="5.13.2">qt5-script-docs</Dependency>
<Dependency versionFrom="5.13.2">qt5-sensors-docs</Dependency>
<Dependency versionFrom="5.13.2">qt5-translations</Dependency>
<Dependency versionFrom="5.13.2">qt5-graphicaleffects-docs</Dependency>
<Dependency versionFrom="5.13.2">qt5-imageformats-docs</Dependency>
<Dependency versionFrom="5.13.2">qt5-websockets-docs</Dependency>
<Dependency versionFrom="5.13.2">qt5-serialport-docs</Dependency>
<Dependency versionFrom="5.13.2">qt5-location-docs</Dependency>
<Dependency versionFrom="5.13.2">qt5-connectivity-docs</Dependency>
</BuildDependencies>
</Source>
<Package>
<Name>qt5-doc</Name>
<RuntimeDependencies>
<Dependency versionFrom="5.13.1">qt5-base</Dependency>
<Dependency versionFrom="5.13.1">qt5-script</Dependency>
<Dependency versionFrom="5.13.1">qt5-svg</Dependency>
<Dependency versionFrom="5.13.1">qt5-xmlpatterns</Dependency>
<Dependency versionFrom="5.13.1">qt5-assistant</Dependency>
<Dependency versionFrom="5.13.1">qt5-declarative</Dependency>
<Dependency versionFrom="5.13.2">qt5-base</Dependency>
<Dependency versionFrom="5.13.2">qt5-script</Dependency>
<Dependency versionFrom="5.13.2">qt5-svg</Dependency>
<Dependency versionFrom="5.13.2">qt5-xmlpatterns</Dependency>
<Dependency versionFrom="5.13.2">qt5-assistant</Dependency>
<Dependency versionFrom="5.13.2">qt5-declarative</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="data">/usr/share/licenses</Path>
@@ -54,6 +54,13 @@
</Package>
<History>
<Update release="16">
<Date>2019-11-02</Date>
<Version>5.13.2</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="15">
<Date>2019-09-05</Date>
<Version>5.13.1</Version>
@@ -0,0 +1,26 @@
From 7ab59a92a0d129b930a343c7c276518994fb6832 Mon Sep 17 00:00:00 2001
From: Alexander Akulich <akulichalexander@gmail.com>
Date: Sun, 7 Jul 2019 03:17:35 +0300
Subject: [PATCH] Fix build with GStreamer 1.16.0
---
src/QGst/caps.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/QGst/caps.cpp b/src/QGst/caps.cpp
index 3824d82..a15b701 100644
--- a/src/QGst/caps.cpp
+++ b/src/QGst/caps.cpp
@@ -54,7 +54,8 @@ QString Caps::toString() const
void Caps::append(const CapsPtr & caps2)
{
- gst_caps_append(object<GstCaps>(), gst_caps_copy(caps2));
+ const GstCaps * caps2ptr = caps2;
+ gst_caps_append(object<GstCaps>(), gst_caps_copy(caps2ptr));
}
CapsPtr Caps::merge(CapsPtr & caps2)
--
2.21.0
+15 -7
View File
@@ -14,9 +14,9 @@
<Description>QtGStreamer is a set of libraries providing C++ bindings for GStreamer with a Qt-style API, plus some helper classes and elements for integrating GStreamer better in Qt applications.The goal of this module is to allow easy use of GStreamer for applications targetting MeeGo Mobile or the KDE desktop.</Description>
<Archive sha1sum="16e363e081e6143030d501278ac882bb7bbe9279" type="tarxz">http://gstreamer.freedesktop.org/src/qt-gstreamer/qt-gstreamer-1.2.0.tar.xz</Archive>
<BuildDependencies>
<Dependency versionFrom="5.13.1">qt5-base-devel</Dependency>
<Dependency versionFrom="5.13.1">qt5-declarative-devel</Dependency>
<Dependency versionFrom="5.13.1">qt5-quickcontrols2-devel</Dependency>
<Dependency versionFrom="5.13.2">qt5-base-devel</Dependency>
<Dependency versionFrom="5.13.2">qt5-declarative-devel</Dependency>
<Dependency versionFrom="5.13.2">qt5-quickcontrols2-devel</Dependency>
<Dependency versionFrom="2.50.2">glib2-devel</Dependency>
<Dependency>gobject-introspection-devel</Dependency>
<Dependency>cmake</Dependency>
@@ -28,14 +28,15 @@
</BuildDependencies>
<Patches>
<Patch level="1">qt-gstreamer-1.6.patch</Patch>
<Patch level="1">0001-Fix-build-with-GStreamer-1.16.0.patch</Patch>
</Patches>
</Source>
<Package>
<Name>qt5-gstreamer</Name>
<RuntimeDependencies>
<Dependency versionFrom="5.13.1">qt5-base</Dependency>
<Dependency versionFrom="5.13.1">qt5-declarative</Dependency>
<Dependency versionFrom="5.13.2">qt5-base</Dependency>
<Dependency versionFrom="5.13.2">qt5-declarative</Dependency>
<!-- <Dependency>qt5-quick1</Dependency> -->
<Dependency>gstreamer</Dependency>
<Dependency versionFrom="1.10.3">gst-plugins-base</Dependency>
@@ -56,9 +57,9 @@
<RuntimeDependencies>
<Dependency release="current">qt5-gstreamer</Dependency>
<Dependency>glib2-devel</Dependency>
<Dependency versionFrom="5.13.1">qt5-base-devel</Dependency>
<Dependency versionFrom="5.13.2">qt5-base-devel</Dependency>
<Dependency>gstreamer-devel</Dependency>
<Dependency versionFrom="5.13.1">qt5-declarative-devel</Dependency>
<Dependency versionFrom="5.13.2">qt5-declarative-devel</Dependency>
<Dependency versionFrom="1.10.3">gst-plugins-base-devel</Dependency>
</RuntimeDependencies>
<Files>
@@ -69,6 +70,13 @@
</Package>
<History>
<Update release="17">
<Date>2019-11-02</Date>
<Version>1.2.0</Version>
<Comment>Rebuild.</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="16">
<Date>2019-09-05</Date>
<Version>1.2.0</Version>