diff options
| -rw-r--r-- | media-video/kmplayer/ChangeLog | 8 | ||||
| -rw-r--r-- | media-video/kmplayer/Manifest | 30 | ||||
| -rw-r--r-- | media-video/kmplayer/files/digest-kmplayer-0.9.3 | 3 | ||||
| -rw-r--r-- | media-video/kmplayer/files/kmplayer-0.9.3-use32bitbin.diff | 205 | ||||
| -rw-r--r-- | media-video/kmplayer/kmplayer-0.9.3.ebuild | 55 |
5 files changed, 296 insertions, 5 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/Manifest b/media-video/kmplayer/Manifest index 21869cce5771..4d57bf76a101 100644 --- a/media-video/kmplayer/Manifest +++ b/media-video/kmplayer/Manifest @@ -1,7 +1,14 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX kmplayer-0.9.2a-use32bitbin.diff 9311 RMD160 ff28f8574e6c52fdac47a123b708e5d9084f6b47 SHA1 90246b1e384d511aa35eeec112034b2129789426 SHA256 1e7450978f30d6296c73c10737035827f6547460799caa6898488e5d84553af3 MD5 cc0ab460a6945037328e7ef52c04d64b files/kmplayer-0.9.2a-use32bitbin.diff 9311 RMD160 ff28f8574e6c52fdac47a123b708e5d9084f6b47 files/kmplayer-0.9.2a-use32bitbin.diff 9311 SHA256 1e7450978f30d6296c73c10737035827f6547460799caa6898488e5d84553af3 files/kmplayer-0.9.2a-use32bitbin.diff 9311 +AUX kmplayer-0.9.3-use32bitbin.diff 10308 RMD160 5983630e340723f7ca210ee87f3aaeda13bda68e SHA1 22a6f5d7990feeee71455d4dd64aa212e86e20fc SHA256 4fe748de0ca402bf01a8a6cbb44a1b88b1f36017bd467464cb303be5b5cc6d3e +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.3_pre2-use32bitbin.diff 10284 RMD160 d43468e04218dda33ce55e00ca662668fb02dd64 SHA1 33907c5847f8dfbc73e284ab7a8c540a51b1d538 SHA256 d9d5d53d63b21b032219824329f5e8144cd57d4eaf023e0c31d368d5087a0a30 MD5 5d18761b3a8a70b67db1356cac037f59 files/kmplayer-0.9.3_pre2-use32bitbin.diff 10284 RMD160 d43468e04218dda33ce55e00ca662668fb02dd64 files/kmplayer-0.9.3_pre2-use32bitbin.diff 10284 @@ -9,6 +16,7 @@ SHA256 d9d5d53d63b21b032219824329f5e8144cd57d4eaf023e0c31d368d5087a0a30 files/km DIST kmplayer-0.9.1c.tar.bz2 874267 RMD160 5a682c72068437ae846c533ef459813cce3c1612 SHA1 b1d6a30ac17296214c21608deb56164f2b7d997b SHA256 3a0d7744f43f8baf74a017cc06fdacd6185e520b6f4ceaf4baa952ab20fd7183 DIST kmplayer-0.9.2a.tar.bz2 902210 RMD160 56eec6b64da0c0da6738896dcc215d1d565bf3ca SHA1 729a6f9a5d8033aa9beba239b66c03b07456dd5c SHA256 ddd5f2afffc1a5458456f5a88e81691a106deee4f8a4ba5ac8edb3b3600dd51f DIST kmplayer-0.9.3-pre2.tar.bz2 742253 RMD160 a1cf78e75a0113b0c0b0eab87b67b0214c4932bd SHA1 98f59937319e3f74afc3af44fc8a22914417d5cc SHA256 1ec37714de43cf4c46e952fed95af6307fda53c1256551550569ea43e0b51d1c +DIST kmplayer-0.9.3.tar.bz2 943240 RMD160 5dd48f2e1564df8576c92bff22f7f9cfaf969d7e SHA1 1e6ff7e37b758c188f79de83ec2559e5605adbb4 SHA256 1b10a7162f305da974dc30bf4ffdea2cfd7a03dc69e2749c8366e0ce78732247 EBUILD kmplayer-0.9.1c.ebuild 1339 RMD160 0e8c10a664dc79121d736338bf876ee373f545f7 SHA1 1165b31f7424e7d1ada5ff3df32436b12fce424b SHA256 393db6252fedd1d2827fc3edbcb96596a2093e52e6fb86b180e15031d8e6dc54 MD5 920dd2294d19b832cfcc092e65fccf6d kmplayer-0.9.1c.ebuild 1339 RMD160 0e8c10a664dc79121d736338bf876ee373f545f7 kmplayer-0.9.1c.ebuild 1339 @@ -21,14 +29,18 @@ EBUILD kmplayer-0.9.2a.ebuild 1373 RMD160 9f29e08485d1c9c55c47dfe178203d45b91c6f MD5 ab8949c1b5200df6c268cee8f2b795dd kmplayer-0.9.2a.ebuild 1373 RMD160 9f29e08485d1c9c55c47dfe178203d45b91c6f11 kmplayer-0.9.2a.ebuild 1373 SHA256 76923049c8ba26f9d6dd0ff77a2275a79bec42d9eca34678ad8120eae0c95d17 kmplayer-0.9.2a.ebuild 1373 +EBUILD kmplayer-0.9.3.ebuild 1524 RMD160 6b37f668519fdaef40d6939f6cd48f8ab814a60c SHA1 ec26749ebce57ad698d6832e1f5524b4c4c385be SHA256 c9d4d061e881ea735ad21fce2865ae373bc40619cfd545161bc3809800ed177e +MD5 452db7365bbea6775a6dcb9d83200195 kmplayer-0.9.3.ebuild 1524 +RMD160 6b37f668519fdaef40d6939f6cd48f8ab814a60c kmplayer-0.9.3.ebuild 1524 +SHA256 c9d4d061e881ea735ad21fce2865ae373bc40619cfd545161bc3809800ed177e kmplayer-0.9.3.ebuild 1524 EBUILD kmplayer-0.9.3_pre2.ebuild 1529 RMD160 8efae590664850d3e12bd45b56e552e855f3f4fc SHA1 9e996b0fe5b8bce68f2f27ba9284fc69837b12d6 SHA256 c4f57a078d41ed4ab931469c955aa700db5326e38a78d8a4fee0bf8f59189548 MD5 425b5f9363b29d72b4eef3f7aca6d591 kmplayer-0.9.3_pre2.ebuild 1529 RMD160 8efae590664850d3e12bd45b56e552e855f3f4fc kmplayer-0.9.3_pre2.ebuild 1529 SHA256 c4f57a078d41ed4ab931469c955aa700db5326e38a78d8a4fee0bf8f59189548 kmplayer-0.9.3_pre2.ebuild 1529 -MISC ChangeLog 10089 RMD160 4e97773b6299d45524e5f8b06c0b942b209c1adf SHA1 ab81176ab03e35965a075697f10aaede0ff5a040 SHA256 48ce89376fa5b49c11453edb9d2d599a15daa48e0683e87a96ed8a0fd5739de9 -MD5 f2510ba4f5f7fde0d824c69ecd016c24 ChangeLog 10089 -RMD160 4e97773b6299d45524e5f8b06c0b942b209c1adf ChangeLog 10089 -SHA256 48ce89376fa5b49c11453edb9d2d599a15daa48e0683e87a96ed8a0fd5739de9 ChangeLog 10089 +MISC ChangeLog 10307 RMD160 5ddb032402175101714e0c1f5424640ec074a063 SHA1 a25d737baad46be2a1021a81664416cddf5a79b4 SHA256 c27066ea93c9dc27f3da912b38d3084189dcf3bfbfced14bd3b8bdf0ee5f353f +MD5 6b3a342a23bd3e54c0543b9f7a713539 ChangeLog 10307 +RMD160 5ddb032402175101714e0c1f5424640ec074a063 ChangeLog 10307 +SHA256 c27066ea93c9dc27f3da912b38d3084189dcf3bfbfced14bd3b8bdf0ee5f353f ChangeLog 10307 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156 @@ -42,6 +54,16 @@ SHA256 f4eb04028770248f26cd1167ba8202a95323c7c5dc3ac5d73fae29d56d0a4e07 files/di MD5 1e34c57da81407f31c22d60a03ebc5c5 files/digest-kmplayer-0.9.2a-r1 250 RMD160 fdc646d1026055e3bdf2a9b7eca70fdfeedb8738 files/digest-kmplayer-0.9.2a-r1 250 SHA256 f4eb04028770248f26cd1167ba8202a95323c7c5dc3ac5d73fae29d56d0a4e07 files/digest-kmplayer-0.9.2a-r1 250 +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 MD5 544bedb1260c50c07be611bf8956fbb3 files/digest-kmplayer-0.9.3_pre2 262 RMD160 3c0477c3005602f163a5a655ef99e5943cc6a20a files/digest-kmplayer-0.9.3_pre2 262 SHA256 12b3c7d4063d5198a6d549df16efa687cc2e442b6b01630b8295207bb74e5358 files/digest-kmplayer-0.9.3_pre2 262 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.5 (GNU/Linux) + +iD8DBQFFEaWHQVeVlgLp4x8RAoL8AJwPXT8y6kif0QudDeDJB4jll4gYyACggFpp +rdygXMllKq/9CLlT8rbAjF4= +=yDGO +-----END PGP SIGNATURE----- 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" +} |