[arch-commits] Commit in maui-clip/repos/community-x86_64 (4 files)

[Antonio Rojas]

    Date: Tuesday, February 8, 2022 @ 08:26:03
  Author: arojas
Revision: 1129004

archrelease: copy trunk to community-x86_64

Added:
  maui-clip/repos/community-x86_64/PKGBUILD
    (from rev 1129003, maui-clip/trunk/PKGBUILD)
  maui-clip/repos/community-x86_64/ffmpeg5.patch
    (from rev 1129003, maui-clip/trunk/ffmpeg5.patch)
Deleted:
  maui-clip/repos/community-x86_64/PKGBUILD
  maui-clip/repos/community-x86_64/ffmpeg5.patch

---------------+
 PKGBUILD      |   60 ++++++++++++++++++++++++++++----------------------------
 ffmpeg5.patch |   32 ++++++++++++++---------------
 2 files changed, 46 insertions(+), 46 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2022-02-08 08:25:52 UTC (rev 1129003)
+++ PKGBUILD	2022-02-08 08:26:03 UTC (rev 1129004)
@@ -1,30 +0,0 @@
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-
-pkgname=maui-clip
-_pkgname=clip
-pkgver=2.1.0
-pkgrel=4
-pkgdesc='Video player and video collection manager'
-url='https://mauikit.org/'
-arch=(x86_64)
-license=(GPL3)
-depends=(mauikit-filebrowsing taglib ffmpeg)
-makedepends=(extra-cmake-modules)
-groups=(maui)
-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
-}
-
-package() {
-  DESTDIR="$pkgdir" cmake --install build
-}

Copied: maui-clip/repos/community-x86_64/PKGBUILD (from rev 1129003, maui-clip/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-02-08 08:26:03 UTC (rev 1129004)
@@ -0,0 +1,30 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+
+pkgname=maui-clip
+_pkgname=clip
+pkgver=2.1.1
+pkgrel=1
+pkgdesc='Video player and video collection manager'
+url='https://mauikit.org/'
+arch=(x86_64)
+license=(GPL3)
+depends=(mauikit-filebrowsing taglib ffmpeg)
+makedepends=(extra-cmake-modules)
+groups=(maui)
+source=(https://download.kde.org/stable/maui/$_pkgname/$pkgver/$_pkgname-$pkgver.tar.xz
+        ffmpeg5.patch)
+sha256sums=('eb229db4a49c2cf64f1655faebe32be55b39f0af170507144edfd32f46b6efd9'
+            '54d5c9d7f077edcfb94a6681d590d40ac9c2b83f3da2c340d477c6b2e1b2576f')
+
+prepare() {
+  patch -d $_pkgname-$pkgver -p1 < ffmpeg5.patch # Fix build with FFmpeg 5
+}
+
+build() {
+  cmake -B build -S $_pkgname-$pkgver
+  cmake --build build
+}
+
+package() {
+  DESTDIR="$pkgdir" cmake --install build
+}

Deleted: ffmpeg5.patch
===================================================================
--- ffmpeg5.patch	2022-02-08 08:25:52 UTC (rev 1129003)
+++ ffmpeg5.patch	2022-02-08 08:26:03 UTC (rev 1129004)
@@ -1,16 +0,0 @@
-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;

Copied: maui-clip/repos/community-x86_64/ffmpeg5.patch (from rev 1129003, maui-clip/trunk/ffmpeg5.patch)
===================================================================
--- ffmpeg5.patch	                        (rev 0)
+++ ffmpeg5.patch	2022-02-08 08:26:03 UTC (rev 1129004)
@@ -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;