diff options
-rw-r--r-- | contrib/Jamfile | 8 | ||||
-rw-r--r-- | contrib/patch-x264-macintel.patch | 8 | ||||
-rw-r--r-- | contrib/version_x264.txt | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/contrib/Jamfile b/contrib/Jamfile index d7cb57151..d133ee695 100644 --- a/contrib/Jamfile +++ b/contrib/Jamfile @@ -324,10 +324,10 @@ rule LibX264 { LIBX264_PATCH = " patch -p1 < ../patch-x264-cygwin.patch && " ; } - else if $(OS) = LINUX - { - LIBX264_PATCH = " patch -p1 < ../patch-x264-linux.patch && " ; - } +# else if $(OS) = LINUX +# { +# LIBX264_PATCH = " patch -p1 < ../patch-x264-linux.patch && " ; +# } Depends $(<) : $(>) ; Depends lib : $(<) ; } diff --git a/contrib/patch-x264-macintel.patch b/contrib/patch-x264-macintel.patch index 9a409968c..93bc4193f 100644 --- a/contrib/patch-x264-macintel.patch +++ b/contrib/patch-x264-macintel.patch @@ -1,6 +1,6 @@ ---- x264/common/i386/i386inc.asm 2006-09-23 14:01:05.000000000 -0400 -+++ x264-patched/common/i386/i386inc.asm 2006-09-24 09:21:27.000000000 -0400 -@@ -40,12 +40,12 @@ +--- x264/common/i386/i386inc.asm-old.asm 2007-05-01 16:45:02.000000000 -0400 ++++ x264/common/i386/i386inc.asm 2007-05-02 11:48:52.000000000 -0400 +@@ -42,12 +42,12 @@ ; is unable to compute address offsets outside of .text so we use the .text ; section instead until NASM is fixed. %macro SECTION_RODATA 0 @@ -12,7 +12,7 @@ +; SECTION .text align=16 +; fakegot: +; %else - SECTION .rodata data align=16 + SECTION .rodata align=16 - %endif +; %endif %endmacro diff --git a/contrib/version_x264.txt b/contrib/version_x264.txt index fed73e9a1..e9cfb1ca1 100644 --- a/contrib/version_x264.txt +++ b/contrib/version_x264.txt @@ -1 +1 @@ -http://download.m0k.org/handbrake/contrib/x264-r604.tar.gz +http://download.m0k.org/handbrake/contrib/x264-r654.tar.gz |