diff --git a/abi_used_libs b/abi_used_libs --- a/abi_used_libs +++ b/abi_used_libs @@ -1,8 +1,8 @@ libFLAC.so.8 libasound.so.2 -libavcodec.so.57 -libavformat.so.57 -libavutil.so.55 +libavcodec.so.58 +libavformat.so.58 +libavutil.so.56 libc.so.6 libcurl.so.4 libdb-5.3.so diff --git a/files/ffmpeg4.patch b/files/ffmpeg4.patch new file mode 100644 --- /dev/null +++ b/files/ffmpeg4.patch @@ -0,0 +1,33 @@ +Index: decoder_plugins/ffmpeg/ffmpeg.c +=================================================================== +--- decoder_plugins/ffmpeg/ffmpeg.c (revisión: 2963) ++++ decoder_plugins/ffmpeg/ffmpeg.c (copia de trabajo) +@@ -697,7 +697,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); +@@ -705,8 +705,8 @@ + } + + 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; + + if (avcodec_open2 (data->enc, data->codec, NULL) < 0) + { +@@ -725,7 +725,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/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,16 +1,17 @@ name : moc version : 2.5.2 -release : 10 +release : 11 source : - http://ftp.daper.net/pub/soft/moc/stable/moc-2.5.2.tar.bz2 : f3a68115602a4788b7cfa9bbe9397a9d5e24c68cb61a57695d1c2c3ecf49db08 -license : GPL-2.0 +license : GPL-2.0-or-later component : multimedia.audio -summary : MOC (music on console) is a console audio player. +summary : MOC (music on console) is a console audio player description: | MOC (music on console) is a console audio player for LINUX/UNIX designed to be powerful and easy to use. builddeps : - pkgconfig(alsa) - pkgconfig(flac) + - pkgconfig(id3tag) - pkgconfig(libavcodec) - pkgconfig(libcurl) - pkgconfig(libmodplug) @@ -24,13 +25,13 @@ - pkgconfig(vorbis) - pkgconfig(wavpack) - faad-devel - - libid3tag-devel - libmad-devel - - mpc-devel setup : | + %patch -p0 < $pkgfiles/ffmpeg4.patch + %configure --disable-static build : | %make install : | %make_install - install -Dm644 $pkgfiles/moc@.service $installdir/etc/systemd/system/moc@.service + install -Dm00644 $pkgfiles/moc@.service $installdir/etc/systemd/system/moc@.service diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -2,25 +2,25 @@ moc - Ikey Doherty - ikey@solus-project.com + Pierre-Yves + pyu@riseup.net - GPL-2.0 + GPL-2.0-or-later multimedia.audio - MOC (music on console) is a console audio player. + MOC (music on console) is a console audio player MOC (music on console) is a console audio player for LINUX/UNIX designed to be powerful and easy to use. https://solus-project.com/sources/README.Solus moc - MOC (music on console) is a console audio player. + MOC (music on console) is a console audio player MOC (music on console) is a console audio player for LINUX/UNIX designed to be powerful and easy to use. multimedia.audio /etc/systemd/system/moc@.service - /usr/bin + /usr/bin/mocp /usr/lib64/moc/decoder_plugins/libaac_decoder.so /usr/lib64/moc/decoder_plugins/libffmpeg_decoder.so /usr/lib64/moc/decoder_plugins/libflac_decoder.so @@ -30,18 +30,30 @@ /usr/lib64/moc/decoder_plugins/libspeex_decoder.so /usr/lib64/moc/decoder_plugins/libvorbis_decoder.so /usr/lib64/moc/decoder_plugins/libwavpack_decoder.so - /usr/share/doc - /usr/share/man - /usr/share/moc + /usr/share/doc/moc/README + /usr/share/doc/moc/README_equalizer + /usr/share/doc/moc/THANKS + /usr/share/doc/moc/config.example + /usr/share/doc/moc/keymap.example + /usr/share/man/man1/mocp.1 + /usr/share/moc/themes/black_theme + /usr/share/moc/themes/darkdot_theme + /usr/share/moc/themes/example_theme + /usr/share/moc/themes/green_theme + /usr/share/moc/themes/moca_theme + /usr/share/moc/themes/nightly_theme + /usr/share/moc/themes/red_theme + /usr/share/moc/themes/transparent-background + /usr/share/moc/themes/yellow_red_theme - - 2017-10-06 + + 2018-08-10 2.5.2 Packaging update - Ikey Doherty - ikey@solus-project.com + Pierre-Yves + pyu@riseup.net \ No newline at end of file