Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Steve Lhomme
VLC
Commits
ddea07a5
Commit
ddea07a5
authored
Jul 08, 2016
by
Steve Lhomme
Committed by
Jean-Baptiste Kempf
Jul 08, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
contrib: ffmpeg: use a ffmpeg specific HASH variable
Signed-off-by:
Jean-Baptiste Kempf
<
jb@videolan.org
>
parent
aceca94c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
11 deletions
+11
-11
contrib/src/ffmpeg/rules.mak
contrib/src/ffmpeg/rules.mak
+11
-11
No files found.
contrib/src/ffmpeg/rules.mak
View file @
ddea07a5
...
...
@@ -5,12 +5,12 @@
#USE_FFMPEG ?= 1
ifdef
USE_FFMPEG
HASH
=
HEAD
FFMPEG_SNAPURL
:=
http://git.videolan.org/?p
=
ffmpeg.git
;
a
=
snapshot
;
h
=
$(HASH)
;
sf
=
tgz
FFMPEG_
HASH
=
HEAD
FFMPEG_SNAPURL
:=
http://git.videolan.org/?p
=
ffmpeg.git
;
a
=
snapshot
;
h
=
$(
FFMPEG_
HASH)
;
sf
=
tgz
FFMPEG_GITURL
:=
git://git.videolan.org/ffmpeg.git
else
HASH
=
HEAD
FFMPEG_SNAPURL
:=
http://git.libav.org/?p
=
libav.git
;
a
=
snapshot
;
h
=
$(HASH)
;
sf
=
tgz
FFMPEG_
HASH
=
HEAD
FFMPEG_SNAPURL
:=
http://git.libav.org/?p
=
libav.git
;
a
=
snapshot
;
h
=
$(
FFMPEG_
HASH)
;
sf
=
tgz
FFMPEG_GITURL
:=
git://git.libav.org/libav.git
endif
...
...
@@ -189,17 +189,17 @@ endif
FFMPEGCONF
+=
--nm
=
"
$(NM)
"
--ar
=
"
$(AR)
"
$(TARBALLS)/ffmpeg-$(HASH).tar.xz
:
$(
call
download_git,
$(FFMPEG_GITURL)
,,
$(HASH)
)
$(TARBALLS)/ffmpeg-$(
FFMPEG_
HASH).tar.xz
:
$(
call
download_git,
$(FFMPEG_GITURL)
,,
$(
FFMPEG_
HASH)
)
.sum-ffmpeg
:
$(TARBALLS)/ffmpeg-$(HASH).tar.xz
.sum-ffmpeg
:
$(TARBALLS)/ffmpeg-$(
FFMPEG_
HASH).tar.xz
$(
warning
Not implemented.
)
touch
$@
ffmpeg
:
ffmpeg-$(HASH).tar.xz .sum-ffmpeg
rm
-Rf
$@
$@
-
$(HASH)
mkdir
-p
$@
-
$(HASH)
$(XZCAT)
"
$<
"
|
(
cd
$@
-
$(HASH)
&&
tar
xv
--strip-components
=
1
)
ffmpeg
:
ffmpeg-$(
FFMPEG_
HASH).tar.xz .sum-ffmpeg
rm
-Rf
$@
$@
-
$(
FFMPEG_
HASH)
mkdir
-p
$@
-
$(
FFMPEG_
HASH)
$(XZCAT)
"
$<
"
|
(
cd
$@
-
$(
FFMPEG_
HASH)
&&
tar
xv
--strip-components
=
1
)
$(MOVE)
.ffmpeg
:
ffmpeg
...
...
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