summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2009-05-28 12:44:49 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2009-05-28 12:44:49 +0000
commit1a4e59aecd6131bb91075e0f7be5ddf2bac0b57d (patch)
tree674a84aebc85755309a353785a7afc08df2a7258 /media-video/kmplayer/files
parentstable on arm (bug #266201) (diff)
downloadgentoo-2-1a4e59aecd6131bb91075e0f7be5ddf2bac0b57d.tar.gz
gentoo-2-1a4e59aecd6131bb91075e0f7be5ddf2bac0b57d.tar.bz2
gentoo-2-1a4e59aecd6131bb91075e0f7be5ddf2bac0b57d.zip
Version bump. Fix slotting. Per bug #271507.
(Portage version: 2.2_rc33/cvs/Linux i686)
Diffstat (limited to 'media-video/kmplayer/files')
-rw-r--r--media-video/kmplayer/files/0.11.0a-fix_linking.patch25
-rw-r--r--media-video/kmplayer/files/0.11.0a-npp.patch13
-rw-r--r--media-video/kmplayer/files/kmplayer-0.9.4a-vop2vf.patch75
3 files changed, 0 insertions, 113 deletions
diff --git a/media-video/kmplayer/files/0.11.0a-fix_linking.patch b/media-video/kmplayer/files/0.11.0a-fix_linking.patch
deleted file mode 100644
index 2aa51ad2046b..000000000000
--- a/media-video/kmplayer/files/0.11.0a-fix_linking.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -urN kmplayer-0.11.0a/src/kmplayer_part.cpp kmplayer-0.11.0a-patched/src/kmplayer_part.cpp
---- kmplayer-0.11.0a/src/kmplayer_part.cpp 2009-01-26 06:27:46.000000000 +1030
-+++ kmplayer-0.11.0a-patched/src/kmplayer_part.cpp 2009-02-18 11:19:12.000000000 +1030
-@@ -125,6 +125,21 @@
- return new KMPlayerPart (wparent, parent, args);
- }
-
-+KDE_NO_EXPORT QString PartBase::getStatus () {
-+ QString rval = "Waiting";
-+ if (source() && source()->document()) {
-+ if (source()->document()->unfinished ())
-+ rval = "Playable";
-+ else if (source()->document()->state >= Node::state_deactivated)
-+ rval = "Complete";
-+ }
-+ return rval;
-+}
-+
-+KDE_NO_EXPORT QString PartBase::doEvaluate (const QString &) {
-+ return "undefined";
-+}
-+
- const KComponentData &KMPlayerFactory::componentData () {
- kDebug () << "KMPlayerFactory::instance";
- if (!s_instance)
diff --git a/media-video/kmplayer/files/0.11.0a-npp.patch b/media-video/kmplayer/files/0.11.0a-npp.patch
deleted file mode 100644
index 979baaa27fe5..000000000000
--- a/media-video/kmplayer/files/0.11.0a-npp.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -urN kmplayer-0.11.0a.old/src/kmplayerprocess.cpp kmplayer-0.11.0a/src/kmplayerprocess.cpp
---- kmplayer-0.11.0a.old/src/kmplayerprocess.cpp 2009-01-25 20:57:46.000000000 +0100
-+++ kmplayer-0.11.0a/src/kmplayerprocess.cpp 2009-03-15 16:13:23.000000000 +0100
-@@ -2829,9 +2829,6 @@
-
- #else
-
--KDE_NO_CDTOR_EXPORT NpStream::NpStream (NpPlayer *p, uint32_t sid, const QString &u)
-- : QObject (p) {}
--
- KDE_NO_CDTOR_EXPORT NpStream::~NpStream () {}
- void NpStream::slotResult (KJob*) {}
- void NpStream::slotData (KIO::Job*, const QByteArray&) {}
diff --git a/media-video/kmplayer/files/kmplayer-0.9.4a-vop2vf.patch b/media-video/kmplayer/files/kmplayer-0.9.4a-vop2vf.patch
deleted file mode 100644
index 1f458ab0ac1f..000000000000
--- a/media-video/kmplayer/files/kmplayer-0.9.4a-vop2vf.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-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);
- }