[arch-commits] Commit in cantata/repos/community-x86_64 (3 files)

[Antonio Rojas]

    Date: Wednesday, March 2, 2022 @ 20:41:10
  Author: arojas
Revision: 1139844

archrelease: copy trunk to community-x86_64

Added:
  cantata/repos/community-x86_64/PKGBUILD
    (from rev 1139843, cantata/trunk/PKGBUILD)
Deleted:
  cantata/repos/community-x86_64/PKGBUILD
  cantata/repos/community-x86_64/ffmpeg5.patch

---------------+
 PKGBUILD      |   66 ++++++++++++++++++++++++++------------------------------
 ffmpeg5.patch |   22 ------------------
 2 files changed, 31 insertions(+), 57 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2022-03-02 20:41:00 UTC (rev 1139843)
+++ PKGBUILD	2022-03-02 20:41:10 UTC (rev 1139844)
@@ -1,35 +0,0 @@
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor:  Federico Cinelli <cinelli at aur.archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Mcder3 <mcder3[at]gmail[dot]com>
-# Contributor: MisterFred <mister.fred[at]free[dot]fr>
-
-pkgname=cantata
-pkgver=2.4.2
-pkgrel=2
-pkgdesc='Qt5 client for the music player daemon (MPD)'
-arch=(x86_64)
-url='https://github.com/CDrummond/cantata'
-license=(GPL3)
-depends=(libmtp libmusicbrainz5 mpg123 qt5-multimedia qt5-svg taglib media-player-info libcdio-paranoia udisks2)
-optdepends=('perl-uri: dynamic playlist' 'mpd: playback' 'ffmpeg: ReplayGain support' 'libebur128: ReplayGain support'
-            'sshfs: remote devices support')
-makedepends=(cmake qt5-tools ffmpeg libebur128)
-source=(https://github.com/CDrummond/cantata/releases/download/v$pkgver/$pkgname-$pkgver.tar.bz2
-        ffmpeg5.patch)
-sha256sums=('3ed25d0c838720af7ed08b89a30f3e05d6952d40a5f520f29b3558b2eacdec82'
-            'b11e8fa86e45b436de9ac02bd2cf728a5617893402ac9fba050e6df036b379fe')
-
-prepare() {
-  patch -d $pkgname-$pkgver -p1 < ffmpeg5.patch # Fix build with FFmpeg 5
-}
-
-build() {
-  cmake -B build -S $pkgname-$pkgver \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  cmake --build build
-}
-
-package() {
-  DESTDIR="$pkgdir" cmake --install build
-}

Copied: cantata/repos/community-x86_64/PKGBUILD (from rev 1139843, cantata/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-03-02 20:41:10 UTC (rev 1139844)
@@ -0,0 +1,31 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor:  Federico Cinelli <cinelli at aur.archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Mcder3 <mcder3[at]gmail[dot]com>
+# Contributor: MisterFred <mister.fred[at]free[dot]fr>
+
+pkgname=cantata
+pkgver=2.5.0
+pkgrel=1
+pkgdesc='Qt5 client for the music player daemon (MPD)'
+arch=(x86_64)
+url='https://github.com/CDrummond/cantata'
+license=(GPL3)
+depends=(libmtp libmusicbrainz5 mpg123 qt5-multimedia qt5-svg taglib media-player-info libcdio-paranoia udisks2)
+optdepends=('perl-uri: dynamic playlist' 'mpd: playback' 'ffmpeg: ReplayGain support' 'libebur128: ReplayGain support'
+            'sshfs: remote devices support')
+makedepends=(cmake qt5-tools ffmpeg libebur128)
+source=(https://github.com/CDrummond/cantata/releases/download/v$pkgver/$pkgname-$pkgver.tar.bz2
+        ffmpeg5.patch)
+sha256sums=('eb7e00ab3f567afaa02ea2c86e2fe811a475afab93182b95922c6eb126821724'
+            '4b01938615a34127236a21ee0ffa20bbb179c8bfcc5ecef872fc5a246727d2e1')
+
+build() {
+  cmake -B build -S $pkgname-$pkgver \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  cmake --build build
+}
+
+package() {
+  DESTDIR="$pkgdir" cmake --install build
+}

Deleted: ffmpeg5.patch
===================================================================
--- ffmpeg5.patch	2022-03-02 20:41:00 UTC (rev 1139843)
+++ ffmpeg5.patch	2022-03-02 20:41:10 UTC (rev 1139844)
@@ -1,22 +0,0 @@
-diff --git a/replaygain/ffmpeginput.cpp b/replaygain/ffmpeginput.cpp
-index 25e6cc151..fbe52671a 100644
---- a/replaygain/ffmpeginput.cpp
-+++ b/replaygain/ffmpeginput.cpp
-@@ -106,7 +106,7 @@ struct FfmpegInput::Handle {
-     }
-     AVFormatContext *formatContext;
-     AVCodecContext *codecContext;
--    AVCodec *codec;
-+    const AVCodec *codec;
-     #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 35, 0)
-     AVFrame *frame;
-     int gotFrame;
-@@ -207,7 +207,7 @@ FfmpegInput::FfmpegInput(const QString &fileName)
- 
-         if (ok) {
-             QString floatCodec=QLatin1String(handle->codec->name)+QLatin1String("float");
--            AVCodec *possibleFloatCodec = avcodec_find_decoder_by_name(floatCodec.toLatin1().constData());
-+            const AVCodec *possibleFloatCodec = avcodec_find_decoder_by_name(floatCodec.toLatin1().constData());
-             if (possibleFloatCodec) {
-                 handle->codec = possibleFloatCodec;
-                 #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 89, 100) // Not 100% of version here!