Merge lp:~noskcaj/ubuntu/vivid/banshee-community-extensions/merge into lp:ubuntu/vivid/banshee-community-extensions

[Jackson Doak]

Merge from debian, dropping dbus#2 change since our banshee is still on version 1.
Makes the package function again. Ignore lp:1268331

[Daniel Holbach (dholbach)]

Thanks. Uploaded.

review: Approve

Unmerged revisions

33. By Jackson Doak on 2014-12-05

Use dbus#1 for the moment

32. By Jackson Doak on 2014-12-05

* Merge from Debian Unstable, remaining changes:
  + Enable AppIndicator extension
* [10ace16] Use DBus#2 API
* Rebuild against taglib-sharp 2.1
* [ef676d16] Add dependency against banshee 2.6.1-3 to sync taglib-sharp usage

=== removed directory '.pc/LastfmFingerprint-Clean-up-caps-handling-and-make-su.patch'
=== removed directory '.pc/LastfmFingerprint-Clean-up-caps-handling-and-make-su.patch/src'
=== removed directory '.pc/LastfmFingerprint-Clean-up-caps-handling-and-make-su.patch/src/LastfmFingerprint'
=== removed directory '.pc/LastfmFingerprint-Clean-up-caps-handling-and-make-su.patch/src/LastfmFingerprint/liblastfmfpbridge'
=== removed file '.pc/LastfmFingerprint-Clean-up-caps-handling-and-make-su.patch/src/LastfmFingerprint/liblastfmfpbridge/gst-lastfmfpbridge.cpp'
--- .pc/LastfmFingerprint-Clean-up-caps-handling-and-make-su.patch/src/LastfmFingerprint/liblastfmfpbridge/gst-lastfmfpbridge.cpp	2013-06-03 23:00:22 +0000
+++ .pc/LastfmFingerprint-Clean-up-caps-handling-and-make-su.patch/src/LastfmFingerprint/liblastfmfpbridge/gst-lastfmfpbridge.cpp	1970-01-01 00:00:00 +0000
@@ -1,367 +0,0 @@
-/*
- * last.fm Fingerprint - Accoustic fingerprint lib to get puid of song
- * inspired from mirage : http://hop.at/mirage
- * 
- * Copyright (C) 2010 Olivier Dufour <olivier(dot)duff(at)gmail(dot)com
- * Modified version of Dominik Schnitzer <[e-mail]>
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301, USA.
- */
-
-#include <time.h>
-
-#include <glib.h>
-#include <gst/gst.h>
-#include <gst/audio/audio.h>
-
-#include <stdlib.h>
-
-#include "gst-lastfmfpbridge.h"
-
-#include "FingerprintExtractor.h"
-
-struct LastfmfpAudio {
-
-    // Cancel decoding mutex
-    GMutex *decoding_mutex;
-
-    // Gstreamer
-    GstElement *pipeline;
-    GstElement *audio;
-
-    gint filerate;
-    gint seconds;
-    gint nchannels;
-    
-    fingerprint::FingerprintExtractor *extractor;
-
-    //input
-    short *data_in;
-    size_t num_samples;
-
-    //output
-    const char* data_out;
-    size_t data_out_size;
-    
-    int fpid;
-
-    gboolean quit;
-    gboolean invalidate;
-};
-
-static void
-Lastfmfp_cb_newpad(GstElement *decodebin, GstPad *pad, LastfmfpAudio *ma)
-{
-    GstCaps *caps;
-    GstStructure *str;
-    GstPad *audiopad;
-
-    // only link once
-    audiopad = gst_element_get_static_pad(ma->audio, "sink");
-    if (GST_PAD_IS_LINKED(audiopad)) {
-        g_object_unref(audiopad);
-        return;
-    }
-
-    // check media type
-    caps = gst_pad_get_current_caps(pad);
-    str = gst_caps_get_structure(caps, 0);
-
-    if (!g_strrstr(gst_structure_get_name(str), "audio")) {
-        gst_caps_unref(caps);
-        gst_object_unref(audiopad);
-        return;
-    }
-    gst_caps_unref(caps);
-
-    // link
-    gst_pad_link(pad, audiopad);
-    gst_object_unref(audiopad);
-}
-
-static void FingerprintFound(LastfmfpAudio *ma)
-{
-	//we have the fingerprint
-    
-    std::pair<const char*, size_t> fpData =  ma->extractor->getFingerprint();
-    ma->data_out = fpData.first;
-    ma->data_out_size = fpData.second;
-}
-
-extern "C" unsigned int
-Lastfmfp_getVersion (LastfmfpAudio *ma)
-{
-	return ma->extractor->getVersion (); 
-}
-
-static void
-Lastfmfp_cb_have_data(GstElement *element, GstBuffer *buffer, GstPad *pad, LastfmfpAudio *ma)
-{
-    GstMapInfo map;
-
-    // if data continues to flow/EOS is not yet processed
-    if (ma->quit)
-        return;
-
-    // exit on empty buffer
-    if (gst_buffer_get_size(buffer) <= 0)
-        return;
-
-    if (!gst_buffer_map (buffer, &map, GST_MAP_READ))
-        return;
-
-    ma->data_in = (short*)map.data;
-    //ma->num_samples = (size_t)(GST_BUFFER_OFFSET_END (buffer) - GST_BUFFER_OFFSET (buffer));
-    ma->num_samples = (size_t)(map.size / sizeof(guint16));
-    
-	//printf("caps: %s\n", gst_caps_to_string(GST_BUFFER_CAPS(buffer)));
-	//printf(" offset : %llu size: %llu \n", (unsigned long long)GST_BUFFER_OFFSET (buffer), (unsigned long long)GST_BUFFER_OFFSET_END (buffer));
-	//GST_LOG ("caps are %" GST_PTR_FORMAT, GST_BUFFER_CAPS(buffer));
-    //extractor.process(const short* pPCM, size_t num_samples, bool end_of_stream = false);
-    //printf("data: %d %d %d %d %d %d %d %d %d %d %d %d \n", ma->data_in[0], ma->data_in[1], ma->data_in[2], ma->data_in[3], ma->data_in[4], ma->data_in[5], ma->data_in[6], ma->data_in[7], ma->data_in[8], ma->data_in[9], ma->data_in[10], ma->data_in[11]);
-    if (ma->extractor->process(ma->data_in, ma->num_samples, false))//TODO check parametters
-    {
-        //stop the gstreamer loop to free all and return fpid
-        GstBus *bus = gst_pipeline_get_bus(GST_PIPELINE(ma->pipeline));
-        GstMessage* eosmsg = gst_message_new_eos(GST_OBJECT(ma->pipeline));
-        gst_bus_post(bus, eosmsg);
-        g_print("libLastfmfp: EOS Message sent\n");
-        gst_object_unref(bus);
-        ma->quit = TRUE;
-    }
-
-    gst_buffer_unmap (buffer, &map);    
-    
-    return;
-}
-
-extern "C"  LastfmfpAudio*
-Lastfmfp_initialize(gint seconds)
-{
-    LastfmfpAudio *ma;
-    
-    ma = g_new0(LastfmfpAudio, 1);
-    ma->seconds = seconds;
-	
-    // cancel decoding mutex
-    ma->decoding_mutex = g_mutex_new();
-
-    return ma;
-}
-
-void
-Lastfmfp_initgstreamer(LastfmfpAudio *ma, const gchar *file)
-{
-    GstPad *audiopad;
-    GstCaps *filter_short;
-    GstElement *cfilt_short;
-    GstElement *dec;
-    GstElement *src;
-    GstElement *sink;
-    GstElement *audioconvert;
-
-    // Gstreamer decoder setup
-    ma->pipeline = gst_pipeline_new("pipeline");
-    
-    // decoder
-    src = gst_element_factory_make("filesrc", "source");
-    g_object_set(G_OBJECT(src), "location", file, NULL);
-    dec = gst_element_factory_make("decodebin", "decoder");
-    g_signal_connect(dec, "pad-added", G_CALLBACK(Lastfmfp_cb_newpad), ma);
-    gst_bin_add_many(GST_BIN(ma->pipeline), src, dec, NULL);
-    gst_element_link(src, dec);
-
-    // audio conversion
-    ma->audio = gst_bin_new("audio");
-
-    audioconvert = gst_element_factory_make("audioconvert", "conv");
-    filter_short = gst_caps_new_simple("audio/x-raw",
-         "format", G_TYPE_STRING, GST_AUDIO_NE(S16),
-         NULL);
-    cfilt_short = gst_element_factory_make("capsfilter", "cfilt_short");
-    g_object_set(G_OBJECT(cfilt_short), "caps", filter_short, NULL);
-    gst_caps_unref(filter_short);
-
-    sink = gst_element_factory_make("fakesink", "sink");
-    g_object_set(G_OBJECT(sink), "signal-handoffs", TRUE, NULL);
-    g_signal_connect(sink, "handoff", G_CALLBACK(Lastfmfp_cb_have_data), ma);
-    
-
-    gst_bin_add_many(GST_BIN(ma->audio),
-            audioconvert, cfilt_short,
-            sink, NULL);
-    gst_element_link_many(audioconvert, cfilt_short,
-           sink, NULL);
-
-    audiopad = gst_element_get_static_pad(audioconvert, "sink");
-    gst_element_add_pad(ma->audio,
-            gst_ghost_pad_new("sink", audiopad));
-    gst_object_unref(audiopad);
-
-    gst_bin_add(GST_BIN(ma->pipeline), ma->audio);
-
-    // Get sampling rate of audio file
-    GstClockTime max_wait = 1 * GST_SECOND;
-    if (gst_element_set_state(ma->pipeline, GST_STATE_READY) == GST_STATE_CHANGE_ASYNC) {
-        gst_element_get_state(ma->pipeline, NULL, NULL, max_wait);
-    }
-    if (gst_element_set_state(ma->pipeline, GST_STATE_PAUSED) == GST_STATE_CHANGE_ASYNC) {
-        gst_element_get_state(ma->pipeline, NULL, NULL, max_wait);
-    }
-
-    GstPad *pad = gst_element_get_static_pad(sink, "sink");
-    GstCaps *caps = gst_pad_get_current_caps(pad);
-    if (GST_IS_CAPS(caps)) {
-        GstStructure *str = gst_caps_get_structure(caps, 0);
-        gst_structure_get_int(str, "rate", &ma->filerate);
-        gst_structure_get_int(str, "channels", &ma->nchannels);
-    } else {
-        ma->filerate = -1;
-    }
-    gst_caps_unref(caps);
-    gst_object_unref(pad);
-}
-
-extern "C" const char*
-Lastfmfp_decode(LastfmfpAudio *ma, const gchar *file, int* size, int* ret)
-{
-    GstBus *bus;
-
-    ma->quit = FALSE;
-
-    g_mutex_lock(ma->decoding_mutex);
-    ma->invalidate = FALSE;
-    g_mutex_unlock(ma->decoding_mutex);
-
-    // Gstreamer setup
-    Lastfmfp_initgstreamer(ma, file);
-    //lastfm setup
-    ma->extractor = new fingerprint::FingerprintExtractor();
-    ma->extractor->initForQuery(ma->filerate, ma->nchannels, ma->seconds);
-    
-    if (ma->filerate < 0) {
-        *size = 0;
-        *ret = -1;
-
-        // Gstreamer cleanup
-        gst_element_set_state(ma->pipeline, GST_STATE_NULL);
-        gst_object_unref(GST_OBJECT(ma->pipeline));
-
-        return NULL;
-    }
-
-    // decode...
-    gst_element_set_state(ma->pipeline, GST_STATE_PLAYING);
-    g_print("libLastfmfp: decoding %s\n", file);
-
-
-    bus = gst_pipeline_get_bus(GST_PIPELINE(ma->pipeline));
-    gboolean decoding = TRUE;
-    *ret = 0;
-    while (decoding) {
-        GstMessage* message = gst_bus_timed_pop_filtered(bus, GST_MSECOND*100,
-               (GstMessageType) (GST_MESSAGE_ERROR | GST_MESSAGE_EOS));
-
-        if (message == NULL)
-            continue;
-
-        switch (GST_MESSAGE_TYPE(message)) {
-            case GST_MESSAGE_ERROR: {
-                GError *err;
-                gchar *debug;
-
-                gst_message_parse_error(message, &err, &debug);
-                g_print("libLastfmfp: error: %s\n", err->message);
-                g_error_free(err);
-                g_free(debug);
-                decoding = FALSE;
-                *ret = -1;
-
-                break;
-            }
-            case GST_MESSAGE_EOS: {
-	            //ma->extractor->process(0, static_cast<size_t>(0), true);
-            	FingerprintFound(ma);
-                g_print("libLastfmfp: EOS Message received\n");
-                decoding = FALSE;
-                break;
-            }
-            default:
-                break;
-        }
-        gst_message_unref(message);
-    }
-    gst_object_unref(bus);
-
-
-    g_mutex_lock(ma->decoding_mutex);
-
-    // Gstreamer cleanup
-    gst_element_set_state(ma->pipeline, GST_STATE_NULL);
-    gst_object_unref(GST_OBJECT(ma->pipeline));
-
-    if (ma->invalidate) {
-        //*size = 0;
-        *ret = -2;
-    } else {
-        //*size = ma->nchannels/2 + 1;
-    }
-
-	*size = ma->data_out_size;
-	
-    g_mutex_unlock(ma->decoding_mutex);
-
-    return ma->data_out;
-}
-
-extern "C" LastfmfpAudio*
-Lastfmfp_destroy(LastfmfpAudio *ma)
-{
-    g_print("libLastfmfp: destroy.\n");
-
-    g_mutex_free(ma->decoding_mutex);
-
-    // common
-    free(ma);
-
-    return NULL;
-}
-
-extern "C" void
-Lastfmfp_canceldecode(LastfmfpAudio *ma)
-{
-    if (GST_IS_ELEMENT(ma->pipeline)) {
-
-        GstState state;
-        gst_element_get_state(ma->pipeline, &state, NULL, 100*GST_MSECOND);
-
-        if (state != GST_STATE_NULL) {
-            g_mutex_lock(ma->decoding_mutex);
-
-            GstBus *bus = gst_pipeline_get_bus(GST_PIPELINE(ma->pipeline));
-            GstMessage* eosmsg = gst_message_new_eos(GST_OBJECT(ma->pipeline));
-            gst_bus_post(bus, eosmsg);
-            g_print("libLastfmfp: EOS Message sent\n");
-            gst_object_unref(bus);
-
-            ma->invalidate = TRUE;
-
-            g_mutex_unlock(ma->decoding_mutex);
-        }
-    }
-}
-
-

=== removed directory '.pc/Mirage-Clean-up-caps-handling-and-make-sure-to-wait-.patch'
=== removed directory '.pc/Mirage-Clean-up-caps-handling-and-make-sure-to-wait-.patch/src'
=== removed directory '.pc/Mirage-Clean-up-caps-handling-and-make-sure-to-wait-.patch/src/Mirage'
=== removed directory '.pc/Mirage-Clean-up-caps-handling-and-make-sure-to-wait-.patch/src/Mirage/libmirageaudio'
=== removed file '.pc/Mirage-Clean-up-caps-handling-and-make-sure-to-wait-.patch/src/Mirage/libmirageaudio/gst-mirageaudio.c'
--- .pc/Mirage-Clean-up-caps-handling-and-make-sure-to-wait-.patch/src/Mirage/libmirageaudio/gst-mirageaudio.c	2013-06-03 23:00:22 +0000
+++ .pc/Mirage-Clean-up-caps-handling-and-make-sure-to-wait-.patch/src/Mirage/libmirageaudio/gst-mirageaudio.c	1970-01-01 00:00:00 +0000
@@ -1,513 +0,0 @@
-/*
- * Mirage - High Performance Music Similarity and Automatic Playlist Generator
- * http://hop.at/mirage
- * 
- * Copyright (C) 2007 Dominik Schnitzer <[e-mail]>
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301, USA.
- */
-
-#include <math.h>
-#include <string.h>
-#include <time.h>
-#include <stdlib.h>
-
-#include <glib.h>
-#include <fftw3.h>
-#include <gst/gst.h>
-#include <gst/audio/audio.h>
-#include <samplerate.h>
-
-#include "gst-mirageaudio.h"
-
-struct MirageAudio {
-
-    // Cancel decoding mutex
-    GMutex *decoding_mutex;
-
-    // Gstreamer
-    GstElement *pipeline;
-    GstElement *audio;
-
-    gint rate;
-    gint filerate;
-    gint seconds;
-    gint winsize;
-    gint samples;
-
-    // FFTW
-    float *fftw;
-    fftwf_plan fftwplan;
-    gint fftwsamples;
-    gint fftwsize;
-
-    // libsamplerate
-    SRC_STATE *src_state;
-    SRC_DATA src_data;
-
-    // Hann window
-    float *window;
-
-    // Output buffer
-    float *out;
-    gint hops;
-    gint curhop;
-    gint cursample;
-
-    gboolean quit;
-    gboolean invalidate;
-};
-
-#define SRC_BUFFERLENGTH 4096
-
-clock_t start;
-clock_t end;
-
-
-void tic()
-{
-    start = clock();
-}
-
-void toc()
-{
-    double ms;
-    end = clock();
-    ms = ((end - start)/(double)(CLOCKS_PER_SEC))*1000.0;
-    g_print("libmirageaudio: time = %f\n", ms);
-}
-
-static void
-mirageaudio_cb_newpad(GstElement *decodebin, GstPad *pad, MirageAudio *ma)
-{
-    GstCaps *caps;
-    GstStructure *str;
-    GstPad *audiopad;
-
-    // only link once
-    audiopad = gst_element_get_static_pad(ma->audio, "sink");
-    if (GST_PAD_IS_LINKED(audiopad)) {
-        g_object_unref(audiopad);
-        return;
-    }
-
-    // check media type
-    caps = gst_pad_get_current_caps(pad);
-    str = gst_caps_get_structure(caps, 0);
-
-    if (!g_strrstr(gst_structure_get_name(str), "audio")) {
-        gst_caps_unref(caps);
-        gst_object_unref(audiopad);
-        return;
-    }
-    gst_caps_unref(caps);
-
-    // link
-    gst_pad_link(pad, audiopad);
-    gst_object_unref(audiopad);
-}
-
-static void
-mirageaudio_cb_have_data(GstElement *element, GstBuffer *buffer, GstPad *pad, MirageAudio *ma)
-{
-    gint buffersamples;
-    gint bufferpos;
-    gint i;
-    gint j;
-    gint fill;
-    GstMapInfo map;
-
-    // if data continues to flow/EOS is not yet processed
-    if (ma->quit)
-        return;
-
-    // exit on empty buffer
-    if (gst_buffer_get_size (buffer) <= 0)
-        return;
-    if (!gst_buffer_map (buffer, &map, GST_MAP_READ))
-      return;
-
-    ma->src_data.data_in = (float*)map.data;
-    ma->src_data.input_frames = map.size/sizeof(float);
-
-    do {
-        // set end of input flag if necessary
-        ma->cursample += ma->src_data.input_frames;
-        if (ma->cursample >= ma->seconds * ma->filerate) {
-            ma->src_data.end_of_input = 1;
-        }
-
-        // resampling
-        int err = src_process(ma->src_state, &ma->src_data);
-
-        if (err != 0) {
-            g_print("libmirageaudio: SRC Error - %s\n", src_strerror(err));
-        }
-        // return if no output
-        if (ma->src_data.output_frames_gen == 0) {
-            gst_buffer_unmap (buffer, &map);
-            return;
-        }
-
-        buffersamples = ma->src_data.output_frames_gen;
-        bufferpos = 0;
-
-        // FFTW
-        // If buffer does not get filled 
-        if (ma->fftwsamples + buffersamples < ma->winsize) {
-            memcpy(ma->fftw+ma->fftwsamples, ma->src_data.data_out, buffersamples*sizeof(float));
-            ma->fftwsamples += buffersamples;
-
-        // If buffer gets filled.
-        } else {
-            do {
-                // prepare FFTW 
-                fill = ma->winsize - ma->fftwsamples;
-
-                if (fill <= 0)
-                    g_print("libmirageaudio: Logic ERROR! fill <= 0\n");
-
-                memcpy(ma->fftw+ma->fftwsamples, ma->src_data.data_out+bufferpos, fill*sizeof(float));
-                memset(ma->fftw+ma->winsize, 0, ma->winsize*sizeof(float));
-                for (i = 0; i < ma->winsize; i++) {
-                    ma->fftw[i] = ma->fftw[i] * ma->window[i] * 32768.0f;
-                }
-
-                // Execute FFTW
-                fftwf_execute(ma->fftwplan);
-
-                // Powerspectrum
-                ma->out[ma->curhop] = powf(ma->fftw[0], 2);
-                for (j = 1; j < ma->winsize/2; j++) {
-                    ma->out[j*ma->hops + ma->curhop] = powf(ma->fftw[j*2], 2) + powf(ma->fftw[ma->fftwsize-j*2], 2);
-                }
-                ma->out[(ma->winsize/2)*ma->hops + ma->curhop] = powf(ma->fftw[ma->winsize], 2);
-
-                ma->fftwsamples = 0;
-                buffersamples -= fill;
-                bufferpos += fill;
-
-                ma->curhop++;
-
-                if (ma->curhop == ma->hops) {
-                    GstBus *bus = gst_pipeline_get_bus(GST_PIPELINE(ma->pipeline));
-                    GstMessage* eosmsg = gst_message_new_eos(GST_OBJECT(ma->pipeline));
-                    gst_bus_post(bus, eosmsg);
-                    g_print("libmirageaudio: EOS Message sent\n");
-                    gst_object_unref(bus);
-                    ma->quit = TRUE;
-                    gst_buffer_unmap (buffer, &map);
-                    return;
-                }
-
-            } while (buffersamples >= ma->winsize);
-
-            if (buffersamples > 0) {
-                memcpy(ma->fftw, ma->src_data.data_out+bufferpos, buffersamples*sizeof(float));
-                ma->fftwsamples = buffersamples;
-            }
-        }
-
-        ma->src_data.data_in += ma->src_data.input_frames_used;
-        ma->src_data.input_frames -= ma->src_data.input_frames_used;
-
-    } while (ma->src_data.input_frames > 0);
-
-    gst_buffer_unmap (buffer, &map);
-
-    return;
-}
-
-MirageAudio*
-mirageaudio_initialize(gint rate, gint seconds, gint winsize)
-{
-    MirageAudio *ma;
-    gint i;
-
-    ma = g_new0(MirageAudio, 1);
-    ma->rate = rate;
-    ma->seconds = seconds;
-    ma->hops = rate*seconds/winsize;
-    ma->out = malloc(ma->hops*((winsize/2)+1)*sizeof(float));
-
-    // FFTW
-    ma->winsize = winsize;
-    ma->fftwsize = 2 * ma->winsize;
-    ma->fftw = (float*)fftwf_malloc(ma->fftwsize * sizeof(float));
-    ma->fftwplan = fftwf_plan_r2r_1d((2*ma->winsize), ma->fftw, ma->fftw, FFTW_R2HC,
-                    FFTW_ESTIMATE | FFTW_DESTROY_INPUT);
-
-    // Hann Window
-    ma->window = malloc(ma->winsize*sizeof(float));
-    for (i = 0; i < ma->winsize; i++) {
-            ma->window[i] = (float)(0.5 * (1.0 - cos((2.0*M_PI *(double)i)/(double)(ma->winsize-1))));
-    }
-
-    // Samplingrate converter
-    int error;
-    ma->src_state = src_new(SRC_ZERO_ORDER_HOLD, 1, &error);
-    ma->src_data.data_out = malloc(SRC_BUFFERLENGTH*sizeof(float));
-    ma->src_data.output_frames = SRC_BUFFERLENGTH;
-
-    // cancel decoding mutex
-    ma->decoding_mutex = g_mutex_new();
-
-    return ma;
-}
-
-void
-mirageaudio_initgstreamer(MirageAudio *ma, const gchar *file)
-{
-    GstPad *audiopad;
-    GstCaps *filter_float;
-    GstCaps *filter_resample;
-    GstElement *cfilt_float;
-    GstElement *cfilt_resample;
-    GstElement *dec;
-    GstElement *src;
-    GstElement *sink;
-    GstElement *audioresample;
-    GstElement *audioconvert;
-
-    // Gstreamer decoder setup
-    ma->pipeline = gst_pipeline_new("pipeline");
-
-    // decoder
-    src = gst_element_factory_make("filesrc", "source");
-    g_object_set(G_OBJECT(src), "location", file, NULL);
-    dec = gst_element_factory_make("decodebin", "decoder");
-    g_signal_connect(dec, "pad-added", G_CALLBACK(mirageaudio_cb_newpad), ma);
-    gst_bin_add_many(GST_BIN(ma->pipeline), src, dec, NULL);
-    gst_element_link(src, dec);
-
-    // audio conversion
-    ma->audio = gst_bin_new("audio");
-
-    audioconvert = gst_element_factory_make("audioconvert", "conv");
-    filter_float = gst_caps_new_simple("audio/x-raw",
-         "format", G_TYPE_STRING, GST_AUDIO_NE(F32),
-         NULL);
-    cfilt_float = gst_element_factory_make("capsfilter", "cfilt_float");
-    g_object_set(G_OBJECT(cfilt_float), "caps", filter_float, NULL);
-    gst_caps_unref(filter_float);
-
-    audioresample = gst_element_factory_make("audioresample", "resample");
-
-    filter_resample =  gst_caps_new_simple("audio/x-raw",
-          "format", G_TYPE_STRING, GST_AUDIO_NE(F32),
-          "channels", G_TYPE_INT, 1,
-          NULL);
-    cfilt_resample = gst_element_factory_make("capsfilter", "cfilt_resample");
-    g_object_set(G_OBJECT(cfilt_resample), "caps", filter_resample, NULL);
-    gst_caps_unref(filter_resample);
-
-    sink = gst_element_factory_make("fakesink", "sink");
-    g_object_set(G_OBJECT(sink), "signal-handoffs", TRUE, NULL);
-    g_signal_connect(sink, "handoff", G_CALLBACK(mirageaudio_cb_have_data), ma);
-    
-
-    gst_bin_add_many(GST_BIN(ma->audio),
-            audioconvert, audioresample,
-            cfilt_resample, cfilt_float,
-            sink, NULL);
-    gst_element_link_many(audioconvert, cfilt_float,
-           audioresample, cfilt_resample,
-           sink, NULL);
-
-    audiopad = gst_element_get_static_pad(audioconvert, "sink");
-    gst_element_add_pad(ma->audio,
-            gst_ghost_pad_new("sink", audiopad));
-    gst_object_unref(audiopad);
-
-    gst_bin_add(GST_BIN(ma->pipeline), ma->audio);
-
-    // Get sampling rate of audio file
-    GstClockTime max_wait = 1 * GST_SECOND;
-    if (gst_element_set_state(ma->pipeline, GST_STATE_READY) == GST_STATE_CHANGE_ASYNC) {
-        gst_element_get_state(ma->pipeline, NULL, NULL, max_wait);
-    }
-    if (gst_element_set_state(ma->pipeline, GST_STATE_PAUSED) == GST_STATE_CHANGE_ASYNC) {
-        gst_element_get_state(ma->pipeline, NULL, NULL, max_wait);
-    }
-
-    GstPad *pad = gst_element_get_static_pad(sink, "sink");
-    GstCaps *caps = gst_pad_get_current_caps(pad);
-    if (GST_IS_CAPS(caps)) {
-        GstStructure *str = gst_caps_get_structure(caps, 0);
-        gst_structure_get_int(str, "rate", &ma->filerate);
-
-    } else {
-        ma->filerate = -1;
-    }
-    gst_caps_unref(caps);
-    gst_object_unref(pad);
-}
-
-float*
-mirageaudio_decode(MirageAudio *ma, const gchar *file, int *frames, int* size, int* ret)
-{
-    GstBus *bus;
-    tic();
-
-    ma->fftwsamples = 0;
-    ma->curhop = 0;
-    ma->cursample = 0;
-    ma->quit = FALSE;
-
-    g_mutex_lock(ma->decoding_mutex);
-    ma->invalidate = FALSE;
-    g_mutex_unlock(ma->decoding_mutex);
-
-    // Gstreamer setup
-    mirageaudio_initgstreamer(ma, file);
-    if (ma->filerate < 0) {
-        *size = 0;
-        *frames = 0;
-        *ret = -1;
-
-        // Gstreamer cleanup
-        gst_element_set_state(ma->pipeline, GST_STATE_NULL);
-        gst_object_unref(GST_OBJECT(ma->pipeline));
-
-        return NULL;
-    }
-
-    // libsamplerate initialization
-    ma->src_data.src_ratio = (double)ma->rate/(double)ma->filerate;
-    ma->src_data.input_frames = 0;
-    ma->src_data.end_of_input = 0;
-    src_reset(ma->src_state);
-    g_print("libmirageaudio: rate=%d, resampling=%f\n", ma->filerate, ma->src_data.src_ratio);
-
-    // decode...
-    gst_element_set_state(ma->pipeline, GST_STATE_PLAYING);
-    g_print("libmirageaudio: decoding %s\n", file);
-
-
-    bus = gst_pipeline_get_bus(GST_PIPELINE(ma->pipeline));
-    gboolean decoding = TRUE;
-    *ret = 0;
-    while (decoding) {
-        GstMessage* message = gst_bus_timed_pop_filtered(bus, GST_MSECOND*100,
-                GST_MESSAGE_ERROR | GST_MESSAGE_EOS);
-
-        if (message == NULL)
-            continue;
-
-        switch (GST_MESSAGE_TYPE(message)) {
-            case GST_MESSAGE_ERROR: {
-                GError *err;
-                gchar *debug;
-
-                gst_message_parse_error(message, &err, &debug);
-                g_print("libmirageaudio: error: %s\n", err->message);
-                g_error_free(err);
-                g_free(debug);
-                ma->curhop = 0;
-                decoding = FALSE;
-                *ret = -1;
-
-                break;
-            }
-            case GST_MESSAGE_EOS: {
-                g_print("libmirageaudio: EOS Message received\n");
-                decoding = FALSE;
-                break;
-            }
-            default:
-                break;
-        }
-        gst_message_unref(message);
-    }
-    gst_object_unref(bus);
-
-
-    g_mutex_lock(ma->decoding_mutex);
-
-    // Gstreamer cleanup
-    gst_element_set_state(ma->pipeline, GST_STATE_NULL);
-    gst_object_unref(GST_OBJECT(ma->pipeline));
-
-    toc();
-
-    if (ma->invalidate) {
-        *size = 0;
-        *frames = 0;
-        *ret = -2;
-    } else {
-        *size = ma->winsize/2 + 1;
-        *frames = ma->curhop;
-    }
-
-    g_mutex_unlock(ma->decoding_mutex);
-
-    g_print("libmirageaudio: frames=%d (maxhops=%d), size=%d\n", *frames, ma->hops, *size);
-    return ma->out;
-}
-
-MirageAudio*
-mirageaudio_destroy(MirageAudio *ma)
-{
-    g_print("libmirageaudio: destroy.\n");
-    // FFTW cleanup
-    fftwf_destroy_plan(ma->fftwplan);
-    fftwf_free(ma->fftw);
-
-    // Hann window clanup
-    free(ma->window);
-
-    // libsamplerate
-    free(ma->src_data.data_out);
-    src_delete(ma->src_state);
-    
-    g_mutex_free(ma->decoding_mutex);
-
-    // common
-    free(ma->out);
-    free(ma);
-
-    return NULL;
-}
-
-void
-mirageaudio_initgst()
-{
-    gst_init(NULL, NULL);
-}
-
-void
-mirageaudio_canceldecode(MirageAudio *ma)
-{
-    if (GST_IS_ELEMENT(ma->pipeline)) {
-
-        GstState state;
-        gst_element_get_state(ma->pipeline, &state, NULL, 100*GST_MSECOND);
-
-        if (state != GST_STATE_NULL) {
-            g_mutex_lock(ma->decoding_mutex);
-
-            GstBus *bus = gst_pipeline_get_bus(GST_PIPELINE(ma->pipeline));
-            GstMessage* eosmsg = gst_message_new_eos(GST_OBJECT(ma->pipeline));
-            gst_bus_post(bus, eosmsg);
-            g_print("libmirageaudio: EOS Message sent\n");
-            gst_object_unref(bus);
-
-            ma->invalidate = TRUE;
-
-            g_mutex_unlock(ma->decoding_mutex);
-        }
-    }
-}

=== removed directory '.pc/Port-LastfmFingerprint-plugin-to-GStreamer-1.0.patch'
=== removed directory '.pc/Port-LastfmFingerprint-plugin-to-GStreamer-1.0.patch/build'
=== removed directory '.pc/Port-LastfmFingerprint-plugin-to-GStreamer-1.0.patch/build/m4'
=== removed directory '.pc/Port-LastfmFingerprint-plugin-to-GStreamer-1.0.patch/build/m4/extensions'
=== removed file '.pc/Port-LastfmFingerprint-plugin-to-GStreamer-1.0.patch/build/m4/extensions/lastfmfingerprint.m4'
--- .pc/Port-LastfmFingerprint-plugin-to-GStreamer-1.0.patch/build/m4/extensions/lastfmfingerprint.m4	2013-06-03 23:00:22 +0000
+++ .pc/Port-LastfmFingerprint-plugin-to-GStreamer-1.0.patch/build/m4/extensions/lastfmfingerprint.m4	1970-01-01 00:00:00 +0000
@@ -1,44 +0,0 @@
-AC_DEFUN([BCE_LASTFMFINGERPRINT],
-[
-	AC_REQUIRE([AC_PROG_CXX])
-	BCE_ARG_DISABLE([LastfmFingerprint], [try])
-
-	BCE_CHECK_EXTENSION_DEP([LastfmFingerprint], [GLIB],
-		[glib-2.0],
-		[The glib library was not found. Please install it or disable the LastfmFingerprint extension by passing --disable-lastfmfingerprint])
-
-	BCE_CHECK_EXTENSION_DEP([LastfmFingerprint], [FFTW3F],
-		[fftw3f],
-		[The fftw3f library was not found. Please install it or disable the LastfmFingerprint extension by passing --disable-lastfmfingerprint])
-
-	BCE_CHECK_EXTENSION_DEP([LastfmFingerprint], [LIBSAMPLERATE],
-		[samplerate],
-		[The samplerate library was not found. Please install it or disable the LastfmFingerprint extension by passing --disable-lastfmfingerprint])
-
-	BCE_CHECK_EXTENSION_DEP([LastfmFingerprint], [BANSHEE_LASTFM],
-		[banshee-lastfm],
-		[banshee-lastfm was not found. Please install it or disable the LastfmFingerprint extension by passing --disable-lastfmfingerprint])
-
-	GSTREAMER_REQUIRED_VERSION=0.10.15
-	BCE_CHECK_EXTENSION_DEP([LastfmFingerprint], [GSTREAMER],
-		[gstreamer-0.10 >= $GSTREAMER_REQUIRED_VERSION
-		 gstreamer-base-0.10 >= $GSTREAMER_REQUIRED_VERSION
-		 gstreamer-plugins-base-0.10 >= $GSTREAMER_REQUIRED_VERSION],
-		[GStreamer >= $GSTREAMER_REQUIRED_VERSION not found. Please install it or disable the LastfmFingerprint extension by passing --disable-lastfmfingerprint])
-
-	if test "x$enable_LastfmFingerprint" = "xtry" \
-		&& test "x$have_GLIB" = "xyes" \
-		&& test "x$have_FFTW3F" = "xyes" \
-		&& test "x$have_LIBSAMPLERATE" = "xyes" \
-		&& test "x$have_BANSHEE_LASTFM" = "xyes" \
-		&& test "x$have_GSTREAMER" = "xyes"; then
-		enable_LastfmFingerprint=yes
-	fi
-
-	if test "x$enable_LastfmFingerprint" = "xyes"; then
-		AM_CONDITIONAL(ENABLE_LASTFMFINGERPRINT, true)
-	else
-		enable_LastfmFingerprint=no
-		AM_CONDITIONAL(ENABLE_LASTFMFINGERPRINT, false)
-	fi
-])

=== removed directory '.pc/Port-LastfmFingerprint-plugin-to-GStreamer-1.0.patch/src'
=== removed directory '.pc/Port-LastfmFingerprint-plugin-to-GStreamer-1.0.patch/src/LastfmFingerprint'
=== removed directory '.pc/Port-LastfmFingerprint-plugin-to-GStreamer-1.0.patch/src/LastfmFingerprint/liblastfmfpbridge'
=== removed file '.pc/Port-LastfmFingerprint-plugin-to-GStreamer-1.0.patch/src/LastfmFingerprint/liblastfmfpbridge/gst-lastfmfpbridge.cpp'
--- .pc/Port-LastfmFingerprint-plugin-to-GStreamer-1.0.patch/src/LastfmFingerprint/liblastfmfpbridge/gst-lastfmfpbridge.cpp	2013-06-03 23:00:22 +0000
+++ .pc/Port-LastfmFingerprint-plugin-to-GStreamer-1.0.patch/src/LastfmFingerprint/liblastfmfpbridge/gst-lastfmfpbridge.cpp	1970-01-01 00:00:00 +0000
@@ -1,363 +0,0 @@
-/*
- * last.fm Fingerprint - Accoustic fingerprint lib to get puid of song
- * inspired from mirage : http://hop.at/mirage
- * 
- * Copyright (C) 2010 Olivier Dufour <olivier(dot)duff(at)gmail(dot)com
- * Modified version of Dominik Schnitzer <[e-mail]>
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301, USA.
- */
-
-#include <time.h>
-
-#include <glib.h>
-#include <gst/gst.h>
-
-#include "gst-lastfmfpbridge.h"
-
-#include "FingerprintExtractor.h"
-
-struct LastfmfpAudio {
-
-    // Cancel decoding mutex
-    GMutex *decoding_mutex;
-
-    // Gstreamer
-    GstElement *pipeline;
-    GstElement *audio;
-
-    gint filerate;
-    gint seconds;
-    gint nchannels;
-    
-    fingerprint::FingerprintExtractor *extractor;
-
-    //input
-    short *data_in;
-    size_t num_samples;
-
-    //output
-    const char* data_out;
-    size_t data_out_size;
-    
-    int fpid;
-
-    gboolean quit;
-    gboolean invalidate;
-};
-
-static void
-Lastfmfp_cb_newpad(GstElement *decodebin, GstPad *pad, gboolean last, LastfmfpAudio *ma)
-{
-    GstCaps *caps;
-    GstStructure *str;
-    GstPad *audiopad;
-
-    // only link once
-    audiopad = gst_element_get_pad(ma->audio, "sink");
-    if (GST_PAD_IS_LINKED(audiopad)) {
-        g_object_unref(audiopad);
-        return;
-    }
-
-    // check media type
-    caps = gst_pad_get_caps(pad);
-    str = gst_caps_get_structure(caps, 0);
-
-    if (!g_strrstr(gst_structure_get_name(str), "audio")) {
-        gst_caps_unref(caps);
-        gst_object_unref(audiopad);
-        return;
-    }
-    gst_caps_unref(caps);
-
-    // link
-    gst_pad_link(pad, audiopad);
-    gst_object_unref(audiopad);
-}
-
-static void FingerprintFound(LastfmfpAudio *ma)
-{
-	//we have the fingerprint
-    
-    std::pair<const char*, size_t> fpData =  ma->extractor->getFingerprint();
-    ma->data_out = fpData.first;
-    ma->data_out_size = fpData.second;
-}
-
-extern "C" unsigned int
-Lastfmfp_getVersion (LastfmfpAudio *ma)
-{
-	return ma->extractor->getVersion (); 
-}
-
-static void
-Lastfmfp_cb_have_data(GstElement *element, GstBuffer *buffer, GstPad *pad, LastfmfpAudio *ma)
-{
-    // if data continues to flow/EOS is not yet processed
-    if (ma->quit)
-        return;
-
-    // exit on empty buffer
-    if (buffer->size <= 0)
-        return;
-
-    ma->data_in = (short*)GST_BUFFER_DATA(buffer);
-    //ma->num_samples = (size_t)(GST_BUFFER_OFFSET_END (buffer) - GST_BUFFER_OFFSET (buffer));
-    ma->num_samples = (size_t)(GST_BUFFER_SIZE (buffer) / sizeof(guint16));
-    
-	//printf("caps: %s\n", gst_caps_to_string(GST_BUFFER_CAPS(buffer)));
-	//printf(" offset : %llu size: %llu \n", (unsigned long long)GST_BUFFER_OFFSET (buffer), (unsigned long long)GST_BUFFER_OFFSET_END (buffer));
-	//GST_LOG ("caps are %" GST_PTR_FORMAT, GST_BUFFER_CAPS(buffer));
-    //extractor.process(const short* pPCM, size_t num_samples, bool end_of_stream = false);
-    //printf("data: %d %d %d %d %d %d %d %d %d %d %d %d \n", ma->data_in[0], ma->data_in[1], ma->data_in[2], ma->data_in[3], ma->data_in[4], ma->data_in[5], ma->data_in[6], ma->data_in[7], ma->data_in[8], ma->data_in[9], ma->data_in[10], ma->data_in[11]);
-    if (ma->extractor->process(ma->data_in, ma->num_samples, false))//TODO check parametters
-    {
-        //stop the gstreamer loop to free all and return fpid
-        GstBus *bus = gst_pipeline_get_bus(GST_PIPELINE(ma->pipeline));
-        GstMessage* eosmsg = gst_message_new_eos(GST_OBJECT(ma->pipeline));
-        gst_bus_post(bus, eosmsg);
-        g_print("libLastfmfp: EOS Message sent\n");
-        gst_object_unref(bus);
-        ma->quit = TRUE;
-        return;
-
-    }
-    
-    
-    return;
-}
-
-extern "C"  LastfmfpAudio*
-Lastfmfp_initialize(gint seconds)
-{
-    LastfmfpAudio *ma;
-    
-    ma = g_new0(LastfmfpAudio, 1);
-    ma->seconds = seconds;
-	
-    // cancel decoding mutex
-    ma->decoding_mutex = g_mutex_new();
-
-    return ma;
-}
-
-void
-Lastfmfp_initgstreamer(LastfmfpAudio *ma, const gchar *file)
-{
-    GstPad *audiopad;
-    GstCaps *filter_short;
-    GstElement *cfilt_short;
-    GstElement *dec;
-    GstElement *src;
-    GstElement *sink;
-    GstElement *audioconvert;
-
-    // Gstreamer decoder setup
-    ma->pipeline = gst_pipeline_new("pipeline");
-    
-    // decoder
-    src = gst_element_factory_make("filesrc", "source");
-    g_object_set(G_OBJECT(src), "location", file, NULL);
-    dec = gst_element_factory_make("decodebin", "decoder");
-    g_signal_connect(dec, "new-decoded-pad", G_CALLBACK(Lastfmfp_cb_newpad), ma);
-    gst_bin_add_many(GST_BIN(ma->pipeline), src, dec, NULL);
-    gst_element_link(src, dec);
-
-    // audio conversion
-    ma->audio = gst_bin_new("audio");
-
-    audioconvert = gst_element_factory_make("audioconvert", "conv");
-    filter_short = gst_caps_new_simple("audio/x-raw-int",
-         "width", G_TYPE_INT, 16, 
-         "depth", G_TYPE_INT, 16, 
-         "endianness", G_TYPE_INT, 1234,//BYTE_ORDER, //1234, 
-         "signed", G_TYPE_BOOLEAN, TRUE, 
-         NULL);
-    cfilt_short = gst_element_factory_make("capsfilter", "cfilt_short");
-    g_object_set(G_OBJECT(cfilt_short), "caps", filter_short, NULL);
-    gst_caps_unref(filter_short);
-
-    sink = gst_element_factory_make("fakesink", "sink");
-    g_object_set(G_OBJECT(sink), "signal-handoffs", TRUE, NULL);
-    g_signal_connect(sink, "handoff", G_CALLBACK(Lastfmfp_cb_have_data), ma);
-    
-
-    gst_bin_add_many(GST_BIN(ma->audio),
-            audioconvert, cfilt_short,
-            sink, NULL);
-    gst_element_link_many(audioconvert, cfilt_short,
-           sink, NULL);
-
-    audiopad = gst_element_get_pad(audioconvert, "sink");
-    gst_element_add_pad(ma->audio,
-            gst_ghost_pad_new("sink", audiopad));
-    gst_object_unref(audiopad);
-
-    gst_bin_add(GST_BIN(ma->pipeline), ma->audio);
-
-    // Get sampling rate of audio file
-    GstClockTime max_wait = 1 * GST_SECOND;
-    if (gst_element_set_state(ma->pipeline, GST_STATE_READY) == GST_STATE_CHANGE_ASYNC) {
-        gst_element_get_state(ma->pipeline, NULL, NULL, max_wait);
-    }
-    if (gst_element_set_state(ma->pipeline, GST_STATE_PAUSED) == GST_STATE_CHANGE_ASYNC) {
-        gst_element_get_state(ma->pipeline, NULL, NULL, max_wait);
-    }
-
-    GstPad *pad = gst_element_get_pad(sink, "sink");
-    GstCaps *caps = gst_pad_get_negotiated_caps(pad);
-    if (GST_IS_CAPS(caps)) {
-        GstStructure *str = gst_caps_get_structure(caps, 0);
-        gst_structure_get_int(str, "rate", &ma->filerate);
-        gst_structure_get_int(str, "channels", &ma->nchannels);
-    } else {
-        ma->filerate = -1;
-    }
-    gst_caps_unref(caps);
-    gst_object_unref(pad);
-}
-
-extern "C" const char*
-Lastfmfp_decode(LastfmfpAudio *ma, const gchar *file, int* size, int* ret)
-{
-    GstBus *bus;
-
-    ma->quit = FALSE;
-
-    g_mutex_lock(ma->decoding_mutex);
-    ma->invalidate = FALSE;
-    g_mutex_unlock(ma->decoding_mutex);
-
-    // Gstreamer setup
-    Lastfmfp_initgstreamer(ma, file);
-    //lastfm setup
-    ma->extractor = new fingerprint::FingerprintExtractor();
-    ma->extractor->initForQuery(ma->filerate, ma->nchannels, ma->seconds);
-    
-    if (ma->filerate < 0) {
-        *size = 0;
-        *ret = -1;
-
-        // Gstreamer cleanup
-        gst_element_set_state(ma->pipeline, GST_STATE_NULL);
-        gst_object_unref(GST_OBJECT(ma->pipeline));
-
-        return NULL;
-    }
-
-    // decode...
-    gst_element_set_state(ma->pipeline, GST_STATE_PLAYING);
-    g_print("libLastfmfp: decoding %s\n", file);
-
-
-    bus = gst_pipeline_get_bus(GST_PIPELINE(ma->pipeline));
-    gboolean decoding = TRUE;
-    *ret = 0;
-    while (decoding) {
-        GstMessage* message = gst_bus_timed_pop_filtered(bus, GST_MSECOND*100,
-               (GstMessageType) (GST_MESSAGE_ERROR | GST_MESSAGE_EOS));
-
-        if (message == NULL)
-            continue;
-
-        switch (GST_MESSAGE_TYPE(message)) {
-            case GST_MESSAGE_ERROR: {
-                GError *err;
-                gchar *debug;
-
-                gst_message_parse_error(message, &err, &debug);
-                g_print("libLastfmfp: error: %s\n", err->message);
-                g_error_free(err);
-                g_free(debug);
-                decoding = FALSE;
-                *ret = -1;
-
-                break;
-            }
-            case GST_MESSAGE_EOS: {
-	            //ma->extractor->process(0, static_cast<size_t>(0), true);
-            	FingerprintFound(ma);
-                g_print("libLastfmfp: EOS Message received\n");
-                decoding = FALSE;
-                break;
-            }
-            default:
-                break;
-        }
-        gst_message_unref(message);
-    }
-    gst_object_unref(bus);
-
-
-    g_mutex_lock(ma->decoding_mutex);
-
-    // Gstreamer cleanup
-    gst_element_set_state(ma->pipeline, GST_STATE_NULL);
-    gst_object_unref(GST_OBJECT(ma->pipeline));
-
-    if (ma->invalidate) {
-        //*size = 0;
-        *ret = -2;
-    } else {
-        //*size = ma->nchannels/2 + 1;
-    }
-
-	*size = ma->data_out_size;
-	
-    g_mutex_unlock(ma->decoding_mutex);
-
-    return ma->data_out;
-}
-
-extern "C" LastfmfpAudio*
-Lastfmfp_destroy(LastfmfpAudio *ma)
-{
-    g_print("libLastfmfp: destroy.\n");
-
-    g_mutex_free(ma->decoding_mutex);
-
-    // common
-    free(ma);
-
-    return NULL;
-}
-
-extern "C" void
-Lastfmfp_canceldecode(LastfmfpAudio *ma)
-{
-    if (GST_IS_ELEMENT(ma->pipeline)) {
-
-        GstState state;
-        gst_element_get_state(ma->pipeline, &state, NULL, 100*GST_MSECOND);
-
-        if (state != GST_STATE_NULL) {
-            g_mutex_lock(ma->decoding_mutex);
-
-            GstBus *bus = gst_pipeline_get_bus(GST_PIPELINE(ma->pipeline));
-            GstMessage* eosmsg = gst_message_new_eos(GST_OBJECT(ma->pipeline));
-            gst_bus_post(bus, eosmsg);
-            g_print("libLastfmfp: EOS Message sent\n");
-            gst_object_unref(bus);
-
-            ma->invalidate = TRUE;
-
-            g_mutex_unlock(ma->decoding_mutex);
-        }
-    }
-}
-
-

=== removed file '.pc/Port-LastfmFingerprint-plugin-to-GStreamer-1.0.patch/src/LastfmFingerprint/liblastfmfpbridge/lastfmfpbridgetest.cpp'
--- .pc/Port-LastfmFingerprint-plugin-to-GStreamer-1.0.patch/src/LastfmFingerprint/liblastfmfpbridge/lastfmfpbridgetest.cpp	2013-06-03 23:00:22 +0000
+++ .pc/Port-LastfmFingerprint-plugin-to-GStreamer-1.0.patch/src/LastfmFingerprint/liblastfmfpbridge/lastfmfpbridgetest.cpp	1970-01-01 00:00:00 +0000
@@ -1,47 +0,0 @@
-/*
- * Mirage - High Performance Music Similarity and Automatic Playlist Generator
- * http://hop.at/mirage
- * 
- * Copyright (C) 2007 Dominik Schnitzer <[e-mail]>
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301, USA.
- */
-
-#include <gst/gst.h>
-
-#include "gst-lastfmfpbridge.h"
-
-gint
-main (gint   argc,
-      gchar *argv[])
-{
-  // init GStreamer
-  gst_init (&argc, &argv);
-
-  int size = 0;
-  int ret = 0;
-
-  //TODO parse argv for param of initialize
-  LastfmfpAudio *ma = Lastfmfp_initialize(215);
-  
-  const char* fpid = Lastfmfp_decode(ma, argv[0], &size, &ret);
-
-  printf("return fpid: %s ret: %d ", fpid, ret);
-
-  ma = Lastfmfp_destroy(ma);
-
-  return 0;
-}

=== removed directory '.pc/Port-Mirage-plugin-to-GStreamer-1.0.patch'
=== removed file '.pc/Port-Mirage-plugin-to-GStreamer-1.0.patch/README'
--- .pc/Port-Mirage-plugin-to-GStreamer-1.0.patch/README	2013-06-03 23:00:22 +0000
+++ .pc/Port-Mirage-plugin-to-GStreamer-1.0.patch/README	1970-01-01 00:00:00 +0000
@@ -1,86 +0,0 @@
-Banshee Community Extensions is a repository and project for extensions to the
-Banshee media player that are community contributed and maintained.
-
-By bringing various third-party extensions into this one project, we can help
-each other maintain them and keep them up to date with the latest Banshee API.
-
-This is meant to be a low-barrier-to-entry way to start, develop, and publish
-a Banshee extension.
-
-=======================
-Points of Contact
-=======================
-
-* Website
-  http://banshee-project.org/download/extensions/
-  http://banshee-project.org/contribute/write-extensions/
-
-* File bugs
-  https://bugzilla.gnome.org/enter_bug.cgi?product=banshee&component=Community%20Extensions
-
-* Mailing list/forum
-  http://mail.gnome.org/mailman/listinfo/banshee-list
-  http://banshee-project.org/support/forum/
-
-  For BCE maintainers/developers:
-  http://mail.gnome.org/mailman/listinfo/banshee-devel-list
-
-* IRC
-  #banshee on irc.gnome.org
-
-=======================
-Dependencies
-=======================
-
-Banshee 2.1.0 and its devel packages are required.  Some extensions have
-specific requirements.
-
-AppIndicator
-  appindicator-sharp
-  notify-sharp
-
-ClutterFlow
-  clutter-sharp
-  clutter-gtk-sharp
-
-LastfmFingerprint
-  glib-2.0
-  fftw3f
-  samplerate
-  gstreamer-0.10 >= 0.10.15
-  gstreamer-base-0.10 >= 0.10.15
-  gstreamer-plugins-base-0.10 >= 0.10.15
-
-LCD
-  LCDProc
-
-Lirc
-  LIRC
-
-Mirage:
-  glib-2.0
-  fftw3f
-  samplerate
-  gstreamer-0.10 >= 0.10.15
-  gstreamer-base-0.10 >= 0.10.15
-  gstreamer-plugins-base-0.10 >= 0.10.15
-
-Telepathy
-  empathy >= 2.27.91
-  telepathy-gabble >= 0.9
-  telepathy-mission-control-5 >= 5.3.1
-  see src/Telepathy/README for more details
-
-ZeitgeistDataprovider
-  zeitgeist-sharp
-
-=======================
-Create a New Extension
-=======================
-
-Simply run:
-
-./create-extension Foo
-
-Where Foo is the name (with no spaces) of the extension.  Read
-http://banshee-project.org/contribute/write-extensions/ for more information.

=== removed directory '.pc/Port-Mirage-plugin-to-GStreamer-1.0.patch/build'
=== removed directory '.pc/Port-Mirage-plugin-to-GStreamer-1.0.patch/build/m4'
=== removed directory '.pc/Port-Mirage-plugin-to-GStreamer-1.0.patch/build/m4/extensions'
=== removed file '.pc/Port-Mirage-plugin-to-GStreamer-1.0.patch/build/m4/extensions/mirage.m4'
--- .pc/Port-Mirage-plugin-to-GStreamer-1.0.patch/build/m4/extensions/mirage.m4	2013-06-03 23:00:22 +0000
+++ .pc/Port-Mirage-plugin-to-GStreamer-1.0.patch/build/m4/extensions/mirage.m4	1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
-AC_DEFUN([BCE_MIRAGE],
-[
-	BCE_ARG_DISABLE([Mirage], [try])
-
-	BCE_CHECK_EXTENSION_DEP([Mirage], [GLIB],
-		[glib-2.0],
-		[The glib library was not found. Please install it or disable the Mirage extension by passing --disable-mirage])
-
-	BCE_CHECK_EXTENSION_DEP([Mirage], [FFTW3F],
-		[fftw3f],
-		[The fftw3f library was not found. Please install it or disable the Mirage extension by passing --disable-mirage])
-
-	BCE_CHECK_EXTENSION_DEP([Mirage], [LIBSAMPLERATE],
-		[samplerate],
-		[The samplerate library was not found. Please install it or disable the Mirage extension by passing --disable-mirage])
-
-	GSTREAMER_REQUIRED_VERSION=0.10.15
-	BCE_CHECK_EXTENSION_DEP([Mirage], [GSTREAMER],
-		[gstreamer-0.10 >= $GSTREAMER_REQUIRED_VERSION
-		 gstreamer-base-0.10 >= $GSTREAMER_REQUIRED_VERSION
-		 gstreamer-plugins-base-0.10 >= $GSTREAMER_REQUIRED_VERSION],
-		[GStreamer >= $GSTREAMER_REQUIRED_VERSION not found. Please install it or disable the Mirage extension by passing --disable-mirage])
-
-	if test "x$enable_Mirage" = "xtry" \
-		&& test "x$have_GLIB" = "xyes" \
-		&& test "x$have_FFTW3F" = "xyes" \
-		&& test "x$have_LIBSAMPLERATE" = "xyes" \
-		&& test "x$have_GSTREAMER" = "xyes"; then
-		enable_Mirage=yes
-	fi
-
-	if test "x$enable_Mirage" = "xyes"; then
-		AM_CONDITIONAL(ENABLE_MIRAGE, true)
-	else
-		enable_Mirage=no
-		AM_CONDITIONAL(ENABLE_MIRAGE, false)
-	fi
-])

=== removed directory '.pc/Port-Mirage-plugin-to-GStreamer-1.0.patch/src'
=== removed directory '.pc/Port-Mirage-plugin-to-GStreamer-1.0.patch/src/Mirage'
=== removed directory '.pc/Port-Mirage-plugin-to-GStreamer-1.0.patch/src/Mirage/libmirageaudio'
=== removed file '.pc/Port-Mirage-plugin-to-GStreamer-1.0.patch/src/Mirage/libmirageaudio/gst-mirageaudio.c'
--- .pc/Port-Mirage-plugin-to-GStreamer-1.0.patch/src/Mirage/libmirageaudio/gst-mirageaudio.c	2013-06-03 23:00:22 +0000
+++ .pc/Port-Mirage-plugin-to-GStreamer-1.0.patch/src/Mirage/libmirageaudio/gst-mirageaudio.c	1970-01-01 00:00:00 +0000
@@ -1,502 +0,0 @@
-/*
- * Mirage - High Performance Music Similarity and Automatic Playlist Generator
- * http://hop.at/mirage
- * 
- * Copyright (C) 2007 Dominik Schnitzer <[e-mail]>
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301, USA.
- */
-
-#include <math.h>
-#include <string.h>
-#include <time.h>
-
-#include <glib.h>
-#include <fftw3.h>
-#include <gst/gst.h>
-#include <samplerate.h>
-
-#include "gst-mirageaudio.h"
-
-struct MirageAudio {
-
-    // Cancel decoding mutex
-    GMutex *decoding_mutex;
-
-    // Gstreamer
-    GstElement *pipeline;
-    GstElement *audio;
-
-    gint rate;
-    gint filerate;
-    gint seconds;
-    gint winsize;
-    gint samples;
-
-    // FFTW
-    float *fftw;
-    fftwf_plan fftwplan;
-    gint fftwsamples;
-    gint fftwsize;
-
-    // libsamplerate
-    SRC_STATE *src_state;
-    SRC_DATA src_data;
-
-    // Hann window
-    float *window;
-
-    // Output buffer
-    float *out;
-    gint hops;
-    gint curhop;
-    gint cursample;
-
-    gboolean quit;
-    gboolean invalidate;
-};
-
-#define SRC_BUFFERLENGTH 4096
-
-clock_t start;
-clock_t end;
-
-
-void tic()
-{
-    start = clock();
-}
-
-void toc()
-{
-    double ms;
-    end = clock();
-    ms = ((end - start)/(double)(CLOCKS_PER_SEC))*1000.0;
-    g_print("libmirageaudio: time = %f\n", ms);
-}
-
-static void
-mirageaudio_cb_newpad(GstElement *decodebin, GstPad *pad, gboolean last, MirageAudio *ma)
-{
-    GstCaps *caps;
-    GstStructure *str;
-    GstPad *audiopad;
-
-    // only link once
-    audiopad = gst_element_get_pad(ma->audio, "sink");
-    if (GST_PAD_IS_LINKED(audiopad)) {
-        g_object_unref(audiopad);
-        return;
-    }
-
-    // check media type
-    caps = gst_pad_get_caps(pad);
-    str = gst_caps_get_structure(caps, 0);
-
-    if (!g_strrstr(gst_structure_get_name(str), "audio")) {
-        gst_caps_unref(caps);
-        gst_object_unref(audiopad);
-        return;
-    }
-    gst_caps_unref(caps);
-
-    // link
-    gst_pad_link(pad, audiopad);
-    gst_object_unref(audiopad);
-}
-
-static void
-mirageaudio_cb_have_data(GstElement *element, GstBuffer *buffer, GstPad *pad, MirageAudio *ma)
-{
-    gint buffersamples;
-    gint bufferpos;
-    gint i;
-    gint j;
-    gint fill;
-
-    // if data continues to flow/EOS is not yet processed
-    if (ma->quit)
-        return;
-
-    // exit on empty buffer
-    if (buffer->size <= 0)
-        return;
-
-    ma->src_data.data_in = (float*)GST_BUFFER_DATA(buffer);
-    ma->src_data.input_frames = GST_BUFFER_SIZE(buffer)/sizeof(float);
-
-    do {
-        // set end of input flag if necessary
-        ma->cursample += ma->src_data.input_frames;
-        if (ma->cursample >= ma->seconds * ma->filerate) {
-            ma->src_data.end_of_input = 1;
-        }
-
-        // resampling
-        int err = src_process(ma->src_state, &ma->src_data);
-
-        if (err != 0) {
-            g_print("libmirageaudio: SRC Error - %s\n", src_strerror(err));
-        }
-        // return if no output
-        if (ma->src_data.output_frames_gen == 0)
-            return;
-
-        buffersamples = ma->src_data.output_frames_gen;
-        bufferpos = 0;
-
-        // FFTW
-        // If buffer does not get filled 
-        if (ma->fftwsamples + buffersamples < ma->winsize) {
-            memcpy(ma->fftw+ma->fftwsamples, ma->src_data.data_out, buffersamples*sizeof(float));
-            ma->fftwsamples += buffersamples;
-
-        // If buffer gets filled.
-        } else {
-            do {
-                // prepare FFTW 
-                fill = ma->winsize - ma->fftwsamples;
-
-                if (fill <= 0)
-                    g_print("libmirageaudio: Logic ERROR! fill <= 0\n");
-
-                memcpy(ma->fftw+ma->fftwsamples, ma->src_data.data_out+bufferpos, fill*sizeof(float));
-                memset(ma->fftw+ma->winsize, 0, ma->winsize*sizeof(float));
-                for (i = 0; i < ma->winsize; i++) {
-                    ma->fftw[i] = ma->fftw[i] * ma->window[i] * 32768.0f;
-                }
-
-                // Execute FFTW
-                fftwf_execute(ma->fftwplan);
-
-                // Powerspectrum
-                ma->out[ma->curhop] = powf(ma->fftw[0], 2);
-                for (j = 1; j < ma->winsize/2; j++) {
-                    ma->out[j*ma->hops + ma->curhop] = powf(ma->fftw[j*2], 2) + powf(ma->fftw[ma->fftwsize-j*2], 2);
-                }
-                ma->out[(ma->winsize/2)*ma->hops + ma->curhop] = powf(ma->fftw[ma->winsize], 2);
-
-                ma->fftwsamples = 0;
-                buffersamples -= fill;
-                bufferpos += fill;
-
-                ma->curhop++;
-
-                if (ma->curhop == ma->hops) {
-                    GstBus *bus = gst_pipeline_get_bus(GST_PIPELINE(ma->pipeline));
-                    GstMessage* eosmsg = gst_message_new_eos(GST_OBJECT(ma->pipeline));
-                    gst_bus_post(bus, eosmsg);
-                    g_print("libmirageaudio: EOS Message sent\n");
-                    gst_object_unref(bus);
-                    ma->quit = TRUE;
-                    return;
-                }
-
-            } while (buffersamples >= ma->winsize);
-
-            if (buffersamples > 0) {
-                memcpy(ma->fftw, ma->src_data.data_out+bufferpos, buffersamples*sizeof(float));
-                ma->fftwsamples = buffersamples;
-            }
-        }
-
-        ma->src_data.data_in += ma->src_data.input_frames_used;
-        ma->src_data.input_frames -= ma->src_data.input_frames_used;
-
-    } while (ma->src_data.input_frames > 0);
-
-    return;
-}
-
-MirageAudio*
-mirageaudio_initialize(gint rate, gint seconds, gint winsize)
-{
-    MirageAudio *ma;
-    gint i;
-
-    ma = g_new0(MirageAudio, 1);
-    ma->rate = rate;
-    ma->seconds = seconds;
-    ma->hops = rate*seconds/winsize;
-    ma->out = malloc(ma->hops*((winsize/2)+1)*sizeof(float));
-
-    // FFTW
-    ma->winsize = winsize;
-    ma->fftwsize = 2 * ma->winsize;
-    ma->fftw = (float*)fftwf_malloc(ma->fftwsize * sizeof(float));
-    ma->fftwplan = fftwf_plan_r2r_1d((2*ma->winsize), ma->fftw, ma->fftw, FFTW_R2HC,
-                    FFTW_ESTIMATE | FFTW_DESTROY_INPUT);
-
-    // Hann Window
-    ma->window = malloc(ma->winsize*sizeof(float));
-    for (i = 0; i < ma->winsize; i++) {
-            ma->window[i] = (float)(0.5 * (1.0 - cos((2.0*M_PI *(double)i)/(double)(ma->winsize-1))));
-    }
-
-    // Samplingrate converter
-    int error;
-    ma->src_state = src_new(SRC_ZERO_ORDER_HOLD, 1, &error);
-    ma->src_data.data_out = malloc(SRC_BUFFERLENGTH*sizeof(float));
-    ma->src_data.output_frames = SRC_BUFFERLENGTH;
-
-    // cancel decoding mutex
-    ma->decoding_mutex = g_mutex_new();
-
-    return ma;
-}
-
-void
-mirageaudio_initgstreamer(MirageAudio *ma, const gchar *file)
-{
-    GstPad *audiopad;
-    GstCaps *filter_float;
-    GstCaps *filter_resample;
-    GstElement *cfilt_float;
-    GstElement *cfilt_resample;
-    GstElement *dec;
-    GstElement *src;
-    GstElement *sink;
-    GstElement *audioresample;
-    GstElement *audioconvert;
-
-    // Gstreamer decoder setup
-    ma->pipeline = gst_pipeline_new("pipeline");
-
-    // decoder
-    src = gst_element_factory_make("filesrc", "source");
-    g_object_set(G_OBJECT(src), "location", file, NULL);
-    dec = gst_element_factory_make("decodebin", "decoder");
-    g_signal_connect(dec, "new-decoded-pad", G_CALLBACK(mirageaudio_cb_newpad), ma);
-    gst_bin_add_many(GST_BIN(ma->pipeline), src, dec, NULL);
-    gst_element_link(src, dec);
-
-    // audio conversion
-    ma->audio = gst_bin_new("audio");
-
-    audioconvert = gst_element_factory_make("audioconvert", "conv");
-    filter_float = gst_caps_new_simple("audio/x-raw-float",
-         "width", G_TYPE_INT, 32,
-         NULL);
-    cfilt_float = gst_element_factory_make("capsfilter", "cfilt_float");
-    g_object_set(G_OBJECT(cfilt_float), "caps", filter_float, NULL);
-    gst_caps_unref(filter_float);
-
-    audioresample = gst_element_factory_make("audioresample", "resample");
-
-    filter_resample =  gst_caps_new_simple("audio/x-raw-float",
-          "channels", G_TYPE_INT, 1,
-          NULL);
-    cfilt_resample = gst_element_factory_make("capsfilter", "cfilt_resample");
-    g_object_set(G_OBJECT(cfilt_resample), "caps", filter_resample, NULL);
-    gst_caps_unref(filter_resample);
-
-    sink = gst_element_factory_make("fakesink", "sink");
-    g_object_set(G_OBJECT(sink), "signal-handoffs", TRUE, NULL);
-    g_signal_connect(sink, "handoff", G_CALLBACK(mirageaudio_cb_have_data), ma);
-    
-
-    gst_bin_add_many(GST_BIN(ma->audio),
-            audioconvert, audioresample,
-            cfilt_resample, cfilt_float,
-            sink, NULL);
-    gst_element_link_many(audioconvert, cfilt_float,
-           audioresample, cfilt_resample,
-           sink, NULL);
-
-    audiopad = gst_element_get_pad(audioconvert, "sink");
-    gst_element_add_pad(ma->audio,
-            gst_ghost_pad_new("sink", audiopad));
-    gst_object_unref(audiopad);
-
-    gst_bin_add(GST_BIN(ma->pipeline), ma->audio);
-
-    // Get sampling rate of audio file
-    GstClockTime max_wait = 1 * GST_SECOND;
-    if (gst_element_set_state(ma->pipeline, GST_STATE_READY) == GST_STATE_CHANGE_ASYNC) {
-        gst_element_get_state(ma->pipeline, NULL, NULL, max_wait);
-    }
-    if (gst_element_set_state(ma->pipeline, GST_STATE_PAUSED) == GST_STATE_CHANGE_ASYNC) {
-        gst_element_get_state(ma->pipeline, NULL, NULL, max_wait);
-    }
-
-    GstPad *pad = gst_element_get_pad(sink, "sink");
-    GstCaps *caps = gst_pad_get_negotiated_caps(pad);
-    if (GST_IS_CAPS(caps)) {
-        GstStructure *str = gst_caps_get_structure(caps, 0);
-        gst_structure_get_int(str, "rate", &ma->filerate);
-
-    } else {
-        ma->filerate = -1;
-    }
-    gst_caps_unref(caps);
-    gst_object_unref(pad);
-}
-
-float*
-mirageaudio_decode(MirageAudio *ma, const gchar *file, int *frames, int* size, int* ret)
-{
-    GstBus *bus;
-    tic();
-
-    ma->fftwsamples = 0;
-    ma->curhop = 0;
-    ma->cursample = 0;
-    ma->quit = FALSE;
-
-    g_mutex_lock(ma->decoding_mutex);
-    ma->invalidate = FALSE;
-    g_mutex_unlock(ma->decoding_mutex);
-
-    // Gstreamer setup
-    mirageaudio_initgstreamer(ma, file);
-    if (ma->filerate < 0) {
-        *size = 0;
-        *frames = 0;
-        *ret = -1;
-
-        // Gstreamer cleanup
-        gst_element_set_state(ma->pipeline, GST_STATE_NULL);
-        gst_object_unref(GST_OBJECT(ma->pipeline));
-
-        return NULL;
-    }
-
-    // libsamplerate initialization
-    ma->src_data.src_ratio = (double)ma->rate/(double)ma->filerate;
-    ma->src_data.input_frames = 0;
-    ma->src_data.end_of_input = 0;
-    src_reset(ma->src_state);
-    g_print("libmirageaudio: rate=%d, resampling=%f\n", ma->filerate, ma->src_data.src_ratio);
-
-    // decode...
-    gst_element_set_state(ma->pipeline, GST_STATE_PLAYING);
-    g_print("libmirageaudio: decoding %s\n", file);
-
-
-    bus = gst_pipeline_get_bus(GST_PIPELINE(ma->pipeline));
-    gboolean decoding = TRUE;
-    *ret = 0;
-    while (decoding) {
-        GstMessage* message = gst_bus_timed_pop_filtered(bus, GST_MSECOND*100,
-                GST_MESSAGE_ERROR | GST_MESSAGE_EOS);
-
-        if (message == NULL)
-            continue;
-
-        switch (GST_MESSAGE_TYPE(message)) {
-            case GST_MESSAGE_ERROR: {
-                GError *err;
-                gchar *debug;
-
-                gst_message_parse_error(message, &err, &debug);
-                g_print("libmirageaudio: error: %s\n", err->message);
-                g_error_free(err);
-                g_free(debug);
-                ma->curhop = 0;
-                decoding = FALSE;
-                *ret = -1;
-
-                break;
-            }
-            case GST_MESSAGE_EOS: {
-                g_print("libmirageaudio: EOS Message received\n");
-                decoding = FALSE;
-                break;
-            }
-            default:
-                break;
-        }
-        gst_message_unref(message);
-    }
-    gst_object_unref(bus);
-
-
-    g_mutex_lock(ma->decoding_mutex);
-
-    // Gstreamer cleanup
-    gst_element_set_state(ma->pipeline, GST_STATE_NULL);
-    gst_object_unref(GST_OBJECT(ma->pipeline));
-
-    toc();
-
-    if (ma->invalidate) {
-        *size = 0;
-        *frames = 0;
-        *ret = -2;
-    } else {
-        *size = ma->winsize/2 + 1;
-        *frames = ma->curhop;
-    }
-
-    g_mutex_unlock(ma->decoding_mutex);
-
-    g_print("libmirageaudio: frames=%d (maxhops=%d), size=%d\n", *frames, ma->hops, *size);
-    return ma->out;
-}
-
-MirageAudio*
-mirageaudio_destroy(MirageAudio *ma)
-{
-    g_print("libmirageaudio: destroy.\n");
-    // FFTW cleanup
-    fftwf_destroy_plan(ma->fftwplan);
-    fftwf_free(ma->fftw);
-
-    // Hann window clanup
-    free(ma->window);
-
-    // libsamplerate
-    free(ma->src_data.data_out);
-    src_delete(ma->src_state);
-    
-    g_mutex_free(ma->decoding_mutex);
-
-    // common
-    free(ma->out);
-    free(ma);
-
-    return NULL;
-}
-
-void
-mirageaudio_initgst()
-{
-    gst_init(NULL, NULL);
-}
-
-void
-mirageaudio_canceldecode(MirageAudio *ma)
-{
-    if (GST_IS_ELEMENT(ma->pipeline)) {
-
-        GstState state;
-        gst_element_get_state(ma->pipeline, &state, NULL, 100*GST_MSECOND);
-
-        if (state != GST_STATE_NULL) {
-            g_mutex_lock(ma->decoding_mutex);
-
-            GstBus *bus = gst_pipeline_get_bus(GST_PIPELINE(ma->pipeline));
-            GstMessage* eosmsg = gst_message_new_eos(GST_OBJECT(ma->pipeline));
-            gst_bus_post(bus, eosmsg);
-            g_print("libmirageaudio: EOS Message sent\n");
-            gst_object_unref(bus);
-
-            ma->invalidate = TRUE;
-
-            g_mutex_unlock(ma->decoding_mutex);
-        }
-    }
-}

=== removed file '.pc/applied-patches'
--- .pc/applied-patches	2013-06-03 23:00:22 +0000
+++ .pc/applied-patches	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-Port-Mirage-plugin-to-GStreamer-1.0.patch
-Port-LastfmFingerprint-plugin-to-GStreamer-1.0.patch
-Mirage-Clean-up-caps-handling-and-make-sure-to-wait-.patch
-LastfmFingerprint-Clean-up-caps-handling-and-make-su.patch

=== modified file 'debian/changelog'
--- debian/changelog	2013-06-03 23:00:22 +0000
+++ debian/changelog	2014-12-05 21:01:57 +0000
@@ -1,3 +1,24 @@
+banshee-community-extensions (2.4.0-4ubuntu1) vivid; urgency=medium
+
+  * Merge from Debian Unstable, remaining changes:
+    + Enable AppIndicator extension
+  * Use dbus#1 for the moment
+
+ -- Jackson Doak <[e-mail]>  Sat, 06 Dec 2014 07:14:01 +1100
+
+banshee-community-extensions (2.4.0-4) unstable; urgency=low
+
+  * [10ace16] Use DBus#2 API
+
+ -- Jo Shields <[e-mail]>  Thu, 09 Jan 2014 10:25:19 +0000
+
+banshee-community-extensions (2.4.0-3) unstable; urgency=low
+
+  * Rebuild against taglib-sharp 2.1
+  * [ef676d16] Add dependency against banshee 2.6.1-3 to sync taglib-sharp usage
+
+ -- Chow Loong Jin <[e-mail]>  Sat, 21 Sep 2013 15:49:06 +0800
+
 banshee-community-extensions (2.4.0-2ubuntu1) saucy; urgency=low
 
   * [ff4badf] Merge from Debian Unstable, remaining changes:

=== modified file 'debian/control'
--- debian/control	2013-06-03 23:00:22 +0000
+++ debian/control	2014-12-05 21:01:57 +0000
@@ -245,6 +245,7 @@
 Enhances: banshee
 Architecture: all
 Depends: banshee-extensions-common (= ${source:Version}),
+         banshee (>= 2.6.1-3),
          ${cli:Depends}, ${misc:Depends}
 Description: Lyrics extension for Banshee
  Banshee Lyrics Plugin is an extension which shows lyrics of songs played in