[gentoo-commits] proj/kde:master commit in: media-video/kmplayer/files/, media-video/kmplayer/
commit: e80bc265e3b70bbb051428c8c4746d250ebe796e
Author: Andreas Sturmlechner gmail com>
AuthorDate: Sat Aug 27 15:50:45 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Wed Aug 31 14:41:09 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=e80bc265
media-video/kmplayer: Sync with tree (DEPENDs, USE=npp fix)
Drop obsolete/broken patch.
Package-Manager: portage-2.2.28
media-video/kmplayer/files/kmplayer-flash.patch | 12
media-video/kmplayer/kmplayer-.ebuild | 12 +++-
2 files changed, 7 insertions(+), 17 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..000
--- 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.0 +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-.ebuild
b/media-video/kmplayer/kmplayer-.ebuild
index 120644a..8021739 100644
--- a/media-video/kmplayer/kmplayer-.ebuild
+++ b/media-video/kmplayer/kmplayer-.ebuild
@@ -9,6 +9,8 @@ inherit kde5
DESCRIPTION="Video player plugin for Konqueror and basic MPlayer frontend"
HOMEPAGE="https://kmplayer.kde.org;
+[[ ${KDE_BUILD_TYPE} != live ]] &&
SRC_URI="mirror://kde/stable/${PN}/${EGIT_BRANCH}/${P}.tar.bz2"
+
LICENSE="GPL-2 FDL-1.2 LGPL-2.1"
KEYWORDS=""
IUSE="cairo npp"
@@ -25,6 +27,7 @@ CDEPEND="
$(add_frameworks_dep kio)
$(add_frameworks_dep kmediaplayer)
$(add_frameworks_dep kparts)
+ $(add_frameworks_dep ktextwidgets)
$(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep kxmlgui)
$(add_qt_dep qtdbus)
@@ -52,12 +55,11 @@ RDEPEND="${CDEPEND}
!media-video/kmplayer:4
"
-if [[ ${KDE_BUILD_TYPE} != live ]] ; then
- S="${WORKDIR}/${PN}"
-fi
-
src_prepare() {
- use npp && epatch "${FILESDIR}/${PN}-flash.patch"
+ if use npp; then
+ sed -i src/kmplayer_part.desktop \
+ -e ":^MimeType: s:=:=application/x-shockwave-flash;:" || die
+ fi
kde5_src_prepare
}
[gentoo-commits] proj/kde:master commit in: media-video/kmplayer/files/, media-video/kmplayer/
commit: 2dcea609a1736b3e7d65e1e7be9ad16518281248
Author: Johannes Huber gentoo org>
AuthorDate: Fri Jun 3 08:33:05 2016 +
Commit: Johannes Huber gentoo org>
CommitDate: Fri Jun 3 08:33:05 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=2dcea609
media-video/kmplayer: Version bump
Gentoo-bug: 584904
Package-Manager: portage-2.3.0_rc1
media-video/kmplayer/files/kmplayer-flash.patch | 12
media-video/kmplayer/kmplayer-.ebuild | 80 +
media-video/kmplayer/metadata.xml | 15 +
3 files changed, 107 insertions(+)
diff --git a/media-video/kmplayer/files/kmplayer-flash.patch
b/media-video/kmplayer/files/kmplayer-flash.patch
new file mode 100644
index 000..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.0 +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-.ebuild
b/media-video/kmplayer/kmplayer-.ebuild
new file mode 100644
index 000..76e6b1a
--- /dev/null
+++ b/media-video/kmplayer/kmplayer-.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+EGIT_BRANCH="0.12"
+inherit kde5
+
+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"
+KEYWORDS=""
+IUSE="cairo npp"
+
+DEPEND="
+ $(add_frameworks_dep kbookmarks)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdelibs4support)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kmediaplayer)
+ $(add_frameworks_dep kparts)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtsvg)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtx11extras)
+ $(add_qt_dep qtxml)
+ media-libs/phonon[qt5]
+ x11-libs/libX11
+ x11-libs/libxcb
+ cairo? ( x11-libs/cairo )
+ npp? (
+ dev-libs/dbus-glib
+ dev-libs/glib:2
+ www-plugins/adobe-flash
+ >=x11-libs/gtk+-2.10.14:2
+ )
+"
+RDEPEND="${DEPEND}
+ media-video/mplayer
+ !media-video/kmplayer:4
+"
+
+if [[ ${KDE_BUILD_TYPE} != live ]] ; then
+ S="${WORKDIR}/${PN}"
+fi
+
+src_prepare() {
+ use npp && epatch "${FILESDIR}/${PN}-flash.patch"
+
+
