rpms/xmms-wma/devel xmms-wma-ffmpeg.patch, NONE, 1.1 xmms-wma-warnings.patch, NONE, 1.1 xmms-wma.spec, 1.4, 1.5

[Dominik Mierzejewski]

Author: rathann

Update of /cvs/free/rpms/xmms-wma/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9579

Modified Files:
	xmms-wma.spec 
Added Files:
	xmms-wma-ffmpeg.patch xmms-wma-warnings.patch 
Log Message:
* Tue Mar 31 2009 Dominik Mierzejewski <rpm AT greysector Dot net> 1.0.5-6
- use Patch0 instead of Patch
- fix build with current FFmpeg
- fix FFmpeg API usage
- fix some gcc warnings


xmms-wma-ffmpeg.patch:

--- NEW FILE xmms-wma-ffmpeg.patch ---
diff -up xmms-wma-1.0.5/xmms-wma.c.ff xmms-wma-1.0.5/xmms-wma.c
--- xmms-wma-1.0.5/xmms-wma.c.ff	2009-03-31 21:40:10.000000000 +0200
+++ xmms-wma-1.0.5/xmms-wma.c	2009-03-31 21:42:45.000000000 +0200
@@ -400,7 +400,8 @@ static void *wma_play_loop(void *arg)
         if(size == 0) break;
 	
         while(size > 0){
-            len = avcodec_decode_audio(c, (short *)wma_outbuf, &out_size,
+            out_size=sizeof(wma_outbuf);
+            len = avcodec_decode_audio2(c, (short *)wma_outbuf, &out_size,
                                        inbuf_ptr, size);
 	    if(len < 0) break;
 	    

xmms-wma-warnings.patch:

--- NEW FILE xmms-wma-warnings.patch ---
diff -up xmms-wma-1.0.5/iir.c.warn xmms-wma-1.0.5/iir.c
--- xmms-wma-1.0.5/iir.c.warn	2004-03-03 21:25:31.000000000 +0100
+++ xmms-wma-1.0.5/iir.c	2009-03-31 22:06:43.000000000 +0200
@@ -58,8 +58,8 @@ void init_iir()
 	iir_cf = iir_cforiginal10;
 
 	/* Zero the history arrays */
-	bzero(data_history, sizeof(sXYData) * EQ_MAX_BANDS * EQ_CHANNELS);
-	bzero(data_history2, sizeof(sXYData) * EQ_MAX_BANDS * EQ_CHANNELS);
+	memset(data_history, 0, sizeof(sXYData) * EQ_MAX_BANDS * EQ_CHANNELS);
+	memset(data_history2, 0, sizeof(sXYData) * EQ_MAX_BANDS * EQ_CHANNELS);
 }
 
 __inline__ int iir(gpointer * d, gint length)
diff -up xmms-wma-1.0.5/iir.h.warn xmms-wma-1.0.5/iir.h
--- xmms-wma-1.0.5/iir.h.warn	2005-09-05 14:44:22.000000000 +0200
+++ xmms-wma-1.0.5/iir.h	2009-03-31 22:07:18.000000000 +0200
@@ -22,6 +22,7 @@
 #ifndef IIR_H
 #define IIR_H
 
+#define _XOPEN_SOURCE 600
 #include <stdio.h>
 #if 0
 #include <gtk/gtk.h>


Index: xmms-wma.spec
===================================================================
RCS file: /cvs/free/rpms/xmms-wma/devel/xmms-wma.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xmms-wma.spec	21 Feb 2009 23:18:11 -0000	1.4
+++ xmms-wma.spec	31 Mar 2009 20:16:53 -0000	1.5
@@ -3,14 +3,19 @@
 Summary: X MultiMedia System input plugin to play Windows Media Audio files
 Name: xmms-wma
 Version: 1.0.5
-Release: 5.1%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 Group: Applications/Multimedia
 URL: http://mcmcc.bat.ru/xmms-wma/
 Source: http://mcmcc.bat.ru/xmms-wma/xmms-wma-%{version}.tar.bz2
-Patch: xmms-wma-1.0.5-build.patch
+Patch0: xmms-wma-1.0.5-build.patch
+# fix FFmpeg API usage
+Patch1: %{name}-ffmpeg.patch
+# fix a couple of warnings
+Patch2: %{name}-warnings.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: xmms-devel, gtk+-devel
+BuildRequires: ffmpeg-devel
 
 %description
 X MultiMedia System input plugin to play Windows Media Audio, aka WMA files.
@@ -22,7 +27,9 @@
 
 %prep
 %setup -q
-%patch -p1 -b .build
+%patch0 -p1 -b .build
+%patch1 -p1 -b .ff
+%patch2 -p1 -b .warn
 
 %build
 %{__make} %{?_smp_mflags} OPTFLAGS="%{optflags} -fPIC -fomit-frame-pointer -ffast-math"
@@ -46,6 +53,12 @@
 
 
 %changelog
+* Tue Mar 31 2009 Dominik Mierzejewski <rpm AT greysector Dot net> 1.0.5-6
+- use Patch0 instead of Patch
+- fix build with current FFmpeg
+- fix FFmpeg API usage
+- fix some gcc warnings
+
 * Sat Oct 18 2008 Orcan Ogetbil <orcanbahri AT yahoo Dot com> 1.0.5-5
 - Minor spec file improvements.
 - License is GPLv2+.