Added new patch that allows to use MPLAYER_BIN on amd64 for version 0.9.3_pre2. Fixes bug #145344.

(Portage version: 2.1-r2)

3 files changed, 211 insertions, 2 deletions

diff --git a/media-video/kmplayer/ChangeLog b/media-video/kmplayer/ChangeLog
index 292ef48507d7..35965ca40dd5 100644
--- a/media-video/kmplayer/ChangeLog
+++ b/media-video/kmplayer/ChangeLog
@@ -1,6 +1,11 @@
 # 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.70 2006/08/25 21:13:32 deathwing00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/ChangeLog,v 1.71 2006/08/29 11:43:53 deathwing00 Exp $
+
+  29 Aug 2006; Ioannis Aslanidis <deathwing00@gentoo.org>
+  +files/kmplayer-0.9.3_pre2-use32bitbin.diff, kmplayer-0.9.3_pre2.ebuild:
+  Added new patch that allows to use MPLAYER_BIN on amd64 for version
+  0.9.3_pre2. Fixes bug #145344.
 
 *kmplayer-0.9.3_pre2 (25 Aug 2006)
 
diff --git a/media-video/kmplayer/files/kmplayer-0.9.3_pre2-use32bitbin.diff b/media-video/kmplayer/files/kmplayer-0.9.3_pre2-use32bitbin.diff
new file mode 100644
index 000000000000..8ce075c7f9c9
--- /dev/null
+++ b/media-video/kmplayer/files/kmplayer-0.9.3_pre2-use32bitbin.diff
@@ -0,0 +1,203 @@
+diff -U 4 -H -b -w -B -E -d -i -r kmplayer-0.9.3-pre2-orig/src/kmplayerapp.cpp kmplayer-0.9.3-pre2/src/kmplayerapp.cpp
+--- kmplayer-0.9.3-pre2-orig/src/kmplayerapp.cpp	2006-08-29 13:19:55.000000000 +0200
++++ kmplayer-0.9.3-pre2/src/kmplayerapp.cpp	2006-08-29 13:24:58.000000000 +0200
+@@ -410,9 +410,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);
+@@ -1630,9 +1630,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];
+@@ -1933,9 +1933,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) {
+         if (m_document->state != KMPlayer::Element::state_deferred)
+             m_document->defer ();
+@@ -2032,9 +2032,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 ();
+Only in kmplayer-0.9.3-pre2/src: kmplayerapp.cpp~
+diff -U 4 -H -b -w -B -E -d -i -r kmplayer-0.9.3-pre2-orig/src/kmplayerconfig.cpp kmplayer-0.9.3-pre2/src/kmplayerconfig.cpp
+--- kmplayer-0.9.3-pre2-orig/src/kmplayerconfig.cpp	2006-08-29 13:19:55.000000000 +0200
++++ kmplayer-0.9.3-pre2/src/kmplayerconfig.cpp	2006-08-29 13:28:13.000000000 +0200
+@@ -119,9 +119,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";
+Only in kmplayer-0.9.3-pre2/src: kmplayerconfig.cpp~
+diff -U 4 -H -b -w -B -E -d -i -r kmplayer-0.9.3-pre2-orig/src/kmplayer_def.h kmplayer-0.9.3-pre2/src/kmplayer_def.h
+--- kmplayer-0.9.3-pre2-orig/src/kmplayer_def.h	2006-08-29 13:19:55.000000000 +0200
++++ kmplayer-0.9.3-pre2/src/kmplayer_def.h	2006-08-29 13:34:47.000000000 +0200
+@@ -55,6 +55,6 @@
+   #define KMPLAYER_EXPORT
+   #define KMPLAYER_NO_EXPORT
+ #endif
+ 
+-
++#define MPLAYER_BIN "mplayer-bin"
+ #endif //_KMPLAYER_DEF_H_
+Only in kmplayer-0.9.3-pre2/src: kmplayer_def.h~
+diff -U 4 -H -b -w -B -E -d -i -r kmplayer-0.9.3-pre2-orig/src/kmplayerpartbase.cpp kmplayer-0.9.3-pre2/src/kmplayerpartbase.cpp
+--- kmplayer-0.9.3-pre2-orig/src/kmplayerpartbase.cpp	2006-08-29 13:19:55.000000000 +0200
++++ kmplayer-0.9.3-pre2/src/kmplayerpartbase.cpp	2006-08-29 13:28:33.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);
+Only in kmplayer-0.9.3-pre2/src: kmplayerpartbase.cpp~
+diff -U 4 -H -b -w -B -E -d -i -r kmplayer-0.9.3-pre2-orig/src/kmplayer_part.cpp kmplayer-0.9.3-pre2/src/kmplayer_part.cpp
+--- kmplayer-0.9.3-pre2-orig/src/kmplayer_part.cpp	2006-08-29 13:19:55.000000000 +0200
++++ kmplayer-0.9.3-pre2/src/kmplayer_part.cpp	2006-08-29 13:29:43.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 {
+Only in kmplayer-0.9.3-pre2/src: kmplayer_part.cpp~
+diff -U 4 -H -b -w -B -E -d -i -r kmplayer-0.9.3-pre2-orig/src/kmplayerprocess.cpp kmplayer-0.9.3-pre2/src/kmplayerprocess.cpp
+--- kmplayer-0.9.3-pre2-orig/src/kmplayerprocess.cpp	2006-08-29 13:19:55.000000000 +0200
++++ kmplayer-0.9.3-pre2/src/kmplayerprocess.cpp	2006-08-29 13:36:27.000000000 +0200
+@@ -346,9 +346,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) {
+@@ -515,10 +515,10 @@
+     if (!m_use_slave) {
+         fprintf (stderr, "%s | ", pipe);
+         *m_process << pipe << " | ";
+     }
+-    fprintf (stderr, "mplayer -wid %lu ", (unsigned long) widget ());
+-    *m_process << "mplayer -wid " << QString::number (widget ());
++    fprintf (stderr, "mplayer-bin -wid %lu ", (unsigned long) widget ());
++    *m_process << "mplayer-bin -wid " << QString::number (widget ());
+ 
+     if (m_use_slave) {
+         fprintf (stderr, "-slave ");
+         *m_process << "-slave ";
+@@ -603,9 +603,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=";
+@@ -927,9 +927,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);
+@@ -1027,9 +1027,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;
+Only in kmplayer-0.9.3-pre2/src: kmplayerprocess.cpp~
+diff -U 4 -H -b -w -B -E -d -i -r kmplayer-0.9.3-pre2-orig/src/kmplayertvsource.cpp kmplayer-0.9.3-pre2/src/kmplayertvsource.cpp
+--- kmplayer-0.9.3-pre2-orig/src/kmplayertvsource.cpp	2006-08-29 13:19:55.000000000 +0200
++++ kmplayer-0.9.3-pre2/src/kmplayertvsource.cpp	2006-08-29 13:30:39.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 ();
+ }
+Only in kmplayer-0.9.3-pre2/src: kmplayertvsource.cpp~
diff --git a/media-video/kmplayer/kmplayer-0.9.3_pre2.ebuild b/media-video/kmplayer/kmplayer-0.9.3_pre2.ebuild
index 665391a5a3e5..c9fe07d07315 100644
--- a/media-video/kmplayer/kmplayer-0.9.3_pre2.ebuild
+++ b/media-video/kmplayer/kmplayer-0.9.3_pre2.ebuild
@@ -1,6 +1,6 @@
 # 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_pre2.ebuild,v 1.1 2006/08/25 21:13:32 deathwing00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kmplayer/kmplayer-0.9.3_pre2.ebuild,v 1.2 2006/08/29 11:43:53 deathwing00 Exp $
 
 inherit kde eutils
 
@@ -41,6 +41,7 @@ src_unpack() {
 	fi
 }
 
+
 src_compile(){
 	local myconf="$(use_with gstreamer) $(use_with xine)"
 	kde_src_compile