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
239a13b8
Commit
239a13b8
authored
Nov 15, 2011
by
Jean-Baptiste Kempf
Committed by
Rémi Denis-Courmont
Nov 15, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Contrib: detect zcat vs gzcat
parent
59b38619
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
2 deletions
+10
-2
contrib/src/ffmpeg/rules.mak
contrib/src/ffmpeg/rules.mak
+1
-1
contrib/src/main.mak
contrib/src/main.mak
+8
-0
contrib/src/x264/rules.mak
contrib/src/x264/rules.mak
+1
-1
No files found.
contrib/src/ffmpeg/rules.mak
View file @
239a13b8
...
...
@@ -112,7 +112,7 @@ FFMPEG_VERSION := git
ffmpeg
:
ffmpeg-$(FFMPEG_VERSION).tar.gz .sum-ffmpeg
rm
-Rf
$@
$@
-git
mkdir
-p
$@
-git
zcat
"
$<
"
|
(
cd
$@
-git
&&
tar
xv
--strip-components
=
1
)
$(ZCAT)
"
$<
"
|
(
cd
$@
-git
&&
tar
xv
--strip-components
=
1
)
ifdef
HAVE_WIN32
sed
-i
"s/std=c99/std=gnu99/"
$@
-
$(FFMPEG_VERSION)
/configure
endif
...
...
contrib/src/main.mak
View file @
239a13b8
...
...
@@ -136,6 +136,14 @@ else
download
=
$(
error
Neither curl nor wget found!
)
endif
ifeq
($(shell gzcat --version >/dev/null 2>&1 || echo FAIL),)
ZCAT
=
gzcat
else
ifeq
($(shell zcat --version >/dev/null 2>&1 || echo FAIL),)
ZCAT
=
zcat
else
ZCAT
?=
$(
error
Gunzip client
(
zcat
)
not found!
)
endif
ifeq
($(shell sha512sum --version >/dev/null 2>&1 || echo FAIL),)
SHA512SUM
=
sha512sum
else
ifeq
($(shell shasum --version >/dev/null 2>&1 || echo FAIL),)
...
...
contrib/src/x264/rules.mak
View file @
239a13b8
...
...
@@ -43,7 +43,7 @@ X264_VERSION := git
x264
:
x264-$(X264_VERSION).tar.gz .sum-x264
rm
-Rf
x264-git
mkdir
-p
x264-git
zcat
"
$<
"
|
(
cd
x264-git
&&
tar
xv
--strip-components
=
1
)
$(ZCAT)
"
$<
"
|
(
cd
x264-git
&&
tar
xv
--strip-components
=
1
)
$(MOVE)
.x264
:
x264
...
...
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