[arch-commits] Commit in ffmpegthumbs/repos/staging-x86_64 (4 files)

[Antonio Rojas]

    Date: Thursday, February 3, 2022 @ 11:00:31
  Author: arojas
Revision: 436091

archrelease: copy trunk to staging-x86_64

Added:
  ffmpegthumbs/repos/staging-x86_64/PKGBUILD
    (from rev 436090, ffmpegthumbs/trunk/PKGBUILD)
  ffmpegthumbs/repos/staging-x86_64/ffmpeg5.patch
    (from rev 436090, ffmpegthumbs/trunk/ffmpeg5.patch)
Deleted:
  ffmpegthumbs/repos/staging-x86_64/PKGBUILD
  ffmpegthumbs/repos/staging-x86_64/ffmpeg5.patch

---------------+
 PKGBUILD      |   71 ++++++++++++++++++++++++++++----------------------------
 ffmpeg5.patch |   40 +++++++++++++++++++++----------
 2 files changed, 63 insertions(+), 48 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2022-02-03 11:00:19 UTC (rev 436090)
+++ PKGBUILD	2022-02-03 11:00:31 UTC (rev 436091)
@@ -1,35 +0,0 @@
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-
-pkgname=ffmpegthumbs
-pkgver=21.12.1
-pkgrel=2
-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=('e39df38df15171acced19588195e5c137c115bf35e31085aa74fe6e8fb03e1d5'
-            'SKIP'
-            'ce314c8c98478ed90521e3cabbd125b2fccfb9a12666ca928b80fb4f87e07f52')
-validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid at kde.org>
-              F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87  # Christoph Feck <cfeck at kde.org>
-              D81C0CB38EB725EF6691C385BB463350D6EF31EF) # Heiko Becker <heiko.becker at kde.org>
-
-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/staging-x86_64/PKGBUILD (from rev 436090, ffmpegthumbs/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-02-03 11:00:31 UTC (rev 436091)
@@ -0,0 +1,36 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+
+pkgname=ffmpegthumbs
+pkgver=21.12.2
+pkgrel=2
+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=('f95b4d7eeeb10f6e712c6595d19f1a0f5b5ff090d6c65e9dbb36384b6bcc9e9d'
+            '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
+}

Deleted: ffmpeg5.patch
===================================================================
--- ffmpeg5.patch	2022-02-03 11:00:19 UTC (rev 436090)
+++ ffmpeg5.patch	2022-02-03 11:00:31 UTC (rev 436091)
@@ -1,13 +0,0 @@
-diff --git a/ffmpegthumbnailer/moviedecoder.h b/ffmpegthumbnailer/moviedecoder.h
-index 502abe9..c96d01b 100644
---- a/ffmpegthumbnailer/moviedecoder.h
-+++ b/ffmpegthumbnailer/moviedecoder.h
-@@ -57,7 +57,7 @@ private:
-     int                     m_VideoStream;
-     AVFormatContext*        m_pFormatContext;
-     AVCodecContext*         m_pVideoCodecContext;
--    AVCodec*                m_pVideoCodec;
-+    const AVCodec*          m_pVideoCodec;
-     AVStream*               m_pVideoStream;
-     AVFrame*                m_pFrame;
-     quint8*                 m_pFrameBuffer;

Copied: ffmpegthumbs/repos/staging-x86_64/ffmpeg5.patch (from rev 436090, ffmpegthumbs/trunk/ffmpeg5.patch)
===================================================================
--- ffmpeg5.patch	                        (rev 0)
+++ ffmpeg5.patch	2022-02-03 11:00:31 UTC (rev 436091)
@@ -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