summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
Diffstat (limited to 'contrib')
-rw-r--r--contrib/x264/A00-version-string.patch6
-rw-r--r--contrib/x264/module.defs4
2 files changed, 5 insertions, 5 deletions
diff --git a/contrib/x264/A00-version-string.patch b/contrib/x264/A00-version-string.patch
index dcd4ec628..49a652256 100644
--- a/contrib/x264/A00-version-string.patch
+++ b/contrib/x264/A00-version-string.patch
@@ -6,7 +6,7 @@ index e5a1600..f635d9e 100644
#include "x264_config.h"
--#define X264_BUILD 130
+-#define X264_BUILD 133
+/*
+ * Define the full version explicitly so that it survives a git --archive.
+ *
@@ -16,8 +16,8 @@ index e5a1600..f635d9e 100644
+#ifdef X264_VERSION
+#undef X264_VERSION
+#endif
-+#define X264_BUILD 130
-+#define X264_VERSION " r2273 b3065e6"
++#define X264_BUILD 133
++#define X264_VERSION " r2334 a3ac64b"
/* 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/module.defs b/contrib/x264/module.defs
index 097f88d42..458a6cddf 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-r2273-b3065e6.tar.gz
+X264.FETCH.url = http://download.handbrake.fr/handbrake/contrib/x264-r2334-a3ac64b.tar.gz
X264.EXTRACT.tarbase = x264
X264.CONFIGURE.deps =
@@ -9,7 +9,7 @@ X264.CONFIGURE.shared =
X264.CONFIGURE.static =
X264.CONFIGURE.extra = --disable-cli --enable-static --enable-strip
-X264.CONFIGURE.extra += --disable-gpac --disable-avs --disable-lavf --disable-ffms --disable-swscale
+X264.CONFIGURE.extra += --disable-gpac --disable-avs --disable-lavf --disable-ffms --disable-swscale --disable-opencl
ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
X264.CONFIGURE.extra += --cross-prefix=$(BUILD.spec)-