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

[Jaroslav Lichtblau]

    Date: Tuesday, April 26, 2022 @ 16:27:41
  Author: jlichtblau
Revision: 1191022

archrelease: copy trunk to community-x86_64

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

---------------+
 PKGBUILD      |   64 +++++++++++++++++++++++---------------------------------
 ffmpeg5.patch |   25 ---------------------
 2 files changed, 27 insertions(+), 62 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2022-04-26 16:27:35 UTC (rev 1191021)
+++ PKGBUILD	2022-04-26 16:27:41 UTC (rev 1191022)
@@ -1,37 +0,0 @@
-# Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
-# Contributor: Daniel Wallace < danielwallace at gtmanfred dot com>
-# Contributor: Mitch Bigelow <ipha00 at gmail.com>
-# Contributor: Patrick Palka <patrick at parcs.ath.cx>
-
-pkgname=pianobar
-pkgver=2020.11.28
-pkgrel=2
-pkgdesc="Console-based frontend for Pandora"
-arch=('x86_64')
-url="https://6xq.net/pianobar/"
-license=('MIT')
-depends=('libao' 'ffmpeg' 'curl' 'json-c')
-source=(https://6xq.net/pianobar/$pkgname-$pkgver.tar.bz2{,.asc}
-        https://github.com/PromyLOPh/pianobar/commit/b14c9d6b.patch
-        ffmpeg5.patch)
-validpgpkeys=('017D74E27F5856963801781DF663943E08D8092A') # Lars-Dominik Braun <lars at 6xq.net>
-sha256sums=('653bfb96b548259e3ac360752f66fdb77e8e220312e52a43c652f7eb96e7d4fe'
-            'SKIP'
-            '01ac6fa2fa7ee7aad022bbac4ad3aaf47b44ed29c3ba88536b1b24ccc126b1ab'
-            '5e4aa07d03f273a815515f99b441cacc4e0a4b69ad5728a424b1911cb23fde76')
-
-prepare() {
-  # Fix build with FFmpeg 5
-  patch -d $pkgname-$pkgver -p1 < b14c9d6b.patch
-  patch -d $pkgname-$pkgver -p1 < ffmpeg5.patch
-}
-
-build() {
-  make -C ${pkgname}-${pkgver}
-}
-
-package() {
-  make -C ${pkgname}-${pkgver} DESTDIR="${pkgdir}" PREFIX=/usr install
-  install -Dm644 $pkgname-"${pkgver}"/COPYING "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE
-  install -Dm755 $pkgname-"${pkgver}"/contrib/headless_pianobar "${pkgdir}"/usr/bin/pianoctl
-}

Copied: pianobar/repos/community-x86_64/PKGBUILD (from rev 1191021, pianobar/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-04-26 16:27:41 UTC (rev 1191022)
@@ -0,0 +1,27 @@
+# Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
+# Contributor: Daniel Wallace < danielwallace at gtmanfred dot com>
+# Contributor: Mitch Bigelow <ipha00 at gmail.com>
+# Contributor: Patrick Palka <patrick at parcs.ath.cx>
+
+pkgname=pianobar
+pkgver=2022.04.01
+pkgrel=1
+pkgdesc="Console-based frontend for Pandora"
+arch=('x86_64')
+url="https://6xq.net/pianobar/"
+license=('MIT')
+depends=('libao' 'ffmpeg' 'curl' 'json-c')
+source=(https://6xq.net/pianobar/$pkgname-$pkgver.tar.bz2{,.asc})
+validpgpkeys=('017D74E27F5856963801781DF663943E08D8092A') # Lars-Dominik Braun <lars at 6xq.net>
+sha256sums=('1670b28865a8b82a57bb6dfea7f16e2fa4145d2f354910bb17380b32c9b94763'
+            'SKIP')
+
+build() {
+  make -C ${pkgname}-${pkgver}
+}
+
+package() {
+  make -C ${pkgname}-${pkgver} DESTDIR="${pkgdir}" PREFIX=/usr install
+  install -Dm644 $pkgname-"${pkgver}"/COPYING "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE
+  install -Dm755 $pkgname-"${pkgver}"/contrib/headless_pianobar "${pkgdir}"/usr/bin/pianoctl
+}

Deleted: ffmpeg5.patch
===================================================================
--- ffmpeg5.patch	2022-04-26 16:27:35 UTC (rev 1191021)
+++ ffmpeg5.patch	2022-04-26 16:27:41 UTC (rev 1191022)
@@ -1,25 +0,0 @@
-diff --git a/src/player.c b/src/player.c
-index 875f473..5379d4d 100644
---- a/src/player.c
-+++ b/src/player.c
-@@ -235,7 +235,7 @@ static bool openStream (player_t * const player) {
- 		softfail ("avcodec_parameters_to_context");
- 	}
- 
--	AVCodec * const decoder = avcodec_find_decoder (cp->codec_id);
-+	const AVCodec *decoder = avcodec_find_decoder (cp->codec_id);
- 	if (decoder == NULL) {
- 		softfail ("find_decoder");
- 	}
-diff --git a/src/player.h b/src/player.h
-index 3179785..0cff9dc 100644
---- a/src/player.h
-+++ b/src/player.h
-@@ -32,6 +32,7 @@ THE SOFTWARE.
- #include <signal.h>
- 
- #include <ao/ao.h>
-+#include <libavcodec/avcodec.h>
- #include <libavformat/avformat.h>
- #include <libavfilter/avfilter.h>
- #include <piano.h>