diff options
author | Tomas Chvatal <scarabeus@gentoo.org> | 2010-08-10 12:52:27 +0000 |
---|---|---|
committer | Tomas Chvatal <scarabeus@gentoo.org> | 2010-08-10 12:52:27 +0000 |
commit | 0cf14c49036b6e94d248e2a3c03bf9f70c1bd67b (patch) | |
tree | 08fc469e01aef7d61283c1743087573aa97d7eed /media-sound | |
parent | stable x86, bug 331761 (diff) | |
download | historical-0cf14c49036b6e94d248e2a3c03bf9f70c1bd67b.tar.gz historical-0cf14c49036b6e94d248e2a3c03bf9f70c1bd67b.tar.bz2 historical-0cf14c49036b6e94d248e2a3c03bf9f70c1bd67b.zip |
Drop unused stuff.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'media-sound')
-rw-r--r-- | media-sound/amarok/Manifest | 10 | ||||
-rw-r--r-- | media-sound/phonon/ChangeLog | 8 | ||||
-rw-r--r-- | media-sound/phonon/Manifest | 19 | ||||
-rw-r--r-- | media-sound/phonon/files/fix_nonascii_chars.patch | 95 | ||||
-rw-r--r-- | media-sound/phonon/files/phonon-4.4-qt7.patch | 11 | ||||
-rw-r--r-- | media-sound/phonon/files/phonon-4.4.1-pulseaudio-connect.patch | 60 | ||||
-rw-r--r-- | media-sound/phonon/files/phonon-4.4.1-xine-volume.patch | 35 | ||||
-rw-r--r-- | media-sound/phonon/phonon-4.4.1-r1.ebuild | 115 |
8 files changed, 21 insertions, 332 deletions
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest index 358c562802c8..f1bf12a78416 100644 --- a/media-sound/amarok/Manifest +++ b/media-sound/amarok/Manifest @@ -1,14 +1,6 @@ -AUX amarok-2.2-mysql-libs.patch 540 RMD160 16b143a50c126ba69851e4c1d1524b1d6b7c175d SHA1 0358c91184604bf4587cfa755202a41ba9c4d346 SHA256 ace02a3f8d20295077de08d17af00382c19ad21ddf4ef324ff7c5e5ec4d666e1 -AUX amarok-2.2.2-nodebug.patch 16478 RMD160 8f8eedbd5a29f10da6243cc4ac586f59ca493a7d SHA1 c2316800d0632b473b14d683415f51a36879922a SHA256 022a655eff5cd918fc61999001a3251de7e406cbffb40127295820eb4e398a29 -AUX amarok-2.3.0-crash_fix_info_applet.patch 1820 RMD160 2ddbd8e30d7c9031eead648430bc8c9e2e6ec0cd SHA1 5aa6fd5ae30c956ea4f4be3d5bb6078af9e88ea3 SHA256 2f48faa43ad621616289b30da5b2febcd2861bc500a73bf9112916d1eeb3b41c AUX amarok-2.3.1-fix-trayicon.patch 13469 RMD160 36f5ae424bdd6d865bfce203e7d74f08966ad379 SHA1 f0110088ecd826b652d558c7463a0a717ed5080b SHA256 4adb543ab25a86f85ea7b914e66374faeca0df8e02aa40682cee17d137a9b76a AUX amarok-fix-accessibility-dep.patch 687 RMD160 184a28eecb351117c8ce3c922112e7ac5c4efde1 SHA1 e9ea735d7431fb3c11f5aabab0935c637826059c SHA256 8d631d10dccce5a72eb24a366afc5672d7853fba8a5c667e300549d8ee85170d -AUX amarok-qtscriptcheck.patch 1024 RMD160 0693ddd6bbaa2f15d381eec329cfeff1e8b176cd SHA1 0585c08f8159a06c95e89f22e788d6e039224fbb SHA256 8a2983f3bd5ec422f2ed0a90a49970fd13fed3852c66ed220c01b4d8418ce89d -DIST amarok-2.2.2.tar.bz2 8788107 RMD160 0782c4b032d318179bd8bb91353f8e33772d2912 SHA1 2075299b856477cf55cba8ba983ea25a93dc139b SHA256 768d308572897a3100f0d87999f1bb1c68b2e2fa3b0961fd0b918bcfd33ae64d DIST amarok-2.3.1.tar.bz2 9823411 RMD160 70e581bd681361d7837f1ed295191174e92e9f8f SHA1 00a596384df8d155b91b40bb2484ec0a7f51da80 SHA256 3fef3f4d4b4ffa22faf4a3b97e2c2bcfde85f55a9973b1ad6d66df55068b4a72 -EBUILD amarok-2.2.2-r1.ebuild 3129 RMD160 7f2f764b4542d2447b7e1109c757a45ea8f0f403 SHA1 24f628aaf70a20f4160fa135df7d07e4f83f724f SHA256 fda21a42223a92bf47f68e2b2824b332017c480c3164389b76b1f8c5106459d1 -EBUILD amarok-2.3.1-r1.ebuild 4128 RMD160 ed941d9b1cdce3e9f900c0d39b21823740c26872 SHA1 27af017934c245dac5d84ff3b00b6d8b22303d1e SHA256 c3434e3d19d7679b2b8cb608de331f79fc05c0118f01dc4708d44051c2e8d9af EBUILD amarok-2.3.1-r2.ebuild 4915 RMD160 f2d19c5d9420659d408306fa682cf24cae39386e SHA1 a99199f5af5c22710c7687ec8b84b41e1bcdd88f SHA256 d1c83136de4ebf642cad3dcbe90545b04985fd1c816d287da6f60999e17adbe8 -EBUILD amarok-2.3.1.ebuild 3465 RMD160 7834bed748ffc58ae9573eaad9f779de67332598 SHA1 ce11a10148980406634e9b494c6eeb530c647f7e SHA256 86b44855a9c8ea722406a13ef861350d18ba8e19ff7c11b202e9a3db9557a632 -MISC ChangeLog 64717 RMD160 b548218865877ff5f2a6104f950a6c6737af79da SHA1 72068fb6483ccac6dcbd4eb05c9608069519512b SHA256 abd7b93bcb496bf9907eb7ad66203797228734efb7f785046b8d655dc069cb90 +MISC ChangeLog 65030 RMD160 5fa209cf5e2c3666ee29e46ae173559bb7164623 SHA1 1e44c10fcd1e1cf8807cb2658710c5a18ef862fd SHA256 e3cbbe042ac0399cc295c541025ae025f18fb6dcd8d5d1cca84b8a86b5ee170b MISC metadata.xml 1413 RMD160 62fc2ae4eae51f52f3ef02d86e8b244a3132ba86 SHA1 dda8b8bf344947925b93744cff693605f46c1006 SHA256 be46bcd7f470f66bb3afc8df3338aab204e055e10f042d4bae2be65eae7b3f8f 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/Manifest b/media-sound/phonon/Manifest index 351e955a32e0..95582ad38019 100644 --- a/media-sound/phonon/Manifest +++ b/media-sound/phonon/Manifest @@ -1,24 +1,9 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -AUX fix_nonascii_chars.patch 3159 RMD160 cde38d5c7000618eefa910b9638ac6b51ed663f9 SHA1 4b520fbc8e42764225d1fe7ee73213e7bbf92f3f SHA256 5969e2766160c21565dfcef3dffb6c264a9031dc6364a580b9b452358d07d6de -AUX phonon-4.4-qt7.patch 15299 RMD160 ec017cf0dbbd79577a29c595f5bd6cbe9df7e199 SHA1 565b2c407acea17bcfeb5e24c82b14dbb398af38 SHA256 68b51882663ed0a8ef0bfa4bbb9acc8d113e033f7704cddba6add8adb061c6e3 -AUX phonon-4.4.1-pulseaudio-connect.patch 2856 RMD160 6616c02938d36841927c2c871bb94fd4f064f61e SHA1 654c74487cebc0a8c12580b9127eda4590a2a9ab SHA256 51ea85ee7126d8b6ab4b0e5e93af5564307475081e1858ecedc314a589e95c42 -AUX phonon-4.4.1-xine-volume.patch 1117 RMD160 98166edfe5aece2b134e0553a8bf918cfa372fdf SHA1 dfb9fc4ab44a41a4a4889009de1f74bd8045291c SHA256 89acdff7a719abd42f2b0efaf46e5fa7b0de33696d69e510395ac104aaed6eac +AUX phonon-4.4-qt7.patch 15621 RMD160 dd46e1cac72aaffc714ef849c079eac1c9c03536 SHA1 f5902d8138fb550457d8acddebf24743cd5e5498 SHA256 8b236f3731434ec6fd591f7da6f1267943c819ebc523797b58d27facfafde68e DIST phonon-4.3.80.tar.bz2 598739 RMD160 5c271c1d53ee8878205255f8f257b7bfcd6c21c3 SHA1 914e4db5a6c23918be4b85e56a31207a2d17bf5d SHA256 89cb295f45d7db1bf261e344569c2597879657d1aa9538e5037bc2db9a508bec -DIST phonon-4.4.1.tar.bz2 625008 RMD160 945669b48fa5278f4ca59b415799a14d45ed1c55 SHA1 e87474e144c2d03944161aeb1b18a0569642a556 SHA256 8a52b0e74c5fb5c8dd3ce65d745c7052cdcea0e7535658fbc655671cef5e5277 DIST phonon-4.4.2.tar.bz2 629193 RMD160 aa37903f166904dd09401541df8fc268a2858606 SHA1 c329d924fb75a89a9de8a4d799ff4dcd7ee3302e SHA256 f1404c3f326201b382c26ba37f2d885d30bc71ba5fd8e1479afb632f92d93486 DIST phonon-4.4_pre20090520.tar.bz2 583005 RMD160 5cd7abe22319124b60fe292b978b7e78fae1a29d SHA1 a0a6942cb40b28c4e30f4272b1420300546a9bdf SHA256 0073efcc672b4d2e6def34e82ff43313cf8cb14ef63d15cd9b4d9f641b998e9d EBUILD phonon-4.3.50_pre20090520.ebuild 1388 RMD160 e7ad41dfa92a0441613a937b86558a5c6952ca1b SHA1 b9d9e872b0410ec85f3dc24cde1614e2d4041a4b SHA256 bf015bee1b009fbc6540231c9a8319b8271d69816db57b061e2cd7a79842a379 EBUILD phonon-4.3.80-r1.ebuild 3165 RMD160 4678ba4b88724247e7aeb2d2df53a0787ac79095 SHA1 9c251cf4d5be9dbc49aa95dbfc254c645dc8d0ad SHA256 c05738861d371f703c2fbed398c21c4baa9ad501fa3b33ba1abf5e250d16160b -EBUILD phonon-4.4.1-r1.ebuild 3305 RMD160 2acaf6705c4a2107537a162abe2671be92ca6339 SHA1 cc6d99bbbbba5ee5b7cc75b6c793f3ccf0f021a8 SHA256 c52b20bbaff8ea38c5f1fd97be9547d13a618bdabd24c0453c4099717e02187e EBUILD phonon-4.4.2.ebuild 3206 RMD160 ed7072aa37d93a466a1a2e38b5972f142cdea0df SHA1 b7231095b5d9817a853bab6fe78babd695f9a7eb SHA256 a2b8b6e78c9f2776bccd4b622e2eae7b70f6cde4c4aecc65a68cccf3773af6e9 -MISC ChangeLog 8075 RMD160 d351c7e41cdab9fffa9e174da2de918a9f486ade SHA1 50996d38d5e372c6a8d2c2fbd255f0d6ec9875e1 SHA256 1d13464b81c037d350d2a4ae6e3518de21d012bb4194e950474d45430b5a8082 +MISC ChangeLog 8332 RMD160 691190b3f345b66f4be06196d1a628f1a844b94e SHA1 54ad7a41c408bcd5923f06740797317eab33c94f SHA256 9b8378f82a0deb0b364d132ae793799225085423ee5abecc2f118f2ccf87ab26 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.15 (GNU/Linux) - -iEYEARECAAYFAkxfZ1cACgkQcsIHjyDViGSZLwCgq6A5fMuVTkyduXfow3vxnR1Z -wh8AoJN9YSHJAaY9JLPSaQGZDfrOXYKX -=htuj ------END PGP SIGNATURE----- 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 -} |