diff options
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/Jamfile | 8 | ||||
| -rw-r--r-- | contrib/version_x264.txt | 2 | ||||
| -rw-r--r-- | contrib/xvidcore.patch | 31 |
3 files changed, 34 insertions, 7 deletions
diff --git a/contrib/Jamfile b/contrib/Jamfile index 2ba2aa492..643840386 100644 --- a/contrib/Jamfile +++ b/contrib/Jamfile @@ -258,10 +258,6 @@ LibX264 $(SUBDIR)/lib/libx264.a : $(SUBDIR)/x264.tar.gz ; # libxvidcore rule LibXvidCore { - if $(OS) = MACOSX && $(OSPLAT) = X86 - { - XVID_OPTIONS = --disable-assembly ; - } Depends $(<) : $(>) ; Depends lib : $(<) ; } @@ -269,8 +265,8 @@ actions LibXvidCore { cd `dirname $(>)` && CONTRIB=`pwd` && rm -rf xvidcore && tar xzf xvidcore.tar.gz && - cd xvidcore/build/generic/ && ./configure $(XVID_OPTIONS) && - make libxvidcore.a && + cd xvidcore && patch -p1 < ../xvidcore.patch && + cd build/generic/ && ./configure && make libxvidcore.a && cp ./=build/libxvidcore.a $CONTRIB/lib/ && cp ../../src/xvid.h $CONTRIB/include/ && strip -S $CONTRIB/lib/libxvidcore.a diff --git a/contrib/version_x264.txt b/contrib/version_x264.txt index 0ff3c2e51..dbf8c5768 100644 --- a/contrib/version_x264.txt +++ b/contrib/version_x264.txt @@ -1 +1 @@ -http://download.m0k.org/handbrake/contrib/x264-r400.tar.gz +http://download.m0k.org/handbrake/contrib/x264-r401.tar.gz diff --git a/contrib/xvidcore.patch b/contrib/xvidcore.patch new file mode 100644 index 000000000..51cb94c6d --- /dev/null +++ b/contrib/xvidcore.patch @@ -0,0 +1,31 @@ +diff -ru xvidcore-1.1.0/build/generic/configure xvidcore-1.1.0-patched/build/generic/configure +--- xvidcore-1.1.0/build/generic/configure 2005-12-30 15:45:30.000000000 +0100 ++++ xvidcore-1.1.0-patched/build/generic/configure 2006-01-16 22:06:10.000000000 +0100 +@@ -4052,6 +4071,12 @@ + PREFIX="-DPREFIX" + MARK_FUNCS="" + ;; ++ *darwin*) ++ echo "$as_me:$LINENO: result: macho" >&5 ++echo "${ECHO_T}macho" >&6 ++ NASM_FORMAT="macho" ++ PREFIX="-DPREFIX" ++ MARK_FUNCS="" + esac + + AS="$chosen_asm_prog" +diff -ru xvidcore-1.1.0/build/generic/configure.in xvidcore-1.1.0-patched/build/generic/configure.in +--- xvidcore-1.1.0/build/generic/configure.in 2005-12-30 15:45:30.000000000 +0100 ++++ xvidcore-1.1.0-patched/build/generic/configure.in 2006-01-16 22:06:04.000000000 +0100 +@@ -397,6 +397,11 @@ + PREFIX="-DPREFIX" + MARK_FUNCS="" + ;; ++ *darwin*) ++ AC_MSG_RESULT([macho]) ++ NASM_FORMAT="macho" ++ PREFIX="-DPREFIX" ++ MARK_FUNCS="" + esac + + AS="$chosen_asm_prog" |