vlc | branch: master | Rafaël Carré <[email protected]> | Mon Nov 7 23:41:03 2011 -0500| [314157beb391d46535a272f5ee8a4504f2975758] | committer: Rafaël Carré
contrib: remove yasm deps build tools will be handled by extras/tools > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=314157beb391d46535a272f5ee8a4504f2975758 --- contrib/src/ffmpeg/rules.mak | 1 - contrib/src/vpx/rules.mak | 2 -- contrib/src/x264/rules.mak | 6 ------ 3 files changed, 0 insertions(+), 9 deletions(-) diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak index 21d1ad0..b6441d9 100644 --- a/contrib/src/ffmpeg/rules.mak +++ b/contrib/src/ffmpeg/rules.mak @@ -59,7 +59,6 @@ endif ifeq ($(ARCH),x86_64) FFMPEGCONF += --cpu=core2 endif -DEPS_ffmpeg += yasm $(DEPS_yasm) endif # Linux diff --git a/contrib/src/vpx/rules.mak b/contrib/src/vpx/rules.mak index 3cd0df1..b102b2e 100644 --- a/contrib/src/vpx/rules.mak +++ b/contrib/src/vpx/rules.mak @@ -27,7 +27,6 @@ ifeq ($(ARCH),arm) VPX_ARCH := armv7 else ifeq ($(ARCH),i386) VPX_ARCH := x86 -#DEPS_vpx += yasm $(DEPS_yasm) else ifeq ($(ARCH),mips) VPX_ARCH := mips32 else ifeq ($(ARCH),ppc) @@ -38,7 +37,6 @@ else ifeq ($(ARCH),sparc) VPX_ARCH := sparch else ifeq ($(ARCH),x86_64) VPX_ARCH := x86_64 -#DEPS_vpx += yasm $(DEPS_yasm) endif ifdef HAVE_LINUX diff --git a/contrib/src/x264/rules.mak b/contrib/src/x264/rules.mak index 1873697..4692522 100644 --- a/contrib/src/x264/rules.mak +++ b/contrib/src/x264/rules.mak @@ -25,12 +25,6 @@ else X264CONF += --enable-win32thread endif -ifdef HAVE_MACOSX -ifneq ($(findstring $(ARCH),i386 x86_64),) -DEPS_x264 += yasm -endif -endif - $(TARBALLS)/x264-$(X264_VERSION).tar.gz: $(call download,$(X264_URL)) _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
