3 files changed, 18 insertions, 6 deletions
diff --git a/contrib/libogg/P00-darwin-O4.patch b/contrib/libogg/P00-darwin-O4.patch
index d26b74596..3b218d2b2 100644
--- a/contrib/libogg/P00-darwin-O4.patch
+++ b/contrib/libogg/P00-darwin-O4.patch
@@ -1,7 +1,6 @@
-diff -ur libogg.orig/configure libogg/configure
---- libogg.orig/configure	2005-11-27 23:26:32.000000000 -0500
-+++ libogg/configure	2011-08-19 23:16:01.000000000 -0400
-@@ -19106,8 +19106,8 @@
+--- libogg-1.3.0.orig/configure.in	2011-08-04 10:11:08.000000000 -0700
++++ libogg-1.3.0/configure.in	2011-10-19 14:31:35.370790124 -0700
+@@ -56,8 +56,8 @@
  		;;
  	*-*-darwin*)
  		DEBUG="-fno-common -g -Wall -fsigned-char"
diff --git a/contrib/libogg/P01-darwin-automake-1.10.patch b/contrib/libogg/P01-darwin-automake-1.10.patch
new file mode 100644
index 000000000..6d8f0ba1f
--- /dev/null
+++ b/contrib/libogg/P01-darwin-automake-1.10.patch
@@ -0,0 +1,11 @@
+--- libogg-1.3.0.orig/Makefile.am	2011-08-04 10:37:15.000000000 -0700
++++ libogg-1.3.0/Makefile.am	2011-10-19 14:31:58.203289946 -0700
+@@ -2,7 +2,7 @@
+ 
+ 
+ #AUTOMAKE_OPTIONS = foreign 1.6 dist-zip
+-AUTOMAKE_OPTIONS = foreign 1.11 dist-zip dist-xz
++AUTOMAKE_OPTIONS = foreign 1.10 dist-zip
+ 
+ SUBDIRS = src include doc
+ 
diff --git a/contrib/libogg/module.defs b/contrib/libogg/module.defs
index e3cd8de42..4b1c8c9ac 100644
--- a/contrib/libogg/module.defs
+++ b/contrib/libogg/module.defs
@@ -1,7 +1,9 @@
 $(eval $(call import.MODULE.defs,LIBOGG,libogg))
 $(eval $(call import.CONTRIB.defs,LIBOGG))
 
-LIBOGG.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libogg-1.1.3.tar.gz
-LIBOGG.EXTRACT.tarbase = libogg
+LIBOGG.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libogg-1.3.0.tar.gz
+LIBOGG.EXTRACT.tarbase = libogg-1.3.0
 
 LIBOGG.CONFIGURE.extra = --disable-sdl
+
+LIBOGG.CONFIGURE.bootstrap = rm -fr aclocal.m4 autom4te.cache configure; autoreconf -fiv;