r3528 - packages/trunk/fenix-plugins/debian/patches

[Miriam Ruiz]

Author: baby-guest
Date: 2007-08-02 15:49:18 +0000 (Thu, 02 Aug 2007)
New Revision: 3528

Added:
   packages/trunk/fenix-plugins/debian/patches/mixer_fix.patch
Modified:
   packages/trunk/fenix-plugins/debian/patches/fxdll_version.patch
Log:
Added new patch



Modified: packages/trunk/fenix-plugins/debian/patches/fxdll_version.patch
===================================================================
--- packages/trunk/fenix-plugins/debian/patches/fxdll_version.patch	2007-08-02 15:15:31 UTC (rev 3527)
+++ packages/trunk/fenix-plugins/debian/patches/fxdll_version.patch	2007-08-02 15:49:18 UTC (rev 3528)
@@ -86,21 +86,6 @@
  
  SDL_AudioSpec spec;
  
-diff -ruN fenix-plugins.orig/mixer-1.0/wav.c fenix-plugins/mixer-1.0/wav.c
---- fenix-plugins.orig/mixer-1.0/wav.c	2007-08-01 20:01:23.630044053 +0000
-+++ fenix-plugins/mixer-1.0/wav.c	2007-08-01 19:59:04.365340553 +0000
-@@ -7,6 +7,11 @@
- #include <fenix/fxdll.h>
- #include "mixer.h"
- 
-+/* PluginVersion is used to identify the plugin structures against which
-+ * we're linking to prevent potential mismatches and segmentation faults
-+ */
-+unsigned int PluginVersion = FXDLL_VERSION;
-+
- typedef struct WAV_SIGNAL WAV_SIGNAL;
- typedef struct WAV_SAMPINFO WAV_SAMPINFO;
- 
 diff -ruN fenix-plugins.orig/mpeg-1.0/mpeg.c fenix-plugins/mpeg-1.0/mpeg.c
 --- fenix-plugins.orig/mpeg-1.0/mpeg.c	2007-08-01 20:01:23.630044053 +0000
 +++ fenix-plugins/mpeg-1.0/mpeg.c	2007-08-01 19:59:37.247395553 +0000

Added: packages/trunk/fenix-plugins/debian/patches/mixer_fix.patch
===================================================================
--- packages/trunk/fenix-plugins/debian/patches/mixer_fix.patch	                        (rev 0)
+++ packages/trunk/fenix-plugins/debian/patches/mixer_fix.patch	2007-08-02 15:49:18 UTC (rev 3528)
@@ -0,0 +1,58 @@
+diff -ruN fenix-plugins-0.0.20070801.orig/mixer-1.0/mixer.c fenix-plugins-0.0.20070801/mixer-1.0/mixer.c
+--- fenix-plugins-0.0.20070801.orig/mixer-1.0/mixer.c	2007-08-02 15:45:31.000000000 +0000
++++ fenix-plugins-0.0.20070801/mixer-1.0/mixer.c	2007-08-02 15:45:43.000000000 +0000
+@@ -30,7 +30,6 @@
+  */
+ 
+ #include <dumb.h>
+-#include <dumbogg.h>
+ #include "wav.h"
+ 
+ #include <fenix/fxdll.h>
+@@ -167,7 +166,7 @@
+ 
+ 
+ 
+-int file_getnc_mixer (char *ptr, long n, void *f) {
++int file_getnc_mixer (void *ptr, long n, void *f) {
+ 
+ 
+ 	return file_read (f, ptr,  n);
+diff -ruN fenix-plugins-0.0.20070801.orig/mixer-1.0/wav.c fenix-plugins-0.0.20070801/mixer-1.0/wav.c
+--- fenix-plugins-0.0.20070801.orig/mixer-1.0/wav.c	2007-08-02 15:45:31.000000000 +0000
++++ fenix-plugins-0.0.20070801/mixer-1.0/wav.c	2007-08-02 15:45:43.000000000 +0000
+@@ -98,7 +93,7 @@
+ 		unsigned long  data_size;
+ 
+ 
+-		file_getnc_mixer(&id,4,fp);								//RIFF
++		file_getnc_mixer(id,4,fp);								//RIFF
+ 
+ 
+ 
+@@ -107,14 +102,14 @@
+ 
+ 
+ 			file_getnc_mixer(&size,4,fp);						//SIZE
+-			file_getnc_mixer(&id,4,fp);							//WAVE
++			file_getnc_mixer(id,4,fp);							//WAVE
+ 
+ 			if ((id[0]=='W') && (id[1]=='A') && (id[2]=='V') && (id[3]=='E')) {
+ 
+ 
+ 
+ 					//Es un wav, por lo tanto vamos a leerlo.
+-					file_getnc_mixer(&id,4,fp);					//format
++					file_getnc_mixer(id,4,fp);					//format
+ 
+ 					file_getnc_mixer(&chunkSize,4,fp);
+ 
+@@ -126,7 +121,7 @@
+ 					file_getnc_mixer(&wBitsPerSample,2,fp);     //bits per sample
+ 
+ 
+-					file_getnc_mixer(&id,4,fp);					//data
++					file_getnc_mixer(id,4,fp);					//data
+ 
+ 
+