audacious-plugins-3.6-2.parabola1: updating version

1 files changed, 22 insertions, 44 deletions

diff --git a/libre/audacious-plugins/PKGBUILD b/libre/audacious-plugins/PKGBUILD
index 5cdd0fd23..a6573f831 100644
--- a/libre/audacious-plugins/PKGBUILD
+++ b/libre/audacious-plugins/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 226071 2014-11-11 18:59:58Z bisson $
+# $Id: PKGBUILD 232383 2015-03-01 16:56:13Z bisson $
 # Maintainer (Arch): Gaetan Bisson <bisson@archlinux.org>
 # Contributor (Arch): Alexander Fehr <pizzapunk gmail com>
 # Contributor (Arch): William Rea <sillywilly@gmail.com>
@@ -7,7 +7,7 @@
 # Contributor: Jorge Lopez <jorginho@parabola.nu>
 
 pkgname=audacious-plugins
-pkgver=3.5.2
+pkgver=3.6
 pkgrel=2.parabola1
 pkgdesc='Plugins for Audacious, without nonfree plugins'
 url='http://audacious-media-player.org/'
@@ -15,9 +15,8 @@ license=('GPL' 'GPL3' 'LGPL' 'custom:BSD')
 arch=('i686' 'x86_64' 'mips64el')
 
 # Licensing issues:
-# The plugins 'scrobbler', stereoplugin', 'wavepack' and 'plugin_echo' have no license notice
-# but I've been informed by an upstream dev, nenolod, that they are all GPL. I don't know what version
-#
+# The plugins 'stereoplugin' and 'wavepack'have no license notice but I've been informed by an upstream dev,
+# nenolod, that they are all GPL. I don't know what version.
 # The plugin 'psf' is under BSD license, mostly, but it uses code from PeOPS, so it's probably GPL.
 # However, 'psf' is apparently an emulator for running nonfree code, so I'm not rushing to fix it.
 #
@@ -30,7 +29,7 @@ makedepends=("audacious>=${pkgver}"
              'glib2' 'python2' # for gdbus-codegen
              'alsa-lib' 'pulseaudio' 'jack2' 'lame' 'libvorbis' 'flac'
              'mpg123' 'faad2' 'ffmpeg' 'libmodplug' 'fluidsynth' 'libcdio-paranoia' 'libsidplayfp' 'wavpack'
-             'dbus-glib' 'libnotify' 'lirc-utils' 'curl' 'libmtp'
+             'dbus-glib' 'libnotify' 'lirc' 'curl' 'libmtp'
              'neon' 'libmms' 'libcue')
 
 optdepends=('alsa-lib: Advanced Linux Sound Arch. output'
@@ -51,7 +50,7 @@ optdepends=('alsa-lib: Advanced Linux Sound Arch. output'
 
             'dbus-glib: Gnome Shortcuts Plugin'
             'libnotify: libnotify OSD'
-            'lirc-utils: LIRC'
+            'lirc: LIRC'
             'curl: AudioScrobbler Client'
             'libmtp: Upload to MTP device'
 
@@ -60,51 +59,28 @@ optdepends=('alsa-lib: Advanced Linux Sound Arch. output'
             'libcue: CUE playlist format')
 
 source=("http://distfiles.audacious-media-player.org/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('470a9c009a92627fb824118762b156eb4604099f')
+sha1sums=('1a0d46f5e8b6ff6fcce0e441818da234b8f1f020')
 
 prepare() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
         # Retrieve upstream & remove plugin 'psf' due to issues mentioned above.
         rm -rv src/psf
-        sed -i s/enable_psf=yes/enable_psf=no/ configure
 
 	# Get license notices out of custom-licensed packages
-	cd src
-	tmpdir=$(mktemp -d /tmp/${pkgname}-${pkgver}-XXXX)
-	head -n 18 albumart/albumart.c | cut -c 4- | tail -n 17 > ${tmpdir}/LICENSE.albumart
-	head -n 17 alsa/alsa.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.alsa
-	head -n 17 audpl/audpl.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.audpl
-	head -n 18 cairo-spectrum/cairo-spectrum.c | cut -c 4- | tail -n 17 > ${tmpdir}/LICENSE.cairo-spectrum
-	head -n 17 compressor/compressor.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.compressor
-	head -n 17 crossfade/crossfade.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.crossfade
-	head -n 18 crystalizer/crystalizer.c | cut -c 4- | tail -n 17 > ${tmpdir}/LICENSE.crystalizer
-	head -n 18 lyricwiki/lyricwiki.c | cut -c 4- | tail -n 17 > ${tmpdir}/LICENSE.lyricwiki
-	head -n 19 mpg123/mpg123.c | cut -c 4- | tail -n 18 > ${tmpdir}/LICENSE.mpg123
-	head -n 17 mpris2/plugin.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.mpris2
-	head -n 17 resample/resample.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.resample
-	head -n 17 unix-io/unix-io.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.unix-io
-	head -n 18 voice_removal/voice_removal.c | cut -c 4- | tail -n 17 > ${tmpdir}/LICENSE.voice_removal
-	head -n 25 xsf/corlett.c | cut -c 2- | tail -n 23 > ${tmpdir}/LICENSE.xfs
-	l=${pkgdir}/usr/share/licenses/${pkgname}/
-	install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
-	cd ..
-	pushd $tmpdir
-	install -m644 LICENSE.albumart $l
-	install -m644 LICENSE.alsa $l
-	install -m644 LICENSE.audpl $l
-	install -m644 LICENSE.cairo-spectrum $l
-	install -m644 LICENSE.compressor $l
-	install -m644 LICENSE.crossfade $l
-	install -m644 LICENSE.crystalizer $l
-	install -m644 LICENSE.lyricwiki $l
-	install -m644 LICENSE.mpg123 $l
-	install -m644 LICENSE.mpris2 $l
-	install -m644 LICENSE.resample $l
-	install -m644 LICENSE.unix-io $l
-	install -m644 LICENSE.voice_removal $l
-	install -m644 LICENSE.xfs $l
-	popd
+	head -n 18 src/albumart/albumart.cc | cut -c 4- | tail -n 17 > ${srcdir}/LICENSE.albumart
+	head -n 17 src/alsa/alsa.cc | cut -c 4- | tail -n 16 > ${srcdir}/LICENSE.alsa
+	head -n 17 src/audpl/audpl.cc | cut -c 4- | tail -n 16 > ${srcdir}/LICENSE.audpl
+	head -n 18 src/cairo-spectrum/cairo-spectrum.cc | cut -c 4- | tail -n 17 > ${srcdir}/LICENSE.cairo-spectrum
+	head -n 17 src/compressor/compressor.cc | cut -c 4- | tail -n 16 > ${srcdir}/LICENSE.compressor
+	head -n 17 src/crossfade/crossfade.cc | cut -c 4- | tail -n 16 > ${srcdir}/LICENSE.crossfade
+	head -n 18 src/crystalizer/crystalizer.cc | cut -c 4- | tail -n 17 > ${srcdir}/LICENSE.crystalizer
+	head -n 18 src/lyricwiki/lyricwiki.cc | cut -c 4- | tail -n 17 > ${srcdir}/LICENSE.lyricwiki
+	head -n 19 src/mpg123/mpg123.cc | cut -c 4- | tail -n 18 > ${srcdir}/LICENSE.mpg123
+	head -n 17 src/mpris2/plugin.cc | cut -c 4- | tail -n 16 > ${srcdir}/LICENSE.mpris2
+	head -n 17 src/resample/resample.cc | cut -c 4- | tail -n 16 > ${srcdir}/LICENSE.resample
+	head -n 18 src/voice_removal/voice_removal.cc | cut -c 4- | tail -n 17 > ${srcdir}/LICENSE.voice_removal
+	head -n 25 src/xsf/corlett.cc | cut -c 2- | tail -n 23 > ${srcdir}/LICENSE.xfs
 }
 
 build() {
@@ -114,6 +90,7 @@ build() {
 		--prefix=/usr \
 		--enable-amidiplug \
 		--disable-adplug \
+		--disable-psf \
 
 	make
 }
@@ -122,4 +99,5 @@ package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	make DESTDIR="${pkgdir}" install
 	install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+	install -m644 ${srcdir}/LICENSE.* "${pkgdir}/usr/share/licenses/${pkgname}"
 }