From: prigaux <pri@nopapers.org>
Date: Thu, 18 Jan 2007 14:17:11 +0000 (+0000)
Subject: Put latest contrib libraries as in the 0.7.3 branch.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=42c3becf6b3f052fe6fbf7d48cbe8130cb58959f;p=handbrake

Put latest contrib libraries as in the 0.7.3 branch.

git-svn-id: svn://svn.handbrake.fr/HandBrake/branches/PixelRatioWorking@186 b64f7644-9d1e-0410-96f1-a4d463321fa5
---

diff --git a/contrib/Jamfile b/contrib/Jamfile
index 33e9c2e5b..28b44c632 100644
--- a/contrib/Jamfile
+++ b/contrib/Jamfile
@@ -253,11 +253,12 @@ LibVorbisEnc $(SUBDIR)/lib/libvorbisenc.a : $(SUBDIR)/lib/libvorbis.a ;
 rule LibX264
 {
     LIBX264_PATCH = "" ;
-    if $(OS) = MACOSX && $(OSPLAT) = X86
-    {
-        LIBX264_PATCH = " patch -p1 < ../patch-x264-macintel.patch && " ;
-    }
-    else if $(OS) = CYGWIN
+#    if $(OS) = MACOSX && $(OSPLAT) = X86
+#    {
+#        LIBX264_PATCH = " patch -p1 < ../patch-x264-macintel.patch && " ;
+#    }
+#    else if $(OS) = CYGWIN
+    if $(OS) = CYGWIN
     {
         LIBX264_PATCH = " patch -p1 < ../patch-x264-cygwin.patch && " ;
     }
diff --git a/contrib/patch-x264-cygwin.patch b/contrib/patch-x264-cygwin.patch
index 40a14fa44..c03fdf719 100644
--- a/contrib/patch-x264-cygwin.patch
+++ b/contrib/patch-x264-cygwin.patch
@@ -1,7 +1,7 @@
 diff -Naur x264/configure x264-patched/configure
---- x264/configure	2007-01-01 17:01:36.609375000 -0500
-+++ x264-patched/configure	2007-01-01 17:02:36.468750000 -0500
-@@ -96,8 +96,8 @@
+--- x264/configure	2007-01-14 12:30:22.000000000 -0500
++++ x264-patched/configure	2007-01-14 13:37:18.078125000 -0500
+@@ -113,8 +113,8 @@
      ;;
    cygwin*)
      SYS="CYGWIN"
diff --git a/contrib/version_libdvdread.txt b/contrib/version_libdvdread.txt
index ff442ba80..811baa124 100644
--- a/contrib/version_libdvdread.txt
+++ b/contrib/version_libdvdread.txt
@@ -1 +1 @@
-http://download.handbrake.dynalias.com/contrib/libdvdread-20050928.tar.gz
+http://download.handbrake.dynalias.com/contrib/libdvdread-0.9.7.tar.gz
diff --git a/contrib/version_mpeg2dec.txt b/contrib/version_mpeg2dec.txt
index e58f080ed..be9cab0e8 100644
--- a/contrib/version_mpeg2dec.txt
+++ b/contrib/version_mpeg2dec.txt
@@ -1 +1 @@
-http://download.handbrake.dynalias.com/contrib/mpeg2dec-20051112.tar.gz
+http://download.handbrake.dynalias.com/contrib/mpeg2dec-0.4.1.tar.gz
diff --git a/contrib/version_x264.txt b/contrib/version_x264.txt
index eff0d42c3..b762a7a35 100644
--- a/contrib/version_x264.txt
+++ b/contrib/version_x264.txt
@@ -1 +1 @@
-http://download.handbrake.dynalias.com/contrib/x264-r604.tar.gz
+http://download.handbrake.dynalias.com/contrib/x264-r618.tar.gz
diff --git a/contrib/version_xvidcore.txt b/contrib/version_xvidcore.txt
index 0a8812c08..3d328862b 100644
--- a/contrib/version_xvidcore.txt
+++ b/contrib/version_xvidcore.txt
@@ -1 +1 @@
-http://download.handbrake.dynalias.com/contrib/xvidcore-1.1.0.tar.gz
+http://download.handbrake.dynalias.com/contrib/xvidcore-1.1.2.tar.gz