[SCM] xbmc packaging branch, master, updated. upstream/9.11.svn24886.deb1-57-gfa2cf59

[ceros-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit b3e30ff3a776f701dc37af4a349297917669fa7f
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Mon Dec 7 09:20:32 2009 -0500

    Add patch to fix usage of new wavpack.

diff --git a/debian/patches/debian.series b/debian/patches/debian.series
new file mode 100644
index 0000000..c7bec69
--- /dev/null
+++ b/debian/patches/debian.series
@@ -0,0 +1 @@
+wavpack-fix.patch
diff --git a/debian/patches/series b/debian/patches/series
new file mode 120000
index 0000000..ee6cf90
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+debian.series
\ No newline at end of file
diff --git a/debian/patches/wavpack-fix.patch b/debian/patches/wavpack-fix.patch
new file mode 100644
index 0000000..d5e22f9
--- /dev/null
+++ b/debian/patches/wavpack-fix.patch
@@ -0,0 +1,48 @@
+Fix for new wavpack 4.60.1.
+==========================================================================
+--- a/xbmc/cores/paplayer/DllWAVPack.h
++++ b/xbmc/cores/paplayer/DllWAVPack.h
+@@ -57,9 +57,9 @@
+     virtual int WavpackGetChannelMask (WavpackContext *wpc)=0;
+     virtual int WavpackGetReducedChannels (WavpackContext *wpc)=0;
+     virtual int WavpackGetFloatNormExp (WavpackContext *wpc)=0;
+-    virtual int WavpackGetMD5Sum (WavpackContext *wpc, uchar data [16])=0;
++    virtual int WavpackGetMD5Sum (WavpackContext *wpc, unsigned char data [16])=0;
+     virtual uint32_t WavpackGetWrapperBytes (WavpackContext *wpc)=0;
+-    virtual uchar *WavpackGetWrapperData (WavpackContext *wpc)=0;
++    virtual unsigned char *WavpackGetWrapperData (WavpackContext *wpc)=0;
+     virtual void WavpackFreeWrapper (WavpackContext *wpc)=0;
+     virtual void WavpackSeekTrailingWrapper (WavpackContext *wpc)=0;
+     virtual double WavpackGetProgress (WavpackContext *wpc)=0;
+@@ -76,7 +76,7 @@
+     virtual WavpackContext *WavpackOpenFileOutput (WavpackBlockOutput blockout, void *wv_id, void *wvc_id)=0;
+     virtual int WavpackSetConfiguration (WavpackContext *wpc, WavpackConfig *config, uint32_t total_samples)=0;
+     virtual int WavpackAddWrapper (WavpackContext *wpc, void *data, uint32_t bcount)=0;
+-    virtual int WavpackStoreMD5Sum (WavpackContext *wpc, uchar data [16])=0;
++    virtual int WavpackStoreMD5Sum (WavpackContext *wpc, unsigned char data [16])=0;
+     virtual int WavpackPackInit (WavpackContext *wpc)=0;
+     virtual int WavpackPackSamples (WavpackContext *wpc, int32_t *sample_buffer, uint32_t sample_count)=0;
+     virtual int WavpackFlushSamples (WavpackContext *wpc)=0;
+@@ -132,11 +132,11 @@
+         { return ::WavpackGetReducedChannels (wpc); }
+     virtual int WavpackGetFloatNormExp (WavpackContext *wpc)
+         { return ::WavpackGetFloatNormExp (wpc); }
+-    virtual int WavpackGetMD5Sum (WavpackContext *wpc, uchar data [16])
++    virtual int WavpackGetMD5Sum (WavpackContext *wpc, unsigned char data [16])
+         { return ::WavpackGetMD5Sum (wpc, data); }
+     virtual uint32_t WavpackGetWrapperBytes (WavpackContext *wpc)
+         { return ::WavpackGetWrapperBytes (wpc); }
+-    virtual uchar *WavpackGetWrapperData (WavpackContext *wpc)
++    virtual unsigned char *WavpackGetWrapperData (WavpackContext *wpc)
+         { return ::WavpackGetWrapperData (wpc); }
+     virtual void WavpackFreeWrapper (WavpackContext *wpc)
+         { return ::WavpackFreeWrapper (wpc); }
+@@ -170,7 +170,7 @@
+         { return ::WavpackSetConfiguration (wpc, config, total_samples); }
+     virtual int WavpackAddWrapper (WavpackContext *wpc, void *data, uint32_t bcount)
+         { return ::WavpackAddWrapper (wpc, data, bcount); }
+-    virtual int WavpackStoreMD5Sum (WavpackContext *wpc, uchar data [16])
++    virtual int WavpackStoreMD5Sum (WavpackContext *wpc, unsigned char data [16])
+         { return ::WavpackStoreMD5Sum (wpc, data); }
+     virtual int WavpackPackInit (WavpackContext *wpc)
+         { return ::WavpackPackInit (wpc); }

-- 
xbmc packaging