banshee-2.6.2-5.nonprism1: fix (FS#38700 -> https://bugs.archlinux.org/task/38700) and (FS#39757 -> https://bugs.archlinux.org/task/39757)

3 files changed, 95 insertions, 6 deletions

diff --git a/nonprism/banshee/Don-t-use-the-new-decoded-pad-signal-of-decodebin.patch b/nonprism/banshee/Don-t-use-the-new-decoded-pad-signal-of-decodebin.patch
new file mode 100644
index 000000000..3a012c990
--- /dev/null
+++ b/nonprism/banshee/Don-t-use-the-new-decoded-pad-signal-of-decodebin.patch
@@ -0,0 +1,62 @@
+From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <slomo@circular-chaos.org>
+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/nonprism/banshee/PKGBUILD b/nonprism/banshee/PKGBUILD
index f8487407b..386ca0052 100644
--- a/nonprism/banshee/PKGBUILD
+++ b/nonprism/banshee/PKGBUILD
@@ -5,12 +5,12 @@
 
 pkgname=banshee
 pkgver=2.6.2
-pkgrel=4.nonprism1
+pkgrel=5.nonprism1
 pkgdesc="Music management and playback for GNOME, without gdata-sharp support"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://banshee.fm/"
 license=('MIT')
-depends=(libxxf86vm gst-plugins-base-libs mono-addins dbus-sharp-glib webkitgtk2 libsoup-gnome taglib-sharp gudev-sharp gkeyfile-sharp gconf-sharp libmtp libgpod mono-zeroconf desktop-file-utils hicolor-icon-theme media-player-info gst-plugins-bad mono-upnp gst-plugins-good)
+depends=(libxxf86vm gst-plugins-base-libs mono-addins dbus-sharp-glib webkitgtk2 libsoup-gnome taglib-sharp gudev-sharp gkeyfile-sharp gconf-sharp libmtp libgpod mono-zeroconf desktop-file-utils hicolor-icon-theme media-player-info gst-plugins-bad mono-upnp gst-plugins-good gvfs)
 makedepends=('intltool' 'gnome-doc-utils' 'gtk-sharp-beans' 'gnome-common')
 optdepends=('gst-plugins-ugly: Extra media codecs'
             'gst-libav: Extra media codecs'
@@ -20,15 +20,16 @@ conflicts=(${pkgname}-nonprism)
 install=$pkgname.install
 source=(http://download.gnome.org/sources/$pkgname/2.6/$pkgname-$pkgver.tar.xz
         Initial-port-to-GStreamer-1.0.patch
-        Remove-build-time-enable-gapless-playback-option.patch)
-md5sums=('12dbb8a996783f7081d538062a8589b7'
-         '16cbe2ef60e6f9b22015585bb3209648'
-         '0bf7ee4241b12538779c9ecc401d142a')
+        Remove-build-time-enable-gapless-playback-option.patch
+        Don-t-use-the-new-decoded-pad-signal-of-decodebin.patch
+        Use-new-style-GStreamer-1.0-raw-audio-caps-in-the-WA.patch)
 
 prepare() {
   cd $pkgname-$pkgver
   patch -p1 -i ../Initial-port-to-GStreamer-1.0.patch
   patch -p1 -i ../Remove-build-time-enable-gapless-playback-option.patch
+  patch -p1 -i ../Don-t-use-the-new-decoded-pad-signal-of-decodebin.patch
+  patch -p1 -i ../Use-new-style-GStreamer-1.0-raw-audio-caps-in-the-WA.patch
 }
 
 build() {
@@ -58,3 +59,8 @@ package() {
 
   install -D -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
+md5sums=('12dbb8a996783f7081d538062a8589b7'
+         '16cbe2ef60e6f9b22015585bb3209648'
+         '0bf7ee4241b12538779c9ecc401d142a'
+         'f87534f54029794bd7be2a123ab01300'
+         'd092827720e4a11549587eb3131123ae')
diff --git a/nonprism/banshee/Use-new-style-GStreamer-1.0-raw-audio-caps-in-the-WA.patch b/nonprism/banshee/Use-new-style-GStreamer-1.0-raw-audio-caps-in-the-WA.patch
new file mode 100644
index 000000000..2d2cc33cd
--- /dev/null
+++ b/nonprism/banshee/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?= <slomo@circular-chaos.org>
+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" )