diff options
author | Thomas Sachau <tommy@gentoo.org> | 2009-08-01 01:51:42 +0200 |
---|---|---|
committer | Thomas Sachau <tommy@gentoo.org> | 2009-08-01 01:51:42 +0200 |
commit | 6c83789fb1898a7cdd79bddf0fb6235546a286d1 (patch) | |
tree | 929a8ca57942b50201bdf07e03f51d2a9b6e17a6 /media-sound | |
parent | Update dependencies for googleearth (diff) | |
download | multilib-portage-6c83789fb1898a7cdd79bddf0fb6235546a286d1.tar.gz multilib-portage-6c83789fb1898a7cdd79bddf0fb6235546a286d1.tar.bz2 multilib-portage-6c83789fb1898a7cdd79bddf0fb6235546a286d1.zip |
Drop media-sound/phonon
Diffstat (limited to 'media-sound')
-rw-r--r-- | media-sound/phonon/Manifest | 3 | ||||
-rw-r--r-- | media-sound/phonon/files/fix_nonascii_chars.patch | 95 | ||||
-rw-r--r-- | media-sound/phonon/phonon-4.3.1.ebuild | 62 |
3 files changed, 0 insertions, 160 deletions
diff --git a/media-sound/phonon/Manifest b/media-sound/phonon/Manifest deleted file mode 100644 index 6a9d87b4c..000000000 --- a/media-sound/phonon/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -AUX fix_nonascii_chars.patch 3159 RMD160 cde38d5c7000618eefa910b9638ac6b51ed663f9 SHA1 4b520fbc8e42764225d1fe7ee73213e7bbf92f3f SHA256 5969e2766160c21565dfcef3dffb6c264a9031dc6364a580b9b452358d07d6de -DIST phonon-4.3.1.tar.bz2 575856 RMD160 d91cc7e994d4f6a143a7cd6c2a723b579b294141 SHA1 f7537e5280d0a4cc1348975daa7a7e45d833d45c SHA256 7fb6d9efad29d7ac390d539cd516177c26cc2f92ddb9b3a5d70f2c49fc15269a -EBUILD phonon-4.3.1.ebuild 1529 RMD160 1dfcfd065909ee48c495a3c132ebc3b727fd70bf SHA1 ca169c36a26dffe9d3a7d53cd7457903c550b660 SHA256 9d6fc7d4a34b69ae96089e36f4149a08709232d984a5bc198c00e089b8b27f64 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 d39e2ab5e..000000000 --- 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/phonon-4.3.1.ebuild b/media-sound/phonon/phonon-4.3.1.ebuild deleted file mode 100644 index ea634ed70..000000000 --- a/media-sound/phonon/phonon-4.3.1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/phonon/phonon-4.3.1.ebuild,v 1.9 2009/06/15 19:38:29 klausman Exp $ - -EAPI="2" -inherit cmake-utils multilib-native - -KDE_VERSION="4.2.1" - -DESCRIPTION="KDE multimedia API" -HOMEPAGE="http://phonon.kde.org" -SRC_URI="mirror://kde/stable/${KDE_VERSION}/src/${P}.tar.bz2" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 x86" -IUSE="debug gstreamer +xcb +xine" - -RDEPEND=" - !kde-base/phonon-xine - !x11-libs/qt-phonon:4 - >=x11-libs/qt-test-4.4.0:4[lib32?] - >=x11-libs/qt-dbus-4.4.0:4[lib32?] - >=x11-libs/qt-gui-4.4.0:4[lib32?] - >=x11-libs/qt-opengl-4.4.0:4[lib32?] - gstreamer? ( - media-libs/gstreamer[lib32?] - media-libs/gst-plugins-base[lib32?] - ) - xine? ( - >=media-libs/xine-lib-1.1.15-r1[xcb?,lib32?] - xcb? ( x11-libs/libxcb[lib32?] ) - ) -" - -DEPEND="${RDEPEND} - >=kde-base/automoc-0.9.87 -" - -PATCHES=( "$FILESDIR/fix_nonascii_chars.patch" ) - -pkg_setup() { - if use !xine && use !gstreamer; then - die "you must at least select one backend for phonon" - fi -} - -multilib-native_src_configure_internal() { - mycmakeargs="${mycmakeargs} - $(cmake-utils_use_with gstreamer GStreamer) - $(cmake-utils_use_with gstreamer GStreamerPlugins) - $(cmake-utils_use_with xine Xine)" - - if use xine; then - mycmakeargs="${mycmakeargs} - $(cmake-utils_use_with xcb XCB)" - else - sed -i -e '/xine/d' \ - "${S}/CMakeLists.txt" || die "sed failed" - fi - cmake-utils_src_configure -} |