replace gstreamer deprecated pad call

4 files changed, 43 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index eccd81b76212..86acf542caf1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = guayadeque
 	pkgdesc = Lightweight music player
 	pkgver = 0.3.7
-	pkgrel = 6
+	pkgrel = 7
 	url = http://guayadeque.org/
 	install = guayadeque.install
 	arch = i686
@@ -30,6 +30,7 @@ pkgbase = guayadeque
 	source = guayadeque_06_pixbuf_link.patch
 	source = guayadeque_07_player_display_fix.patch
 	source = guayadeque_08_EditCrash.patch
+	source = guayadeque_09_gstreamer_deprecated.patch
 	sha256sums = d23eb1247add0bef8d5fef834294d7cb3d7c5fc20db9022b86f618a13d359938
 	sha256sums = 56ff5fae064fa421cb951a7c664550861e04ae4df8b692044e2a4785f238ce24
 	sha256sums = 15b49c58be40a57ecb1d38e7055c1edc5aaf71e0164062cc5f2b8fb589530377
@@ -42,6 +43,7 @@ pkgbase = guayadeque
 	sha256sums = 23d388711a17dc7e1487c740fd961ceb563a967d5866c5d5508865252be2d645
 	sha256sums = e2dbb71fc1d6118fa31d30f49382c16bb306130fc94118f3df9f0ea64c27ca0f
 	sha256sums = aaf355a3df930128da5c165b6ff07d06c3aa8ed4514522cc6a71e78634b5ee14
+	sha256sums = b9df9aad73ef4b78850dea00d1f123770b0b139eddeba614bc662756ebfc4c6e
 
 pkgname = guayadeque
 
diff --git a/PKGBUILD b/PKGBUILD
index 19e8d6caf9ff..955cb152cba7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=guayadeque
 pkgver=0.3.7
-pkgrel=6
+pkgrel=7
 pkgdesc='Lightweight music player'
 arch=('i686' 'x86_64')
 url='http://guayadeque.org/'
@@ -29,7 +29,8 @@ source=("https://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgve
         'guayadeque_05_wxSqlite_upgrade.patch'
         'guayadeque_06_pixbuf_link.patch'
         'guayadeque_07_player_display_fix.patch'
-        'guayadeque_08_EditCrash.patch')
+        'guayadeque_08_EditCrash.patch'
+        'guayadeque_09_gstreamer_deprecated.patch')
 sha256sums=('d23eb1247add0bef8d5fef834294d7cb3d7c5fc20db9022b86f618a13d359938'
             '56ff5fae064fa421cb951a7c664550861e04ae4df8b692044e2a4785f238ce24'
             '15b49c58be40a57ecb1d38e7055c1edc5aaf71e0164062cc5f2b8fb589530377'
@@ -41,7 +42,8 @@ sha256sums=('d23eb1247add0bef8d5fef834294d7cb3d7c5fc20db9022b86f618a13d359938'
             '6bd07e63afe0aa7baf30b616d701e234fd1c304897053e3eb466acb2db818071'
             '23d388711a17dc7e1487c740fd961ceb563a967d5866c5d5508865252be2d645'
             'e2dbb71fc1d6118fa31d30f49382c16bb306130fc94118f3df9f0ea64c27ca0f'
-            'aaf355a3df930128da5c165b6ff07d06c3aa8ed4514522cc6a71e78634b5ee14')
+            'aaf355a3df930128da5c165b6ff07d06c3aa8ed4514522cc6a71e78634b5ee14'
+            'b9df9aad73ef4b78850dea00d1f123770b0b139eddeba614bc662756ebfc4c6e')
 BUILDFLDR='buildlocal'
 
 prepare() {
@@ -57,6 +59,7 @@ prepare() {
   patch -Np0 -i ../guayadeque_06_pixbuf_link.patch
   patch -Np0 -i ../guayadeque_07_player_display_fix.patch
   patch -Np0 -i ../guayadeque_08_EditCrash.patch
+  patch -Np0 -i ../guayadeque_09_gstreamer_deprecated.patch
 }
 
 build() {
diff --git a/README b/README
index ab0e4c558c36..88cd904c37d1 100644
--- a/README
+++ b/README
@@ -11,17 +11,18 @@ for their work and efforts which lead to this package.
 === initial release
 - Start with latest Guayadeque Release(dated 2014-02-10)
 - Apply patches
-  guayadeque_01a_rev1891                (update download to SVN rev 1891)
-  guayadeque_01b_rev1892                (update to SVN rev 1892)
-  guayadeque_01c_rev1893                (update to SVN rev 1893)
-  guayadeque_01d_rev1894                (update to SVN rev 1894)
-  guayadeque_02_pause_crash.patch       (correct crash on pause/stop track)
-  guayadeque_03_wx30.patch              (update src for use with wx3.0)
-  guayadeque_04_wxcurl.patch            (update header path for wxcurl)
-  guayadeque_05_wxSqlite_upgrade.patch  (update internal wxSqlite3 to rev 3.2.1)
-  guayadeque_06_pixbuf_link.patch       (add build link to libgdk-pixbuf-2.0.so)
-  guayadeque_07_player_display_fix.patch(correct current track display bug)
-  guayadeque_08_EditCrash.patch         (workaround seg error when editing track ID3)
+  guayadeque_01a_rev1891                    (update download to SVN rev 1891)
+  guayadeque_01b_rev1892                    (update to SVN rev 1892)
+  guayadeque_01c_rev1893                    (update to SVN rev 1893)
+  guayadeque_01d_rev1894                    (update to SVN rev 1894)
+  guayadeque_02_pause_crash.patch           (correct crash on pause/stop track)
+  guayadeque_03_wx30.patch                  (update src for use with wx3.0)
+  guayadeque_04_wxcurl.patch                (update header path for wxcurl)
+  guayadeque_05_wxSqlite_upgrade.patch      (update internal wxSqlite3 to rev 3.2.1)
+  guayadeque_06_pixbuf_link.patch           (add build link to libgdk-pixbuf-2.0.so)
+  guayadeque_07_player_display_fix.patch    (correct current track display bug)
+  guayadeque_08_EditCrash.patch             (workaround seg error when editing track ID3)
+  guayadeque_09_gstreamer_deprecated.patch  (replace gstreamer deprecated pad call)
 
 =====
 KNOWN BUILD ISSUES
diff --git a/guayadeque_09_gstreamer_deprecated.patch b/guayadeque_09_gstreamer_deprecated.patch
new file mode 100644
index 000000000000..0dd19604091c
--- /dev/null
+++ b/guayadeque_09_gstreamer_deprecated.patch
@@ -0,0 +1,22 @@
+diff --git src/MediaCtrl.cpp src/MediaCtrl.cpp
+index 3385429..f7c8a1f 100644
+--- src/MediaCtrl.cpp
++++ src/MediaCtrl.cpp
+@@ -1579,7 +1579,7 @@ bool guFaderPlayBin::BuildPlaybackBin( void )
+                                             gst_element_link_many( m_Tee, queue, converter, resample, m_FaderVolume, level, m_Equalizer, limiter, m_Volume, outconverter, outresample, m_OutputSink, NULL );
+                                         }
+ 
+-                                        GstPad * pad = gst_element_get_pad( m_Tee, "sink" );
++                                        GstPad * pad = gst_element_get_static_pad( m_Tee, "sink" );
+                                         if( GST_IS_PAD( pad ) )
+                                         {
+                                             GstPad * ghostpad = gst_ghost_pad_new( "sink", pad );
+@@ -1752,7 +1752,7 @@ bool guFaderPlayBin::BuildRecordBin( const wxString &path, GstElement * encoder,
+                         gst_element_link_many( queue, converter, resample, encoder, m_FileSink, NULL );
+                     }
+ 
+-                    GstPad * pad = gst_element_get_pad( queue, "sink" );
++                    GstPad * pad = gst_element_get_static_pad( queue, "sink" );
+                     if( GST_IS_PAD( pad ) )
+                     {
+                         m_RecordGhostPad = gst_ghost_pad_new( "sink", pad );