Update kmplayer to 0.11.2a

Changes since version 0.11.2
- Add 'escape-uri' and 'contains' expression functions, support for '.' node
- Fix slider hiding when mplayer starts and no length available
- TV device scanner fix, recognize v4l2 inputs and fix detection when done
- Fix opening multiple files on commandline
- smilText improvements, support transition and background attributes
- Fix load-on-demand icon not shown for plugin
- SMIL support for paramGroup and mediaAlign attributes
Changes since version 0.11.1b
- Add pulse and vpau output drivers for MPlayer
- Fix audio language and sub title selection for MPlayer
- Port all K3Process to use QProcess
- Update npp to xulrunner-1.9
- Begin of SMIL state support, limited implementation of XPath
Changes since version 0.11.1a
- Hopefully fix crash reported in bugs.kde.org:195464
- Implement animateColor
- Don't set plugins background color (bugs.kde.org:161282)
- Fix animation timer not killed
- Update hardcoded flash version to 10.0r22
- Fix audio previews with flash on www.7digital.de (bugs.kde.org:193843)
- Fix slider for scaling the video
Changes since version 0.11.1
- Add title to blip.tv information page
- Enable more text attributes for smilText
- Fix resizing generators information page making text area smaller
- Fix title on youtube information page started with a newline
Changes since version 0.11.0a
- Merged generators from Maemo port
- Enable clear history
- Also a summary if RSS has media tags
- Implement still missing tvscanner using it (FWIW)
- Support SMIL region backgroundOpacity and media type mediaBackgroundOpacity
- Save toolbar settings
- Don't set aspects for NPP
- Support 'fill="transition"` inside SMIL 'seq' tags
- Support more than one begin and end triggers for SMIL elements
- Fix playing paths having spaces
Changes since version 0.11.0
- Implement NPNPostUrl, fixes some not working flash cases
- Set correct version in about dialog
- Delay completed signal with npp until first stream is finished
- Disable powermanager when we watch a film
- Add dbus interface for part, inluding org.kdeKMediaPlayer
- Fix for eof doesn't exit fullscreen
- Fix pressing play button doing nothing when there are child links
- Fix MPlayer often inserting the same link
Changes since version 0.11.0-rc4
- Extend Atom feed for Youtube queries
- Fix crash with npp if we get a javascript call before the plugin is loaded
- Report npp plugin loading failure
- Fix crash with D&D in playlist
Changes since version 0.11.0-rc3
- Silence most of the QDBus warnings about missing members or spurious replies
- Fix crash in npplayer for the GetVariable call from Javascript
- Bookmark updates from Edgar Klingberg
- Commented out lots of not (yet) implemented or empty menu's
- Phonon stream information is now shown
- Fix leaking XPixmap's in the back buffer code
Changes since version 0.11.0-rc2
- Change LoadOnDemand icon to default KDE's video icon
- Begin of support for SMIL::PriorityClass
- Fix controlpanel leaking menu's
- Support for simple calls to the npp plugin, onces that don't pass or return
  object, such as flash' GotoFrame
- Replace cairo_push_group by using XPixmap instead
- Save half of the dbus calls with npp's NPRuntime
Changes since version 0.11.0-rc1
- Fix browser function 'evalutate' in npp
- Make forward/backward buttons work again
- Add default region to smil layout, fixes some audio only cases
- Simple 'target' attribute support for smil a/area elements for plugin
- Hide controlpanel in khtml by default
- Skip OnDemand plugin loading if we expect too little space to click on
- Make collaboratiog kparts work again
Changes since version 0.10.0c
- Never start playing directly if we detected a HREF attribute
- Rename option 'Click to Play' to 'Grab image when 'Click to Play' is detected
- Add option for load on demand for when embedded in khtml
- Remove xine and gstreamer, add phonon backend
- Port to KDE4
- Support for simultaneous audio/video streams with SMIL

6 files changed, 61 insertions, 139 deletions

diff --git a/multimedia/kmplayer/Makefile b/multimedia/kmplayer/Makefile
index 8bda61eccdf..0b601719f3f 100644
--- a/multimedia/kmplayer/Makefile
+++ b/multimedia/kmplayer/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.49 2010/01/18 09:59:17 wiz Exp $
+# $NetBSD: Makefile,v 1.50 2010/04/10 04:09:21 markd Exp $
 #
 
-DISTNAME=	kmplayer-0.10.0c
-PKGREVISION=	3
+DISTNAME=	kmplayer-0.11.2a
 CATEGORIES=	multimedia kde
 MASTER_SITES=	http://kmplayer.kde.org/pkgs/
 EXTRACT_SUFX=	.tar.bz2
@@ -15,30 +14,15 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 DEPENDS+=		mplayer>=1.0rc3:../../multimedia/mplayer
 DEPENDS+=		mencoder>=1.0rc3:../../multimedia/mencoder
-DEPENDS+=		xine-arts>=1rc0a:../../audio/xine-arts
 
-GNU_CONFIGURE=		yes
-USE_TOOLS+=		gmake msgfmt perl pkg-config
+USE_CMAKE=		yes
+USE_TOOLS+=		msgfmt perl pkg-config
 USE_LANGUAGES=		c c++
-USE_LIBTOOL=		yes
 
-CONFIGURE_ARGS+=	--without-gstreamer
-
-SHLIBTOOL_OVERRIDE=	# empty
-
-SUBST_CLASSES+=		desktop
-SUBST_MESSAGE.desktop=	Fixing application launcher.
-SUBST_STAGE.desktop=	pre-configure
-SUBST_FILES.desktop=	src/kmplayer.desktop
-SUBST_SED.desktop=	-e 's|@PREFIX@|${PREFIX}|g'
-
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/cairo/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../meta-pkgs/kde3/kde3.mk"
+.include "../../sysutils/dbus-glib/buildlink3.mk"
+.include "../../meta-pkgs/kde4/kde4.mk"
 .include "../../multimedia/xine-lib/buildlink3.mk"
-.include "../../x11/kdelibs3/buildlink3.mk"
-.include "../../x11/libXv/buildlink3.mk"
+.include "../../x11/kdelibs4/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/kmplayer/PLIST b/multimedia/kmplayer/PLIST
index f89db105487..d0c9d82f1fc 100644
--- a/multimedia/kmplayer/PLIST
+++ b/multimedia/kmplayer/PLIST
@@ -1,45 +1,14 @@
-@comment $NetBSD: PLIST,v 1.18 2009/06/14 18:08:06 joerg Exp $
+@comment $NetBSD: PLIST,v 1.19 2010/04/10 04:09:21 markd Exp $
 bin/kmplayer
-bin/kxineplayer
-bin/kxvplayer
-lib/kde3/kmplayer.la
-lib/kde3/libkmplayerpart.la
-lib/libkdeinit_kmplayer.la
-lib/libkmplayercommon.la
-share/applications/kde/kmplayer.desktop
-share/doc/kde/HTML/da/kmplayer/common
-share/doc/kde/HTML/da/kmplayer/index.cache.bz2
-share/doc/kde/HTML/da/kmplayer/index.docbook
-share/doc/kde/HTML/de/kmplayer/common
-share/doc/kde/HTML/de/kmplayer/index.cache.bz2
-share/doc/kde/HTML/de/kmplayer/index.docbook
+bin/knpplayer
+bin/kphononplayer
+lib/kde4/libkmplayerpart.so
+lib/libkdeinit4_kmplayer.so
+lib/libkmplayercommon.so
+share/applications/kde4/kmplayer.desktop
 share/doc/kde/HTML/en/kmplayer/common
 share/doc/kde/HTML/en/kmplayer/index.cache.bz2
 share/doc/kde/HTML/en/kmplayer/index.docbook
-share/doc/kde/HTML/es/kmplayer/common
-share/doc/kde/HTML/es/kmplayer/index.cache.bz2
-share/doc/kde/HTML/es/kmplayer/index.docbook
-share/doc/kde/HTML/et/kmplayer/common
-share/doc/kde/HTML/et/kmplayer/index.cache.bz2
-share/doc/kde/HTML/et/kmplayer/index.docbook
-share/doc/kde/HTML/fr/kmplayer/common
-share/doc/kde/HTML/fr/kmplayer/index.cache.bz2
-share/doc/kde/HTML/fr/kmplayer/index.docbook
-share/doc/kde/HTML/it/kmplayer/common
-share/doc/kde/HTML/it/kmplayer/index.cache.bz2
-share/doc/kde/HTML/it/kmplayer/index.docbook
-share/doc/kde/HTML/nl/kmplayer/common
-share/doc/kde/HTML/nl/kmplayer/index.cache.bz2
-share/doc/kde/HTML/nl/kmplayer/index.docbook
-share/doc/kde/HTML/pt/kmplayer/common
-share/doc/kde/HTML/pt/kmplayer/index.cache.bz2
-share/doc/kde/HTML/pt/kmplayer/index.docbook
-share/doc/kde/HTML/ru/kmplayer/common
-share/doc/kde/HTML/ru/kmplayer/index.cache.bz2
-share/doc/kde/HTML/ru/kmplayer/index.docbook
-share/doc/kde/HTML/sv/kmplayer/common
-share/doc/kde/HTML/sv/kmplayer/index.cache.bz2
-share/doc/kde/HTML/sv/kmplayer/index.docbook
 share/icons/hicolor/128x128/apps/kmplayer.png
 share/icons/hicolor/16x16/apps/kmplayer.png
 share/icons/hicolor/22x22/apps/kmplayer.png
@@ -47,58 +16,50 @@ share/icons/hicolor/32x32/apps/kmplayer.png
 share/icons/hicolor/48x48/apps/kmplayer.png
 share/icons/hicolor/64x64/apps/kmplayer.png
 share/icons/hicolor/scalable/apps/kmplayer.svgz
+share/kde/apps/kmplayer/blip-api.xsl
 share/kde/apps/kmplayer/bookmarks.xml
+share/kde/apps/kmplayer/find-media.sh
+share/kde/apps/kmplayer/generators/blip-tv.xml
+share/kde/apps/kmplayer/generators/find-media.xml
+share/kde/apps/kmplayer/generators/shoutcast.xml
+share/kde/apps/kmplayer/generators/youtube-query.xml
 share/kde/apps/kmplayer/kmplayerpartui.rc
 share/kde/apps/kmplayer/kmplayerui.rc
-share/kde/apps/kmplayer/noise.gif
 share/kde/apps/kmplayer/pluginsinfo
+share/kde/apps/kmplayer/shoutcast.xsl
+share/kde/apps/kmplayer/youtube.xsl
 share/kde/config/kmplayerrc
-share/kde/mimelnk/application/x-kmplayer.desktop
-share/kde/mimelnk/video/x-ms-wmp.desktop
-share/kde/services/kmplayer_part.desktop
-share/locale/ar/LC_MESSAGES/kmplayer.mo
-share/locale/be/LC_MESSAGES/kmplayer.mo
-share/locale/br/LC_MESSAGES/kmplayer.mo
-share/locale/bs/LC_MESSAGES/kmplayer.mo
-share/locale/ca/LC_MESSAGES/kmplayer.mo
+share/kde4/services/kmplayer_part.desktop
 share/locale/cs/LC_MESSAGES/kmplayer.mo
-share/locale/csb/LC_MESSAGES/kmplayer.mo
-share/locale/cy/LC_MESSAGES/kmplayer.mo
 share/locale/da/LC_MESSAGES/kmplayer.mo
 share/locale/de/LC_MESSAGES/kmplayer.mo
 share/locale/el/LC_MESSAGES/kmplayer.mo
 share/locale/en_GB/LC_MESSAGES/kmplayer.mo
 share/locale/es/LC_MESSAGES/kmplayer.mo
 share/locale/et/LC_MESSAGES/kmplayer.mo
-share/locale/fi/LC_MESSAGES/kmplayer.mo
 share/locale/fr/LC_MESSAGES/kmplayer.mo
 share/locale/ga/LC_MESSAGES/kmplayer.mo
 share/locale/gl/LC_MESSAGES/kmplayer.mo
-share/locale/he/LC_MESSAGES/kmplayer.mo
-share/locale/hi/LC_MESSAGES/kmplayer.mo
-share/locale/hu/LC_MESSAGES/kmplayer.mo
-share/locale/is/LC_MESSAGES/kmplayer.mo
 share/locale/it/LC_MESSAGES/kmplayer.mo
 share/locale/ja/LC_MESSAGES/kmplayer.mo
-share/locale/ka/LC_MESSAGES/kmplayer.mo
+share/locale/km/LC_MESSAGES/kmplayer.mo
+share/locale/ku/LC_MESSAGES/kmplayer.mo
 share/locale/lt/LC_MESSAGES/kmplayer.mo
-share/locale/mt/LC_MESSAGES/kmplayer.mo
+share/locale/lv/LC_MESSAGES/kmplayer.mo
+share/locale/mai/LC_MESSAGES/kmplayer.mo
 share/locale/nb/LC_MESSAGES/kmplayer.mo
+share/locale/nds/LC_MESSAGES/kmplayer.mo
 share/locale/nl/LC_MESSAGES/kmplayer.mo
 share/locale/nn/LC_MESSAGES/kmplayer.mo
-share/locale/pa/LC_MESSAGES/kmplayer.mo
 share/locale/pl/LC_MESSAGES/kmplayer.mo
 share/locale/pt/LC_MESSAGES/kmplayer.mo
 share/locale/pt_BR/LC_MESSAGES/kmplayer.mo
 share/locale/ro/LC_MESSAGES/kmplayer.mo
 share/locale/ru/LC_MESSAGES/kmplayer.mo
-share/locale/rw/LC_MESSAGES/kmplayer.mo
 share/locale/sk/LC_MESSAGES/kmplayer.mo
-share/locale/sr/LC_MESSAGES/kmplayer.mo
-share/locale/sr@Latn/LC_MESSAGES/kmplayer.mo
 share/locale/sv/LC_MESSAGES/kmplayer.mo
-share/locale/ta/LC_MESSAGES/kmplayer.mo
 share/locale/tr/LC_MESSAGES/kmplayer.mo
 share/locale/uk/LC_MESSAGES/kmplayer.mo
-share/locale/xx/LC_MESSAGES/kmplayer.mo
+share/locale/x-test/LC_MESSAGES/kmplayer.mo
 share/locale/zh_CN/LC_MESSAGES/kmplayer.mo
+share/locale/zh_TW/LC_MESSAGES/kmplayer.mo
diff --git a/multimedia/kmplayer/distinfo b/multimedia/kmplayer/distinfo
index 0d37ad8b6a7..3422e5caea7 100644
--- a/multimedia/kmplayer/distinfo
+++ b/multimedia/kmplayer/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.17 2008/09/04 12:12:49 markd Exp $
+$NetBSD: distinfo,v 1.18 2010/04/10 04:09:21 markd Exp $
 
-SHA1 (kmplayer-0.10.0c.tar.bz2) = 52bfa017e1360fdc60c10445090c867039da4830
-RMD160 (kmplayer-0.10.0c.tar.bz2) = 4f7f291733f9a73f5838e028af5e5268d1a0ee10
-Size (kmplayer-0.10.0c.tar.bz2) = 1047729 bytes
-SHA1 (patch-aa) = 7e0c7d32ded98070438532c6365cafc0ef8bfd1f
-SHA1 (patch-ab) = 6d0635e5d9ea62de7363f761493d80d9d9734857
-SHA1 (patch-ac) = d91f1a27a0768e19c856079328db54d563e96128
+SHA1 (kmplayer-0.11.2a.tar.bz2) = d925e1b7e3268e64cc05590fbfb31f6dc969b4e8
+RMD160 (kmplayer-0.11.2a.tar.bz2) = 0bf3c19e79bf5802a62c7e4e3159db79617adbfb
+Size (kmplayer-0.11.2a.tar.bz2) = 528873 bytes
+SHA1 (patch-aa) = cab80928dd5027a2fffcace7ce56f12df994f8be
+SHA1 (patch-ab) = 975524f4ef0163d47c452f16ab98016acebead09
diff --git a/multimedia/kmplayer/patches/patch-aa b/multimedia/kmplayer/patches/patch-aa
index f90ebe7e201..aef106b2584 100644
--- a/multimedia/kmplayer/patches/patch-aa
+++ b/multimedia/kmplayer/patches/patch-aa
@@ -1,22 +1,13 @@
-$NetBSD: patch-aa,v 1.5 2008/09/04 12:12:49 markd Exp $
+$NetBSD: patch-aa,v 1.6 2010/04/10 04:09:22 markd Exp $
 
---- configure.orig	2007-12-22 10:51:44.000000000 +1300
-+++ configure
-@@ -34319,7 +34319,7 @@ LIBQTDBUS=""
- LIBDBUS_CFLAGS=""
- # Check whether --enable-nspr was given.
- if test "${enable_nspr+set}" = set; then
--  enableval=$enable_nspr; if test "x$enableval" == "xno"; then
-+  enableval=$enable_nspr; if test "x$enableval" = "xno"; then
-         buildnpp=no
-     fi
- fi
-@@ -34438,7 +34438,7 @@ LIBCAIRO_LIBS=""
- LIBCAIRO_CFLAGS=""
- # Check whether --enable-cairo was given.
- if test "${enable_cairo+set}" = set; then
--  enableval=$enable_cairo; if test "x$enableval" == "xno"; then
-+  enableval=$enable_cairo; if test "x$enableval" = "xno"; then
-         hascairo=no
-     fi
- fi
+--- src/mediaobject.cpp.orig	2010-04-06 08:39:06.000000000 +0000
++++ src/mediaobject.cpp
+@@ -402,7 +402,7 @@ KDE_NO_EXPORT void MediaInfo::killWGet (
+ /**
+  * Gets contents from url and puts it in m_data
+  */
+-KDE_NO_EXPORT bool MediaInfo::wget (const QString &str) {
++bool MediaInfo::wget (const QString &str) {
+     clearData ();
+     url = str;
+ 
diff --git a/multimedia/kmplayer/patches/patch-ab b/multimedia/kmplayer/patches/patch-ab
index 7e06ffa3b69..eb62dcb7d5b 100644
--- a/multimedia/kmplayer/patches/patch-ab
+++ b/multimedia/kmplayer/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.2 2005/04/07 12:07:44 markd Exp $
+$NetBSD: patch-ab,v 1.3 2010/04/10 04:09:22 markd Exp $
 
---- src/kmplayer.desktop.orig	2005-03-14 22:22:19.000000000 +1300
-+++ src/kmplayer.desktop
-@@ -2,7 +2,7 @@
- [Desktop Entry]
- Encoding=UTF-8
- Type=Application
--Exec=kmplayer -caption "%c" %i %m %U
-+Exec=@PREFIX@/bin/kmplayer -caption "%c" %i %m %U
- Icon=kmplayer.png
- DocPath=kmplayer/index.html
- Comment=KDE interface for MPlayer
+--- src/kmplayerplaylist.cpp.orig	2010-04-06 08:40:08.000000000 +0000
++++ src/kmplayerplaylist.cpp
+@@ -367,7 +367,7 @@ void TreeNode<Node>::appendChild (Node *
+ }
+ 
+ template <>
+-KDE_NO_EXPORT void TreeNode<Node>::insertBefore (Node *c, Node *b) {
++void TreeNode<Node>::insertBefore (Node *c, Node *b) {
+     ASSERT (!c->parentNode ());
+     static_cast <Node *> (this)->document()->m_tree_version++;
+     insertBeforeImpl (c, b);
diff --git a/multimedia/kmplayer/patches/patch-ac b/multimedia/kmplayer/patches/patch-ac
deleted file mode 100644
index 4addb7b6400..00000000000
--- a/multimedia/kmplayer/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2006/08/02 14:34:01 markd Exp $
-
---- mimetypes/application/Makefile.in.orig	2006-06-07 08:45:15.000000000 +1200
-+++ mimetypes/application/Makefile.in
-@@ -339,7 +339,7 @@ x_libraries = @x_libraries@
- xdg_appsdir = @xdg_appsdir@
- xdg_directorydir = @xdg_directorydir@
- xdg_menudir = @xdg_menudir@
--mime_DATA = x-mplayer2.desktop x-kmplayer.desktop
-+mime_DATA = x-kmplayer.desktop
- mimedir = $(kde_mimedir)/application
- EXTRA_DIST = $(mime_DATA)
- #>- all: all-am