[arch-commits] Commit in maui-clip/trunk (PKGBUILD ffmpeg5.patch)

[Antonio Rojas]

    Date: Tuesday, January 25, 2022 @ 12:49:06
  Author: arojas
Revision: 1115494

ffmpeg 5 rebuild

Added:
  maui-clip/trunk/ffmpeg5.patch
Modified:
  maui-clip/trunk/PKGBUILD

---------------+
 PKGBUILD      |   12 +++++++++---
 ffmpeg5.patch |   16 ++++++++++++++++
 2 files changed, 25 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-01-25 12:41:48 UTC (rev 1115493)
+++ PKGBUILD	2022-01-25 12:49:06 UTC (rev 1115494)
@@ -3,7 +3,7 @@
 pkgname=maui-clip
 _pkgname=clip
 pkgver=2.1.0
-pkgrel=2
+pkgrel=3
 pkgdesc='Video player and video collection manager'
 url='https://mauikit.org/'
 arch=(x86_64)
@@ -11,9 +11,15 @@
 depends=(mauikit-filebrowsing taglib ffmpeg)
 makedepends=(extra-cmake-modules)
 groups=(maui)
-source=(https://download.kde.org/stable/maui/$_pkgname/$pkgver/$_pkgname-$pkgver.tar.xz)
-sha256sums=('c09f9668c25710e4018ca1ac00fa56d7d00a5c64ffc3e967aa3abf3a46c97bef')
+source=(https://download.kde.org/stable/maui/$_pkgname/$pkgver/$_pkgname-$pkgver.tar.xz
+        ffmpeg5.patch)
+sha256sums=('c09f9668c25710e4018ca1ac00fa56d7d00a5c64ffc3e967aa3abf3a46c97bef'
+            '54d5c9d7f077edcfb94a6681d590d40ac9c2b83f3da2c340d477c6b2e1b2576f')
 
+prepare() {
+  patch -d $_pkgname-$pkgver -p1 < ffmpeg5.patch # Fix build with FFmpeg 5
+}
+
 build() {
   cmake -B build -S $_pkgname-$pkgver
   cmake --build build

Added: ffmpeg5.patch
===================================================================
--- ffmpeg5.patch	                        (rev 0)
+++ ffmpeg5.patch	2022-01-25 12:49:06 UTC (rev 1115494)
@@ -0,0 +1,16 @@
+diff --git a/src/utils/ffmpegthumbs/moviedecoder.h b/src/utils/ffmpegthumbs/moviedecoder.h
+index 53a9522..d6b717d 100644
+--- a/src/utils/ffmpegthumbs/moviedecoder.h
++++ b/src/utils/ffmpegthumbs/moviedecoder.h
+@@ -57,7 +57,11 @@ private:
+     int                     m_VideoStream;
+     AVFormatContext*        m_pFormatContext;
+     AVCodecContext*         m_pVideoCodecContext;
++#if LIBAVCODEC_VERSION_MAJOR < 59
+     AVCodec*                m_pVideoCodec;
++#else
++    const AVCodec*          m_pVideoCodec;
++#endif
+ //    AVStream*               m_pVideoStream;
+     AVFrame*                m_pFrame;
+     quint8*                 m_pFrameBuffer;