summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorJohn Stebbins <[email protected]>2016-02-11 08:34:18 -0700
committerJohn Stebbins <[email protected]>2016-02-11 08:36:56 -0700
commit163b00195a8536309731a0149a0ab6bb801211af (patch)
tree0d95077f42b968a92b29da1a416e14f7663b24cf /contrib
parent426f1c1614cdc40e51a4626e1aed96a438025cd8 (diff)
x265: bump to version 1.9
Allows disabling of libnuma. HandBrake would previously encounter link errors when libnuma was auto-detected by the x265 build system. Other various fixes and improvements... (cherry picked from commit e1d46e31ed4534d989bfab78ad514fd5126e5373)
Diffstat (limited to 'contrib')
-rw-r--r--contrib/x265/module.defs4
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/x265/module.defs b/contrib/x265/module.defs
index fdbb2b88a..9a6c3dec4 100644
--- a/contrib/x265/module.defs
+++ b/contrib/x265/module.defs
@@ -2,14 +2,14 @@ __deps__ := YASM CMAKE
$(eval $(call import.MODULE.defs,X265,x265,$(__deps__)))
$(eval $(call import.CONTRIB.defs,X265))
-X265.FETCH.url = http://download.handbrake.fr/contrib/x265_1.8.tar.gz
+X265.FETCH.url = http://download.handbrake.fr/contrib/x265_1.9.tar.gz
X265.CONFIGURE.exe = cmake
X265.CONFIGURE.args.prefix = -DCMAKE_INSTALL_PREFIX="$(X265.CONFIGURE.prefix)"
X265.CONFIGURE.deps =
X265.CONFIGURE.static =
X265.CONFIGURE.shared = -DENABLE_SHARED=OFF
-X265.CONFIGURE.extra = -DENABLE_CLI=OFF -DHIGH_BIT_DEPTH=OFF
+X265.CONFIGURE.extra = -DENABLE_CLI=OFF -DHIGH_BIT_DEPTH=OFF -DENABLE_LIBNUMA=OFF
ifneq (none,$(X265.GCC.g))
X265.CONFIGURE.extra += -DCMAKE_BUILD_TYPE=Debug