summaryrefslogtreecommitdiffstats
path: root/vlc/build/speex_no-ogg.patch
blob: a8f40f018e147c43403536270ef2648f5c9207ae (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
diff -ur speex.orig/configure.ac speex/configure.ac
--- speex.orig/configure.ac	2012-01-22 15:23:09.767731000 -0500
+++ speex/configure.ac	2012-01-22 15:24:03.891731001 -0500
@@ -112,7 +112,7 @@
 
 AC_CHECK_HEADERS(sys/soundcard.h sys/audioio.h)
 
-XIPH_PATH_OGG([src="src"], [src=""])
+src=
 AC_SUBST(src)
 
 AC_CHECK_LIB(m, sin)
diff -ur speex.orig/libspeex/Makefile.am speex/libspeex/Makefile.am
--- speex.orig/libspeex/Makefile.am	2012-01-22 15:23:09.759731001 -0500
+++ speex/libspeex/Makefile.am	2012-01-22 15:23:40.799730998 -0500
@@ -11,7 +11,7 @@
 
 EXTRA_DIST=echo_diagnostic.m
 
-INCLUDES = -I$(top_builddir)/include -I$(top_builddir) @OGG_CFLAGS@ @FFT_CFLAGS@
+INCLUDES = -I$(top_builddir)/include -I$(top_builddir) @FFT_CFLAGS@
 
 lib_LTLIBRARIES = libspeex.la libspeexdsp.la
 
diff -ur speex.orig/src/Makefile.am speex/src/Makefile.am
--- speex.orig/src/Makefile.am	2012-01-22 15:23:09.775731000 -0500
+++ speex/src/Makefile.am	2012-01-22 15:23:30.351731024 -0500
@@ -11,7 +11,7 @@
   VPSY_LIB=
 endif
 
-INCLUDES = -I$(top_builddir) @OGG_CFLAGS@
+INCLUDES = -I$(top_builddir)
 
 man_MANS = speexenc.1 speexdec.1
 
@@ -24,8 +24,8 @@
 
 speexenc_SOURCES = speexenc.c wav_io.c skeleton.c
 speexenc_LDADD = $(top_builddir)/libspeex/libspeex.la $(top_builddir)/libspeex/libspeexdsp.la \
-	$(OGG_LIBS)  @FFT_LIBS@	
+	@FFT_LIBS@
 
 speexdec_SOURCES = speexdec.c wav_io.c
 speexdec_LDADD = $(top_builddir)/libspeex/libspeex.la $(VPSY_LIB) \
-	$(OGG_LIBS)  @FFT_LIBS@
+	@FFT_LIBS@