diff --git a/Don-t-use-the-new-decoded-pad-signal-of-decodebin.patch b/Don-t-use-the-new-decoded-pad-signal-of-decodebin.patch new file mode 100644 index 0000000..3a012c9 --- /dev/null +++ b/Don-t-use-the-new-decoded-pad-signal-of-decodebin.patch @@ -0,0 +1,62 @@ +From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= +Date: Tue, 28 May 2013 11:36:04 +0200 +Subject: Don't use the new-decoded-pad signal of decodebin + +It is not available anymore in 1.0 and pad-added should be used. +--- + libbanshee/banshee-bpmdetector.c | 8 ++++---- + libbanshee/banshee-transcoder.c | 8 ++++---- + 2 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/libbanshee/banshee-bpmdetector.c b/libbanshee/banshee-bpmdetector.c +index 68b0419..131d2e5 100644 +--- a/libbanshee/banshee-bpmdetector.c ++++ b/libbanshee/banshee-bpmdetector.c +@@ -159,8 +159,8 @@ bbd_pipeline_bus_callback (GstBus *bus, GstMessage *message, gpointer data) + } + + static void +-bbd_new_decoded_pad(GstElement *decodebin, GstPad *pad, +- gboolean last, gpointer data) ++bbd_pad_added(GstElement *decodebin, GstPad *pad, ++ gpointer data) + { + GstCaps *caps; + GstStructure *str; +@@ -244,8 +244,8 @@ bbd_pipeline_construct (BansheeBpmDetector *detector) + } + + // decodebin and audioconvert are linked dynamically when the decodebin creates a new pad +- g_signal_connect(detector->decodebin, "new-decoded-pad", +- G_CALLBACK(bbd_new_decoded_pad), detector); ++ g_signal_connect(detector->decodebin, "pad-added", ++ G_CALLBACK(bbd_pad_added), detector); + + if (!gst_element_link_many (detector->audioconvert, detector->bpmdetect, detector->fakesink, NULL)) { + bbd_raise_error (detector, _("Could not link pipeline elements"), NULL); +diff --git a/libbanshee/banshee-transcoder.c b/libbanshee/banshee-transcoder.c +index 0e241f0..f678838 100644 +--- a/libbanshee/banshee-transcoder.c ++++ b/libbanshee/banshee-transcoder.c +@@ -185,8 +185,8 @@ gst_transcoder_build_encoder(const gchar *encoder_pipeline) + } + + static void +-gst_transcoder_new_decoded_pad(GstElement *decodebin, GstPad *pad, +- gboolean last, gpointer data) ++gst_transcoder_pad_added(GstElement *decodebin, GstPad *pad, ++ gpointer data) + { + GstCaps *caps; + GstStructure *str; +@@ -293,8 +293,8 @@ gst_transcoder_create_pipeline(GstTranscoder *transcoder, + + gst_element_link(source_elem, decoder_elem); + +- g_signal_connect(decoder_elem, "new-decoded-pad", +- G_CALLBACK(gst_transcoder_new_decoded_pad), transcoder); ++ g_signal_connect(decoder_elem, "pad-added", ++ G_CALLBACK(gst_transcoder_pad_added), transcoder); + + gst_bus_add_watch(gst_pipeline_get_bus(GST_PIPELINE(transcoder->pipeline)), + gst_transcoder_bus_callback, transcoder); diff --git a/Use-new-style-GStreamer-1.0-raw-audio-caps-in-the-WA.patch b/Use-new-style-GStreamer-1.0-raw-audio-caps-in-the-WA.patch new file mode 100644 index 0000000..2d2cc33 --- /dev/null +++ b/Use-new-style-GStreamer-1.0-raw-audio-caps-in-the-WA.patch @@ -0,0 +1,21 @@ +From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= +Date: Tue, 28 May 2013 11:49:29 +0200 +Subject: Use new-style GStreamer 1.0 raw audio caps in the WAV audio profile + +--- + data/audio-profiles/wav.xml.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/data/audio-profiles/wav.xml.in b/data/audio-profiles/wav.xml.in +index 6dc1bab..1759f3c 100644 +--- a/data/audio-profiles/wav.xml.in ++++ b/data/audio-profiles/wav.xml.in +@@ -13,7 +13,7 @@ + (gst-construct-pipeline + "audioresample" + "audioconvert" +- (+ "audio/x-raw-int, " ++ (+ "audio/x-raw, " + "format=(string)S16LE, " + "rate=(int)44100, " + "channels=(int)2" ) diff --git a/banshee.spec b/banshee.spec index a5debaa..c2c29b2 100644 --- a/banshee.spec +++ b/banshee.spec @@ -7,8 +7,11 @@ License: MIT URL: http://banshee.fm/ Source0: http://ftp.gnome.org/pub/GNOME/sources/banshee/2.6/banshee-%{version}.tar.xz +# GStreamer 1.0 patches from Debian: Patch2: Initial-port-to-GStreamer-1.0.patch Patch3: Remove-build-time-enable-gapless-playback-option.patch +Patch4: Don-t-use-the-new-decoded-pad-signal-of-decodebin.patch +Patch5: Use-new-style-GStreamer-1.0-raw-audio-caps-in-the-WA.patch # Mono only available on these: ExclusiveArch: %{mono_arches} @@ -120,6 +123,8 @@ developing applications that use %{name}-musicbrainz. %setup -q %patch2 -p1 -b .gst1 %patch3 -p1 -b .gapless +%patch4 -p1 +%patch5 -p1 %build # Snapshots only @@ -195,6 +200,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog * Sun Mar 09 2014 Kalev Lember - 2.6.2-1 - Update to 2.6.2 +- Add two more GStreamer 1.0 patches from Debian * Sat Aug 03 2013 Fedora Release Engineering - 2.6.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild