* The same getopt problem that theora has, exists in speex as well.

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 83448234f414e4b9c3e03a4eed3f690f518a77cb..73edcd58b81dc92b03e9a4782a3fe1cd2898c774 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -589,6 +589,7 @@ speex-$(SPEEX_VERSION).tar.gz:
 
 speex: speex-$(SPEEX_VERSION).tar.gz
        $(EXTRACT_GZ)
+       patch -p0 < Patches/speex.patch
 
 .speex: speex
        (cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) --enable-ogg=no && make && make install)
@@ -849,7 +850,7 @@ live: live-$(LIVEDOTCOM_VERSION).tar.gz
        patch -p 0 < Patches/live.patch
 
 .live: live
-       (cd $<; ./genMakefiles macosx-before-version-10.4 && make )
+       (cd $<; ./genMakefiles macosx-before-version-10.4-before-version-10.4 && make )
        touch $@
 
 CLEAN_FILE += .live

diff --git a/extras/contrib/src/Patches/speex.patch b/extras/contrib/src/Patches/speex.patch
new file mode 100644 (file)
index 0000000..201d523
--- /dev/null
+++ b/extras/contrib/src/Patches/speex.patch
@@ -0,0 +1,29 @@
+diff -ruN speex-1.1.10/Makefile.am speex/Makefile.am
+--- speex-1.1.10/Makefile.am   Thu Jun  9 08:22:08 2005
++++ speex/Makefile.am  Fri Aug 26 14:55:35 2005
+@@ -13,9 +13,9 @@
+ EXTRA_DIST = Speex.spec Speex.spec.in Speex.kdevelop speex.m4 speex.pc.in
+ 
+ #Fools KDevelop into including all files
+-SUBDIRS = libspeex include @src@ doc win32 symbian
++SUBDIRS = libspeex include doc win32 symbian
+ 
+-DIST_SUBDIRS = libspeex include src doc win32 symbian
++DIST_SUBDIRS = libspeex include doc win32 symbian
+ 
+ rpm: dist
+       rpmbuild -ta ${PACKAGE}-${VERSION}.tar.gz
+diff -ruN speex-1.1.10/Makefile.in speex/Makefile.in
+--- speex-1.1.10/Makefile.in   Thu Jun  9 08:25:48 2005
++++ speex/Makefile.in  Fri Aug 26 14:56:21 2005
+@@ -194,8 +194,8 @@
+ EXTRA_DIST = Speex.spec Speex.spec.in Speex.kdevelop speex.m4 speex.pc.in
+ 
+ #Fools KDevelop into including all files
+-SUBDIRS = libspeex include @src@ doc win32 symbian
+-DIST_SUBDIRS = libspeex include src doc win32 symbian
++SUBDIRS = libspeex include doc win32 symbian
++DIST_SUBDIRS = libspeex include doc win32 symbian
+ all: config.h
+       $(MAKE) $(AM_MAKEFLAGS) all-recursive
+