[arch-commits] Commit in audacious-plugins/trunk (2 files)

[Evangelos Foutras]

    Date: Wednesday, December 28, 2016 @ 05:41:33
  Author: foutrelis
Revision: 284919

upgpkg: audacious-plugins 3.8.1-2

Apply upstream fix for error message in the ffaudio plugin (FS#51860).

Added:
  audacious-plugins/trunk/ffaudio-fix-packet-initialization.patch
Modified:
  audacious-plugins/trunk/PKGBUILD

-----------------------------------------+
 PKGBUILD                                |   15 ++++++++++--
 ffaudio-fix-packet-initialization.patch |   36 ++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-12-28 05:27:10 UTC (rev 284918)
+++ PKGBUILD	2016-12-28 05:41:33 UTC (rev 284919)
@@ -6,7 +6,7 @@
 
 pkgname=audacious-plugins
 pkgver=3.8.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Plugins for Audacious"
 arch=('i686' 'x86_64')
 url="http://audacious-media-player.org/"
@@ -46,9 +46,18 @@
             'libmms: libmms-based mms transport'
             'libcue: CUE playlist format')
 
-source=(http://distfiles.audacious-media-player.org/$pkgname-$pkgver.tar.bz2)
-sha256sums=('109c0559c072703dd8d9fc0bb1c5121126bd1e0edcc2804e1ea85974d98e2638')
+source=(http://distfiles.audacious-media-player.org/$pkgname-$pkgver.tar.bz2
+        ffaudio-fix-packet-initialization.patch)
+sha256sums=('109c0559c072703dd8d9fc0bb1c5121126bd1e0edcc2804e1ea85974d98e2638'
+            'c1ef4a79cdcace10fbef4eda669301df70bcf125bdaeec4ed863445d0c5fe4b8')
 
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # http://redmine.audacious-media-player.org/issues/691
+  patch -Np1 -i ../ffaudio-fix-packet-initialization.patch
+}
+
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 

Added: ffaudio-fix-packet-initialization.patch
===================================================================
--- ffaudio-fix-packet-initialization.patch	                        (rev 0)
+++ ffaudio-fix-packet-initialization.patch	2016-12-28 05:41:33 UTC (rev 284919)
@@ -0,0 +1,36 @@
+From 634cca030d4b9c03f86ed0a2c95f64b1c8b4eb80 Mon Sep 17 00:00:00 2001
+From: John Lindgren <john.lindgren at aol.com>
+Date: Thu, 22 Dec 2016 15:26:31 -0500
+Subject: [PATCH] ffaudio: av_init_packet() is not enough to initialize the
+ packet.  Closes: #691.
+
+---
+ src/ffaudio/ffaudio-core.cc | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/src/ffaudio/ffaudio-core.cc b/src/ffaudio/ffaudio-core.cc
+index 4800db1..390160c 100644
+--- a/src/ffaudio/ffaudio-core.cc
++++ b/src/ffaudio/ffaudio-core.cc
+@@ -99,7 +99,8 @@ struct ScopedContext
+ 
+ struct ScopedPacket : public AVPacket
+ {
+-    ScopedPacket () { av_init_packet (this); }
++    ScopedPacket () : AVPacket ()
++        { av_init_packet (this); }
+ 
+ #if CHECK_LIBAVCODEC_VERSION (55, 25, 100, 55, 16, 0)
+     ~ScopedPacket () { av_packet_unref (this); }
+@@ -553,8 +554,10 @@ bool FFaudio::play (const char * filename, VFSFile & file)
+         /* On EOF, send an empty packet to "flush" the decoder */
+         /* Otherwise, make a mutable (shallow) copy of the real packet */
+         AVPacket tmp;
+-        if (eof)
++        if (eof) {
++            tmp = AVPacket ();
+             av_init_packet (& tmp);
++        }
+         else
+             tmp = pkt;
+