Update to v3.9.1

3 files changed, 30 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e1ed9ce4175e..6dca95fde050 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = kid3-cli
 	pkgdesc = An MP3, Ogg/Vorbis and FLAC tag editor, CLI version
-	pkgver = 3.8.7
+	pkgver = 3.9.1
 	pkgrel = 1
 	url = https://kid3.kde.org/
 	arch = i686
@@ -11,7 +11,7 @@ pkgbase = kid3-cli
 	makedepends = id3lib
 	makedepends = taglib
 	makedepends = libmp4v2
-	makedepends = qt5-tools
+	makedepends = qt6-tools
 	makedepends = hicolor-icon-theme
 	makedepends = docbook-xsl
 	makedepends = extra-cmake-modules
@@ -20,11 +20,13 @@ pkgbase = kid3-cli
 	depends = id3lib
 	depends = taglib
 	depends = libmp4v2
-	depends = qt5-multimedia
+	depends = qt6-multimedia
 	provides = kid3
 	conflicts = kid3-kde
 	conflicts = kid3-qt
-	source = http://downloads.sourceforge.net/kid3/kid3-3.8.7.tar.gz
-	sha256sums = 9239576626295fb31f12027d5c6c79d65658ebc0822ab59c5eb3d7a84dee2f41
+	source = http://downloads.sourceforge.net/kid3/kid3-3.9.1.tar.gz
+	source = ffmpeg5.patch
+	sha256sums = e5f126697f773dbaa10476a76810ce91c2f3f60025d38688098e075bdb561dca
+	sha256sums = e5e485e541411dec96864e25883e831b9e542944d017cb9a4838f22d6e4585ed
 
 pkgname = kid3-cli
diff --git a/PKGBUILD b/PKGBUILD
index 362b32a2a41a..900324862a9c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,23 +3,25 @@
 # Contributor: Alois Nespor <alois.nespor@gmail.com>
 
 pkgname=kid3-cli
-pkgver=3.8.7
+pkgver=3.9.1
 pkgrel=1
 pkgdesc="An MP3, Ogg/Vorbis and FLAC tag editor, CLI version"
 arch=(i686 x86_64)
 url="https://kid3.kde.org/"
 license=(GPL)
-depends=(chromaprint id3lib taglib libmp4v2 qt5-multimedia)
-makedepends=(ninja chromaprint id3lib taglib libmp4v2 qt5-tools
+depends=(chromaprint id3lib taglib libmp4v2 qt6-multimedia)
+makedepends=(ninja chromaprint id3lib taglib libmp4v2 qt6-tools
              hicolor-icon-theme docbook-xsl extra-cmake-modules python)
 conflicts=(kid3-kde kid3-qt)
 provides=(kid3)
-source=(http://downloads.sourceforge.net/${pkgname/-cli/}/${pkgname/-cli/}-$pkgver.tar.gz)
-sha256sums=('9239576626295fb31f12027d5c6c79d65658ebc0822ab59c5eb3d7a84dee2f41')
+source=(http://downloads.sourceforge.net/${pkgname/-cli/}/${pkgname/-cli/}-$pkgver.tar.gz ffmpeg5.patch)
+sha256sums=('e5f126697f773dbaa10476a76810ce91c2f3f60025d38688098e075bdb561dca'
+            'e5e485e541411dec96864e25883e831b9e542944d017cb9a4838f22d6e4585ed')
 
 prepare() {
   [ -d ${srcdir}/build ] && rm -rf build
   mkdir -p ${srcdir}/build
+  patch -d kid3-$pkgver -p1 < ffmpeg5.patch # Fix build with FFmpeg 5
   cd "${srcdir}"/build
   cmake -GNinja \
     ../${pkgname/-cli/}-${pkgver} \
diff --git a/ffmpeg5.patch b/ffmpeg5.patch
new file mode 100644
index 000000000000..341e64afa9fa
--- /dev/null
+++ b/ffmpeg5.patch
@@ -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;
+ };