Import KDE4.3.1 from wip

OKed during freeze by wiz and agc

12 files changed, 344 insertions, 0 deletions

diff --git a/multimedia/kdemultimedia4/DESCR b/multimedia/kdemultimedia4/DESCR
new file mode 100644
index 00000000000..2319ac6d0d8
--- /dev/null
+++ b/multimedia/kdemultimedia4/DESCR
@@ -0,0 +1,12 @@
+The kdemultimedia module of KDE provides various sound and movie
+format players:
+
+* dragonplayer: Video Player is a very simple Phonon-based media player.
+* kmix: the audio mixer as a standalone program and Kicker applet
+* kscd: A CD player with an interface to the internet CDDB database
+
+The following are libraries and plugins that are building the core
+infrastructure of above applications:
+
+* strigi-analyzer: provide meta information about sound files
+* libkcddb: a library for retrieving and sending cddb information
diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile
new file mode 100644
index 00000000000..820000675cd
--- /dev/null
+++ b/multimedia/kdemultimedia4/Makefile
@@ -0,0 +1,33 @@
+# $NetBSD: Makefile,v 1.1.1.1 2009/10/02 20:25:35 markd Exp $
+
+DISTNAME=	kdemultimedia-${_KDE_VERSION}
+CATEGORIES=	multimedia
+COMMENT=	Multimedia tools for the KDE integrated X11 desktop
+
+.include "../../meta-pkgs/kde4/Makefile.kde4"
+
+# BUILD_MAKE_FLAGS+= VERBOSE=1
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+DEPENDS+=	xine-xcb>=1.1.9:../../x11/xine-xcb
+
+.include "../../mk/bsd.prefs.mk"
+.include "options.mk"
+
+.include "../../meta-pkgs/kde4/kde4.mk"
+
+.include "../../audio/cdparanoia/buildlink3.mk"
+.include "../../audio/flac/buildlink3.mk"
+.include "../../audio/libtunepimp/buildlink3.mk"
+.include "../../audio/musicbrainz/buildlink3.mk"
+.include "../../audio/taglib/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../multimedia/libtheora/buildlink3.mk"
+.include "../../multimedia/xine-lib/buildlink3.mk"
+.include "../../x11/kdelibs4/buildlink3.mk"
+.include "../../x11/kdelibs-experimental4/buildlink3.mk"
+.include "../../x11/kdebase-runtime4/buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/kdemultimedia4/PLIST b/multimedia/kdemultimedia4/PLIST
new file mode 100644
index 00000000000..a9a1781d576
--- /dev/null
+++ b/multimedia/kdemultimedia4/PLIST
@@ -0,0 +1,176 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2009/10/02 20:25:35 markd Exp $
+bin/dragon
+bin/juk
+bin/kmix
+bin/kmixctrl
+bin/kscd
+bin/mplayerthumbsconfig
+include/audiocdencoder.h
+include/libkcddb/cdinfo.h
+include/libkcddb/cdinfodialog.h
+include/libkcddb/client.h
+include/libkcddb/configbase.h
+include/libkcddb/genres.h
+include/libkcddb/kcddb.h
+include/libkcddb/kcddb_export.h
+include/libkcddb/kcddbconfig.h
+include/libkcompactdisc/kcompactdisc.h
+lib/kde4/dragonpart.so
+lib/kde4/kcm_audiocd.so
+lib/kde4/kcm_cddb.so
+lib/kde4/kio_audiocd.so
+lib/kde4/libaudiocd_encoder_flac.so
+lib/kde4/libaudiocd_encoder_lame.so
+lib/kde4/libaudiocd_encoder_vorbis.so
+lib/kde4/libaudiocd_encoder_wav.so
+lib/kde4/videopreview.so
+lib/libaudiocdplugins.so
+lib/libaudiocdplugins.so.4
+lib/libaudiocdplugins.so.4.3.0
+lib/libkcddb.so
+lib/libkcddb.so.4
+lib/libkcddb.so.4.3.0
+lib/libkcompactdisc.so
+lib/libkcompactdisc.so.4
+lib/libkcompactdisc.so.4.3.0
+lib/libkdeinit4_kmix.so
+lib/libkdeinit4_kmixctrl.so
+share/applications/kde4/dragonplayer.desktop
+share/applications/kde4/juk.desktop
+share/applications/kde4/kmix.desktop
+share/applications/kde4/kscd.desktop
+share/dbus-1/interfaces/org.kde.KMix.xml
+share/dbus-1/interfaces/org.kde.juk.collection.xml
+share/dbus-1/interfaces/org.kde.juk.player.xml
+share/dbus-1/interfaces/org.kde.juk.search.xml
+share/dbus-1/interfaces/org.kde.kscd.cdplayer.xml
+share/doc/kde/HTML/en/dragonplayer/common
+share/doc/kde/HTML/en/dragonplayer/index.cache.bz2
+share/doc/kde/HTML/en/dragonplayer/index.docbook
+share/doc/kde/HTML/en/dragonplayer/main.png
+share/doc/kde/HTML/en/juk/common
+share/doc/kde/HTML/en/juk/history-playlist.png
+share/doc/kde/HTML/en/juk/index.cache.bz2
+share/doc/kde/HTML/en/juk/index.docbook
+share/doc/kde/HTML/en/juk/juk-adv-search.png
+share/doc/kde/HTML/en/juk/juk-file-renamer.png
+share/doc/kde/HTML/en/juk/juk-main.png
+share/doc/kde/HTML/en/juk/juk-tag-guesser.png
+share/doc/kde/HTML/en/juk/normal-playlist.png
+share/doc/kde/HTML/en/juk/search-playlist.png
+share/doc/kde/HTML/en/juk/toolbar.png
+share/doc/kde/HTML/en/kioslave/audiocd/common
+share/doc/kde/HTML/en/kioslave/audiocd/index.cache.bz2
+share/doc/kde/HTML/en/kioslave/audiocd/index.docbook
+share/doc/kde/HTML/en/kmix/common
+share/doc/kde/HTML/en/kmix/index.cache.bz2
+share/doc/kde/HTML/en/kmix/index.docbook
+share/doc/kde/HTML/en/kmix/kmix-channel-playback.png
+share/doc/kde/HTML/en/kmix/kmix-channel-record.png
+share/doc/kde/HTML/en/kmix/kmix-channel-switches.png
+share/doc/kde/HTML/en/kmix/kmix-window.png
+share/doc/kde/HTML/en/kscd/common
+share/doc/kde/HTML/en/kscd/index.cache.bz2
+share/doc/kde/HTML/en/kscd/index.docbook
+share/doc/kde/HTML/en/kscd/kscd.png
+share/doc/kde/HTML/en/kscd/kscd11.png
+share/doc/kde/HTML/en/kscd/kscd12.png
+share/doc/kde/HTML/en/kscd/kscd13.png
+share/doc/kde/HTML/en/kscd/kscd14.png
+share/doc/kde/HTML/en/kscd/kscd16.png
+share/doc/kde/HTML/en/kscd/kscd18.png
+share/doc/kde/HTML/en/kscd/kscd19.png
+share/doc/kde/HTML/en/kscd/kscd2.png
+share/doc/kde/HTML/en/kscd/kscd3.png
+share/doc/kde/HTML/en/kscd/kscd5.png
+share/doc/kde/HTML/en/kscd/kscd6.png
+share/doc/kde/HTML/en/kscd/kscd9.png
+share/doc/kde/HTML/en/kscd/kscdannounc.png
+share/icons/hicolor/128x128/apps/dragonplayer.png
+share/icons/hicolor/128x128/apps/juk.png
+share/icons/hicolor/128x128/apps/kmix.png
+share/icons/hicolor/128x128/apps/kscd.png
+share/icons/hicolor/16x16/apps/dragonplayer.png
+share/icons/hicolor/16x16/apps/juk.png
+share/icons/hicolor/16x16/apps/kmix.png
+share/icons/hicolor/16x16/apps/kscd.png
+share/icons/hicolor/22x22/apps/dragonplayer.png
+share/icons/hicolor/32x32/apps/dragonplayer.png
+share/icons/hicolor/32x32/apps/juk.png
+share/icons/hicolor/32x32/apps/kmix.png
+share/icons/hicolor/32x32/apps/kscd.png
+share/icons/hicolor/48x48/apps/dragonplayer.png
+share/icons/hicolor/48x48/apps/juk.png
+share/icons/hicolor/48x48/apps/kmix.png
+share/icons/hicolor/48x48/apps/kscd.png
+share/icons/hicolor/64x64/apps/dragonplayer.png
+share/icons/hicolor/64x64/apps/juk.png
+share/icons/hicolor/64x64/apps/kmix.png
+share/icons/hicolor/64x64/apps/kscd.png
+share/icons/hicolor/scalable/apps/dragonplayer.svgz
+share/icons/oxygen/16x16/actions/player-volume-muted.png
+share/icons/oxygen/22x22/actions/kscd-dock.png
+share/icons/oxygen/22x22/actions/player-volume-muted.png
+share/icons/oxygen/32x32/actions/player-volume-muted.png
+share/icons/oxygen/48x48/actions/player-volume-muted.png
+share/icons/oxygen/scalable/actions/player-volume-muted.svgz
+share/kde/apps/dragonplayer/dragonlogo.png
+share/kde/apps/dragonplayer/dragonplayerui.rc
+share/kde/apps/juk/juk.notifyrc
+share/kde/apps/juk/jukui-rtl.rc
+share/kde/apps/juk/jukui.rc
+share/kde/apps/juk/pics/playing.png
+share/kde/apps/juk/pics/splash.png
+share/kde/apps/juk/pics/yahoo_credit.png
+share/kde/apps/kconf_update/audiocd.upd
+share/kde/apps/kconf_update/kcmcddb-emailsettings.upd
+share/kde/apps/kconf_update/upgrade-metadata.sh
+share/kde/apps/kmix/kmixui.rc
+share/kde/apps/kmix/pics/kmixdocked.png
+share/kde/apps/kmix/pics/kmixdocked_error.png
+share/kde/apps/kmix/pics/kmixdocked_mute.png
+share/kde/apps/kmix/pics/mix_record.png
+share/kde/apps/kmix/pics/mixer-ac97.png
+share/kde/apps/kmix/pics/mixer-capture.png
+share/kde/apps/kmix/pics/mixer-cd.png
+share/kde/apps/kmix/pics/mixer-digital.png
+share/kde/apps/kmix/pics/mixer-front.png
+share/kde/apps/kmix/pics/mixer-headset.png
+share/kde/apps/kmix/pics/mixer-lfe.png
+share/kde/apps/kmix/pics/mixer-line.png
+share/kde/apps/kmix/pics/mixer-master.png
+share/kde/apps/kmix/pics/mixer-microphone.png
+share/kde/apps/kmix/pics/mixer-midi.png
+share/kde/apps/kmix/pics/mixer-pcm-default.png
+share/kde/apps/kmix/pics/mixer-pcm.png
+share/kde/apps/kmix/pics/mixer-surround.png
+share/kde/apps/kmix/pics/mixer-video.png
+share/kde/apps/kmix/profiles/ALSA.default.xml
+share/kde/apps/kmix/profiles/OSS.default.xml
+share/kde/apps/konqsidebartng/virtual_folders/services/audiocd.desktop
+share/kde/apps/kscd/skin/Chrome.svg
+share/kde/apps/kscd/skin/Obsidian-Coast.svg
+share/kde/apps/kscd/skin/Steel.svg
+share/kde/apps/kscd/skin/default.svg
+share/kde/apps/profiles/kscd.profile.xml
+share/kde/apps/solid/actions/dragonplayer-opendvd.desktop
+share/kde/apps/solid/actions/kscd-play-audiocd.desktop
+share/kde/apps/videothumbnail/sprocket-large.png
+share/kde/apps/videothumbnail/sprocket-medium.png
+share/kde/apps/videothumbnail/sprocket-small.png
+share/kde/autostart/kmix_autostart.desktop
+share/kde/autostart/restore_kmix_volumes.desktop
+share/kde/config.kcfg/audiocd_lame_encoder.kcfg
+share/kde/config.kcfg/audiocd_vorbis_encoder.kcfg
+share/kde/config.kcfg/kscd.kcfg
+share/kde/config.kcfg/libkcddb.kcfg
+share/kde/config.kcfg/mplayerthumbs.kcfg
+share/kde/config/dragonplayerrc
+share/kde4/services/ServiceMenus/dragonplayer_play_dvd.desktop
+share/kde4/services/ServiceMenus/jukservicemenu.desktop
+share/kde4/services/audiocd.desktop
+share/kde4/services/audiocd.protocol
+share/kde4/services/dragonplayer_part.desktop
+share/kde4/services/kmixctrl_restore.desktop
+share/kde4/services/libkcddb.desktop
+share/kde4/services/videopreview.desktop
diff --git a/multimedia/kdemultimedia4/buildlink3.mk b/multimedia/kdemultimedia4/buildlink3.mk
new file mode 100644
index 00000000000..4a99ebe6a83
--- /dev/null
+++ b/multimedia/kdemultimedia4/buildlink3.mk
@@ -0,0 +1,13 @@
+# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/10/02 20:25:35 markd Exp $
+
+BUILDLINK_TREE+=	kdemultimedia4
+
+.if !defined(KDEMULTIMEDIA4_BUILDLINK3_MK)
+KDEMULTIMEDIA4_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.kdemultimedia4+=	kdemultimedia4>=4.1.0
+BUILDLINK_PKGSRCDIR.kdemultimedia4?=	../../multimedia/kdemultimedia4
+
+.endif # KDEMULTIMEDIA4_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-kdemultimedia4
diff --git a/multimedia/kdemultimedia4/distinfo b/multimedia/kdemultimedia4/distinfo
new file mode 100644
index 00000000000..39e356c2d2a
--- /dev/null
+++ b/multimedia/kdemultimedia4/distinfo
@@ -0,0 +1,11 @@
+$NetBSD: distinfo,v 1.1.1.1 2009/10/02 20:25:35 markd Exp $
+
+SHA1 (kdemultimedia-4.3.1.tar.bz2) = ef50f869f1a6cdf91fe7808f095fccbd9463a7dd
+RMD160 (kdemultimedia-4.3.1.tar.bz2) = 893453f71b12969c2b16df2b4b5361edab6a7ef0
+Size (kdemultimedia-4.3.1.tar.bz2) = 1585744 bytes
+SHA1 (patch-ac) = 729f99548af7a21b98e5aa746cca7699f7880800
+SHA1 (patch-ad) = 8901537664189b95f54f06b429362ac15df5afa9
+SHA1 (patch-af) = c6ce9d8c45ca25ce5fb9ea8f0e26344cc7c70e15
+SHA1 (patch-ag) = 8242c31fff139a128688c72c6ae36840138d1492
+SHA1 (patch-ah) = 53ee197c6a39a8b5cae2273dc57bfcfdce281e28
+SHA1 (patch-al) = df1832fe6dfd1bb31660a91e32731d0cc14b8f36
diff --git a/multimedia/kdemultimedia4/options.mk b/multimedia/kdemultimedia4/options.mk
new file mode 100644
index 00000000000..bbebc498692
--- /dev/null
+++ b/multimedia/kdemultimedia4/options.mk
@@ -0,0 +1,13 @@
+# $NetBSD: options.mk,v 1.1.1.1 2009/10/02 20:25:35 markd Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.kdemultimedia
+PKG_SUPPORTED_OPTIONS=	pulseaudio
+PKG_SUGGESTED_OPTIONS=
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mpulseaudio)
+.include "../../audio/pulseaudio/buildlink3.mk"
+.else
+CMAKE_ARGS+=	-DWITH_PulseAudio:BOOL=OFF
+.endif
diff --git a/multimedia/kdemultimedia4/patches/patch-ac b/multimedia/kdemultimedia4/patches/patch-ac
new file mode 100644
index 00000000000..6a65b452324
--- /dev/null
+++ b/multimedia/kdemultimedia4/patches/patch-ac
@@ -0,0 +1,22 @@
+$NetBSD: patch-ac,v 1.1.1.1 2009/10/02 20:25:35 markd Exp $
+
+--- kmix/CMakeLists.txt.orig	2009-05-20 00:06:59.000000000 +1200
++++ kmix/CMakeLists.txt
+@@ -39,7 +39,7 @@ set(kmix_KDEINIT_SRCS ${kmix_adaptor_SRC
+ 
+ kde4_add_kdeinit_executable( kmix ${kmix_KDEINIT_SRCS})
+ 
+-target_link_libraries(kdeinit_kmix ${LIBKNOTIFICATIONITEM-1_LIBRARIES} ${KDE4_KUTILS_LIBS} ${KDE4_PHONON_LIBS} ${KDE4_SOLID_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTXML_LIBRARY})
++target_link_libraries(kdeinit_kmix ${LIBKNOTIFICATIONITEM-1_LIBRARIES} ${KDE4_KUTILS_LIBS} ${KDE4_PHONON_LIBS} ${KDE4_SOLID_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTXML_LIBRARY} $ENV{LIBOSSAUDIO})
+ 
+ if (HAVE_LIBASOUND2)
+     target_link_libraries(kdeinit_kmix ${ASOUND_LIBRARY})
+@@ -72,7 +72,7 @@ set(kmixctrl_KDEINIT_SRCS ${kmix_adaptor
+ 
+ kde4_add_kdeinit_executable( kmixctrl ${kmixctrl_KDEINIT_SRCS})
+ 
+-target_link_libraries(kdeinit_kmixctrl ${KDE4_KDEUI_LIBS} ${KDE4_SOLID_LIBS} ${QT_QTXML_LIBRARY})
++target_link_libraries(kdeinit_kmixctrl ${KDE4_KDEUI_LIBS} ${KDE4_SOLID_LIBS} ${QT_QTXML_LIBRARY} $ENV{LIBOSSAUDIO})
+ 
+ if (HAVE_LIBASOUND2)
+     target_link_libraries(kdeinit_kmixctrl ${ASOUND_LIBRARY})
diff --git a/multimedia/kdemultimedia4/patches/patch-ad b/multimedia/kdemultimedia4/patches/patch-ad
new file mode 100644
index 00000000000..8d232c019da
--- /dev/null
+++ b/multimedia/kdemultimedia4/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1.1.1 2009/10/02 20:25:35 markd Exp $
+
+--- kmix/tests/CMakeLists.txt.orig	2008-12-22 09:21:07.000000000 +1300
++++ kmix/tests/CMakeLists.txt
+@@ -21,7 +21,7 @@ kde4_add_executable(profiletest ${profil
+     ${kmix_adaptor_SRCS}
+     )
+ 
+-target_link_libraries(profiletest  ${KDE4_KDECORE_LIBS} ${KDE4_SOLID_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QTXML_LIBRARY} )
++target_link_libraries(profiletest  ${KDE4_KDECORE_LIBS} ${KDE4_SOLID_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QTXML_LIBRARY} $ENV{LIBOSSAUDIO})
+ 
+ if (HAVE_LIBASOUND2)
+     target_link_libraries(profiletest ${ASOUND_LIBRARY})
diff --git a/multimedia/kdemultimedia4/patches/patch-af b/multimedia/kdemultimedia4/patches/patch-af
new file mode 100644
index 00000000000..017b9cb3de6
--- /dev/null
+++ b/multimedia/kdemultimedia4/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1.1.1 2009/10/02 20:25:35 markd Exp $
+
+--- kioslave/audiocd/plugins/wav/encodercda.cpp.orig	2008-10-31 02:24:16.000000000 +1300
++++ kioslave/audiocd/plugins/wav/encodercda.cpp
+@@ -44,7 +44,7 @@ extern "C"
+ {
+   //cdda_interface.h in cdparanoia 10.2 has a member called 'private' which the C++ compiler doesn't like
+   #define private _private
+-  #include <cdda_interface.h>
++  #include <cdparanoia/cdda_interface.h>
+   #undef private
+ }
+ 
diff --git a/multimedia/kdemultimedia4/patches/patch-ag b/multimedia/kdemultimedia4/patches/patch-ag
new file mode 100644
index 00000000000..4c97971866e
--- /dev/null
+++ b/multimedia/kdemultimedia4/patches/patch-ag
@@ -0,0 +1,15 @@
+$NetBSD: patch-ag,v 1.1.1.1 2009/10/02 20:25:35 markd Exp $
+
+--- kioslave/audiocd/audiocd.cpp.orig	2008-10-31 02:24:17.000000000 +1300
++++ kioslave/audiocd/audiocd.cpp
+@@ -29,8 +29,8 @@ extern "C"
+ {
+ 	//cdda_interface.h in cdparanoia 10.2 has a member called 'private' which the C++ compiler doesn't like
+ 	#define private _private   
+-	#include <cdda_interface.h>
+-	#include <cdda_paranoia.h>
++	#include <cdparanoia/cdda_interface.h>
++	#include <cdparanoia/cdda_paranoia.h>
+ 	#undef private
+ 	void paranoiaCallback(long, int);
+ 
diff --git a/multimedia/kdemultimedia4/patches/patch-ah b/multimedia/kdemultimedia4/patches/patch-ah
new file mode 100644
index 00000000000..47d76d33888
--- /dev/null
+++ b/multimedia/kdemultimedia4/patches/patch-ah
@@ -0,0 +1,10 @@
+$NetBSD: patch-ah,v 1.1.1.1 2009/10/02 20:25:35 markd Exp $
+
+--- kioslave/audiocd/audiocd.upd.orig	2006-10-26 15:29:33.000000000 +1300
++++ kioslave/audiocd/audiocd.upd
+@@ -1,4 +1,4 @@
+ # Update for transport configuration
+ Id=1
+ File=kcmaudiocdrc
+-Script=upgrade-metadata.sh,bash
++Script=upgrade-metadata.sh,sh
diff --git a/multimedia/kdemultimedia4/patches/patch-al b/multimedia/kdemultimedia4/patches/patch-al
new file mode 100644
index 00000000000..753803f817d
--- /dev/null
+++ b/multimedia/kdemultimedia4/patches/patch-al
@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.1.1.1 2009/10/02 20:25:35 markd Exp $
+
+--- kioslave/audiocd/CMakeLists.txt.orig	2008-10-18 00:01:46.000000000 +1300
++++ kioslave/audiocd/CMakeLists.txt
+@@ -5,7 +5,7 @@ add_definitions (-DQT3_SUPPORT -DQT3_SUP
+ 
+ MACRO_PUSH_REQUIRED_VARS()
+ SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} /usr/include/cdda)
+-check_struct_member("struct cdrom_drive" "ioctl_device_name" "cdda_interface.h" CDDA_IOCTL_DEVICE_EXISTS)
++check_struct_member("struct cdrom_drive" "ioctl_device_name" "cdparanoia/cdda_interface.h" CDDA_IOCTL_DEVICE_EXISTS)
+ MACRO_POP_REQUIRED_VARS()
+ macro_bool_to_01(CDDA_IOCTL_DEVICE_EXISTS HAVE_CDDA_IOCTL_DEVICE)
+