contrib: Switch yasm dependencies to nasm.

wolfcon · Jun 17, 2018 · e910330 · e910330
1 parent 1dac209
commit e910330
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 38 deletions.
diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs
@@ -1,4 +1,4 @@
-__deps__ := YASM BZIP2 ZLIB FDKAAC LIBVPX LAME LIBOPUS LIBSPEEX XZ
+__deps__ := BZIP2 ZLIB FDKAAC LIBVPX LAME LIBOPUS LIBSPEEX XZ
 ifeq (1,$(FEATURE.qsv))
 __deps__ += LIBMFX
 endif

diff --git a/contrib/libass/module.defs b/contrib/libass/module.defs
@@ -1,4 +1,4 @@
-__deps__ := YASM FREETYPE FRIBIDI HARFBUZZ
+__deps__ := FREETYPE FRIBIDI HARFBUZZ
 
 ifeq (,$(filter $(BUILD.system),darwin cygwin mingw))
     __deps__ += FONTCONFIG
@@ -32,10 +32,3 @@ ifneq ($(BUILD.system),linux)
         FRIBIDI_LIBS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/))lib -lfribidi" \
         FRIBIDI_CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include"
 endif
-
-ifneq (1,$(BUILD.cross))
-    ifeq (1,$(FEATURE.local_yasm))
-        LIBASS.CONFIGURE.env.LOCAL_PATH = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)"
-        LIBASS.BUILD.env                = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)"
-    endif
-endif
diff --git 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
diff --git a/contrib/x265/module.defs b/contrib/x265/module.defs
@@ -1,4 +1,4 @@
-__deps__ := YASM CMAKE X265_8 X265_10 X265_12
+__deps__ := CMAKE X265_8 X265_10 X265_12
 $(eval $(call import.MODULE.defs,X265,x265,$(__deps__)))
 $(eval $(call import.CONTRIB.defs,X265))
 

diff --git a/contrib/x265_10bit/module.defs b/contrib/x265_10bit/module.defs
@@ -1,4 +1,4 @@
-__deps__ := YASM CMAKE X265_8
+__deps__ := CMAKE X265_8
 $(eval $(call import.MODULE.defs,X265_10,x265_10,$(__deps__),x265))
 $(eval $(call import.CONTRIB.defs,X265_10))
 
@@ -33,10 +33,6 @@ ifeq (1,$(BUILD.cross))
     X265_10.CONFIGURE.args.build = -DCMAKE_HOST_SYSTEM="$(X265_10.CONFIGURE.build)"
 else
     X265_10.CONFIGURE.args.host  = -DCMAKE_HOST_SYSTEM="$(X265_10.CONFIGURE.host)"
-    ifeq (1,$(FEATURE.local_yasm))
-        X265_10.CONFIGURE.env.LOCAL_PATH = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)"
-        X265_10.BUILD.env                = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)"
-    endif
 endif
 
 ## find CMakeLists.txt

diff --git a/contrib/x265_12bit/module.defs b/contrib/x265_12bit/module.defs
@@ -1,4 +1,4 @@
-__deps__ := YASM CMAKE X265_8
+__deps__ := CMAKE X265_8
 $(eval $(call import.MODULE.defs,X265_12,x265_12,$(__deps__),x265))
 $(eval $(call import.CONTRIB.defs,X265_12))
 
@@ -33,10 +33,6 @@ ifeq (1,$(BUILD.cross))
     X265_12.CONFIGURE.args.build = -DCMAKE_HOST_SYSTEM="$(X265_12.CONFIGURE.build)"
 else
     X265_12.CONFIGURE.args.host  = -DCMAKE_HOST_SYSTEM="$(X265_12.CONFIGURE.host)"
-    ifeq (1,$(FEATURE.local_yasm))
-        X265_12.CONFIGURE.env.LOCAL_PATH = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)"
-        X265_12.BUILD.env                = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)"
-    endif
 endif
 
 ## find CMakeLists.txt

diff --git a/contrib/x265_8bit/module.defs b/contrib/x265_8bit/module.defs
@@ -1,4 +1,4 @@
-__deps__ := YASM CMAKE
+__deps__ := CMAKE
 $(eval $(call import.MODULE.defs,X265_8,x265_8,$(__deps__),x265))
 $(eval $(call import.CONTRIB.defs,X265_8))
 
@@ -30,10 +30,6 @@ ifeq (1,$(BUILD.cross))
     X265_8.CONFIGURE.args.build = -DCMAKE_HOST_SYSTEM="$(X265_8.CONFIGURE.build)"
 else
     X265_8.CONFIGURE.args.host  = -DCMAKE_HOST_SYSTEM="$(X265_8.CONFIGURE.host)"
-    ifeq (1,$(FEATURE.local_yasm))
-        X265_8.CONFIGURE.env.LOCAL_PATH = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)"
-        X265_8.BUILD.env                = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)"
-    endif
 endif
 
 ## find CMakeLists.txt