Version bump with brand new amd64 patch for binary mplayer.

(Portage version: 2.1.1)

4 files changed, 270 insertions, 1 deletions

diff --git a/media-video/kmplayer/ChangeLog b/media-video/kmplayer/ChangeLog
index 35965ca40dd5..5e1cb5c78903 100644
--- a/media-video/kmplayer/ChangeLog
+++ b/media-video/kmplayer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/kmplayer
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/ChangeLog,v 1.71 2006/08/29 11:43:53 deathwing00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/ChangeLog,v 1.72 2006/09/20 20:33:07 deathwing00 Exp $
+
+*kmplayer-0.9.3 (20 Sep 2006)
+
+  20 Sep 2006; Ioannis Aslanidis <deathwing00@gentoo.org>
+  +kmplayer-0.9.3.ebuild, +files/kmplayer-0.9.3-use32bitbin.diff:
+  Version bump with brand new amd64 patch for binary mplayer.
 
   29 Aug 2006; Ioannis Aslanidis <deathwing00@gentoo.org>
   +files/kmplayer-0.9.3_pre2-use32bitbin.diff, kmplayer-0.9.3_pre2.ebuild:
diff --git a/media-video/kmplayer/files/digest-kmplayer-0.9.3 b/media-video/kmplayer/files/digest-kmplayer-0.9.3
new file mode 100644
index 000000000000..835492e7da15
--- /dev/null
+++ b/media-video/kmplayer/files/digest-kmplayer-0.9.3
@@ -0,0 +1,3 @@
+MD5 b5866658c62995185f3fb63f3804cfa2 kmplayer-0.9.3.tar.bz2 943240
+RMD160 5dd48f2e1564df8576c92bff22f7f9cfaf969d7e kmplayer-0.9.3.tar.bz2 943240
+SHA256 1b10a7162f305da974dc30bf4ffdea2cfd7a03dc69e2749c8366e0ce78732247 kmplayer-0.9.3.tar.bz2 943240
diff --git a/media-video/kmplayer/files/kmplayer-0.9.3-use32bitbin.diff b/media-video/kmplayer/files/kmplayer-0.9.3-use32bitbin.diff
new file mode 100644
index 000000000000..f1bf145b41d3
--- /dev/null
+++ b/media-video/kmplayer/files/kmplayer-0.9.3-use32bitbin.diff
@@ -0,0 +1,205 @@
+diff -U 4 -H -b -w -B -E -d -i -r kmplayer-0.9.3-orig/src/kmplayerapp.cpp kmplayer-0.9.3/src/kmplayerapp.cpp
+--- kmplayer-0.9.3-orig/src/kmplayerapp.cpp	2006-09-20 21:51:19.000000000 +0200
++++ kmplayer-0.9.3/src/kmplayerapp.cpp	2006-09-20 21:57:12.000000000 +0200
+@@ -425,9 +425,9 @@
+     connect (m_broadcastconfig, SIGNAL (broadcastStopped()), this, SLOT (broadcastStopped()));
+     initStatusBar();
+     m_player->init (actionCollection ());
+     m_player->players () ["xvideo"] = new XVideo(m_player,m_player->settings());
+-    m_player->setProcess ("mplayer");
++    m_player->setProcess (MPLAYER_BIN);
+     m_player->setRecorder ("mencoder");
+     ListsSource * lstsrc = new ListsSource (m_player);
+     m_player->sources () ["listssource"] = lstsrc;
+     m_player->sources () ["dvdsource"] = new ::KMPlayerDVDSource(this, m_dvdmenu);
+@@ -1688,9 +1688,9 @@
+         return true;
+     if (m_identified)
+         return false;
+     //kdDebug () << "scanning " << cstr << endl;
+-    QRegExp * patterns = static_cast <KMPlayer::MPlayer *> (m_player->players () ["mplayer"])->configPage ()->m_patterns;
++    QRegExp * patterns = static_cast <KMPlayer::MPlayer *> (m_player->players () [MPLAYER_BIN])->configPage ()->m_patterns;
+     QRegExp & langRegExp = patterns[KMPlayer::MPlayerPreferencesPage::pat_dvdlang];
+     QRegExp & subtitleRegExp = patterns[KMPlayer::MPlayerPreferencesPage::pat_dvdsub];
+     QRegExp & titleRegExp = patterns[KMPlayer::MPlayerPreferencesPage::pat_dvdtitle];
+     QRegExp & chapterRegExp = patterns[KMPlayer::MPlayerPreferencesPage::pat_dvdchapter];
+@@ -1991,9 +1991,9 @@
+         return true;
+     if (m_identified)
+         return false;
+     //kdDebug () << "scanning " << cstr << endl;
+-    QRegExp * patterns = static_cast<KMPlayer::MPlayer *> (m_player->players () ["mplayer"])->configPage ()->m_patterns;
++    QRegExp * patterns = static_cast<KMPlayer::MPlayer *> (m_player->players () [MPLAYER_BIN])->configPage ()->m_patterns;
+     QRegExp & trackRegExp = patterns [KMPlayer::MPlayerPreferencesPage::pat_vcdtrack];
+     if (trackRegExp.search (str) > -1) {
+         m_document->state = KMPlayer::Element::state_deferred;
+         m_document->appendChild (new KMPlayer::GenericMrl (m_document, QString ("vcd://") + trackRegExp.cap (1), i18n ("Track ") + trackRegExp.cap (1)));
+@@ -2089,9 +2089,9 @@
+         return true;
+     if (m_identified)
+         return false;
+     //kdDebug () << "scanning " << str << endl;
+-    QRegExp * patterns = static_cast<KMPlayer::MPlayer *> (m_player->players () ["mplayer"])->configPage ()->m_patterns;
++    QRegExp * patterns = static_cast<KMPlayer::MPlayer *> (m_player->players () [MPLAYER_BIN])->configPage ()->m_patterns;
+     QRegExp & trackRegExp = patterns [KMPlayer::MPlayerPreferencesPage::pat_cdromtracks];
+     if (trackRegExp.search (str) > -1) {
+         //if (m_document->state != KMPlayer::Element::state_deferred)
+         //    m_document->defer ();
+diff -U 4 -H -b -w -B -E -d -i -r kmplayer-0.9.3-orig/src/kmplayerconfig.cpp kmplayer-0.9.3/src/kmplayerconfig.cpp
+--- kmplayer-0.9.3-orig/src/kmplayerconfig.cpp	2006-09-20 21:51:19.000000000 +0200
++++ kmplayer-0.9.3/src/kmplayerconfig.cpp	2006-09-20 21:57:54.000000000 +0200
+@@ -127,9 +127,9 @@
+     // configdialog should be destroyed when the view is destroyed
+     //delete configdialog;
+ }
+ 
+-KDE_EXPORT const char * strMPlayerGroup = "MPlayer";
++KDE_EXPORT const char * strMPlayerGroup = MPLAYER_BIN;
+ const char * strGeneralGroup = "General Options";
+ static const char * strKeepSizeRatio = "Keep Size Ratio";
+ static const char * strRememberSize = "Remember Size";
+ static const char * strAutoResize = "Auto Resize";
+diff -U 4 -H -b -w -B -E -d -i -r kmplayer-0.9.3-orig/src/kmplayer_def.h kmplayer-0.9.3/src/kmplayer_def.h
+--- kmplayer-0.9.3-orig/src/kmplayer_def.h	2006-09-20 21:51:19.000000000 +0200
++++ kmplayer-0.9.3/src/kmplayer_def.h	2006-09-20 21:58:47.000000000 +0200
+@@ -55,6 +55,6 @@
+   #define KMPLAYER_EXPORT
+   #define KMPLAYER_NO_EXPORT
+ #endif
+ 
+-
++#define MPLAYER_BIN "mplayer-bin"
+ #endif //_KMPLAYER_DEF_H_
+diff -U 4 -H -b -w -B -E -d -i -r kmplayer-0.9.3-orig/src/kmplayerpartbase.cpp kmplayer-0.9.3/src/kmplayerpartbase.cpp
+--- kmplayer-0.9.3-orig/src/kmplayerpartbase.cpp	2006-09-20 21:51:19.000000000 +0200
++++ kmplayer-0.9.3/src/kmplayerpartbase.cpp	2006-09-20 21:59:49.000000000 +0200
+@@ -121,9 +121,9 @@
+    m_auto_controls (true),
+    m_bPosSliderPressed (false),
+    m_in_update_tree (false)
+ {
+-    m_players ["mplayer"] = new MPlayer (this, m_settings);
++    m_players [MPLAYER_BIN] = new MPlayer (this, m_settings);
+     Xine * xine = new Xine (this, m_settings);
+     m_players ["xine"] = xine;
+     m_players ["gstreamer"] = new GStreamer (this, m_settings);
+     m_recorders ["mencoder"] = new MEncoder (this, m_settings);
+diff -U 4 -H -b -w -B -E -d -i -r kmplayer-0.9.3-orig/src/kmplayer_part.cpp kmplayer-0.9.3/src/kmplayer_part.cpp
+--- kmplayer-0.9.3-orig/src/kmplayer_part.cpp	2006-09-20 21:51:19.000000000 +0200
++++ kmplayer-0.9.3/src/kmplayer_part.cpp	2006-09-20 22:00:13.000000000 +0200
+@@ -317,9 +317,9 @@
+     }
+     bool group_member = !m_group.isEmpty () && m_group != QString::fromLatin1("_unique") && m_features != Feat_Unknown;
+     if (!group_member || m_features & Feat_Viewer) {
+         // not part of a group or we're the viewer
+-        setProcess ("mplayer");
++        setProcess (MPLAYER_BIN);
+         setRecorder ("mencoder");
+         connectPanel (m_view->controlPanel ());
+         if (m_features & Feat_StatusBar) {
+             last_time_left = 0;
+@@ -337,9 +337,9 @@
+                 i = std::find_if (++i, e, pred)) {
+             // found viewer and control part, exchange players now
+             KMPlayerPart * vp = (m_features & Feat_Viewer) ? this : *i;
+             KMPlayerPart * cp = (m_features & Feat_Viewer) ? *i : this;
+-            setProcess ("mplayer");
++            setProcess (MPLAYER_BIN);
+             cp->connectToPart (vp);
+         }
+     } else
+         m_group.truncate (0);
+@@ -1074,9 +1074,9 @@
+         QTimer::singleShot (0, this, SLOT (finished ()));
+         return;
+     }
+     init ();
+-    m_player->setProcess ("mplayer");
++    m_player->setProcess (MPLAYER_BIN);
+     if (m_player->process ()->grabPicture (m_url, 0))
+         connect (m_player->process (), SIGNAL (grabReady (const QString &)),
+                  this, SLOT (grabReady (const QString &)));
+     else {
+diff -U 4 -H -b -w -B -E -d -i -r kmplayer-0.9.3-orig/src/kmplayerprocess.cpp kmplayer-0.9.3/src/kmplayerprocess.cpp
+--- kmplayer-0.9.3-orig/src/kmplayerprocess.cpp	2006-09-20 21:51:19.000000000 +0200
++++ kmplayer-0.9.3/src/kmplayerprocess.cpp	2006-09-20 22:02:59.000000000 +0200
+@@ -349,9 +349,9 @@
+     "dvdsource", "exitsource", "hrefsource", "introsource", "pipesource", "tvscanner", "tvsource", "urlsource", "vcdsource", "audiocdsource", 0L
+ };
+ 
+ KDE_NO_CDTOR_EXPORT MPlayer::MPlayer (QObject * parent, Settings * settings)
+- : MPlayerBase (parent, settings, "mplayer"),
++ : MPlayerBase (parent, settings, MPLAYER_BIN),
+    m_widget (0L),
+    m_configpage (new MPlayerPreferencesPage (this)),
+    aid (-1), sid (-1),
+    m_needs_restarted (false) {
+@@ -520,9 +520,9 @@
+         *m_process << pipe << " | ";
+     }
+     QString exe = m_configpage->mplayer_path;
+     if (exe.isEmpty ())
+-        exe = "mplayer";
++        exe = MPLAYER_BIN;
+     fprintf (stderr, "%s -wid %lu ", exe.ascii(), (unsigned long) widget ());
+     *m_process << exe << " -wid " << QString::number (widget ());
+ 
+     if (m_use_slave) {
+@@ -622,9 +622,9 @@
+     QString outdir = locateLocal ("data", "kmplayer/");
+     m_grabfile = outdir + QString ("00000001.jpg");
+     unlink (m_grabfile.ascii ());
+     QString myurl (url.isLocalFile () ? getPath (url) : url.url ());
+-    QString args ("mplayer ");
++    QString args ("mplayer-bin ");
+     if (m_settings->mplayerpost090)
+         args += "-vo jpeg:outdir=";
+     else
+         args += "-vo jpeg -jpeg outdir=";
+@@ -921,9 +921,9 @@
+     for (int i = 0; i < int (pat_last); i++)
+         m_patterns[i].setPattern (config->readEntry
+                 (_mplayer_patterns[i].name, _mplayer_patterns[i].pattern));
+     config->setGroup (strMPlayerGroup);
+-    mplayer_path = config->readEntry (strMPlayerPath, "mplayer");
++    mplayer_path = config->readEntry (strMPlayerPath, MPLAYER_BIN);
+     additionalarguments = config->readEntry (strAddArgs);
+     cachesize = config->readNumEntry (strCacheSize, 384);
+     alwaysbuildindex = config->readBoolEntry (strAlwaysBuildIndex, false);
+ }
+@@ -952,9 +952,9 @@
+ 
+ KDE_NO_EXPORT void MPlayerPreferencesPage::prefLocation (QString & item, QString & icon, QString & tab) {
+     item = i18n ("General Options");
+     icon = QString ("kmplayer");
+-    tab = i18n ("MPlayer");
++    tab = i18n (MPLAYER_BIN);
+ }
+ 
+ KDE_NO_EXPORT QFrame * MPlayerPreferencesPage::prefPage (QWidget * parent) {
+     m_configframe = new MPlayerPreferencesFrame (parent);
+@@ -1052,9 +1052,9 @@
+     QString args;
+     m_use_slave = m_source->pipeCmd ().isEmpty ();
+     if (!m_use_slave)
+         args = m_source->pipeCmd () + QString (" | ");
+-    args += QString ("mplayer ") + m_source->recordCmd ();
++    args += QString ("mplayer-bin ") + m_source->recordCmd ();
+     // FIXME if (m_player->source () == source) // ugly
+     //    m_player->stop ();
+     QString myurl = url.isLocalFile () ? getPath (url) : url.url ();
+     bool post090 = m_settings->mplayerpost090;
+diff -U 4 -H -b -w -B -E -d -i -r kmplayer-0.9.3-orig/src/kmplayertvsource.cpp kmplayer-0.9.3/src/kmplayertvsource.cpp
+--- kmplayer-0.9.3-orig/src/kmplayertvsource.cpp	2006-09-20 21:51:19.000000000 +0200
++++ kmplayer-0.9.3/src/kmplayertvsource.cpp	2006-09-20 22:08:59.000000000 +0200
+@@ -697,9 +697,9 @@
+     QString args;
+     args.sprintf ("tv:// -tv driver=%s:device=%s -identify -frames 0", m_driver.ascii (), m_tvdevice->src.ascii ());
+     m_tvsource->player ()->stop ();
+     m_tvsource->player ()->process ()->initProcess (m_player->settings ()->defaultView ()->viewer ());
+-    KMPlayer::Process *proc = m_tvsource->player ()->players () ["mplayer"];
++    KMPlayer::Process *proc = m_tvsource->player ()->players () [MPLAYER_BIN];
+     proc->setSource (this);
+     if (!static_cast <KMPlayer::MPlayer *> (proc)->run (args.ascii()))
+         deactivate ();
+ }
diff --git a/media-video/kmplayer/kmplayer-0.9.3.ebuild b/media-video/kmplayer/kmplayer-0.9.3.ebuild
new file mode 100644
index 000000000000..a836cc225a99
--- /dev/null
+++ b/media-video/kmplayer/kmplayer-0.9.3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/kmplayer-0.9.3.ebuild,v 1.1 2006/09/20 20:33:07 deathwing00 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 ~x86"
+IUSE="gstreamer mplayer xine"
+
+DEPEND="xine? ( >=media-libs/xine-lib-1.1.1 )
+	gstreamer? ( || ( =media-libs/gst-plugins-base-0.10* =media-libs/gst-plugins-0.8* ) )"
+
+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* ) )"
+
+need-kde 3.5.4
+
+pkg_setup() {
+	if ! use mplayer && ! use xine ; then
+		echo
+		ewarn "Neither mplayer nor xine use flag is set. Either one is needed."
+		ewarn "You can install mplayer later, though.\n"
+	fi
+}
+
+src_unpack() {
+	kde_src_unpack
+
+	if use mplayer && use amd64 && ! has_version media-video/mplayer; then
+		epatch "${FILESDIR}/${P}-use32bitbin.diff"
+	fi
+}
+
+
+src_compile(){
+	local myconf="$(use_with gstreamer) $(use_with xine)"
+	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"
+}