Magellan Linux

Contents of /trunk/qt4/patches/qt-4.5.3-phonon.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 918 - (show annotations) (download)
Fri Oct 30 18:39:48 2009 UTC (14 years, 6 months ago) by niro
File size: 2532 byte(s)
more patches

1 diff -ur qt-orig/src/phonon/phonon.pro qt-x11-opensource-src-4.5.2/src/phonon/phonon.pro
2 --- qt-orig/src/phonon/phonon.pro 2009-06-20 06:57:57.000000000 +0200
3 +++ qt-x11-opensource-src-4.5.2/src/phonon/phonon.pro 2009-06-25 19:30:00.000000000 +0200
4 @@ -112,4 +112,9 @@
5 DEFINES += QT_NO_DBUS
6 }
7
8 +# install dbus service file
9 +sources.files = $$PHONON_DIR/org.kde.Phonon.AudioOutput.xml
10 +sources.path = /usr/share/dbus-1/interfaces
11 +INSTALLS += sources
12 +
13 contains(QT_CONFIG, reduce_exports): CONFIG += hide_symbols
14 diff -ur qt-orig/src/plugins/phonon/gstreamer/gstreamer.pro qt-x11-opensource-src-4.5.2/src/plugins/phonon/gstreamer/gstreamer.pro
15 --- qt-orig/src/plugins/phonon/gstreamer/gstreamer.pro 2009-06-20 06:57:58.000000000 +0200
16 +++ qt-x11-opensource-src-4.5.2/src/plugins/phonon/gstreamer/gstreamer.pro 2009-06-25 19:31:36.000000000 +0200
17 @@ -62,6 +62,8 @@
18 }
19
20 target.path = $$[QT_INSTALL_PLUGINS]/phonon_backend
21 -INSTALLS += target
22 +services.files = $$PHONON_GSTREAMER_DIR/gstreamer.desktop
23 +services.path = /usr/share/kde4/services/phononbackends
24 +INSTALLS += target services
25
26 include(../../qpluginbase.pri)
27 diff -ur qt-orig/src/3rdparty/phonon/gstreamer/gstreamer.desktop qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/gstreamer.desktop
28 --- qt-orig/src/3rdparty/phonon/gstreamer/gstreamer.desktop 2009-06-20 06:57:54.000000000 +0200
29 +++ qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/gstreamer.desktop 2009-06-25 19:30:00.000000000 +0200
30 @@ -2,7 +2,7 @@
31 Type=Service
32 X-KDE-ServiceTypes=PhononBackend
33 MimeType=application/x-annodex;video/quicktime;video/x-quicktime;audio/x-m4a;application/x-quicktimeplayer;video/mkv;video/msvideo;video/x-msvideo;video/x-flic;audio/x-aiff;audio/aiff;audio/x-pn-aiff;audio/x-realaudio;audio/basic;audio/x-basic;audio/x-pn-au;audio/x-8svx;audio/8svx;audio/x-16sv;audio/168sv;image/x-ilbm;image/ilbm;video/x-anim;video/anim;image/png;image/x-png;video/mng;video/x-mng;audio/x-ogg;audio/x-speex+ogg;application/ogg;application/ogg;audio/vnd.rn-realaudio;audio/x-pn-realaudio-plugin;audio/x-real-audio;application/vnd.rn-realmedia;video/mpeg;video/x-mpeg;audio/x-wav;audio/wav;audio/x-pn-wav;audio/x-pn-windows-acm;audio/mpeg2;audio/x-mpeg2;audio/mpeg3;audio/x-mpeg3;audio/mpeg;audio/x-mpeg;x-mpegurl;audio/x-mpegurl;audio/mp3;audio/mpeg;
34 -X-KDE-Library=phonon_gstreamer
35 +X-KDE-Library=libphonon_gstreamer
36 X-KDE-PhononBackendInfo-InterfaceVersion=1
37 X-KDE-PhononBackendInfo-Version=0.1
38 X-KDE-PhononBackendInfo-Website=http://gstreamer.freedesktop.org/