- fix building with ffmpeg 4.0

- rel 2

diff --git a/ffmpeg4.patch b/ffmpeg4.patch
new file mode 100644 (file)
index 0000000..3fec0ec
--- /dev/null
+++ b/ffmpeg4.patch
@@ -0,0 +1,42 @@
+--- moc-2.5.0/decoder_plugins/ffmpeg/ffmpeg.c~ 2018-04-29 21:54:01.000000000 +0200
++++ moc-2.5.0/decoder_plugins/ffmpeg/ffmpeg.c  2018-04-29 22:01:20.762926575 +0200
+@@ -978,7 +978,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);
+@@ -987,8 +987,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)
+@@ -1019,7 +1019,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);
+--- moc-2.5.0/decoder_plugins/ffmpeg/ffmpeg.m4~        2014-08-30 04:32:27.000000000 +0200
++++ moc-2.5.0/decoder_plugins/ffmpeg/ffmpeg.m4 2018-04-29 22:02:04.057134940 +0200
+@@ -185,7 +185,7 @@
+                                [#include <libavcodec/avcodec.h>])
+               AC_CHECK_DECLS([AV_SAMPLE_FMT_FLTP], , ,
+                                [#include <libavcodec/avcodec.h>])
+-              AC_CHECK_DECLS([CODEC_CAP_EXPERIMENTAL], , ,
++              AC_CHECK_DECLS([AV_CODEC_CAP_EXPERIMENTAL], , ,
+                                [#include <libavcodec/avcodec.h>])
+               AC_SEARCH_LIBS(av_get_sample_fmt_name, avutil,
+                       [AC_DEFINE([HAVE_AV_GET_SAMPLE_FMT_NAME], 1,

diff --git a/moc.spec b/moc.spec
index 374dd0363b96e8ee2827df71606c638382804cce..4f824c4c73936a5107d71bdfc279b42241ca80bf 100644 (file)
--- a/moc.spec
+++ b/moc.spec
@@ -8,13 +8,14 @@ Summary(hu.UTF-8):    Konzolos audiólejátszó egyszerű ncurses felülettel
 Summary(pl.UTF-8):     Konsolowy odtwarzacz audio z prostym interfejsem ncurses
 Name:          moc
 Version:       2.5.0
-Release:       1
+Release:       2
 License:       GPL
 Group:         Applications/Sound
 Source0:       http://ftp.daper.net/pub/soft/moc/stable/%{name}-%{version}.tar.bz2
 # Source0-md5: 18e3a979b67091bfee4b62217908c473
 Patch0:                %{name}-home_etc.patch
 Patch1:                ffmpeg3.patch
+Patch2:                ffmpeg4.patch
 URL:           http://moc.daper.net/
 BuildRequires: a52dec-libs-devel
 BuildRequires: alsa-lib-devel
@@ -268,6 +269,7 @@ należy uruchomić ponownie MOC.
 %setup -q
 %{?with_home_etc:%patch0 -p1}
 %patch1 -p1
+%patch2 -p1
 
 rm -rf libltdl
 %{__sed} -i -e '/SUBDIRS/ s/libltdl//' Makefile.am