Updated and re-enabled x264 Cygwin patch

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

diff --git a/contrib/Jamfile b/contrib/Jamfile
index 1fc19f2282b3a08bcdac7a95ab01f4cd434ad61e..28b44c6327e99988450f47986deead53259f0100 100644 (file)
--- a/contrib/Jamfile
+++ b/contrib/Jamfile
@@ -258,9 +258,10 @@ rule LibX264
 #        LIBX264_PATCH = " patch -p1 < ../patch-x264-macintel.patch && " ;
 #    }
 #    else if $(OS) = CYGWIN
-#    {
-#        LIBX264_PATCH = " patch -p1 < ../patch-x264-cygwin.patch && " ;
-#    }
+    if $(OS) = CYGWIN
+    {
+        LIBX264_PATCH = " patch -p1 < ../patch-x264-cygwin.patch && " ;
+    }
     Depends $(<) : $(>) ;
     Depends lib  : $(<) ;
 }

diff --git a/contrib/patch-x264-cygwin.patch b/contrib/patch-x264-cygwin.patch
index 40a14fa4498541fe17030178e70b2d985612b7b3..c03fdf7199540234d191c831237c47448346463d 100644 (file)
--- 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"