Drop unused stuff.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

6 files changed, 18 insertions, 306 deletions

diff --git a/media-sound/phonon/ChangeLog b/media-sound/phonon/ChangeLog
index c75d1a3a85bb..c5c7d3c6bd97 100644
--- a/media-sound/phonon/ChangeLog
+++ b/media-sound/phonon/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/phonon
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/phonon/ChangeLog,v 1.59 2010/08/09 02:27:37 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/phonon/ChangeLog,v 1.60 2010/08/10 12:52:27 scarabeus Exp $
+
+  10 Aug 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  files/phonon-4.4-qt7.patch, -phonon-4.4.1-r1.ebuild,
+  -files/phonon-4.4.1-pulseaudio-connect.patch,
+  -files/phonon-4.4.1-xine-volume.patch, -files/fix_nonascii_chars.patch:
+  Drop unused stuff.
 
   09 Aug 2010; Joseph Jezak <josejx@gentoo.org> phonon-4.4.2.ebuild:
   Marked ppc/ppc64 stable for bug #329847.
diff --git a/media-sound/phonon/files/fix_nonascii_chars.patch b/media-sound/phonon/files/fix_nonascii_chars.patch
deleted file mode 100644
index d39e2ab5e34c..000000000000
--- a/media-sound/phonon/files/fix_nonascii_chars.patch
+++ /dev/null
@@ -1,95 +0,0 @@
---- branches/phonon/4.3/xine/mediaobject.cpp	2009/02/10 09:11:04	924143
-+++ branches/phonon/4.3/xine/mediaobject.cpp	2009/02/10 09:17:28	924144
-@@ -317,6 +317,20 @@
-     setSourceInternal(source, HardSwitch);
- }
- 
-+static QByteArray mrlEncode(QByteArray mrl)
-+{
-+    for (int i = 0; i < mrl.size(); ++i) {
-+        const unsigned char c = static_cast<unsigned char>(mrl.at(i));
-+        if (c & 0x80 || c == '\\' || c < 32 || c == '%') {
-+            char enc[4];
-+            qsnprintf(enc, 4, "%%%02X", c);
-+            mrl = mrl.left(i) + QByteArray(enc, 3) + mrl.mid(i + 1);
-+            i += 2;
-+        }
-+    }
-+    return mrl;
-+}
-+
- void MediaObject::setSourceInternal(const MediaSource &source, HowToSetTheUrl how)
- {
-     //debug() << Q_FUNC_INFO;
-@@ -340,13 +354,18 @@
-             m_stream->setError(Phonon::NormalError, tr("Cannot open media data at '<i>%1</i>'").arg(source.url().toString(QUrl::RemovePassword)));
-             return;
-         }
--        switch (how) {
--        case GaplessSwitch:
--            m_stream->gaplessSwitchTo(source.url());
--            break;
--        case HardSwitch:
--            m_stream->setUrl(source.url());
--            break;
-+        {
-+            const QByteArray &mrl = (source.url().scheme() == QLatin1String("file") ?
-+                    "file:/" + mrlEncode(QFile::encodeName(source.url().toLocalFile())) :
-+                    source.url().toEncoded());
-+            switch (how) {
-+                case GaplessSwitch:
-+                    m_stream->gaplessSwitchTo(mrl);
-+                    break;
-+                case HardSwitch:
-+                    m_stream->setMrl(mrl);
-+                    break;
-+            }
-         }
-         break;
-     case MediaSource::Disc:
---- branches/phonon/4.3/xine/xinestream.cpp	2009/02/10 09:11:04	924143
-+++ branches/phonon/4.3/xine/xinestream.cpp	2009/02/10 09:17:28	924144
-@@ -619,12 +619,6 @@
- }
- 
- // called from main thread
--void XineStream::gaplessSwitchTo(const QUrl &url)
--{
--    gaplessSwitchTo(url.toEncoded());
--}
--
--// called from main thread
- void XineStream::gaplessSwitchTo(const QByteArray &mrl)
- {
-     QCoreApplication::postEvent(this, new GaplessSwitchEvent(mrl));
-@@ -1707,12 +1701,6 @@
- }
- 
- // called from main thread
--void XineStream::setUrl(const QUrl &url)
--{
--    setMrl(url.toEncoded());
--}
--
--// called from main thread
- void XineStream::setMrl(const QByteArray &mrl, StateForNewMrl sfnm)
- {
-     debug() << Q_FUNC_INFO << mrl << ", " << sfnm;
---- branches/phonon/4.3/xine/xinestream.h	2009/02/10 09:11:04	924143
-+++ branches/phonon/4.3/xine/xinestream.h	2009/02/10 09:17:28	924144
-@@ -86,7 +86,6 @@
-         //void needRewire(AudioPostList *postList);
-         void useGaplessPlayback(bool);
-         void useGapOf(int gap);
--        void gaplessSwitchTo(const QUrl &url);
-         void gaplessSwitchTo(const QByteArray &mrl);
-         void closeBlocking();
-         void aboutToDeleteVideoWidget();
-@@ -141,7 +140,6 @@
- 
-         void unload();
-     public slots:
--        void setUrl(const QUrl &url);
-         void setMrl(const QByteArray &mrl, StateForNewMrl = StoppedState);
-         void play();
-         void pause();
diff --git a/media-sound/phonon/files/phonon-4.4-qt7.patch b/media-sound/phonon/files/phonon-4.4-qt7.patch
index 974fe11d2a4f..8890fa1da0cf 100644
--- a/media-sound/phonon/files/phonon-4.4-qt7.patch
+++ b/media-sound/phonon/files/phonon-4.4-qt7.patch
@@ -350,3 +350,14 @@ Author:	Heiko Przybyl <zuxez@cs.tu-berlin.de>
  	description.componentType = kAudioUnitType_Generator;
  	description.componentSubType = kAudioUnitSubType_ScheduledSoundPlayer;
  	description.componentManufacturer = kAudioUnitManufacturer_Apple;
+ayer.h
+--- phonon-4.4.2-orig/qt7/quicktimevideoplayer.h	2010-08-06 08:43:28.000000000 +0200
++++ phonon-4.4.2/qt7/quicktimevideoplayer.h	2010-08-06 08:43:43.000000000 +0200
+@@ -20,6 +20,7 @@
+ 
+ #include "backendheader.h"
+ 
++#include <QtGui/qmacdefines_mac.h>
+ #import <QTKit/QTDataReference.h>
+ #import <QTKit/QTMovie.h>
+ 
diff --git a/media-sound/phonon/files/phonon-4.4.1-pulseaudio-connect.patch b/media-sound/phonon/files/phonon-4.4.1-pulseaudio-connect.patch
deleted file mode 100644
index 2aa84369c80c..000000000000
--- a/media-sound/phonon/files/phonon-4.4.1-pulseaudio-connect.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 1eb324f60f8df6bc7a866679919d79f1a2a3ff81 Mon Sep 17 00:00:00 2001
-From: Colin Guthrie <cguthrie@mandriva.org>
-Date: Sat, 24 Apr 2010 14:54:36 +0100
-Subject: [PATCH] pulse: Fix the reading of stream information on startup.
-
-Due to the new probe+reconnect logic, it is possible to initialise
-a 'PulseStream' object and start the backend outputting it
-prior to our control connection being established. This means that
-we miss the subscription event and never actually associate the
-PA stream index with our stream object. Whenever something changes
-on the stream at the PA end things would kick in and would work fine,
-so this was sometimes hard to see and identify.
-
-This change simply invalidates all streams when we're finished connecting
-to PA and then loads up all info from PA to set the indexes correctly.
-
-CCBUG: 235193
----
- phonon/pulsesupport.cpp |   25 +++++++++++++++++++++++++
- 1 files changed, 25 insertions(+), 0 deletions(-)
-
-diff --git a/phonon/pulsesupport.cpp b/phonon/pulsesupport.cpp
-index f4f2a13..92a732d 100644
---- a/phonon/pulsesupport.cpp
-+++ b/phonon/pulsesupport.cpp
-@@ -569,6 +569,31 @@ static void context_state_callback(pa_context *c, void *)
-                 return;
-             }
-             pa_operation_unref(o);
-+
-+            // In the case of reconnection or simply lagging behind the stream object creation
-+            // on startup (due to the probe+reconnect system), we invalidate all loaded streams
-+            // and then load up info about all streams.
-+            for (QMap<QString, PulseStream*>::iterator it = s_outputStreams.begin(); it != s_outputStreams.end(); ++it) {
-+              PulseStream *stream = *it;
-+              logMessage(QString("Phonon Output Stream %1 is gone at the PA end. Marking it as invalid in our cache as we may reuse it.").arg(stream->uuid()));
-+              stream->setIndex(PA_INVALID_INDEX);
-+            }
-+            if (!(o = pa_context_get_sink_input_info_list(c, sink_input_cb, NULL))) {
-+              logMessage(QString("pa_context_get_sink_input_info_list() failed"));
-+              return;
-+            }
-+            pa_operation_unref(o);
-+
-+            for (QMap<QString, PulseStream*>::iterator it = s_captureStreams.begin(); it != s_captureStreams.end(); ++it) {
-+              PulseStream *stream = *it;
-+              logMessage(QString("Phonon Capture Stream %1 is gone at the PA end. Marking it as invalid in our cache as we may reuse it.").arg(stream->uuid()));
-+              stream->setIndex(PA_INVALID_INDEX);
-+            }
-+            if (!(o = pa_context_get_source_output_info_list(c, source_output_cb, NULL))) {
-+              logMessage(QString("pa_context_get_source_output_info_list() failed"));
-+              return;
-+            }
-+            pa_operation_unref(o);
-         }
- 
- #ifdef HAVE_PULSEAUDIO_DEVICE_MANAGER
--- 
-1.6.1
-
diff --git a/media-sound/phonon/files/phonon-4.4.1-xine-volume.patch b/media-sound/phonon/files/phonon-4.4.1-xine-volume.patch
deleted file mode 100644
index 5d25d9df86e0..000000000000
--- a/media-sound/phonon/files/phonon-4.4.1-xine-volume.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From b44f19d7038f7e6182db4d29aee39dab569193fd Mon Sep 17 00:00:00 2001
-From: Colin Guthrie <cguthrie@mandriva.org>
-Date: Sat, 24 Apr 2010 14:25:31 +0100
-Subject: [PATCH] xine: Initialise volume to 1.
-
-When PulseAudio is used, it's essential that the internal representation
-of the volume remains at the maxium. Xine will use this to set the initial volume.
-
-Thankfully, xine's PulseAudio output does not seem to use per-application volume control
-as otherwise this 100% would be passed on an prevent PA from saving
-volumes properly.
-
-Currently, however one more problem remains with Xine+PA+volume
-in that the standard volume widget does not seem to be hooked up
-correctly. I'll look at this problem next.
-BUG: 235193
----
- xine/audiooutput.cpp |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/xine/audiooutput.cpp b/xine/audiooutput.cpp
-index 05b9240..f9f922e 100644
---- a/xine/audiooutput.cpp
-+++ b/xine/audiooutput.cpp
-@@ -48,6 +48,7 @@ namespace Xine
- 
- AudioOutput::AudioOutput(QObject *parent)
-     : AbstractAudioOutput(new AudioOutputXT, parent)
-+    , m_volume(1.0)
- {
- }
- 
--- 
-1.6.1
-
diff --git a/media-sound/phonon/phonon-4.4.1-r1.ebuild b/media-sound/phonon/phonon-4.4.1-r1.ebuild
deleted file mode 100644
index 6373ee93401f..000000000000
--- a/media-sound/phonon/phonon-4.4.1-r1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/phonon/phonon-4.4.1-r1.ebuild,v 1.6 2010/08/09 02:00:13 josejx Exp $
-
-EAPI="2"
-
-inherit cmake-utils
-
-DESCRIPTION="KDE multimedia API"
-HOMEPAGE="http://phonon.kde.org"
-SRC_URI="mirror://kde/stable/phonon/${PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
-IUSE="alsa aqua debug gstreamer pulseaudio +xcb +xine"
-
-RDEPEND="
-	!kde-base/phonon-xine
-	!x11-libs/qt-phonon:4
-	>=x11-libs/qt-test-4.6.0:4[aqua=]
-	>=x11-libs/qt-dbus-4.6.0:4[aqua=]
-	>=x11-libs/qt-gui-4.6.0:4[aqua=]
-	>=x11-libs/qt-opengl-4.6.0:4[aqua=]
-	gstreamer? (
-		media-libs/gstreamer
-		media-plugins/gst-plugins-meta[alsa?]
-	)
-	pulseaudio? (
-		dev-libs/glib:2
-		>=media-sound/pulseaudio-0.9.21[glib]
-	)
-	xine? (
-		>=media-libs/xine-lib-1.1.15-r1[xcb?]
-		xcb? ( x11-libs/libxcb )
-	)
-"
-DEPEND="${RDEPEND}
-	>=dev-util/automoc-0.9.87
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-xine-volume.patch"
-	"${FILESDIR}/${P}-pulseaudio-connect.patch"
-)
-
-S=${WORKDIR}/${P/.0}
-
-pkg_setup() {
-	if use !xine && use !gstreamer && use !aqua; then
-		die "you must at least select one backend for phonon"
-	fi
-
-	if use xine && use aqua; then
-		die "XINE backend needs X11 which is not available for USE=aqua"
-	fi
-}
-
-src_prepare() {
-	# Fix the qt7 backend for MacOS 10.6.
-	[[ ${CHOST} == *-darwin10 ]] && epatch "${FILESDIR}"/${PN}-4.4-qt7.patch
-
-	# On MacOS we additionally want the gstreamer plugin.
-	if use aqua && use gstreamer; then
-		sed -e "/add_subdirectory(qt7)/a add_subdirectory(gstreamer)" \
-			-i CMakeLists.txt \
-			|| die "failed to enable GStreamer backend"
-	fi
-
-	base_src_prepare
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with alsa)
-		$(cmake-utils_use_build aqua PHONON_QT7)
-		$(cmake-utils_use_with gstreamer GStreamer)
-		$(cmake-utils_use_with gstreamer GStreamerPlugins)
-		$(cmake-utils_use_with pulseaudio PulseAudio)
-		$(cmake-utils_use_with pulseaudio GLib2)
-		$(cmake-utils_use_with xine)
-		$(cmake-utils_use_with xcb)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use aqua; then
-		local MY_PV=4.4.0
-
-		install_name_tool \
-			-id "${EPREFIX}/usr/lib/libphonon.${MY_PV::1}.dylib" \
-			"${ED}/usr/lib/libphonon.${MY_PV}.dylib" \
-			|| die "failed to fix libphonon.${MY_PV}.dylib"
-
-		install_name_tool \
-			-id "${EPREFIX}/usr/lib/libphononexperimental.${MY_PV::1}.dylib" \
-			-change "libphonon.${MY_PV::1}.dylib" \
-				"${EPREFIX}/usr/lib/libphononexperimental.${MY_PV::1}.dylib" \
-			"${ED}/usr/lib/libphononexperimental.${MY_PV}.dylib" \
-			|| die "failed to fix libphononexperimental.${MY_PV}.dylib"
-
-		# fake the framework for the qt-apps depending on qt-frameworks (qt-webkit)
-		dodir /usr/lib/qt4/phonon.framework/Versions/${MY_PV::1}
-		dosym ${MY_PV::1} /usr/lib/qt4/phonon.framework/Versions/Current \
-			|| die "failed to create symlink"
-		dosym ../../../../libphonon.${MY_PV::1}.dylib /usr/lib/qt4/phonon.framework/Versions/${MY_PV::1}/phonon \
-			|| die "failed to create symlink"
-		dosym Versions/${MY_PV::1}/phonon /usr/lib/qt4/phonon.framework/phonon \
-			|| die "failed to create symlink"
-	fi
-}