Date: Tuesday, January 25, 2022 @ 12:41:38 Author: arojas Revision: 1115492
ffmpeg 5 rebuild Added: cantata/trunk/ffmpeg5.patch Modified: cantata/trunk/PKGBUILD ---------------+ PKGBUILD | 12 +++++++++--- ffmpeg5.patch | 22 ++++++++++++++++++++++ 2 files changed, 31 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-01-25 11:57:46 UTC (rev 1115491) +++ PKGBUILD 2022-01-25 12:41:38 UTC (rev 1115492) @@ -6,7 +6,7 @@ pkgname=cantata pkgver=2.4.2 -pkgrel=1 +pkgrel=2 pkgdesc='Qt5 client for the music player daemon (MPD)' arch=(x86_64) url='https://github.com/CDrummond/cantata' @@ -15,9 +15,15 @@ optdepends=('perl-uri: dynamic playlist' 'mpd: playback' 'ffmpeg: ReplayGain support' 'libebur128: ReplayGain support' 'sshfs: remote devices support') makedepends=(cmake qt5-tools ffmpeg libebur128) -source=("https://github.com/CDrummond/cantata/releases/download/v$pkgver/$pkgname-$pkgver.tar.bz2";) -sha256sums=('3ed25d0c838720af7ed08b89a30f3e05d6952d40a5f520f29b3558b2eacdec82') +source=(https://github.com/CDrummond/cantata/releases/download/v$pkgver/$pkgname-$pkgver.tar.bz2 + ffmpeg5.patch) +sha256sums=('3ed25d0c838720af7ed08b89a30f3e05d6952d40a5f520f29b3558b2eacdec82' + 'b11e8fa86e45b436de9ac02bd2cf728a5617893402ac9fba050e6df036b379fe') +prepare() { + patch -d $pkgname-$pkgver -p1 < ffmpeg5.patch # Fix build with FFmpeg 5 +} + build() { cmake -B build -S $pkgname-$pkgver \ -DCMAKE_INSTALL_PREFIX=/usr Added: ffmpeg5.patch =================================================================== --- ffmpeg5.patch (rev 0) +++ ffmpeg5.patch 2022-01-25 12:41:38 UTC (rev 1115492) @@ -0,0 +1,22 @@ +diff --git a/replaygain/ffmpeginput.cpp b/replaygain/ffmpeginput.cpp +index 25e6cc151..fbe52671a 100644 +--- a/replaygain/ffmpeginput.cpp ++++ b/replaygain/ffmpeginput.cpp +@@ -106,7 +106,7 @@ struct FfmpegInput::Handle { + } + AVFormatContext *formatContext; + AVCodecContext *codecContext; +- AVCodec *codec; ++ const AVCodec *codec; + #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 35, 0) + AVFrame *frame; + int gotFrame; +@@ -207,7 +207,7 @@ FfmpegInput::FfmpegInput(const QString &fileName) + + if (ok) { + QString floatCodec=QLatin1String(handle->codec->name)+QLatin1String("float"); +- AVCodec *possibleFloatCodec = avcodec_find_decoder_by_name(floatCodec.toLatin1().constData()); ++ const AVCodec *possibleFloatCodec = avcodec_find_decoder_by_name(floatCodec.toLatin1().constData()); + if (possibleFloatCodec) { + handle->codec = possibleFloatCodec; + #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 89, 100) // Not 100% of version here!
