diff options
| author | John Stebbins <[email protected]> | 2019-01-20 13:08:30 -0800 |
|---|---|---|
| committer | Bradley Sepos <[email protected]> | 2019-04-04 18:29:47 -0400 |
| commit | e67db75db08e4cbef260b851a7cdcb649039ad45 (patch) | |
| tree | 61e2b349e73de94af6608306d712ad7169682477 | |
| parent | bb54b66f5a02e2a2750bb203d2351d94d27194e1 (diff) | |
x265: enable building with libnuma on linux
Threadripper and other modern CPUs are now multi-core modules that
benefit from having NUMA available.
Adds a dependency for libnuma.
Fixes https://github.com/HandBrake/HandBrake/issues/1142
| -rw-r--r-- | contrib/x265_10bit/module.defs | 2 | ||||
| -rw-r--r-- | contrib/x265_12bit/module.defs | 2 | ||||
| -rw-r--r-- | contrib/x265_8bit/module.defs | 2 | ||||
| -rw-r--r-- | gtk/configure.ac | 2 | ||||
| -rw-r--r-- | test/module.defs | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/contrib/x265_10bit/module.defs b/contrib/x265_10bit/module.defs index f3a371461..252ef50e5 100644 --- a/contrib/x265_10bit/module.defs +++ b/contrib/x265_10bit/module.defs @@ -17,7 +17,7 @@ X265_10.CONFIGURE.args.prefix = -DCMAKE_INSTALL_PREFIX="$(X265_10.CONFIGURE.pref X265_10.CONFIGURE.deps = X265_10.CONFIGURE.static = X265_10.CONFIGURE.shared = -DENABLE_SHARED=OFF -X265_10.CONFIGURE.extra = -DENABLE_CLI=OFF -DHIGH_BIT_DEPTH=ON -DENABLE_LIBNUMA=OFF -DEXPORT_C_API=OFF +X265_10.CONFIGURE.extra = -DENABLE_CLI=OFF -DHIGH_BIT_DEPTH=ON -DEXPORT_C_API=OFF ifneq (none,$(X265_10.GCC.g)) X265_10.CONFIGURE.extra += -DCMAKE_BUILD_TYPE=Debug diff --git a/contrib/x265_12bit/module.defs b/contrib/x265_12bit/module.defs index 10697aff6..f350fff5d 100644 --- a/contrib/x265_12bit/module.defs +++ b/contrib/x265_12bit/module.defs @@ -17,7 +17,7 @@ X265_12.CONFIGURE.args.prefix = -DCMAKE_INSTALL_PREFIX="$(X265_12.CONFIGURE.pref X265_12.CONFIGURE.deps = X265_12.CONFIGURE.static = X265_12.CONFIGURE.shared = -DENABLE_SHARED=OFF -X265_12.CONFIGURE.extra = -DENABLE_CLI=OFF -DHIGH_BIT_DEPTH=ON -DENABLE_LIBNUMA=OFF -DEXPORT_C_API=OFF -DMAIN12=ON +X265_12.CONFIGURE.extra = -DENABLE_CLI=OFF -DHIGH_BIT_DEPTH=ON -DEXPORT_C_API=OFF -DMAIN12=ON ifneq (none,$(X265_12.GCC.g)) X265_12.CONFIGURE.extra += -DCMAKE_BUILD_TYPE=Debug diff --git a/contrib/x265_8bit/module.defs b/contrib/x265_8bit/module.defs index f90438983..173a95fca 100644 --- a/contrib/x265_8bit/module.defs +++ b/contrib/x265_8bit/module.defs @@ -14,7 +14,7 @@ X265_8.CONFIGURE.args.prefix = -DCMAKE_INSTALL_PREFIX="$(X265_8.CONFIGURE.prefix X265_8.CONFIGURE.deps = X265_8.CONFIGURE.static = X265_8.CONFIGURE.shared = -DENABLE_SHARED=OFF -X265_8.CONFIGURE.extra = -DENABLE_CLI=OFF -DHIGH_BIT_DEPTH=OFF -DENABLE_LIBNUMA=OFF -DEXTRA_LIB="x265_main10.a;x265_main12.a" -DEXTRA_LINK_FLAGS=-L. -DLINKED_10BIT=ON -DLINKED_12BIT=ON +X265_8.CONFIGURE.extra = -DENABLE_CLI=OFF -DHIGH_BIT_DEPTH=OFF -DEXTRA_LIB="x265_main10.a;x265_main12.a" -DEXTRA_LINK_FLAGS=-L. -DLINKED_10BIT=ON -DLINKED_12BIT=ON ifneq (none,$(X265_8.GCC.g)) X265_8.CONFIGURE.extra += -DCMAKE_BUILD_TYPE=Debug diff --git a/gtk/configure.ac b/gtk/configure.ac index 3316aa311..6e8c896e3 100644 --- a/gtk/configure.ac +++ b/gtk/configure.ac @@ -197,7 +197,7 @@ case $host in HB_LIBS="$HB_LIBS -lpthread" ;; *) - HB_LIBS="$HB_LIBS -ldl -lpthread" + HB_LIBS="$HB_LIBS -ldl -lpthread -lnuma" ;; esac diff --git a/test/module.defs b/test/module.defs index af3a14997..cae807520 100644 --- a/test/module.defs +++ b/test/module.defs @@ -78,7 +78,7 @@ ifeq ($(BUILD.system),darwin) TEST.GCC.f += IOKit CoreServices CoreText CoreGraphics AudioToolbox VideoToolbox CoreMedia CoreVideo Foundation TEST.GCC.l += iconv else ifeq ($(BUILD.system),linux) - TEST.GCC.l += pthread dl m + TEST.GCC.l += pthread dl m numa else ifeq ($(BUILD.system),kfreebsd) TEST.GCC.l += pthread dl m else ifeq ($(BUILD.system),freebsd) |