]> git.sesse.net Git - vlc/commitdiff
Contrib: fix speex patch. Thanks to JB Kempf
authorChristophe Mutricy <xtophe@videolan.org>
Wed, 26 Jul 2006 13:49:56 +0000 (13:49 +0000)
committerChristophe Mutricy <xtophe@videolan.org>
Wed, 26 Jul 2006 13:49:56 +0000 (13:49 +0000)
extras/contrib/src/Patches/speex.patch

index 3a810aef054c4eaef88a9438f40e5ddffa2bd7da..6e6490319417139a6c1175e602f76c675b79cfa9 100644 (file)
@@ -1,5 +1,18 @@
+diff -ruN speex-1.1.12/libspeex/kiss_fft.h speex/libspeex/kiss_fft.h
+--- speex-1.1.12/libspeex/kiss_fft.h   2005-12-22 12:14:33.000000000 +0100
++++ speex/libspeex/kiss_fft.h  2006-07-26 15:38:39.000000000 +0200
+@@ -5,7 +5,7 @@
+ #include <stdio.h>
+ #include <math.h>
+ #include <memory.h>
+-#include <malloc.h>
++//#include <malloc.h>
+ #ifdef __cplusplus
+ extern "C" {
+diff -ruN speex-1.1.12/libspeex/stack_alloc.h speex/libspeex/stack_alloc.h
 --- speex-1.1.12/libspeex/stack_alloc.h        2006-01-31 23:25:10.000000000 +0100
-+++ speex/libspeex/stack_alloc.h       2006-07-11 21:34:01.000000000 +0200
++++ speex/libspeex/stack_alloc.h       2006-07-26 15:38:04.000000000 +0200
 @@ -109,7 +109,7 @@
  
  #endif
@@ -11,7 +24,7 @@
  #elif defined(USE_ALLOCA)
 diff -ruN speex-1.1.12/Makefile.am speex/Makefile.am
 --- speex-1.1.12/Makefile.am   2005-11-23 12:42:56.000000000 +0100
-+++ speex/Makefile.am  2006-07-11 21:34:45.000000000 +0200
++++ speex/Makefile.am  2006-07-26 15:38:04.000000000 +0200
 @@ -13,9 +13,9 @@
  EXTRA_DIST = Speex.spec Speex.spec.in Speex.kdevelop speex.m4 speex.pc.in README.blackfin README.symbian README.TI-DSP
  
@@ -26,7 +39,7 @@ diff -ruN speex-1.1.12/Makefile.am speex/Makefile.am
        rpmbuild -ta ${PACKAGE}-${VERSION}.tar.gz
 diff -ruN speex-1.1.12/Makefile.in speex/Makefile.in
 --- speex-1.1.12/Makefile.in   2006-02-10 11:13:16.000000000 +0100
-+++ speex/Makefile.in  2006-07-11 21:35:15.000000000 +0200
++++ speex/Makefile.in  2006-07-26 15:38:04.000000000 +0200
 @@ -194,8 +194,8 @@
  EXTRA_DIST = Speex.spec Speex.spec.in Speex.kdevelop speex.m4 speex.pc.in README.blackfin README.symbian README.TI-DSP