diff options
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 16 | ||||
| -rw-r--r-- | moc-ffmpeg4.patch | 33 |
3 files changed, 49 insertions, 6 deletions
@@ -1,6 +1,6 @@ pkgbase = moc-lyrics-git pkgdesc = An ncurses console audio player (with lyrics patch) - pkgver = 0.2212.b21db58 + pkgver = 0.2213.c51e02e pkgrel = 1 epoch = 1 url = https://github.com/christophgysin/moc @@ -9,7 +9,7 @@ pkgbase = moc-lyrics-git license = GPL makedepends = git makedepends = speex - makedepends = ffmpeg + makedepends = ffmpeg4.4 makedepends = taglib makedepends = libmpcdec makedepends = wavpack @@ -31,6 +31,8 @@ pkgbase = moc-lyrics-git provides = moc conflicts = moc source = git+https://github.com/christophgysin/moc#branch=lyrics + source = moc-ffmpeg4.patch sha1sums = SKIP + sha1sums = 007a0580ac754e1c318a0d0b6f0d403883797eaf pkgname = moc-lyrics-git @@ -2,7 +2,7 @@ pkgname=moc-lyrics-git _pkgname=moc -pkgver=0.2212.b21db58 +pkgver=0.2213.c51e02e pkgrel=1 epoch=1 pkgdesc="An ncurses console audio player (with lyrics patch)" @@ -10,7 +10,7 @@ arch=('i686' 'x86_64') url="https://github.com/christophgysin/moc" license=('GPL') depends=('libmad' 'libid3tag' 'jack' 'curl' 'libltdl' 'file') -makedepends=('git' 'speex' 'ffmpeg' 'taglib' 'libmpcdec' 'wavpack' 'libmodplug' 'faad2') +makedepends=('git' 'speex' 'ffmpeg4.4' 'taglib' 'libmpcdec' 'wavpack' 'libmodplug' 'faad2') optdepends=('speex: for using the speex plugin' 'ffmpeg: for using the ffmpeg plugin' 'taglib: for using the musepack plugin' @@ -20,8 +20,10 @@ optdepends=('speex: for using the speex plugin' 'libmodplug: for using the modplug plugin') provides=('moc') conflicts=('moc') -source=('git+https://github.com/christophgysin/moc#branch=lyrics') -sha1sums=('SKIP') +source=('git+https://github.com/christophgysin/moc#branch=lyrics' + 'moc-ffmpeg4.patch') +sha1sums=('SKIP' + '007a0580ac754e1c318a0d0b6f0d403883797eaf') pkgver() { @@ -31,9 +33,15 @@ pkgver() echo "0.${count}.${rev}" } +prepare() { + cd "$_pkgname" + patch -p0 -i ../moc-ffmpeg4.patch +} + build() { cd $_pkgname + export PKG_CONFIG_PATH=/usr/lib/ffmpeg4.4/pkgconfig autoreconf -ifs ./configure \ --prefix=/usr \ diff --git a/moc-ffmpeg4.patch b/moc-ffmpeg4.patch new file mode 100644 index 000000000000..c1e43a7c2f3e --- /dev/null +++ b/moc-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); |