Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #6157 from Rmys/master

Browse Source 
qt5-phonon:rebuild
This commit is contained in:
Rmys
2018-12-24 23:41:53 +03:00
committed by GitHub
parent 20d5ec0095 12bef3ad84
commit cd0801fce2
3 changed files with 37 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/kde/phonon/qt5-phonon-backend-gstreamer/pspec.xml
+7
View File
@@ -47,6 +47,13 @@
</Package> </Package>
<History> <History>
<Update release="7">
<Date>2018-12-11</Date>
<Version>4.9.0</Version>
<Comment>Rebuild</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="6"> <Update release="6">
<Date>2018-10-18</Date> <Date>2018-10-18</Date>
<Version>4.9.0</Version> <Version>4.9.0</Version>
desktop/kde/phonon/qt5-phonon/files/phonon-qt5.12.patch
+14
View File
@@ -0,0 +1,14 @@
diff --git a/phonon/pulsesupport.cpp b/phonon/pulsesupport.cpp
index b7009b11..d3240840 100644
--- a/phonon/pulsesupport.cpp
+++ b/phonon/pulsesupport.cpp
@@ -840,7 +840,8 @@ PulseSupport::PulseSupport()
}
// We require a glib event loop
- if (!QByteArray(QAbstractEventDispatcher::instance()->metaObject()->className()).contains("EventDispatcherGlib")) {
+ if (!QByteArray(QAbstractEventDispatcher::instance()->metaObject()->className()).contains("EventDispatcherGlib") &&
+ !QByteArray(QAbstractEventDispatcher::instance()->metaObject()->className()).contains("GlibEventDispatcher")) {
qWarning("WARNING: Disabling PulseAudio integration for lack of GLib event loop.");
return;
}
desktop/kde/phonon/qt5-phonon/pspec.xml
+16 -9
View File
@@ -15,18 +15,18 @@
<Archive sha1sum="9e5340bd53e23f578738c8bf70406f09b1f468a4" type="tarxz">https://download.kde.org/stable/phonon/4.10.1/phonon-4.10.1.tar.xz</Archive> <Archive sha1sum="9e5340bd53e23f578738c8bf70406f09b1f468a4" type="tarxz">https://download.kde.org/stable/phonon/4.10.1/phonon-4.10.1.tar.xz</Archive>
<BuildDependencies> <BuildDependencies>
<Dependency>extra-cmake-modules</Dependency> <Dependency>extra-cmake-modules</Dependency>
<Dependency versionFrom="5.9.3">qt5-declarative-devel</Dependency> <Dependency versionFrom="5.12.0">qt5-declarative-devel</Dependency>
<Dependency versionFrom="5.9.3">qt5-base-devel</Dependency> <Dependency versionFrom="5.12.0">qt5-base-devel</Dependency>
<Dependency versionFrom="5.9.3">qt5-designer-devel</Dependency> <Dependency versionFrom="5.12.0">qt5-designer-devel</Dependency>
<!-- <Dependency>qt5-quick1-devel</Dependency> --> <!-- <Dependency>qt5-quick1-devel</Dependency> -->
<Dependency>alsa-lib-devel</Dependency> <Dependency>alsa-lib-devel</Dependency>
<Dependency>gst-plugins-base-devel</Dependency> <Dependency>gst-plugins-base-devel</Dependency>
<Dependency>pulseaudio-libs-devel</Dependency> <Dependency>pulseaudio-libs-devel</Dependency>
<Dependency>gstreamer-devel</Dependency> <Dependency>gstreamer-devel</Dependency>
<Dependency versionFrom="13.0.4">mesa-devel</Dependency> <Dependency versionFrom="18.2.5">mesa-devel</Dependency>
</BuildDependencies> </BuildDependencies>
<Patches> <Patches>
<!-- <Patch>qt-5.4.2.patch</Patch> --> <Patch>phonon-qt5.12.patch</Patch>
</Patches> </Patches>
</Source> </Source>
@@ -34,8 +34,8 @@
<Name>qt5-phonon</Name> <Name>qt5-phonon</Name>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency>libgcc</Dependency> <Dependency>libgcc</Dependency>
<Dependency versionFrom="5.7.1">qt5-base</Dependency> <Dependency versionFrom="5.12.0">qt5-base</Dependency>
<Dependency versionFrom="5.7.1">qt5-designer</Dependency> <Dependency versionFrom="5.12.0">qt5-designer</Dependency>
<!-- <Dependency>qt5-quick1</Dependency> --> <!-- <Dependency>qt5-quick1</Dependency> -->
<Dependency>pulseaudio-libs</Dependency> <Dependency>pulseaudio-libs</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
@@ -52,8 +52,8 @@
<Summary>Development files for phonon-qt5</Summary> <Summary>Development files for phonon-qt5</Summary>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency release="current">qt5-phonon</Dependency> <Dependency release="current">qt5-phonon</Dependency>
<Dependency versionFrom="5.7.1">qt5-base-devel</Dependency> <Dependency versionFrom="5.12.0">qt5-base-devel</Dependency>
<Dependency versionFrom="5.7.1">qt5-designer-devel</Dependency> <Dependency versionFrom="5.12.0">qt5-designer-devel</Dependency>
<Dependency>pulseaudio-libs-devel</Dependency> <Dependency>pulseaudio-libs-devel</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
@@ -64,6 +64,13 @@
</Package> </Package>
<History> <History>
<Update release="10">
<Date>2018-12-12</Date>
<Version>4.10.1</Version>
<Comment>Rebuild</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="9"> <Update release="9">
<Date>2018-10-18</Date> <Date>2018-10-18</Date>
<Version>4.10.1</Version> <Version>4.10.1</Version>