public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/kde:master commit in: media-video/kmplayer/, media-video/kmplayer/files/
@ 2014-04-04 11:29 Johannes Huber
  0 siblings, 0 replies; 2+ messages in thread
From: Johannes Huber @ 2014-04-04 11:29 UTC (permalink / raw
  To: gentoo-commits

commit:     80164e51ff960729b5bcd86c2f9edb6b4bb46a12
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  4 11:29:26 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Apr  4 11:29:26 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=80164e51

[media-video/kmplayer] Sync with tree

Package-Manager: portage-2.2.10

---
 media-video/kmplayer/files/kmplayer-flash.patch | 12 +++++++++
 media-video/kmplayer/kmplayer-9999.ebuild       | 34 +++++++++++++++++--------
 2 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/media-video/kmplayer/files/kmplayer-flash.patch b/media-video/kmplayer/files/kmplayer-flash.patch
new file mode 100644
index 0000000..0a6a72b
--- /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-9999.ebuild b/media-video/kmplayer/kmplayer-9999.ebuild
index 8d532bd..fdeaa64 100644
--- a/media-video/kmplayer/kmplayer-9999.ebuild
+++ b/media-video/kmplayer/kmplayer-9999.ebuild
@@ -4,17 +4,23 @@
 
 EAPI=5
 
+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="Video player plugin for Konqueror and basic MPlayer/Xine/ffmpeg/ffserver/VDR frontend."
+DESCRIPTION="Video player plugin for Konqueror and basic MPlayer/Xine/ffmpeg/ffserver/VDR frontend"
 HOMEPAGE="http://kmplayer.kde.org/"
 
-LICENSE="GPL-2"
-KEYWORDS=""
+LICENSE="GPL-2 FDL-1.2 LGPL-2.1"
 SLOT="4"
+KEYWORDS=""
 IUSE="cairo debug expat npp"
 
 DEPEND="
+	media-libs/phonon
+	x11-libs/libX11
 	expat? ( >=dev-libs/expat-2.0.1 )
 	cairo? (
 		x11-libs/cairo
@@ -22,29 +28,37 @@ DEPEND="
 	)
 	npp? (
 		dev-libs/dbus-glib
+		$(add_kdebase_dep kreadconfig)
 		>=x11-libs/gtk+-2.10.14:2
+		www-plugins/adobe-flash
 	)
 "
 RDEPEND="${DEPEND}
-	!media-video/kmplayer:4.1
 	media-video/mplayer
 "
 
 src_prepare() {
-	# fixup icon install
-	sed -i \
-		-e "s:add_subdirectory(icons):#add_subdirectory(icons):g"\
-		CMakeLists.txt || die "removing icons failed"
+	use npp && epatch "${FILESDIR}/${PN}-flash.patch"
+	sed -e '/add_subdirectory(icons)/d' \
+		-i CMakeLists.txt || die
 
 	kde4-base_src_prepare
 }
 
 src_configure() {
-	mycmakeargs=(
+	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
 }
+
+src_install() {
+	kde4-base_src_install
+
+	if use npp; then
+		kwriteconfig --file "${ED}/usr/share/config/kmplayerrc" --group "application/x-shockwave-flash" --key player npp
+		kwriteconfig --file "${ED}/usr/share/config/kmplayerrc" --group "application/x-shockwave-flash" --key plugin /usr/lib/nsbrowser/plugins/libflashplayer.so
+	fi
+}


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] proj/kde:master commit in: media-video/kmplayer/, media-video/kmplayer/files/
@ 2016-04-28  6:58 Johannes Huber
  0 siblings, 0 replies; 2+ messages in thread
From: Johannes Huber @ 2016-04-28  6:58 UTC (permalink / raw
  To: gentoo-commits

commit:     bc639b4bef5a54de9a41227645c3f4a02fb345f8
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 28 06:51:33 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Apr 28 06:51:33 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=bc639b4b

media-video/kmplayer: Remove pkg

No KDE Frameworks port available. Still uses deprecated kdelibs4. Stable
and testing version in gentoo main tree available.

 media-video/kmplayer/files/kmplayer-flash.patch | 12 -----
 media-video/kmplayer/kmplayer-9999.ebuild       | 65 -------------------------
 media-video/kmplayer/metadata.xml               | 15 ------
 3 files changed, 92 deletions(-)

diff --git a/media-video/kmplayer/files/kmplayer-flash.patch b/media-video/kmplayer/files/kmplayer-flash.patch
deleted file mode 100644
index 0a6a72b..0000000
--- a/media-video/kmplayer/files/kmplayer-flash.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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-9999.ebuild b/media-video/kmplayer/kmplayer-9999.ebuild
deleted file mode 100644
index 4ecdc52..0000000
--- a/media-video/kmplayer/kmplayer-9999.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-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="Video player plugin for Konqueror and basic MPlayer frontend"
-HOMEPAGE="https://projects.kde.org/projects/extragear/multimedia/kmplayer"
-
-LICENSE="GPL-2 FDL-1.2 LGPL-2.1"
-SLOT="4"
-KEYWORDS=""
-IUSE="cairo debug expat npp"
-
-DEPEND="
-	media-libs/phonon[qt4]
-	x11-libs/libX11
-	cairo? (
-		x11-libs/cairo
-		x11-libs/pango
-	)
-	expat? ( >=dev-libs/expat-2.0.1 )
-	npp? (
-		$(add_kdeapps_dep kreadconfig)
-		dev-libs/dbus-glib
-		www-plugins/adobe-flash
-		>=x11-libs/gtk+-2.10.14:2
-	)
-"
-RDEPEND="${DEPEND}
-	media-video/mplayer
-"
-
-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=(
-		-DKMPLAYER_BUILT_WITH_CAIRO=$(usex cairo)
-		-DKMPLAYER_BUILT_WITH_EXPAT=$(usex expat)
-		-DKMPLAYER_BUILT_WITH_NPP=$(usex npp)
-	)
-
-	kde4-base_src_configure
-}
-
-src_install() {
-	kde4-base_src_install
-
-	if use npp; then
-		kwriteconfig --file "${ED}/usr/share/config/kmplayerrc" --group "application/x-shockwave-flash" --key player npp
-		kwriteconfig --file "${ED}/usr/share/config/kmplayerrc" --group "application/x-shockwave-flash" --key plugin /usr/lib/nsbrowser/plugins/libflashplayer.so
-	fi
-}

diff --git a/media-video/kmplayer/metadata.xml b/media-video/kmplayer/metadata.xml
deleted file mode 100644
index d4fe1b9..0000000
--- a/media-video/kmplayer/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>media-video@gentoo.org</email>
-		<name>Gentoo Video project</name>
-	</maintainer>
-	<use>
-		<flag name="npp">Compile the npp backend that plays xembed style browser plugins.</flag>
-	</use>
-</pkgmetadata>


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2016-04-28  6:58 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-04-04 11:29 [gentoo-commits] proj/kde:master commit in: media-video/kmplayer/, media-video/kmplayer/files/ Johannes Huber
  -- strict thread matches above, loose matches on Subject: below --
2016-04-28  6:58 Johannes Huber

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox