kdemultimedia, 4.6.0

2 files changed, 61 insertions, 23 deletions

diff --git a/kde/kdemultimedia/.footprint b/kde/kdemultimedia/.footprint
index 4f8d73e49..85cd68dbd 100644
--- a/kde/kdemultimedia/.footprint
+++ b/kde/kdemultimedia/.footprint
@@ -1,9 +1,9 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/dragon
--rwxr-xr-x	root/root	usr/bin/juk
 -rwxr-xr-x	root/root	usr/bin/kmix
 -rwxr-xr-x	root/root	usr/bin/kmixctrl
+-rwxr-xr-x	root/root	usr/bin/kscd
 -rwxr-xr-x	root/root	usr/bin/mplayerthumbsconfig
 drwxr-xr-x	root/root	usr/include/
 -rw-r--r--	root/root	usr/include/audiocdencoder.h
@@ -46,20 +46,12 @@ drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/applications/
 drwxr-xr-x	root/root	usr/share/applications/kde4/
 -rwxr-xr-x	root/root	usr/share/applications/kde4/dragonplayer.desktop
--rwxr-xr-x	root/root	usr/share/applications/kde4/juk.desktop
 -rwxr-xr-x	root/root	usr/share/applications/kde4/kmix.desktop
+-rwxr-xr-x	root/root	usr/share/applications/kde4/kscd.desktop
 drwxr-xr-x	root/root	usr/share/apps/
 drwxr-xr-x	root/root	usr/share/apps/dragonplayer/
 -rw-r--r--	root/root	usr/share/apps/dragonplayer/dragonlogo.png
 -rw-r--r--	root/root	usr/share/apps/dragonplayer/dragonplayerui.rc
-drwxr-xr-x	root/root	usr/share/apps/juk/
--rw-r--r--	root/root	usr/share/apps/juk/juk.notifyrc
--rw-r--r--	root/root	usr/share/apps/juk/jukui-rtl.rc
--rw-r--r--	root/root	usr/share/apps/juk/jukui.rc
-drwxr-xr-x	root/root	usr/share/apps/juk/pics/
--rw-r--r--	root/root	usr/share/apps/juk/pics/playing.png
--rw-r--r--	root/root	usr/share/apps/juk/pics/splash.png
--rw-r--r--	root/root	usr/share/apps/juk/pics/yahoo_credit.png
 drwxr-xr-x	root/root	usr/share/apps/kconf_update/
 -rw-r--r--	root/root	usr/share/apps/kconf_update/audiocd.upd
 -rw-r--r--	root/root	usr/share/apps/kconf_update/kcmcddb-emailsettings.upd
@@ -95,9 +87,16 @@ drwxr-xr-x	root/root	usr/share/apps/konqsidebartng/
 drwxr-xr-x	root/root	usr/share/apps/konqsidebartng/virtual_folders/
 drwxr-xr-x	root/root	usr/share/apps/konqsidebartng/virtual_folders/services/
 -rw-r--r--	root/root	usr/share/apps/konqsidebartng/virtual_folders/services/audiocd.desktop
+drwxr-xr-x	root/root	usr/share/apps/kscd/
+drwxr-xr-x	root/root	usr/share/apps/kscd/skin/
+-rw-r--r--	root/root	usr/share/apps/kscd/skin/Chrome.svg
+-rw-r--r--	root/root	usr/share/apps/kscd/skin/Obsidian-Coast.svg
+-rw-r--r--	root/root	usr/share/apps/kscd/skin/Steel.svg
+-rw-r--r--	root/root	usr/share/apps/kscd/skin/default.svg
 drwxr-xr-x	root/root	usr/share/apps/solid/
 drwxr-xr-x	root/root	usr/share/apps/solid/actions/
 -rw-r--r--	root/root	usr/share/apps/solid/actions/dragonplayer-opendvd.desktop
+-rw-r--r--	root/root	usr/share/apps/solid/actions/kscd-play-audiocd.desktop
 -rw-r--r--	root/root	usr/share/apps/solid/actions/solid_audiocd.desktop
 drwxr-xr-x	root/root	usr/share/apps/videothumbnail/
 -rw-r--r--	root/root	usr/share/apps/videothumbnail/sprocket-large.png
@@ -109,6 +108,7 @@ drwxr-xr-x	root/root	usr/share/autostart/
 drwxr-xr-x	root/root	usr/share/config.kcfg/
 -rw-r--r--	root/root	usr/share/config.kcfg/audiocd_lame_encoder.kcfg
 -rw-r--r--	root/root	usr/share/config.kcfg/audiocd_vorbis_encoder.kcfg
+-rw-r--r--	root/root	usr/share/config.kcfg/kscd.kcfg
 -rw-r--r--	root/root	usr/share/config.kcfg/libkcddb.kcfg
 -rw-r--r--	root/root	usr/share/config.kcfg/mplayerthumbs.kcfg
 drwxr-xr-x	root/root	usr/share/config/
@@ -116,39 +116,70 @@ drwxr-xr-x	root/root	usr/share/config/
 drwxr-xr-x	root/root	usr/share/dbus-1/
 drwxr-xr-x	root/root	usr/share/dbus-1/interfaces/
 -rw-r--r--	root/root	usr/share/dbus-1/interfaces/org.kde.KMix.xml
--rw-r--r--	root/root	usr/share/dbus-1/interfaces/org.kde.juk.collection.xml
--rw-r--r--	root/root	usr/share/dbus-1/interfaces/org.kde.juk.player.xml
--rw-r--r--	root/root	usr/share/dbus-1/interfaces/org.kde.juk.search.xml
+-rw-r--r--	root/root	usr/share/dbus-1/interfaces/org.kde.kscd.cdplayer.xml
+drwxr-xr-x	root/root	usr/share/doc/
+drwxr-xr-x	root/root	usr/share/doc/kde/
+drwxr-xr-x	root/root	usr/share/doc/kde/html/
+drwxr-xr-x	root/root	usr/share/doc/kde/html/en/
+drwxr-xr-x	root/root	usr/share/doc/kde/html/en/dragonplayer/
+lrwxrwxrwx	root/root	usr/share/doc/kde/html/en/dragonplayer/common -> /usr/share/doc/kde/html/en//common
+-rw-r--r--	root/root	usr/share/doc/kde/html/en/dragonplayer/index.cache.bz2
+-rw-r--r--	root/root	usr/share/doc/kde/html/en/dragonplayer/index.docbook
+-rw-r--r--	root/root	usr/share/doc/kde/html/en/dragonplayer/main.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/en/dragonplayer/playmedia.png
+drwxr-xr-x	root/root	usr/share/doc/kde/html/en/kcontrol/
+drwxr-xr-x	root/root	usr/share/doc/kde/html/en/kcontrol/cddbretrieval/
+lrwxrwxrwx	root/root	usr/share/doc/kde/html/en/kcontrol/cddbretrieval/common -> /usr/share/doc/kde/html/en/common
+-rw-r--r--	root/root	usr/share/doc/kde/html/en/kcontrol/cddbretrieval/index.cache.bz2
+-rw-r--r--	root/root	usr/share/doc/kde/html/en/kcontrol/cddbretrieval/index.docbook
+-rw-r--r--	root/root	usr/share/doc/kde/html/en/kcontrol/cddbretrieval/kscd13.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/en/kcontrol/cddbretrieval/kscd14.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/en/kcontrol/cddbretrieval/kscd16.png
+drwxr-xr-x	root/root	usr/share/doc/kde/html/en/kioslave/
+drwxr-xr-x	root/root	usr/share/doc/kde/html/en/kioslave/audiocd/
+lrwxrwxrwx	root/root	usr/share/doc/kde/html/en/kioslave/audiocd/common -> /usr/share/doc/kde/html/en/common
+-rw-r--r--	root/root	usr/share/doc/kde/html/en/kioslave/audiocd/index.cache.bz2
+-rw-r--r--	root/root	usr/share/doc/kde/html/en/kioslave/audiocd/index.docbook
+drwxr-xr-x	root/root	usr/share/doc/kde/html/en/kmix/
+lrwxrwxrwx	root/root	usr/share/doc/kde/html/en/kmix/common -> /usr/share/doc/kde/html/en/common
+-rw-r--r--	root/root	usr/share/doc/kde/html/en/kmix/index.cache.bz2
+-rw-r--r--	root/root	usr/share/doc/kde/html/en/kmix/index.docbook
+-rw-r--r--	root/root	usr/share/doc/kde/html/en/kmix/kmix-channels.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/en/kmix/kmix-configure.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/en/kmix/kmix-file.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/en/kmix/kmix-master.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/en/kmix/kmix-options.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/en/kmix/kmix.png
 drwxr-xr-x	root/root	usr/share/icons/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/128x128/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/128x128/apps/
 -rw-r--r--	root/root	usr/share/icons/hicolor/128x128/apps/dragonplayer.png
--rw-r--r--	root/root	usr/share/icons/hicolor/128x128/apps/juk.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/128x128/apps/kmix.png
+-rw-r--r--	root/root	usr/share/icons/hicolor/128x128/apps/kscd.png
 drwxr-xr-x	root/root	usr/share/icons/hicolor/16x16/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/16x16/apps/
 -rw-r--r--	root/root	usr/share/icons/hicolor/16x16/apps/dragonplayer.png
--rw-r--r--	root/root	usr/share/icons/hicolor/16x16/apps/juk.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/16x16/apps/kmix.png
+-rw-r--r--	root/root	usr/share/icons/hicolor/16x16/apps/kscd.png
 drwxr-xr-x	root/root	usr/share/icons/hicolor/22x22/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/22x22/apps/
 -rw-r--r--	root/root	usr/share/icons/hicolor/22x22/apps/dragonplayer.png
 drwxr-xr-x	root/root	usr/share/icons/hicolor/32x32/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/32x32/apps/
 -rw-r--r--	root/root	usr/share/icons/hicolor/32x32/apps/dragonplayer.png
--rw-r--r--	root/root	usr/share/icons/hicolor/32x32/apps/juk.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/32x32/apps/kmix.png
+-rw-r--r--	root/root	usr/share/icons/hicolor/32x32/apps/kscd.png
 drwxr-xr-x	root/root	usr/share/icons/hicolor/48x48/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/48x48/apps/
 -rw-r--r--	root/root	usr/share/icons/hicolor/48x48/apps/dragonplayer.png
--rw-r--r--	root/root	usr/share/icons/hicolor/48x48/apps/juk.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/48x48/apps/kmix.png
+-rw-r--r--	root/root	usr/share/icons/hicolor/48x48/apps/kscd.png
 drwxr-xr-x	root/root	usr/share/icons/hicolor/64x64/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/64x64/apps/
 -rw-r--r--	root/root	usr/share/icons/hicolor/64x64/apps/dragonplayer.png
--rw-r--r--	root/root	usr/share/icons/hicolor/64x64/apps/juk.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/64x64/apps/kmix.png
+-rw-r--r--	root/root	usr/share/icons/hicolor/64x64/apps/kscd.png
 drwxr-xr-x	root/root	usr/share/icons/hicolor/scalable/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/scalable/apps/
 -rw-r--r--	root/root	usr/share/icons/hicolor/scalable/apps/dragonplayer.svgz
@@ -158,6 +189,7 @@ drwxr-xr-x	root/root	usr/share/icons/oxygen/16x16/actions/
 -rw-r--r--	root/root	usr/share/icons/oxygen/16x16/actions/player-volume-muted.png
 drwxr-xr-x	root/root	usr/share/icons/oxygen/22x22/
 drwxr-xr-x	root/root	usr/share/icons/oxygen/22x22/actions/
+-rw-r--r--	root/root	usr/share/icons/oxygen/22x22/actions/kscd-dock.png
 -rw-r--r--	root/root	usr/share/icons/oxygen/22x22/actions/player-volume-muted.png
 drwxr-xr-x	root/root	usr/share/icons/oxygen/32x32/
 drwxr-xr-x	root/root	usr/share/icons/oxygen/32x32/actions/
@@ -172,7 +204,6 @@ drwxr-xr-x	root/root	usr/share/kde4/
 drwxr-xr-x	root/root	usr/share/kde4/services/
 drwxr-xr-x	root/root	usr/share/kde4/services/ServiceMenus/
 -rw-r--r--	root/root	usr/share/kde4/services/ServiceMenus/dragonplayer_play_dvd.desktop
--rw-r--r--	root/root	usr/share/kde4/services/ServiceMenus/jukservicemenu.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/audiocd.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/audiocd.protocol
 -rw-r--r--	root/root	usr/share/kde4/services/dragonplayer_part.desktop
diff --git a/kde/kdemultimedia/Pkgfile b/kde/kdemultimedia/Pkgfile
index 353646518..782ba2c42 100755
--- a/kde/kdemultimedia/Pkgfile
+++ b/kde/kdemultimedia/Pkgfile
@@ -2,12 +2,13 @@
 # URL: http://www.kde.org
 # Maintainer: NuTyX packager team
 # Packager: lesibel at free dot fr
-# Depends on: xorg-libxtst, kdelibs, taglib, cdparanoia, phonon, phonon-backend-xine
-# Run on: kdelibs,taglib,cdparanoia,phonon,phonon-backend-xine
+# Depends on: cmake, automoc4, kdelibs, kdebase-runtime, ffmpeg, mplayer, docbook-xsl, pulseaudio, libmusicbrainz, cdparanoia
+
+# Run on: kdelibs,kdebase-runtime,ffmpeg,mplayer,pulseaudio,libmusicbrainz,cdparanoia
 
 name=kdemultimedia
 version=4.6.0
-release=1
+release=2
 source=( ftp://ftp.kde.org/pub/kde/stable/$version/src/$name-$version.tar.bz2)
 
 build() {
@@ -15,8 +16,14 @@ build() {
 	mkdir build
 	cd build
 	cmake ../ -DCMAKE_INSTALL_PREFIX=/usr \
-	-DBUILD_doc=OFF
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_SKIP_RPATH=ON
 	make
 	make DESTDIR=$PKG install
+	
+	for i in kioslave doc/kioslave libkcddb libkcompactdisc; do
+		cd $SRC/$name-*/build/$i
+		make DESTDIR=$PKG install
+	done
 }