* Contrib Updates:

- libogg-1.1.3.tar.gz
- xvidcore-1.1.3.tar.gz
- libtheora-1.0beta3.tar.gz
- libmpeg2-0.5.1.tar.gz
- faac-1.26.tar.gz
- ffmpeg-r14737.tar.gz

* Cygwin Patch for new libfaac


git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1637 b64f7644-9d1e-0410-96f1-a4d463321fa5

8 files changed, 25 insertions, 9 deletions

diff --git a/contrib/Jamfile b/contrib/Jamfile
index a723f1b7b..b224b2001 100644
--- a/contrib/Jamfile
+++ b/contrib/Jamfile
@@ -218,12 +218,16 @@ rule LibFaac
 {
     Depends $(<) : $(>) ;
     Depends lib  : $(<) ;
+	if $(OS) = CYGWIN
+    {
+        CYGWIN_PATCH = "$(PATCH) -p1 < ../patch-faac-cygwin.patch" ;
+    }
 }
 actions LibFaac
 {
     cd `dirname $(>)` && CONTRIB=`pwd` &&
-    rm -rf faac && (gzip -dc faac.tar.gz | tar xf - ) && cd faac &&
-    ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared --enable-static &&
+    rm -rf faac && (gzip -dc faac.tar.gz | tar xf - ) && cd faac && $(CYGWIN_PATCH) && ./bootstrap &&
+    ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared --enable-static --without-mp4v2 &&
     $(MAKE) && $(MAKE) install &&
     $(STRIP) $CONTRIB/lib/libfaac.a
 }
@@ -303,7 +307,7 @@ actions LibMpeg2
 {
     cd `dirname $(>)` && CONTRIB=`pwd` &&
     rm -rf mpeg2dec && (gzip -dc mpeg2dec.tar.gz | tar xf - ) && 
-    cd mpeg2dec && $(PATCH) -p1 < ../patch-libmpeg2.patch &&
+    cd mpeg2dec &&
     ./configure --prefix=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared --disable-sdl --without-x &&
     $(MAKE) && $(MAKE) install &&
     $(STRIP) $CONTRIB/lib/libmpeg2.a
diff --git a/contrib/patch-faac-cygwin.patch b/contrib/patch-faac-cygwin.patch
new file mode 100644
index 000000000..d54b08d02
--- /dev/null
+++ b/contrib/patch-faac-cygwin.patch
@@ -0,0 +1,12 @@
+diff -Naur faac2/include/faac.h faac3/include/faac.h
+--- faac/include/faac.h	2004-07-04 13:12:06.000000000 +0100
++++ faac/include/faac.h	2008-08-17 19:56:29.734375000 +0100
+@@ -50,7 +50,7 @@
+ typedef void *faacEncHandle;
+ 
+ #ifndef HAVE_INT32_T
+-typedef int int32_t;
++//typedef int int32_t;
+ #endif
+ 
+ /*
diff --git a/contrib/version_faac.txt b/contrib/version_faac.txt
index e3466666b..b53bcc4dd 100644
--- a/contrib/version_faac.txt
+++ b/contrib/version_faac.txt
@@ -1 +1 @@
-http://download.m0k.org/handbrake/contrib/faac-1.24.tar.gz
+http://download.m0k.org/handbrake/contrib/faac-1.26.tar.gz
diff --git a/contrib/version_ffmpeg.txt b/contrib/version_ffmpeg.txt
index 053e21995..f7a55d4c6 100644
--- a/contrib/version_ffmpeg.txt
+++ b/contrib/version_ffmpeg.txt
@@ -1 +1 @@
-http://download.m0k.org/handbrake/contrib/ffmpeg-r13707.tar.gz
+http://download.m0k.org/handbrake/contrib/ffmpeg-r14737.tar.gz
diff --git a/contrib/version_libogg.txt b/contrib/version_libogg.txt
index 57daaf702..25bcb92ce 100644
--- a/contrib/version_libogg.txt
+++ b/contrib/version_libogg.txt
@@ -1 +1 @@
-http://download.m0k.org/handbrake/contrib/libogg-1.1.2.tar.gz
+http://download.m0k.org/handbrake/contrib/libogg-1.1.3.tar.gz
diff --git a/contrib/version_libtheora.txt b/contrib/version_libtheora.txt
index 30401afb3..fadd34cca 100644
--- a/contrib/version_libtheora.txt
+++ b/contrib/version_libtheora.txt
@@ -1,2 +1,2 @@
-http://download.m0k.org/handbrake/contrib/libtheora-1.0beta2.tar.gz
+http://download.m0k.org/handbrake/contrib/libtheora-1.0beta3.tar.gz
 
diff --git a/contrib/version_mpeg2dec.txt b/contrib/version_mpeg2dec.txt
index dd4d00229..248ce7bfa 100644
--- a/contrib/version_mpeg2dec.txt
+++ b/contrib/version_mpeg2dec.txt
@@ -1 +1 @@
-http://download.m0k.org/handbrake/contrib/mpeg2dec-0.4.1.tar.gz
+http://download.m0k.org/handbrake/contrib/mpeg2dec-0.5.1.tar.gz
diff --git a/contrib/version_xvidcore.txt b/contrib/version_xvidcore.txt
index 615ddc864..5d8c19719 100644
--- a/contrib/version_xvidcore.txt
+++ b/contrib/version_xvidcore.txt
@@ -1 +1 @@
-http://download.m0k.org/handbrake/contrib/xvidcore-1.1.2.tar.gz
+http://download.m0k.org/handbrake/contrib/xvidcore-1.1.3.tar.gz