[rpms/amarok] epel10: add patch to make lastfm work with xine-lib 1.1.3 (sent by upstream)

[rpms/amarok] epel10: add patch to make lastfm work with xine-lib 1.1.3 (sent by upstream)

[Aurelien Bompard]

A new commit has been pushed.

Repo   : rpms/amarok
Branch : epel10
Commit : 50f90b853a837b63ce1acc01a7c9c8c748f04c37
Author : Aurelien Bompard <abompard@fedoraproject.org>
Date   : 2006-12-19T07:35:48+00:00
Stats  : +30/-0 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/amarok/c/50f90b853a837b63ce1acc01a7c9c8c748f04c37?branch=epel10

Log:
add patch to make lastfm work with xine-lib 1.1.3 (sent by upstream)

---
diff --git a/amarok-1.4.4-lastfm+xine-lib-1.1.3.patch b/amarok-1.4.4-lastfm+xine-lib-1.1.3.patch
new file mode 100644
index 0000000..fde2e41
--- /dev/null
+++ b/amarok-1.4.4-lastfm+xine-lib-1.1.3.patch
@@ -0,0 +1,25 @@
+Index: amarok-1.4.4/amark/src/amarok_proxy.rb
+===================================================================
+--- amarok-1.4.4/amarok/src/amarok_proxy.rb	(revision 609364)
++++ amarok-1.4.4/amarok/src/amarok_proxy.rb	(revision 609365)
+@@ -117,6 +117,11 @@
+   def cp_to_empty_outward( income, output )
+     myputs "cp_to_empty_outward( income => #{income.inspect}, output => #{output.inspect}"
+     income.each_line do |data|
++      if data =~ /User-Agent: xine\/([0-9.]+)/
++        version = $1.split(".").collect { |v| v.to_i }
++        myputs("Found xine user agent version #{version.join(".")}")
++        @xineworkaround = ( version[0] <= 1 && version[1] <= 1 && version[2] <= 2 )
++      end
+       myputs( data )
+       data.chomp!
+       safe_write( output, data )
+@@ -142,7 +147,7 @@
+ 
+   def cp_all_inward( income, output )
+     myputs( "cp_all( income => #{income.inspect}, output => #{output.inspect}" )
+-    if self.is_a?( LastFM ) and @engine == 'xine-engine'
++    if self.is_a?( LastFM ) and @xineworkaround
+       myputs( "Using buffer fill workaround." )
+       filler = Array.new( 4096, 0 )
+       safe_write( output, filler ) # HACK: Fill xine's buffer so that xine_open() won't block

diff --git a/amarok.spec b/amarok.spec
index 2270810..3801570 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -11,6 +11,7 @@ License:    GPL
 Url:        http://amarok.kde.org
 # http://download.kde.org/download.php?url=stable/amarok/1.4.3/src
 Source0:    http://mirrors.isc.org/pub/kde/stable/amarok/%{version}/src/amarok-%{version}.tar.bz2
+Patch0:     amarok-1.4.4-lastfm+xine-lib-1.1.3.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdemultimedia-devel >= 6:3.2
@@ -80,6 +81,7 @@ use any of xmms' visualisation plugins with Amarok.
 
 %prep
 %setup -q
+%patch0 -p1 -b .lastfm
 
 
 
@@ -238,6 +240,9 @@ rm -fr $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 19 2006 Aurelien Bompard <abompard@fedoraproject.org> 1.4.4-3
+- add patch to make lastfm work with xine-lib 1.1.3 (sent by upstream)
+
 * Sat Dec 09 2006 Aurelien Bompard <abompard@fedoraproject.org> 1.4.4-3
 - rebuild