Mplayer compatibility patch thanks to Robert Marmorstein, bug #176893.

Package-Manager: portage-2.1.2.7

5 files changed, 182 insertions, 5 deletions

diff --git a/media-video/kmplayer/ChangeLog b/media-video/kmplayer/ChangeLog
index 50f0a158c854..385e730bd3cc 100644
--- a/media-video/kmplayer/ChangeLog
+++ b/media-video/kmplayer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/kmplayer
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/ChangeLog,v 1.95 2007/04/07 13:41:18 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/ChangeLog,v 1.96 2007/05/08 21:36:50 carlo Exp $
+
+*kmplayer-0.9.4a-r1 (08 May 2007)
+
+  08 May 2007; Carsten Lohrke <carlo@gentoo.org>
+  +files/kmplayer-0.9.4a-vop2vf.patch, +kmplayer-0.9.4a-r1.ebuild:
+  Mplayer compatibility patch thanks to Robert Marmorstein, bug #176893.
 
 *kmplayer-0.9.4a (05 Apr 2007)
 
diff --git a/media-video/kmplayer/Manifest b/media-video/kmplayer/Manifest
index d2360c625330..13dddec4fbc7 100644
--- a/media-video/kmplayer/Manifest
+++ b/media-video/kmplayer/Manifest
@@ -2,6 +2,10 @@ AUX kmplayer-0.9.3-use32bitbin.diff 10308 RMD160 5983630e340723f7ca210ee87f3aaed
 MD5 e5e09564ed22fdaa4e10c067c2ba11a7 files/kmplayer-0.9.3-use32bitbin.diff 10308
 RMD160 5983630e340723f7ca210ee87f3aaeda13bda68e files/kmplayer-0.9.3-use32bitbin.diff 10308
 SHA256 4fe748de0ca402bf01a8a6cbb44a1b88b1f36017bd467464cb303be5b5cc6d3e files/kmplayer-0.9.3-use32bitbin.diff 10308
+AUX kmplayer-0.9.4a-vop2vf.patch 3636 RMD160 9f435e2003ad0bc855a698964814fa90bb7ca88c SHA1 017911852e58dcd50772ae9cc8ebc45c84eeee4a SHA256 71b74ae6812912ab8f4c825cd0407236b5fc76c520974eb8677a1a2ebd258af3
+MD5 de0ac92eb8c1e40af6f75c67ebdf5928 files/kmplayer-0.9.4a-vop2vf.patch 3636
+RMD160 9f435e2003ad0bc855a698964814fa90bb7ca88c files/kmplayer-0.9.4a-vop2vf.patch 3636
+SHA256 71b74ae6812912ab8f4c825cd0407236b5fc76c520974eb8677a1a2ebd258af3 files/kmplayer-0.9.4a-vop2vf.patch 3636
 DIST kmplayer-0.9.3.tar.bz2 943240 RMD160 5dd48f2e1564df8576c92bff22f7f9cfaf969d7e SHA1 1e6ff7e37b758c188f79de83ec2559e5605adbb4 SHA256 1b10a7162f305da974dc30bf4ffdea2cfd7a03dc69e2749c8366e0ce78732247
 DIST kmplayer-0.9.3a.tar.bz2 950430 RMD160 1e98a30a7a200e1235c86129df708c799cfaa595 SHA1 646f6716f24d4d635545f5e3946671c2f01e3e8c SHA256 13fafbc1a149dad9354192072f202a70c98868d10cd44299bc7d22915fd1c202
 DIST kmplayer-0.9.4.tar.bz2 965254 RMD160 cf93e34f98eaedd161b552f9f323835679dbc36d SHA1 cb5df7744b77df2cb656109d1becd3744816a0d2 SHA256 63b604ab5d92261af202f078e8397b9c08aefe03ffde353071958b38e317d260
@@ -22,18 +26,26 @@ EBUILD kmplayer-0.9.4.ebuild 1723 RMD160 177523570038d91f1bd713601ed161a53266931
 MD5 38fdf530d6909e275e8e4c5e6ff217ef kmplayer-0.9.4.ebuild 1723
 RMD160 177523570038d91f1bd713601ed161a532669317 kmplayer-0.9.4.ebuild 1723
 SHA256 da3f84badb0ad888512ffe385f40e5db1ed041d071cad58ff05fe6754c80569f kmplayer-0.9.4.ebuild 1723
+EBUILD kmplayer-0.9.4a-r1.ebuild 2243 RMD160 993ef97ffe23fb1fbb3c848e0a572da965a9221a SHA1 ea9b097e39eebed4a7c69cbc5010ff66747efac8 SHA256 011cf270cf1ffeb4c6a1dac3c4e9c8adcdad108170ceef1692d379a5a7c81142
+MD5 9946153cb7970a0d26f85069404baea0 kmplayer-0.9.4a-r1.ebuild 2243
+RMD160 993ef97ffe23fb1fbb3c848e0a572da965a9221a kmplayer-0.9.4a-r1.ebuild 2243
+SHA256 011cf270cf1ffeb4c6a1dac3c4e9c8adcdad108170ceef1692d379a5a7c81142 kmplayer-0.9.4a-r1.ebuild 2243
 EBUILD kmplayer-0.9.4a.ebuild 2190 RMD160 33d1b2c3a5c34ae9137a9c56c37281321627fd77 SHA1 4f164841ab575bb56fe05d6648bfcab8b303087f SHA256 4526cab126793538fea79b19fc0604c96336afc3b6cfe497dd51597fedc5df57
 MD5 81751355a3c780802dcc88d7d50a8f63 kmplayer-0.9.4a.ebuild 2190
 RMD160 33d1b2c3a5c34ae9137a9c56c37281321627fd77 kmplayer-0.9.4a.ebuild 2190
 SHA256 4526cab126793538fea79b19fc0604c96336afc3b6cfe497dd51597fedc5df57 kmplayer-0.9.4a.ebuild 2190
-MISC ChangeLog 13077 RMD160 457e965bbdf71265af4fef9b76d168307dd71701 SHA1 c6fec4ecdc1d986f4b9fe9392a46ff9447c75ab8 SHA256 e928794eb5bef1848d49e549a0964c3057e726d7b4310049239ba1444106cf35
-MD5 4447fae822b8560a2b592ecc1801dd73 ChangeLog 13077
-RMD160 457e965bbdf71265af4fef9b76d168307dd71701 ChangeLog 13077
-SHA256 e928794eb5bef1848d49e549a0964c3057e726d7b4310049239ba1444106cf35 ChangeLog 13077
+MISC ChangeLog 13300 RMD160 64d91a4955ad9c4fc9b5690552e4175aa75e5517 SHA1 28b0203d2e06c3c508dc77e1858c96961322ab27 SHA256 6bfd26ee5c7f2b96df4fd3d0d2cd0a7eb73ea804562394e12b5301ce7f7ea0ce
+MD5 bf4e33694b486c38586b2a159737bb9a ChangeLog 13300
+RMD160 64d91a4955ad9c4fc9b5690552e4175aa75e5517 ChangeLog 13300
+SHA256 6bfd26ee5c7f2b96df4fd3d0d2cd0a7eb73ea804562394e12b5301ce7f7ea0ce ChangeLog 13300
 MISC metadata.xml 301 RMD160 8cdfa7196c9fd8e12c3abec835f953aa9104bd4b SHA1 3085c41a72d20d1fd313c697f47b57cfc4f1d922 SHA256 384f81a99d921498726f234957a04616544bd6a4e26e55064cc2e0c9e08f780a
 MD5 c23e0598555bbfe06e04be579dc97186 metadata.xml 301
 RMD160 8cdfa7196c9fd8e12c3abec835f953aa9104bd4b metadata.xml 301
 SHA256 384f81a99d921498726f234957a04616544bd6a4e26e55064cc2e0c9e08f780a metadata.xml 301
+MISC tags 146 RMD160 484973d725a6df2642d26557fc79e021e9629456 SHA1 9d75468ff68aac7596d0c2954e8bd4632be9a404 SHA256 26d2e69111d26903e1104bbe1bbe53c54a6195e286cf8634f4455897b00d9ea6
+MD5 ad790400d1c096e92f252cd716a7b42f tags 146
+RMD160 484973d725a6df2642d26557fc79e021e9629456 tags 146
+SHA256 26d2e69111d26903e1104bbe1bbe53c54a6195e286cf8634f4455897b00d9ea6 tags 146
 MD5 a8ca55a7f5245bd844a93badf6352557 files/digest-kmplayer-0.9.3 247
 RMD160 25bd6ea69f1022d73ff950c7272fd97c44f0d853 files/digest-kmplayer-0.9.3 247
 SHA256 6e55fd56cd1492538805f5f13ced19d93fee8220b94badd1afc296c808bf965f files/digest-kmplayer-0.9.3 247
@@ -49,3 +61,6 @@ SHA256 e31c599652be018d36f436124812c01f22fec0b228592e4963419bf2cccf5c55 files/di
 MD5 814020e3aad9b85bb2ac2a4f8064627e files/digest-kmplayer-0.9.4a 250
 RMD160 630d1ab8dce8649b647230356a1d2f997a8590b0 files/digest-kmplayer-0.9.4a 250
 SHA256 ada6d437825b9b2fdc0a2eff84e89c297e5b68903cafab096774301f2209019a files/digest-kmplayer-0.9.4a 250
+MD5 814020e3aad9b85bb2ac2a4f8064627e files/digest-kmplayer-0.9.4a-r1 250
+RMD160 630d1ab8dce8649b647230356a1d2f997a8590b0 files/digest-kmplayer-0.9.4a-r1 250
+SHA256 ada6d437825b9b2fdc0a2eff84e89c297e5b68903cafab096774301f2209019a files/digest-kmplayer-0.9.4a-r1 250
diff --git a/media-video/kmplayer/files/digest-kmplayer-0.9.4a-r1 b/media-video/kmplayer/files/digest-kmplayer-0.9.4a-r1
new file mode 100644
index 000000000000..6b3c60cbf07e
--- /dev/null
+++ b/media-video/kmplayer/files/digest-kmplayer-0.9.4a-r1
@@ -0,0 +1,3 @@
+MD5 10eeb318a4800e4cfa74957c7a6714da kmplayer-0.9.4a.tar.bz2 970527
+RMD160 74d8fe2b2fd2c9e18518ff73b66b254b974291be kmplayer-0.9.4a.tar.bz2 970527
+SHA256 1c5d705818bca7cb00384991498fe020b70bc0f55622185e63905551793aaa9c kmplayer-0.9.4a.tar.bz2 970527
diff --git a/media-video/kmplayer/files/kmplayer-0.9.4a-vop2vf.patch b/media-video/kmplayer/files/kmplayer-0.9.4a-vop2vf.patch
new file mode 100644
index 000000000000..1f458ab0ac1f
--- /dev/null
+++ b/media-video/kmplayer/files/kmplayer-0.9.4a-vop2vf.patch
@@ -0,0 +1,75 @@
+diff -Naur kmplayer-0.9.4a.old/src/kmplayerapp.cpp kmplayer-0.9.4a/src/kmplayerapp.cpp
+--- kmplayer-0.9.4a.old/src/kmplayerapp.cpp	2007-05-03 03:28:14.000000000 -0400
++++ kmplayer-0.9.4a/src/kmplayerapp.cpp	2007-05-03 03:29:32.000000000 -0400
+@@ -1827,7 +1827,7 @@
+         if (m_player->settings ()->dvddevice.length () > 0)
+             m_options += QString(" -dvd-device ") + m_player->settings()->dvddevice;
+     }
+-    m_recordcmd = m_options + QString (" -vop scale -zoom");
++    m_recordcmd = m_options + QString (" -vf scale -zoom");
+ }
+ 
+ KDE_NO_EXPORT QString KMPlayerDVDSource::filterOptions () {
+diff -Naur kmplayer-0.9.4a.old/src/kmplayerconfig.h kmplayer-0.9.4a/src/kmplayerconfig.h
+--- kmplayer-0.9.4a.old/src/kmplayerconfig.h	2007-05-03 03:28:14.000000000 -0400
++++ kmplayer-0.9.4a/src/kmplayerconfig.h	2007-05-03 03:29:34.000000000 -0400
+@@ -136,8 +136,8 @@
+ // postproc thingies
+     bool postprocessing : 1;
+     bool disableppauto : 1;
+-    bool pp_default : 1;	// -vop pp=de
+-    bool pp_fast : 1;	// -vop pp=fa
++    bool pp_default : 1;	// -vf pp=de
++    bool pp_fast : 1;	// -vf pp=fa
+     bool pp_custom : 1;	// coming up
+ 
+     bool pp_custom_hz : 1; 		// horizontal deblocking
+diff -Naur kmplayer-0.9.4a.old/src/kmplayerpartbase.cpp kmplayer-0.9.4a/src/kmplayerpartbase.cpp
+--- kmplayer-0.9.4a.old/src/kmplayerpartbase.cpp	2007-05-03 03:28:14.000000000 -0400
++++ kmplayer-0.9.4a/src/kmplayerpartbase.cpp	2007-05-03 03:29:33.000000000 -0400
+@@ -1240,11 +1240,11 @@
+     if (m_settings->postprocessing)
+     {
+         if (m_settings->pp_default)
+-            PPargs = "-vop pp=de";
++            PPargs = "-vf pp=de";
+         else if (m_settings->pp_fast)
+-            PPargs = "-vop pp=fa";
++            PPargs = "-vf pp=fa";
+         else if (m_settings->pp_custom) {
+-            PPargs = "-vop pp=";
++            PPargs = "-vf pp=";
+             if (m_settings->pp_custom_hz) {
+                 PPargs += "hb";
+                 if (m_settings->pp_custom_hz_aq && \
+diff -Naur kmplayer-0.9.4a.old/src/kmplayertvsource.cpp kmplayer-0.9.4a/src/kmplayertvsource.cpp
+--- kmplayer-0.9.4a.old/src/kmplayertvsource.cpp	2007-05-03 03:28:14.000000000 -0400
++++ kmplayer-0.9.4a/src/kmplayertvsource.cpp	2007-05-03 03:29:33.000000000 -0400
+@@ -505,7 +505,7 @@
+ KDE_NO_EXPORT QString KMPlayerTVSource::filterOptions () {
+     if (! m_player->settings ()->disableppauto)
+         return KMPlayer::Source::filterOptions ();
+-    return QString ("-vop pp=lb");
++    return QString ("-vf pp=lb");
+ }
+ 
+ KDE_NO_EXPORT bool KMPlayerTVSource::hasLength () {
+diff -Naur kmplayer-0.9.4a.old/src/xineplayer.cpp kmplayer-0.9.4a/src/xineplayer.cpp
+--- kmplayer-0.9.4a.old/src/xineplayer.cpp	2007-05-03 03:28:14.000000000 -0400
++++ kmplayer-0.9.4a/src/xineplayer.cpp	2007-05-03 03:29:33.000000000 -0400
+@@ -1183,11 +1183,11 @@
+             xine_close_audio_driver (xine, ap);
+             fprintf (stderr, "audio output: %s\n", *aop);
+         }
+-        const char *const * vops = xine_list_video_output_plugins (xine);
+-        for (const char *const* vop = vops; *vop; vop++) {
+-            xine_video_port_t * vp = xine_open_video_driver (xine, *vop, XINE_VISUAL_TYPE_NONE, 0L);
++        const char *const * vfs = xine_list_video_output_plugins (xine);
++        for (const char *const* vf = vfs; *vf; vf++) {
++            xine_video_port_t * vp = xine_open_video_driver (xine, *vf, XINE_VISUAL_TYPE_NONE, 0L);
+             xine_close_video_driver (xine, vp);
+-            fprintf (stderr, "vidio output: %s\n", *vop);
++            fprintf (stderr, "vidio output: %s\n", *vf);
+         }*/
+         getConfigEntries (buf);
+     }
diff --git a/media-video/kmplayer/kmplayer-0.9.4a-r1.ebuild b/media-video/kmplayer/kmplayer-0.9.4a-r1.ebuild
new file mode 100644
index 000000000000..a4a2675c046b
--- /dev/null
+++ b/media-video/kmplayer/kmplayer-0.9.4a-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/kmplayer-0.9.4a-r1.ebuild,v 1.1 2007/05/08 21:36:50 carlo Exp $
+
+inherit kde eutils
+
+MY_P="${P/_/-}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="KMPlayer is a Video player plugin for Konqueror and basic MPlayer/Xine/ffmpeg/ffserver/VDR frontend for KDE."
+HOMEPAGE="http://kmplayer.kde.org/"
+SRC_URI="http://kmplayer.kde.org/pkgs/${MY_P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="gstreamer mplayer xine cairo"
+
+RDEPEND="mplayer? ( || ( media-video/mplayer media-video/mplayer-bin ) )
+	xine? ( >=media-libs/xine-lib-1.1.1 )
+	gstreamer? ( || ( =media-libs/gst-plugins-base-0.10* =media-libs/gst-plugins-0.8* ) )
+	cairo? ( x11-libs/cairo )"
+
+DEPEND="xine? ( >=media-libs/xine-lib-1.1.1 )
+	gstreamer? ( || ( =media-libs/gst-plugins-base-0.10* =media-libs/gst-plugins-0.8* ) )
+	cairo? ( x11-libs/cairo )"
+
+LANGS="ar br bs ca cs cy da de el en_GB es et fi fr ga gl he hi hu is it ja ka
+lt mt nb nl pa pl pt_BR pt ro ru rw sk sr@Latn sr sv ta tr uk zh_CN"
+
+
+for X in ${LANGS} ; do
+	IUSE="${IUSE} linguas_${X}"
+done
+
+
+need-kde 3.5
+
+PATCHES="${FILESDIR}/kmplayer-0.9.4a-vop2vf.patch"
+
+pkg_setup() {
+	if ! use mplayer && ! use xine && ! use gstreamer && ! use cairo; then
+		echo
+		ewarn "Neither the mplayer, xine, gstreamer or cairo use flags have"
+		ewarn "been set. One of them is required. From them, mplayer can be"
+		ewarn "installed afterwards; however, xine and gstreamer will require"
+		ewarn "you to recompile kmplayer."
+	fi
+}
+
+src_unpack() {
+	kde_src_unpack
+
+	if use mplayer && use amd64 && ! has_version media-video/mplayer; then
+		elog 'NOTICE: You have mplayer-bin installed; you will need to configure'
+		elog 'NOTICE: kmplayer to use it from within the application.'
+	fi
+
+	cd "${WORKDIR}/${MY_P}/po"
+	for X in ${LANGS} ; do
+		use linguas_${X} || rm -f "${X}."*
+	done
+	rm -f "${S}/configure"
+}
+
+
+src_compile(){
+	local myconf="$(use_with gstreamer) $(use_with xine) $(use_with cairo)"
+	kde_src_compile
+}
+
+src_install() {
+	kde_src_install
+
+	# Remove this, as kdelibs 3.5.4 provides it
+	rm -f "${D}/usr/share/mimelnk/application/x-mplayer2.desktop"
+}
+