diff options
| author | Bradley Sepos <[email protected]> | 2018-06-01 16:28:42 -0400 |
|---|---|---|
| committer | Bradley Sepos <[email protected]> | 2018-06-17 00:23:31 -0400 |
| commit | e910330e6a022f8267b61be940fc03a01fee2109 (patch) | |
| tree | 82ee93f0df80514857fc0e0f5486a39d26be321a /contrib/libvpx | |
| parent | 1dac20933de015b9aeeee2c584efc60098f52c98 (diff) | |
contrib: Switch yasm dependencies to nasm.
Diffstat (limited to 'contrib/libvpx')
| -rw-r--r-- | contrib/libvpx/module.defs | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/contrib/libvpx/module.defs b/contrib/libvpx/module.defs index 35b4957be..4650307cf 100644 --- a/contrib/libvpx/module.defs +++ b/contrib/libvpx/module.defs @@ -1,10 +1,4 @@ -__deps__ := YASM -ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system)) -__deps__ += PTHREADW32 -endif - - -$(eval $(call import.MODULE.defs,LIBVPX,libvpx,$(__deps__))) +$(eval $(call import.MODULE.defs,LIBVPX,libvpx,PTHREADW32)) $(eval $(call import.CONTRIB.defs,LIBVPX)) LIBVPX.FETCH.url = https://download.handbrake.fr/contrib/libvpx-1.7.0.tar.gz @@ -14,7 +8,7 @@ LIBVPX.FETCH.sha256 = 1fec931eb5c94279ad219a5b6e0202358e94a93a90cfb1603578c326a LIBVPX.CONFIGURE.args.host = LIBVPX.CONFIGURE.deps = LIBVPX.CONFIGURE.extra = \ - --as=yasm \ + --as=nasm \ --enable-vp8-encoder \ --disable-vp8-decoder \ --enable-vp9-encoder \ @@ -39,8 +33,3 @@ ifeq (linux,$(BUILD.system)) LIBVPX.CONFIGURE.extra += --enable-pic endif endif - -ifeq (1,$(FEATURE.local_yasm)) - LIBVPX.CONFIGURE.env.LOCAL_PATH = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)" - LIBVPX.BUILD.env = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)" -endif |