diff options
| author | Rodeo <[email protected]> | 2014-05-10 18:42:44 +0000 |
|---|---|---|
| committer | Rodeo <[email protected]> | 2014-05-10 18:42:44 +0000 |
| commit | 1045fd5adfa35e5169767b9525de54c271b2bde6 (patch) | |
| tree | 39bb00247e350d5b04feee3f2eb98cae3b3a84d1 /contrib | |
| parent | 974cae15854b3b8525caa1a3d3ca4e3b72329460 (diff) | |
Bump x264 to r2431 ac76440.
Miscellaneous bugfixes and improvements, as usual.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6175 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/x264/A00-version-string.patch | 4 | ||||
| -rw-r--r-- | contrib/x264/P00-darwin-configure-clang.patch | 11 | ||||
| -rw-r--r-- | contrib/x264/module.defs | 2 |
3 files changed, 3 insertions, 14 deletions
diff --git a/contrib/x264/A00-version-string.patch b/contrib/x264/A00-version-string.patch index 6af0744d8..44aaa1101 100644 --- a/contrib/x264/A00-version-string.patch +++ b/contrib/x264/A00-version-string.patch @@ -1,5 +1,5 @@ diff --git a/x264.h b/x264.h -index 2e4a98d..6261638 100644 +index 2e4a98d..2065222 100644 --- a/x264.h +++ b/x264.h @@ -41,7 +41,17 @@ @@ -17,7 +17,7 @@ index 2e4a98d..6261638 100644 +#undef X264_VERSION +#endif +#define X264_BUILD 142 -+#define X264_VERSION " r2409 d6b4e63" ++#define X264_VERSION " r2431 ac76440" /* Application developers planning to link against a shared library version of * libx264 from a Microsoft Visual Studio or similar development environment diff --git a/contrib/x264/P00-darwin-configure-clang.patch b/contrib/x264/P00-darwin-configure-clang.patch deleted file mode 100644 index 619eee8c8..000000000 --- a/contrib/x264/P00-darwin-configure-clang.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ur x264.orig/configure x264/configure ---- x264.orig/configure 2014-01-21 16:40:15.000000000 -0500 -+++ x264/configure 2014-03-11 20:33:33.000000000 -0400 -@@ -467,7 +467,6 @@ - ;; - darwin*) - SYS="MACOSX" -- CFLAGS="$CFLAGS -falign-loops=16" - libm="-lm" - if [ "$pic" = "no" ]; then - cc_check "" -mdynamic-no-pic && CFLAGS="$CFLAGS -mdynamic-no-pic" diff --git a/contrib/x264/module.defs b/contrib/x264/module.defs index e6a83e78e..126b34da4 100644 --- a/contrib/x264/module.defs +++ b/contrib/x264/module.defs @@ -1,7 +1,7 @@ $(eval $(call import.MODULE.defs,X264,x264,YASM PTHREADW32)) $(eval $(call import.CONTRIB.defs,X264)) -X264.FETCH.url = http://download.handbrake.fr/handbrake/contrib/x264-r2409-d6b4e63.tar.gz +X264.FETCH.url = http://download.handbrake.fr/handbrake/contrib/x264-r2431-ac76440.tar.gz X264.EXTRACT.tarbase = x264 X264.GCC.args.c_std = |