Revision bump, add fix for konqueror flash wrt bug 434724, credit to Marco Clocchiatti <ziapannocchia@gmail.com>

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 42618354)

3 files changed, 86 insertions, 1 deletions

diff --git a/media-video/kmplayer/ChangeLog b/media-video/kmplayer/ChangeLog
index a26aaa4689b9..828d3ac60a9f 100644
--- a/media-video/kmplayer/ChangeLog
+++ b/media-video/kmplayer/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/kmplayer
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/ChangeLog,v 1.156 2012/10/23 13:47:41 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/ChangeLog,v 1.157 2012/11/09 00:04:03 creffett Exp $
+
+*kmplayer-0.11.3d-r1 (09 Nov 2012)
+
+  09 Nov 2012; Chris Reffett <creffett@gentoo.org> +files/kmplayer-flash.patch,
+  +kmplayer-0.11.3d-r1.ebuild:
+  Revision bump, add fix for konqueror flash wrt bug 434724, credit to Marco
+  Clocchiatti <ziapannocchia@gmail.com>
 
   23 Oct 2012; Michael Palimaka <kensington@gentoo.org>
   -kmplayer-0.11.3c.ebuild:
diff --git a/media-video/kmplayer/files/kmplayer-flash.patch b/media-video/kmplayer/files/kmplayer-flash.patch
new file mode 100644
index 000000000000..0a6a72b10531
--- /dev/null
+++ b/media-video/kmplayer/files/kmplayer-flash.patch
@@ -0,0 +1,12 @@
+diff -urN kmplayer-0.11.3d.old/src/kmplayer_part.desktop kmplayer-0.11.3d/src/kmplayer_part.desktop
+--- kmplayer-0.11.3d.old/src/kmplayer_part.desktop	2012-06-10 14:35:46.000000000 +0200
++++ kmplayer-0.11.3d/src/kmplayer_part.desktop	2012-09-11 14:42:04.160426844 +0200
+@@ -93,7 +93,7 @@
+ Comment[zh_TW]=影像播放器外掛程式（與 QuickTime，XMovie，Windows Media 與 RealPlayer 相容）
+ X-KDE-Library=libkmplayerpart
+ # Keep in sync with the audio types in kmplayer.desktop
+-MimeType=application/ogg;application/smil;application/vnd.ms-asf;application/vnd.rn-realmedia;application/x-kmplayer;application/x-mplayer2;application/x-ogg;application/xspf+xml;audio/basic;audio/m3u;audio/mp4;audio/mpeg;audio/mpegurl;audio/vnd.rn-realaudio;audio/vorbis;audio/x-aiff;audio/x-flac;audio/x-m3u;audio/x-matroska;audio/x-mp2;audio/x-mp3;audio/x-mpegurl;audio/x-ms-asx;audio/x-ms-wma;audio/x-musepack;audio/x-mod;audio/x-oggflac;audio/x-pn-realaudio;audio/x-scpls;audio/x-speex;audio/x-vorbis;audio/x-wav;video/avi;video/mediaplayer;video/mp4;video/mpeg;video/quicktime;video/vnd.rn-realvideo;video/x-avi;video/x-flic;video/x-matroska;video/x-ms-asf;video/x-msvideo;video/x-ms-wmp;video/x-ms-wmv;video/x-ogm;video/x-theora;x-scheme-handler/mms;x-scheme-handler/pnm;x-scheme-handler/rtspt;x-scheme-handler/rtspu;
++MimeType=application/x-shockwave-flash;application/ogg;application/smil;application/vnd.ms-asf;application/vnd.rn-realmedia;application/x-kmplayer;application/x-mplayer2;application/x-ogg;application/xspf+xml;audio/basic;audio/m3u;audio/mp4;audio/mpeg;audio/mpegurl;audio/vnd.rn-realaudio;audio/vorbis;audio/x-aiff;audio/x-flac;audio/x-m3u;audio/x-matroska;audio/x-mp2;audio/x-mp3;audio/x-mpegurl;audio/x-ms-asx;audio/x-ms-wma;audio/x-musepack;audio/x-mod;audio/x-oggflac;audio/x-pn-realaudio;audio/x-scpls;audio/x-speex;audio/x-vorbis;audio/x-wav;video/avi;video/mediaplayer;video/mp4;video/mpeg;video/quicktime;video/vnd.rn-realvideo;video/x-avi;video/x-flic;video/x-matroska;video/x-ms-asf;video/x-msvideo;video/x-ms-wmp;video/x-ms-wmv;video/x-ogm;video/x-theora;x-scheme-handler/mms;x-scheme-handler/pnm;x-scheme-handler/rtspt;x-scheme-handler/rtspu;
+ Type=Service
+ Icon=kmplayer
+ X-KDE-ServiceTypes=KParts/ReadOnlyPart,Browser/View,KMediaPlayer/Player
diff --git a/media-video/kmplayer/kmplayer-0.11.3d-r1.ebuild b/media-video/kmplayer/kmplayer-0.11.3d-r1.ebuild
new file mode 100644
index 000000000000..feffb1e69ce7
--- /dev/null
+++ b/media-video/kmplayer/kmplayer-0.11.3d-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/kmplayer-0.11.3d-r1.ebuild,v 1.1 2012/11/09 00:04:03 creffett Exp $
+
+EAPI=4
+KDE_LINGUAS="bg bs ca ca@valencia cs da de el en_GB eo es et fr ga gl hr hu it
+ja km ku lt lv mai nb nds nl nn pl pt pt_BR ro ru sk sr sr@latin sv th tr ug uk
+zh_CN zh_TW"
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="KMPlayer is a Video player plugin for Konqueror and basic MPlayer/Xine/ffmpeg/ffserver/VDR frontend."
+HOMEPAGE="http://kmplayer.kde.org/"
+SRC_URI="http://kmplayer.kde.org/pkgs/${P}.tar.bz2"
+
+LICENSE="GPL-2 FDL-1.2 LGPL-2.1"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="cairo debug expat handbook npp"
+
+DEPEND="media-libs/phonon
+	x11-libs/libX11
+	expat? ( >=dev-libs/expat-2.0.1 )
+	cairo? (
+		x11-libs/cairo
+		x11-libs/pango
+	)
+	npp? (
+		dev-libs/dbus-glib
+		>=x11-libs/gtk+-2.10.14:2
+		www-plugins/adobe-flash
+	)
+"
+RDEPEND="${DEPEND}
+	media-video/mplayer
+"
+
+DOCS=( AUTHORS ChangeLog README TODO )
+
+src_prepare() {
+	use npp && epatch "${FILESDIR}/${PN}-flash.patch"
+	sed -e '/add_subdirectory(icons)/d' \
+		-i CMakeLists.txt || die
+
+	kde4-base_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use cairo KMPLAYER_BUILT_WITH_CAIRO)
+		$(cmake-utils_use expat KMPLAYER_BUILT_WITH_EXPAT)
+		$(cmake-utils_use npp KMPLAYER_BUILT_WITH_NPP)
+	)
+
+	kde4-base_src_configure
+}
+
+pkg_postinst() {
+	if use npp; then
+		kwriteconfig --file "${PORTAGE_BUILDDIR}/usr/share/config/kmplayerrc" --group "application/x-shockwave-flash" --key player npp
+		kwriteconfig --file "${PORTAGE_BUILDDIR}/usr/share/config/kmplayerrc" --group "application/x-shockwave-flash" --key plugin /usr/lib/nsbrowser/plugins/libflashplayer.so
+		update-desktop-database
+		ewarn "If users have problems using flash in Konqueror, follow the steps"
+		ewarn "at http://dev.gentoo.org/~lack/konqueror-flash.xml to solve them"
+	fi
+}