diff options
| author | Michael Forney <mforney@mforney.org> | 2017-10-15 21:03:10 -0700 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2017-10-15 21:03:10 -0700 |
| commit | 79e60e5e95b5ba78a663ff88dc20f372dc63877a (patch) | |
| tree | 0ffb72b4e30cc96010c0f7e4dfd28bc2bb71f87d /pkg/ffmpeg/gen.lua | |
| parent | 6c200af7986812602e94fd8ef7429277f1c32915 (diff) | |
ffmpeg: Update to 3.4
Diffstat (limited to 'pkg/ffmpeg/gen.lua')
| -rw-r--r-- | pkg/ffmpeg/gen.lua | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/pkg/ffmpeg/gen.lua b/pkg/ffmpeg/gen.lua index 6e1b1001..360cd677 100644 --- a/pkg/ffmpeg/gen.lua +++ b/pkg/ffmpeg/gen.lua @@ -36,8 +36,8 @@ build('awk', '$outdir/include/libavutil/avconfig.h', {'$dir/options.h', '|', '$d expr='-f $dir/avconfig.awk', }) -rule('ffversion', 'sh $srcdir/version.sh $srcdir $out') -build('ffversion', '$outdir/include/libavutil/ffversion.h', {'|', '$srcdir/version.sh'}) +rule('ffversion', 'sh $srcdir/ffbuild/version.sh $srcdir $out') +build('ffversion', '$outdir/include/libavutil/ffversion.h', {'|', '$srcdir/ffbuild/version.sh'}) -- TODO: Copy the rest of the headers. pkg.hdrs = { @@ -108,8 +108,10 @@ lib('libavcodec.a', { 'bsf.c', 'codec_desc.c', 'd3d11va.c', + 'decode.c', 'dirac.c', 'dv_profile.c', + 'encode.c', 'imgconvert.c', 'jni.c', 'mathtables.c', @@ -251,6 +253,7 @@ lib('libavutil.a', { 'samplefmt.c', 'sha.c', 'sha512.c', + 'slicethread.c', 'spherical.c', 'stereo3d.c', 'threadmessage.c', @@ -335,12 +338,12 @@ local libs = { 'libswscale.a.d', } -cc('cmdutils.c', {'$dir/deps'}) +cc('fftools/cmdutils.c', {'$dir/deps'}) -exe('ffprobe', {'ffprobe.c', 'cmdutils.c.o', libs}) +exe('ffprobe', {paths[[fftools/(ffprobe.c cmdutils.c.o)]], libs}) file('bin/ffprobe', '755', '$outdir/ffprobe') -exe('ffmpeg', {'ffmpeg.c', 'ffmpeg_opt.c', 'ffmpeg_filter.c', 'cmdutils.c.o', libs}) +exe('ffmpeg', {paths[[fftools/(ffmpeg.c ffmpeg_opt.c ffmpeg_filter.c ffmpeg_hw.c cmdutils.c.o)]], libs}) file('bin/ffmpeg', '755', '$outdir/ffmpeg') rule('texi2mdoc', 'texi2mdoc -I $outdir $in >$out.tmp && mv $out.tmp $out') |