[arch-commits] Commit in kdelibs/trunk (3 files)

Mon Mar 9 19:35:01 UTC 2009

Date: Monday, March 9, 2009 @ 15:35:01
  Author: pierre
Revision: 29525

revert using Qt's phonon. It introduces too much problems.

Modified:
  kdelibs/trunk/PKGBUILD
Deleted:
  kdelibs/trunk/gstreamer.desktop
  kdelibs/trunk/org.kde.Phonon.AudioOutput.xml

--------------------------------+
 PKGBUILD                       |   20 +++------------
 gstreamer.desktop              |   52 ---------------------------------------
 org.kde.Phonon.AudioOutput.xml |   32 ------------------------
 3 files changed, 5 insertions(+), 99 deletions(-)

Modified: PKGBUILD
===================================================================

--- PKGBUILD	2009-03-09 19:34:03 UTC (rev 29524)
+++ PKGBUILD	2009-03-09 19:35:01 UTC (rev 29525)
@@ -3,13 +3,13 @@
 
 pkgname=kdelibs
 pkgver=4.2.1
-pkgrel=2
+pkgrel=1
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde')
-depends=('qt' 'shared-mime-info' 'libxpm' 'hal'  'heimdal'
+depends=('phonon' 'shared-mime-info' 'libxpm' 'hal' 
 	 'enchant' 'jasper' 'openexr' 'strigi' 'libxtst'
 	 'giflib' 'soprano' 'ca-certificates' 'xdg-utils' 'libxft')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'intltool' 'avahi' 'libgl' 'hspell')
@@ -17,13 +17,10 @@
 options=('docs')
 install='kdelibs.install'
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
-        'kde-applications-menu.patch' 'archlinux-menu.patch'
-        'gstreamer.desktop' 'org.kde.Phonon.AudioOutput.xml')
-md5sums=('3ccc094df33db9d61f5ad065b9b857ac'
+        'kde-applications-menu.patch' 'archlinux-menu.patch')
+md5sums=('fa4206dd747890c4e4283c8adb831e6c'
          'e94450ba5430ea9c1e33bad9ae38ca2d'
-         '0ad42200df2d2b8aab01d2ef4b21e02f'
-         '568099330c280a9571e7dd1669e42afb'
-         'a2e5400548bd08296d4e4c59ba80b1fd')
+         '0ad42200df2d2b8aab01d2ef4b21e02f')
 
 build() {
 	cd $srcdir/${pkgname}-${pkgver}
@@ -49,11 +46,4 @@
 	# link it to the one from ca-certificates
 	rm -f $pkgdir/usr/share/apps/kssl/ca-bundle.crt
 	ln -sf /etc/ssl/certs/ca-certificates.crt $pkgdir/usr/share/apps/kssl/ca-bundle.crt
-
-	# ensure compatibility with Qt's bundled phonon
-	ln -sf /usr/include/phonon $pkgdir/usr/include/KDE/Phonon
-	install -d -m755 $pkgdir/usr/include/phonon
-	ln -sf /usr/include/phonon/phononnamespace.h $pkgdir/usr/include/phonon/Global
-	install -D -m644 $srcdir/org.kde.Phonon.AudioOutput.xml $pkgdir/usr/share/dbus-1/interfaces/org.kde.Phonon.AudioOutput.xml
-	install -D -m644 $srcdir/gstreamer.desktop $pkgdir/usr/share/kde4/services/phononbackends/gstreamer.desktop
 }

Deleted: gstreamer.desktop
===================================================================
--- gstreamer.desktop	2009-03-09 19:34:03 UTC (rev 29524)
+++ gstreamer.desktop	2009-03-09 19:35:01 UTC (rev 29525)
@@ -1,52 +0,0 @@
-[Desktop Entry]
-Type=Service
-X-KDE-ServiceTypes=PhononBackend
-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;
-X-KDE-Library=libphonon_gstreamer
-X-KDE-PhononBackendInfo-InterfaceVersion=1
-X-KDE-PhononBackendInfo-Version=0.1
-X-KDE-PhononBackendInfo-Website=http://gstreamer.freedesktop.org/
-Icon=phonon-gstreamer
-InitialPreference=10
-
-Name=GStreamer
-Name[pa]=ਜੀਸਟੀਰਮਰ
-Name[sr]=Гстример
-Name[sv]=Gstreamer
-Name[x-test]=xxGStreamerxx
-
-Comment=Phonon GStreamer backend
-Comment[bg]=Phonon GStreamer
-Comment[ca]=Dorsal GStreamer del Phonon
-Comment[da]=GStreamer-backend til Phonon
-Comment[de]=Phonon-Treiber für GStreamer
-Comment[el]=Σύστημα υποστήριξης GStreamer του Phonon
-Comment[es]=Motor GStreamer para Phonon
-Comment[et]=Phononi GStreameri taustaprogramm
-Comment[fr]=Système de gestion GStreamer pour Phonon 
-Comment[ga]=Inneall GStreamer le haghaidh Phonon
-Comment[gl]=Infraestrutura de GStreamer para Phonon
-Comment[hu]=Phonon GStreamer modul
-Comment[is]=Phonon GStreamer bakendi
-Comment[it]=Motore Gstreamer di Phonon
-Comment[ja]=Phonon GStreamer バックエンド
-Comment[ko]=Phonon GStreamer 백엔드
-Comment[ku]=Binesaza Phonon GStreamer
-Comment[lv]=Phonon GStreamer aizmugure
-Comment[nds]=Phonon-Hülpprogramm GStreamer
-Comment[nl]=GStreamer-backend (Phonon)
-Comment[nn]=Phonon-motor for GStreamer
-Comment[pa]=ਫੋਨੋਨ ਜਸਟੀਰਮਰ ਬੈਕਐਂਡ
-Comment[pl]=Obsługa GStreamera przez Phonon
-Comment[pt]=Infra-estrutura do GStreamer para o Phonon
-Comment[pt_BR]=Infraestrutura Phonon GStreamer
-Comment[sk]=GStreamer podsystém
-Comment[sl]=Phononova hrbtenica GStreamer
-Comment[sr]=Гстример као позадина Фонона
-Comment[sr at latin]=GStreamer kao pozadina Phonona
-Comment[sv]=Phonon Gstreamer-gränssnitt
-Comment[tr]=Phonon GStreamer arka ucu
-Comment[uk]=Сервер GStreamer для Phonon
-Comment[x-test]=xxPhonon GStreamer backendxx
-Comment[zh_CN]=Phonon GStreamer 后端
-Comment[zh_TW]=Phonon GStreamer 後端介面

Deleted: org.kde.Phonon.AudioOutput.xml
===================================================================
--- org.kde.Phonon.AudioOutput.xml	2009-03-09 19:34:03 UTC (rev 29524)
+++ org.kde.Phonon.AudioOutput.xml	2009-03-09 19:35:01 UTC (rev 29525)
@@ -1,32 +0,0 @@
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node>
-  <interface name="org.kde.Phonon.AudioOutput">
-    <property name="volume" type="d" access="readwrite"/>
-    <property name="muted" type="b" access="readwrite"/>
-    <property name="outputDeviceIndex" type="i" access="readwrite"/>
-    <signal name="volumeChanged">
-      <arg type="d" direction="out"/>
-    </signal>
-    <signal name="mutedChanged">
-      <arg type="b" direction="out"/>
-    </signal>
-    <signal name="outputDeviceIndexChanged">
-      <arg type="i" direction="out"/>
-    </signal>
-    <signal name="nameChanged">
-      <arg name="newName" type="s" direction="out"/>
-    </signal>
-    <signal name="newOutputAvailable">
-      <arg name="service" type="s" direction="out"/>
-      <arg name="path" type="s" direction="out"/>
-    </signal>
-    <signal name="outputDestroyed">
-    </signal>
-    <method name="category">
-      <arg type="s" direction="out"/>
-    </method>
-    <method name="name">
-      <arg type="s" direction="out"/>
-    </method>
-  </interface>
-</node>


