From d4c06bc7faff9d31fcf9b9932150d77f08ee4fc6 Mon Sep 17 00:00:00 2001 From: Johannes Brechtmann Date: Fri, 11 May 2018 12:52:05 +0200 Subject: [PATCH] moc: add patch for ffmpeg-4.0.1. --- srcpkgs/moc/patches/ffmpeg4.patch | 32 +++++++++++++++++++++++++++++++ srcpkgs/moc/template | 2 +- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/moc/patches/ffmpeg4.patch diff --git a/srcpkgs/moc/patches/ffmpeg4.patch b/srcpkgs/moc/patches/ffmpeg4.patch new file mode 100644 index 0000000000..0606a52ab9 --- /dev/null +++ b/srcpkgs/moc/patches/ffmpeg4.patch @@ -0,0 +1,32 @@ +--- decoder_plugins/ffmpeg/ffmpeg.c.orig 2018-05-11 12:48:29.897671514 +0200 ++++ decoder_plugins/ffmpeg/ffmpeg.c 2018-05-11 12:50:09.133692416 +0200 +@@ -984,7 +984,7 @@ + * FFmpeg/LibAV in use. For some versions this will be caught in + * *_find_stream_info() above and misreported as an unfound codec + * parameters error. */ +- if (data->codec->capabilities & CODEC_CAP_EXPERIMENTAL) { ++ if (data->codec->capabilities & AV_CODEC_CAP_EXPERIMENTAL) { + decoder_error (&data->error, ERROR_FATAL, 0, + "The codec is experimental and may damage MOC: %s", + data->codec->name); +@@ -993,8 +993,8 @@ + #endif + + set_downmixing (data); +- if (data->codec->capabilities & CODEC_CAP_TRUNCATED) +- data->enc->flags |= CODEC_FLAG_TRUNCATED; ++ if (data->codec->capabilities & AV_CODEC_CAP_TRUNCATED) ++ data->enc->flags |= AV_CODEC_FLAG_TRUNCATED; + + #ifdef HAVE_AVCODEC_OPEN2 + if (avcodec_open2 (data->enc, data->codec, NULL) < 0) +@@ -1025,7 +1025,7 @@ + + data->sample_width = sfmt_Bps (data->fmt); + +- if (data->codec->capabilities & CODEC_CAP_DELAY) ++ if (data->codec->capabilities & AV_CODEC_CAP_DELAY) + data->delay = true; + data->seek_broken = is_seek_broken (data); + data->timing_broken = is_timing_broken (data->ic); + diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template index de141788df..874f8b6342 100644 --- a/srcpkgs/moc/template +++ b/srcpkgs/moc/template @@ -1,7 +1,7 @@ # Template file for 'moc' pkgname=moc version=2.5.2 -revision=2 +revision=3 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel