[arch-commits] Commit in ffmpegthumbs/repos (3 files)

[Antonio Rojas]

    Date: Thursday, March 3, 2022 @ 11:32:58
  Author: arojas
Revision: 438491

archrelease: copy trunk to testing-x86_64

Added:
  ffmpegthumbs/repos/testing-x86_64/
  ffmpegthumbs/repos/testing-x86_64/PKGBUILD
    (from rev 438490, ffmpegthumbs/trunk/PKGBUILD)
  ffmpegthumbs/repos/testing-x86_64/ffmpeg5.patch
    (from rev 438490, ffmpegthumbs/trunk/ffmpeg5.patch)

---------------+
 PKGBUILD      |   36 ++++++++++++++++++++++++++++++++++++
 ffmpeg5.patch |   27 +++++++++++++++++++++++++++
 2 files changed, 63 insertions(+)

Copied: ffmpegthumbs/repos/testing-x86_64/PKGBUILD (from rev 438490, ffmpegthumbs/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2022-03-03 11:32:58 UTC (rev 438491)
@@ -0,0 +1,36 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+
+pkgname=ffmpegthumbs
+pkgver=21.12.3
+pkgrel=1
+pkgdesc='FFmpeg-based thumbnail creator for video files'
+url='https://apps.kde.org/ffmpegthumbs/'
+arch=(x86_64)
+license=(GPL LGPL FDL)
+groups=(kde-applications kde-multimedia)
+depends=(kio ffmpeg taglib)
+makedepends=(extra-cmake-modules)
+source=(https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz{,.sig}
+        ffmpeg5.patch)
+sha256sums=('9a9b310eef45990f065449688801f435fbc9e0a936c83e6e307f7e0546bf4f74'
+            'SKIP'
+            '2a58654d21eb2113377d92bd2faa040506544e09b2934bcfcfdb5df4f77a9bba')
+validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid at kde.org>
+              F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87  # Christoph Feck <cfeck at kde.org>
+              D81C0CB38EB725EF6691C385BB463350D6EF31EF) # Heiko Becker <heiko.becker at kde.org>
+options=(debug)
+
+prepare() {
+  patch -d $pkgname-$pkgver -p1 < ffmpeg5.patch # Fix build with ffmpeg 5
+}
+
+build() {
+  cmake -B build -S $pkgname-$pkgver \
+    -DBUILD_TESTING=OFF
+  cmake --build build
+}
+
+package() {
+  DESTDIR="$pkgdir" cmake --install build
+}

Copied: ffmpegthumbs/repos/testing-x86_64/ffmpeg5.patch (from rev 438490, ffmpegthumbs/trunk/ffmpeg5.patch)
===================================================================
--- testing-x86_64/ffmpeg5.patch	                        (rev 0)
+++ testing-x86_64/ffmpeg5.patch	2022-03-03 11:32:58 UTC (rev 438491)
@@ -0,0 +1,27 @@
+From 8c9491775a5af072bfbcf1a2fdfc1f016d1333cf Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas at archlinux.org>
+Date: Tue, 25 Jan 2022 12:53:45 +0100
+Subject: [PATCH] Fix build with FFmpeg 5
+
+---
+ ffmpegthumbnailer/moviedecoder.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/ffmpegthumbnailer/moviedecoder.h b/ffmpegthumbnailer/moviedecoder.h
+index 502abe9..03eb6dd 100644
+--- a/ffmpegthumbnailer/moviedecoder.h
++++ b/ffmpegthumbnailer/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;
+-- 
+GitLab