Date: Wednesday, January 26, 2022 @ 21:06:56 Author: arojas Revision: 1116194
ffmpeg 5 rebuild Added: kid3/trunk/ffmpeg5.patch Modified: kid3/trunk/PKGBUILD ---------------+ PKGBUILD | 10 +++++++--- ffmpeg5.patch | 16 ++++++++++++++++ 2 files changed, 23 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-01-26 20:56:30 UTC (rev 1116193) +++ PKGBUILD 2022-01-26 21:06:56 UTC (rev 1116194) @@ -4,7 +4,7 @@ pkgbase=kid3 pkgname=('kid3-common' 'kid3-qt' 'kid3') pkgver=3.9.1 -pkgrel=1 +pkgrel=2 pkgdesc="An MP3, Ogg/Vorbis and FLAC tag editor" arch=('x86_64') url="https://kid3.kde.org/" @@ -13,14 +13,18 @@ 'qt5-declarative' 'qt5-multimedia' 'taglib' 'kio') makedepends=('cmake' 'docbook-xsl' 'extra-cmake-modules' 'kdoctools' 'python' 'qt5-tools') changelog=$pkgbase.changelog -source=(https://prdownloads.sourceforge.net/$pkgbase/$pkgbase-$pkgver.tar.gz{,.sig}) +source=(https://prdownloads.sourceforge.net/$pkgbase/$pkgbase-$pkgver.tar.gz{,.sig} + ffmpeg5.patch) validpgpkeys=('7D09794C2812F62194B081C14CAD34426E354DD2') # Urs Fleisch sha256sums=('e5f126697f773dbaa10476a76810ce91c2f3f60025d38688098e075bdb561dca' - 'SKIP') + 'SKIP' + 'e5e485e541411dec96864e25883e831b9e542944d017cb9a4838f22d6e4585ed') prepare() { cd "${srcdir}" [[ ! -d build ]] && mkdir build + + patch -d $pkgbase-$pkgver -p1 < ffmpeg5.patch # Fix build with FFmpeg 5 } build() { Added: ffmpeg5.patch =================================================================== --- ffmpeg5.patch (rev 0) +++ ffmpeg5.patch 2022-01-26 21:06:56 UTC (rev 1116194) @@ -0,0 +1,16 @@ +diff --git a/src/plugins/acoustidimport/ffmpegfingerprintdecoder.cpp b/src/plugins/acoustidimport/ffmpegfingerprintdecoder.cpp +index e156d424..e12b9abd 100644 +--- a/src/plugins/acoustidimport/ffmpegfingerprintdecoder.cpp ++++ b/src/plugins/acoustidimport/ffmpegfingerprintdecoder.cpp +@@ -232,7 +232,11 @@ private: + friend class Format; + friend class Converter; + AVCodecContext* m_ptr; ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(59, 0, 0) + AVCodec* m_impl; ++#else ++ const AVCodec* m_impl; ++#endif + AVFrame* m_frame; + bool m_opened; + };