Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
314157be
Commit
314157be
authored
Nov 07, 2011
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
contrib: remove yasm deps
build tools will be handled by extras/tools
parent
7f2a7295
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
9 deletions
+0
-9
contrib/src/ffmpeg/rules.mak
contrib/src/ffmpeg/rules.mak
+0
-1
contrib/src/vpx/rules.mak
contrib/src/vpx/rules.mak
+0
-2
contrib/src/x264/rules.mak
contrib/src/x264/rules.mak
+0
-6
No files found.
contrib/src/ffmpeg/rules.mak
View file @
314157be
...
@@ -59,7 +59,6 @@ endif
...
@@ -59,7 +59,6 @@ endif
ifeq
($(ARCH),x86_64)
ifeq
($(ARCH),x86_64)
FFMPEGCONF
+=
--cpu
=
core2
FFMPEGCONF
+=
--cpu
=
core2
endif
endif
DEPS_ffmpeg
+=
yasm
$(DEPS_yasm)
endif
endif
# Linux
# Linux
...
...
contrib/src/vpx/rules.mak
View file @
314157be
...
@@ -27,7 +27,6 @@ ifeq ($(ARCH),arm)
...
@@ -27,7 +27,6 @@ ifeq ($(ARCH),arm)
VPX_ARCH
:=
armv7
VPX_ARCH
:=
armv7
else
ifeq
($(ARCH),i386)
else
ifeq
($(ARCH),i386)
VPX_ARCH
:=
x86
VPX_ARCH
:=
x86
#DEPS_vpx += yasm $(DEPS_yasm)
else
ifeq
($(ARCH),mips)
else
ifeq
($(ARCH),mips)
VPX_ARCH
:=
mips32
VPX_ARCH
:=
mips32
else
ifeq
($(ARCH),ppc)
else
ifeq
($(ARCH),ppc)
...
@@ -38,7 +37,6 @@ else ifeq ($(ARCH),sparc)
...
@@ -38,7 +37,6 @@ else ifeq ($(ARCH),sparc)
VPX_ARCH
:=
sparch
VPX_ARCH
:=
sparch
else
ifeq
($(ARCH),x86_64)
else
ifeq
($(ARCH),x86_64)
VPX_ARCH
:=
x86_64
VPX_ARCH
:=
x86_64
#DEPS_vpx += yasm $(DEPS_yasm)
endif
endif
ifdef
HAVE_LINUX
ifdef
HAVE_LINUX
...
...
contrib/src/x264/rules.mak
View file @
314157be
...
@@ -25,12 +25,6 @@ else
...
@@ -25,12 +25,6 @@ else
X264CONF
+=
--enable-win32thread
X264CONF
+=
--enable-win32thread
endif
endif
ifdef
HAVE_MACOSX
ifneq
($(findstring $(ARCH),i386 x86_64),)
DEPS_x264
+=
yasm
endif
endif
$(TARBALLS)/x264-$(X264_VERSION).tar.gz
:
$(TARBALLS)/x264-$(X264_VERSION).tar.gz
:
$(
call
download,
$(X264_URL)
)
$(
call
download,
$(X264_URL)
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment