[arch-commits] Commit in audacious-plugins/repos (6 files)

Evangelos Foutras foutrelis at archlinux.org
Wed Dec 28 05:41:43 UTC 2016


    Date: Wednesday, December 28, 2016 @ 05:41:43
  Author: foutrelis
Revision: 284920

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  audacious-plugins/repos/extra-i686/PKGBUILD
    (from rev 284919, audacious-plugins/trunk/PKGBUILD)
  audacious-plugins/repos/extra-i686/ffaudio-fix-packet-initialization.patch
    (from rev 284919, audacious-plugins/trunk/ffaudio-fix-packet-initialization.patch)
  audacious-plugins/repos/extra-x86_64/PKGBUILD
    (from rev 284919, audacious-plugins/trunk/PKGBUILD)
  audacious-plugins/repos/extra-x86_64/ffaudio-fix-packet-initialization.patch
    (from rev 284919, audacious-plugins/trunk/ffaudio-fix-packet-initialization.patch)
Deleted:
  audacious-plugins/repos/extra-i686/PKGBUILD
  audacious-plugins/repos/extra-x86_64/PKGBUILD

------------------------------------------------------+
 /PKGBUILD                                            |  152 +++++++++++++++++
 extra-i686/PKGBUILD                                  |   67 -------
 extra-i686/ffaudio-fix-packet-initialization.patch   |   36 ++++
 extra-x86_64/PKGBUILD                                |   67 -------
 extra-x86_64/ffaudio-fix-packet-initialization.patch |   36 ++++
 5 files changed, 224 insertions(+), 134 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2016-12-28 05:41:33 UTC (rev 284919)
+++ extra-i686/PKGBUILD	2016-12-28 05:41:43 UTC (rev 284920)
@@ -1,67 +0,0 @@
-# $Id$
-# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
-# Contributor: Gaetan Bisson <bisson at archlinux.org>
-# Contributor: Alexander Fehr <pizzapunk gmail com>
-# Contributor: William Rea <sillywilly at gmail.com>
-
-pkgname=audacious-plugins
-pkgver=3.8.1
-pkgrel=1
-pkgdesc="Plugins for Audacious"
-arch=('i686' 'x86_64')
-url="http://audacious-media-player.org/"
-license=('BSD' 'GPL')
-
-makedepends=("audacious>=$pkgver"
-             'glib2' 'python' # for gdbus-codegen
-             'alsa-lib' 'pulseaudio' 'jack2' 'lame' 'libvorbis' 'flac'
-             'mpg123' 'faad2' 'ffmpeg' 'libmodplug' 'fluidsynth' 'libcdio-paranoia' 'libsidplayfp' 'wavpack'
-             'dbus-glib' 'libsamplerate' 'libnotify' 'lirc' 'curl' 'libmtp'
-             'neon' 'libmms' 'libcue')
-
-optdepends=('alsa-lib: Advanced Linux Sound Arch. output'
-            'pulseaudio: PulseAudio output'
-            'jack2: Jack Audio Connection Kit output'
-            'lame: FileWriter MP3 output'
-            'libvorbis: Vorbis input, FileWriter Vorbis output'
-            'flac: FLAC input, FileWriter FLAC output'
-
-            'mpg123: MP3 input'
-            'faad2: AAC input'
-            'ffmpeg: ffaudio input'
-            'libmodplug: modplug input'
-            'fluidsynth: MIDI FluidSynth backend input'
-            'libcdio-paranoia: CD Digital Audio input'
-            'libsidplayfp: Commodore 64 audio input'
-            'wavpack: WavPack input'
-
-            'dbus-glib: Gnome Shortcuts Plugin'
-            'libsamplerate: Speed and Pitch Plugin'
-            'libnotify: libnotify OSD'
-            'lirc: LIRC'
-            'curl: AudioScrobbler Client'
-            'libmtp: Upload to MTP device'
-
-            'neon: neon-based http transport'
-            'libmms: libmms-based mms transport'
-            'libcue: CUE playlist format')
-
-source=(http://distfiles.audacious-media-player.org/$pkgname-$pkgver.tar.bz2)
-sha256sums=('109c0559c072703dd8d9fc0bb1c5121126bd1e0edcc2804e1ea85974d98e2638')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure \
-    --prefix=/usr \
-    --enable-amidiplug
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
-# vim:set ts=2 sw=2 et:

Copied: audacious-plugins/repos/extra-i686/PKGBUILD (from rev 284919, audacious-plugins/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2016-12-28 05:41:43 UTC (rev 284920)
@@ -0,0 +1,76 @@
+# $Id$
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+# Contributor: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Alexander Fehr <pizzapunk gmail com>
+# Contributor: William Rea <sillywilly at gmail.com>
+
+pkgname=audacious-plugins
+pkgver=3.8.1
+pkgrel=2
+pkgdesc="Plugins for Audacious"
+arch=('i686' 'x86_64')
+url="http://audacious-media-player.org/"
+license=('BSD' 'GPL')
+
+makedepends=("audacious>=$pkgver"
+             'glib2' 'python' # for gdbus-codegen
+             'alsa-lib' 'pulseaudio' 'jack2' 'lame' 'libvorbis' 'flac'
+             'mpg123' 'faad2' 'ffmpeg' 'libmodplug' 'fluidsynth' 'libcdio-paranoia' 'libsidplayfp' 'wavpack'
+             'dbus-glib' 'libsamplerate' 'libnotify' 'lirc' 'curl' 'libmtp'
+             'neon' 'libmms' 'libcue')
+
+optdepends=('alsa-lib: Advanced Linux Sound Arch. output'
+            'pulseaudio: PulseAudio output'
+            'jack2: Jack Audio Connection Kit output'
+            'lame: FileWriter MP3 output'
+            'libvorbis: Vorbis input, FileWriter Vorbis output'
+            'flac: FLAC input, FileWriter FLAC output'
+
+            'mpg123: MP3 input'
+            'faad2: AAC input'
+            'ffmpeg: ffaudio input'
+            'libmodplug: modplug input'
+            'fluidsynth: MIDI FluidSynth backend input'
+            'libcdio-paranoia: CD Digital Audio input'
+            'libsidplayfp: Commodore 64 audio input'
+            'wavpack: WavPack input'
+
+            'dbus-glib: Gnome Shortcuts Plugin'
+            'libsamplerate: Speed and Pitch Plugin'
+            'libnotify: libnotify OSD'
+            'lirc: LIRC'
+            'curl: AudioScrobbler Client'
+            'libmtp: Upload to MTP device'
+
+            'neon: neon-based http transport'
+            'libmms: libmms-based mms transport'
+            'libcue: CUE playlist format')
+
+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"
+
+  ./configure \
+    --prefix=/usr \
+    --enable-amidiplug
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:

Copied: audacious-plugins/repos/extra-i686/ffaudio-fix-packet-initialization.patch (from rev 284919, audacious-plugins/trunk/ffaudio-fix-packet-initialization.patch)
===================================================================
--- extra-i686/ffaudio-fix-packet-initialization.patch	                        (rev 0)
+++ extra-i686/ffaudio-fix-packet-initialization.patch	2016-12-28 05:41:43 UTC (rev 284920)
@@ -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;
+ 

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2016-12-28 05:41:33 UTC (rev 284919)
+++ extra-x86_64/PKGBUILD	2016-12-28 05:41:43 UTC (rev 284920)
@@ -1,67 +0,0 @@
-# $Id$
-# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
-# Contributor: Gaetan Bisson <bisson at archlinux.org>
-# Contributor: Alexander Fehr <pizzapunk gmail com>
-# Contributor: William Rea <sillywilly at gmail.com>
-
-pkgname=audacious-plugins
-pkgver=3.8.1
-pkgrel=1
-pkgdesc="Plugins for Audacious"
-arch=('i686' 'x86_64')
-url="http://audacious-media-player.org/"
-license=('BSD' 'GPL')
-
-makedepends=("audacious>=$pkgver"
-             'glib2' 'python' # for gdbus-codegen
-             'alsa-lib' 'pulseaudio' 'jack2' 'lame' 'libvorbis' 'flac'
-             'mpg123' 'faad2' 'ffmpeg' 'libmodplug' 'fluidsynth' 'libcdio-paranoia' 'libsidplayfp' 'wavpack'
-             'dbus-glib' 'libsamplerate' 'libnotify' 'lirc' 'curl' 'libmtp'
-             'neon' 'libmms' 'libcue')
-
-optdepends=('alsa-lib: Advanced Linux Sound Arch. output'
-            'pulseaudio: PulseAudio output'
-            'jack2: Jack Audio Connection Kit output'
-            'lame: FileWriter MP3 output'
-            'libvorbis: Vorbis input, FileWriter Vorbis output'
-            'flac: FLAC input, FileWriter FLAC output'
-
-            'mpg123: MP3 input'
-            'faad2: AAC input'
-            'ffmpeg: ffaudio input'
-            'libmodplug: modplug input'
-            'fluidsynth: MIDI FluidSynth backend input'
-            'libcdio-paranoia: CD Digital Audio input'
-            'libsidplayfp: Commodore 64 audio input'
-            'wavpack: WavPack input'
-
-            'dbus-glib: Gnome Shortcuts Plugin'
-            'libsamplerate: Speed and Pitch Plugin'
-            'libnotify: libnotify OSD'
-            'lirc: LIRC'
-            'curl: AudioScrobbler Client'
-            'libmtp: Upload to MTP device'
-
-            'neon: neon-based http transport'
-            'libmms: libmms-based mms transport'
-            'libcue: CUE playlist format')
-
-source=(http://distfiles.audacious-media-player.org/$pkgname-$pkgver.tar.bz2)
-sha256sums=('109c0559c072703dd8d9fc0bb1c5121126bd1e0edcc2804e1ea85974d98e2638')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure \
-    --prefix=/usr \
-    --enable-amidiplug
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
-# vim:set ts=2 sw=2 et:

Copied: audacious-plugins/repos/extra-x86_64/PKGBUILD (from rev 284919, audacious-plugins/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2016-12-28 05:41:43 UTC (rev 284920)
@@ -0,0 +1,76 @@
+# $Id$
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+# Contributor: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Alexander Fehr <pizzapunk gmail com>
+# Contributor: William Rea <sillywilly at gmail.com>
+
+pkgname=audacious-plugins
+pkgver=3.8.1
+pkgrel=2
+pkgdesc="Plugins for Audacious"
+arch=('i686' 'x86_64')
+url="http://audacious-media-player.org/"
+license=('BSD' 'GPL')
+
+makedepends=("audacious>=$pkgver"
+             'glib2' 'python' # for gdbus-codegen
+             'alsa-lib' 'pulseaudio' 'jack2' 'lame' 'libvorbis' 'flac'
+             'mpg123' 'faad2' 'ffmpeg' 'libmodplug' 'fluidsynth' 'libcdio-paranoia' 'libsidplayfp' 'wavpack'
+             'dbus-glib' 'libsamplerate' 'libnotify' 'lirc' 'curl' 'libmtp'
+             'neon' 'libmms' 'libcue')
+
+optdepends=('alsa-lib: Advanced Linux Sound Arch. output'
+            'pulseaudio: PulseAudio output'
+            'jack2: Jack Audio Connection Kit output'
+            'lame: FileWriter MP3 output'
+            'libvorbis: Vorbis input, FileWriter Vorbis output'
+            'flac: FLAC input, FileWriter FLAC output'
+
+            'mpg123: MP3 input'
+            'faad2: AAC input'
+            'ffmpeg: ffaudio input'
+            'libmodplug: modplug input'
+            'fluidsynth: MIDI FluidSynth backend input'
+            'libcdio-paranoia: CD Digital Audio input'
+            'libsidplayfp: Commodore 64 audio input'
+            'wavpack: WavPack input'
+
+            'dbus-glib: Gnome Shortcuts Plugin'
+            'libsamplerate: Speed and Pitch Plugin'
+            'libnotify: libnotify OSD'
+            'lirc: LIRC'
+            'curl: AudioScrobbler Client'
+            'libmtp: Upload to MTP device'
+
+            'neon: neon-based http transport'
+            'libmms: libmms-based mms transport'
+            'libcue: CUE playlist format')
+
+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"
+
+  ./configure \
+    --prefix=/usr \
+    --enable-amidiplug
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:

Copied: audacious-plugins/repos/extra-x86_64/ffaudio-fix-packet-initialization.patch (from rev 284919, audacious-plugins/trunk/ffaudio-fix-packet-initialization.patch)
===================================================================
--- extra-x86_64/ffaudio-fix-packet-initialization.patch	                        (rev 0)
+++ extra-x86_64/ffaudio-fix-packet-initialization.patch	2016-12-28 05:41:43 UTC (rev 284920)
@@ -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;
+ 



More information about the arch-commits mailing list