diff options
Diffstat (limited to 'audio/last.fm')
18 files changed, 62 insertions, 64 deletions
diff --git a/audio/last.fm/files/patch-LastFM.pro b/audio/last.fm/files/patch-LastFM.pro index 519abaf586e0..dc3250bbb401 100644 --- a/audio/last.fm/files/patch-LastFM.pro +++ b/audio/last.fm/files/patch-LastFM.pro @@ -1,6 +1,6 @@ ---- LastFM.pro.orig 2012-12-02 14:23:24.000000000 +0100 -+++ LastFM.pro 2012-12-02 14:23:37.000000000 +0100 -@@ -37,7 +37,7 @@ +--- LastFM.pro.orig 2010-09-20 10:43:11 UTC ++++ LastFM.pro +@@ -37,7 +37,7 @@ mac { SUBDIRS -= src/mediadevices/ipod } diff --git a/audio/last.fm/files/patch-src-output-alsa-playback-alsaaudio.cpp b/audio/last.fm/files/patch-src-output-alsa-playback-alsaaudio.cpp deleted file mode 100644 index 278496f231e1..000000000000 --- a/audio/last.fm/files/patch-src-output-alsa-playback-alsaaudio.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/output/alsa-playback/alsaaudio.cpp.orig 2014-08-15 14:23:25.000000000 +0200 -+++ src/output/alsa-playback/alsaaudio.cpp 2014-08-15 16:29:32.000000000 +0200 -@@ -798,8 +798,6 @@ - { - case -EPIPE: - return xrun_recover(); -- case -ESTRPIPE: -- return suspend_recover(); - } - - return err; diff --git a/audio/last.fm/files/patch-src-output-alsa-playback-xconvert.c b/audio/last.fm/files/patch-src-output-alsa-playback-xconvert.c deleted file mode 100644 index 385a3b6a823c..000000000000 --- a/audio/last.fm/files/patch-src-output-alsa-playback-xconvert.c +++ /dev/null @@ -1,10 +0,0 @@ ---- src/output/alsa-playback/xconvert.c.orig 2012-12-02 14:30:50.000000000 +0100 -+++ src/output/alsa-playback/xconvert.c 2012-12-02 14:33:58.000000000 +0100 -@@ -57,6 +57,7 @@ - - #endif - -+#define uint size_t - - struct buffer { - void *buffer; diff --git a/audio/last.fm/files/patch-src-AudioController.cpp b/audio/last.fm/files/patch-src_AudioController.cpp index fa671556dec2..052ad3dd70c5 100644 --- a/audio/last.fm/files/patch-src-AudioController.cpp +++ b/audio/last.fm/files/patch-src_AudioController.cpp @@ -1,6 +1,6 @@ ---- src/AudioController.cpp.orig 2007-12-18 15:18:20.000000000 +0100 -+++ src/AudioController.cpp 2009-11-04 19:22:00.000000000 +0100 -@@ -168,13 +168,7 @@ +--- src/AudioController.cpp.orig 2016-07-26 15:06:09 UTC ++++ src/AudioController.cpp +@@ -168,13 +168,7 @@ AudioControllerThread::loadPlugins() m_transcode->setBufferCapacity( kDecodedBufferMinSize ); diff --git a/audio/last.fm/files/patch-src__lastfmapplication.cpp b/audio/last.fm/files/patch-src_lastfmapplication.cpp index 036369437ed7..02cd05aade25 100644 --- a/audio/last.fm/files/patch-src__lastfmapplication.cpp +++ b/audio/last.fm/files/patch-src_lastfmapplication.cpp @@ -1,4 +1,4 @@ ---- src/lastfmapplication.cpp.orig +--- src/lastfmapplication.cpp.orig 2016-07-26 15:06:09 UTC +++ src/lastfmapplication.cpp @@ -55,6 +55,10 @@ #include <QTcpSocket> diff --git a/audio/last.fm/files/patch-src-libFingerprint-fplib-src-FloatingAverage.h b/audio/last.fm/files/patch-src_libFingerprint_fplib_src_FloatingAverage.h index 17ebdcdc5aa4..cf9304065423 100644 --- a/audio/last.fm/files/patch-src-libFingerprint-fplib-src-FloatingAverage.h +++ b/audio/last.fm/files/patch-src_libFingerprint_fplib_src_FloatingAverage.h @@ -1,6 +1,6 @@ ---- src/libFingerprint/fplib/src/FloatingAverage.h.orig 2007-12-18 15:18:19.000000000 +0100 -+++ src/libFingerprint/fplib/src/FloatingAverage.h 2012-11-25 13:23:10.000000000 +0100 -@@ -78,6 +78,7 @@ +--- src/libFingerprint/fplib/src/FloatingAverage.h.orig 2016-07-26 15:06:09 UTC ++++ src/libFingerprint/fplib/src/FloatingAverage.h +@@ -78,6 +78,7 @@ public: { T real_sum = 0; const T* pCircularBuffer = m_values.get_buffer(); @@ -8,5 +8,3 @@ for ( int i = 0; i < size; ++i ) real_sum += pCircularBuffer[i]; return abs(real_sum - m_sum) / this->size(); - - diff --git a/audio/last.fm/files/patch-src-libUnicorn-Settings.h b/audio/last.fm/files/patch-src_libUnicorn_Settings.h index 76717ae8d82f..36d94e704d17 100644 --- a/audio/last.fm/files/patch-src-libUnicorn-Settings.h +++ b/audio/last.fm/files/patch-src_libUnicorn_Settings.h @@ -1,6 +1,6 @@ ---- src/libUnicorn/Settings.h.orig 2011-08-28 17:30:32.000000000 +0200 -+++ src/libUnicorn/Settings.h 2011-08-28 17:31:03.000000000 +0200 -@@ -105,7 +105,7 @@ +--- src/libUnicorn/Settings.h.orig 2016-07-26 15:06:09 UTC ++++ src/libUnicorn/Settings.h +@@ -105,7 +105,7 @@ protected: public: MyQSettings( const UserSettings* const s ) { diff --git a/audio/last.fm/files/patch-src__libUnicorn__TrackInfo.h b/audio/last.fm/files/patch-src_libUnicorn_TrackInfo.h index 89a3f4e79dc9..1164608f704e 100644 --- a/audio/last.fm/files/patch-src__libUnicorn__TrackInfo.h +++ b/audio/last.fm/files/patch-src_libUnicorn_TrackInfo.h @@ -1,4 +1,4 @@ ---- src/libUnicorn/TrackInfo.h.orig +--- src/libUnicorn/TrackInfo.h.orig 2016-07-26 15:06:09 UTC +++ src/libUnicorn/TrackInfo.h @@ -33,6 +33,8 @@ #include <QStringList> diff --git a/audio/last.fm/files/patch-src__libUnicorn__UnicornCommon.cpp b/audio/last.fm/files/patch-src_libUnicorn_UnicornCommon.cpp index eaa768aa63b3..fccf43d11f5a 100644 --- a/audio/last.fm/files/patch-src__libUnicorn__UnicornCommon.cpp +++ b/audio/last.fm/files/patch-src_libUnicorn_UnicornCommon.cpp @@ -1,4 +1,4 @@ ---- src/libUnicorn/UnicornCommon.cpp.orig +--- src/libUnicorn/UnicornCommon.cpp.orig 2016-07-26 15:06:09 UTC +++ src/libUnicorn/UnicornCommon.cpp @@ -29,6 +29,10 @@ #include <QCoreApplication> diff --git a/audio/last.fm/files/patch-src_output_RtAudio_RtAudio.pro b/audio/last.fm/files/patch-src_output_RtAudio_RtAudio.pro new file mode 100644 index 000000000000..e4ee11fb0ae8 --- /dev/null +++ b/audio/last.fm/files/patch-src_output_RtAudio_RtAudio.pro @@ -0,0 +1,13 @@ +--- src/output/RtAudio/RtAudio.pro.orig 2008-04-09 11:46:29 UTC ++++ src/output/RtAudio/RtAudio.pro +@@ -8,10 +8,6 @@ include( ../../../definitions.pro.inc ) + HEADERS = rtaudioplayback.h + SOURCES = rtaudioplayback.cpp rtaudio/RtAudio.cpp + +-unix:!mac { +- LIBS += -lasound +-} +- + win32 { + LIBS += -lwinmm -Ldsound -ldsound -lole32 -lgdi32 -luser32 + INCLUDEPATH += dsound diff --git a/audio/last.fm/files/patch-src_output_RtAudio_rtaudio_RtAudio.cpp b/audio/last.fm/files/patch-src_output_RtAudio_rtaudio_RtAudio.cpp index 9c6dd5a04867..7ef7e9bfbaf7 100644 --- a/audio/last.fm/files/patch-src_output_RtAudio_rtaudio_RtAudio.cpp +++ b/audio/last.fm/files/patch-src_output_RtAudio_rtaudio_RtAudio.cpp @@ -1,4 +1,4 @@ ---- src/output/RtAudio/rtaudio/RtAudio.cpp.orig 2014-04-04 08:59:58.151014000 +0000 +--- src/output/RtAudio/rtaudio/RtAudio.cpp.orig 2016-07-26 15:06:09 UTC +++ src/output/RtAudio/rtaudio/RtAudio.cpp @@ -42,7 +42,7 @@ #include <QtGlobal> diff --git a/audio/last.fm/files/patch-src_rtaudioplayback-rtaudioplayback.cpp b/audio/last.fm/files/patch-src_output_RtAudio_rtaudioplayback.cpp index 3244cdb4caeb..793f3d4fdc07 100644 --- a/audio/last.fm/files/patch-src_rtaudioplayback-rtaudioplayback.cpp +++ b/audio/last.fm/files/patch-src_output_RtAudio_rtaudioplayback.cpp @@ -1,6 +1,6 @@ ---- src/output/RtAudio/rtaudioplayback.cpp.orig 2007-09-13 13:46:07.000000000 +0200 -+++ src/output/RtAudio/rtaudioplayback.cpp 2007-09-14 20:54:41.000000000 +0200 -@@ -157,7 +157,7 @@ +--- src/output/RtAudio/rtaudioplayback.cpp.orig 2016-07-26 15:06:09 UTC ++++ src/output/RtAudio/rtaudioplayback.cpp +@@ -158,7 +158,7 @@ RtAudioPlayback::soundSystems() #endif #ifdef Q_WS_X11 @@ -9,8 +9,8 @@ #endif #ifdef Q_WS_MAC -@@ -280,7 +280,7 @@ - int card = internalSoundCardID( The::settings().soundCard() ); +@@ -284,7 +284,7 @@ RtAudioPlayback::initAudio( + int card = internalSoundCardID( m_deviceNum ); #ifdef Q_WS_X11 - api = RtAudio::LINUX_ALSA; diff --git a/audio/last.fm/files/patch-src_output_alsa-playback_alsaaudio.cpp b/audio/last.fm/files/patch-src_output_alsa-playback_alsaaudio.cpp new file mode 100644 index 000000000000..b74adacfe79b --- /dev/null +++ b/audio/last.fm/files/patch-src_output_alsa-playback_alsaaudio.cpp @@ -0,0 +1,11 @@ +--- src/output/alsa-playback/alsaaudio.cpp.orig 2016-07-26 15:06:09 UTC ++++ src/output/alsa-playback/alsaaudio.cpp +@@ -798,8 +798,6 @@ int AlsaAudio::alsa_handle_error( int er + { + case -EPIPE: + return xrun_recover(); +- case -ESTRPIPE: +- return suspend_recover(); + } + + return err; diff --git a/audio/last.fm/files/patch-src_output_alsa-playback_xconvert.c b/audio/last.fm/files/patch-src_output_alsa-playback_xconvert.c new file mode 100644 index 000000000000..4435bb3f6bea --- /dev/null +++ b/audio/last.fm/files/patch-src_output_alsa-playback_xconvert.c @@ -0,0 +1,10 @@ +--- src/output/alsa-playback/xconvert.c.orig 2007-02-01 12:59:50 UTC ++++ src/output/alsa-playback/xconvert.c +@@ -57,6 +57,7 @@ + + #endif + ++#define uint size_t + + struct buffer { + void *buffer; diff --git a/audio/last.fm/files/patch-src__playerlistener.cpp b/audio/last.fm/files/patch-src_playerlistener.cpp index b6a54e32e061..8d5d127cdd8d 100644 --- a/audio/last.fm/files/patch-src__playerlistener.cpp +++ b/audio/last.fm/files/patch-src_playerlistener.cpp @@ -1,4 +1,4 @@ ---- src/playerlistener.cpp.orig +--- src/playerlistener.cpp.orig 2016-07-26 15:06:09 UTC +++ src/playerlistener.cpp @@ -33,6 +33,10 @@ #include <iostream> diff --git a/audio/last.fm/files/patch-src_rtaudioplayback-rtaudioplayback.pro b/audio/last.fm/files/patch-src_rtaudioplayback-rtaudioplayback.pro deleted file mode 100644 index 216db3b9fb50..000000000000 --- a/audio/last.fm/files/patch-src_rtaudioplayback-rtaudioplayback.pro +++ /dev/null @@ -1,13 +0,0 @@ ---- src/output/RtAudio/RtAudio.pro.orig Sat Jul 14 09:37:38 2007 -+++ src/output/RtAudio/RtAudio.pro Sat Jul 14 09:37:51 2007 -@@ -8,10 +8,6 @@ - HEADERS = rtaudioplayback.h - SOURCES = rtaudioplayback.cpp rtaudio/RtAudio.cpp - --unix:!mac { -- LIBS += -lasound --} -- - win32 { - LIBS += -lwinmm -Ldsound -ldsound -lole32 -lgdi32 -luser32 -lshfolder - INCLUDEPATH += dsound diff --git a/audio/last.fm/files/patch-src-updatewizard.h b/audio/last.fm/files/patch-src_updatewizard.h index 91f6896c163c..c8a8868472df 100644 --- a/audio/last.fm/files/patch-src-updatewizard.h +++ b/audio/last.fm/files/patch-src_updatewizard.h @@ -1,6 +1,6 @@ ---- src/updatewizard.h.orig 2012-12-02 14:01:31.000000000 +0100 -+++ src/updatewizard.h 2012-12-02 14:01:42.000000000 +0100 -@@ -50,7 +50,7 @@ +--- src/updatewizard.h.orig 2016-07-26 15:06:09 UTC ++++ src/updatewizard.h +@@ -50,7 +50,7 @@ public: CAutoUpdater& updater, QWidget* parent = NULL); diff --git a/audio/last.fm/files/patch-src-wizardselectupdatespage.h b/audio/last.fm/files/patch-src_wizardselectupdatespage.h index 630a18a8afb3..7a5aac7be511 100644 --- a/audio/last.fm/files/patch-src-wizardselectupdatespage.h +++ b/audio/last.fm/files/patch-src_wizardselectupdatespage.h @@ -1,6 +1,6 @@ ---- src/wizardselectupdatespage.h.orig 2012-12-02 13:59:46.000000000 +0100 -+++ src/wizardselectupdatespage.h 2012-12-02 14:00:17.000000000 +0100 -@@ -58,7 +58,7 @@ +--- src/wizardselectupdatespage.h.orig 2016-07-26 15:06:09 UTC ++++ src/wizardselectupdatespage.h +@@ -58,7 +58,7 @@ public: GetChecked( std::vector<CComponentInfo*>& vecChecked); |