Audacious-plugins-libre 3.1-1

1 files changed, 14 insertions, 15 deletions

diff --git a/libre/audacious-plugins-libre/PKGBUILD b/libre/audacious-plugins-libre/PKGBUILD
index d92a363c6..9cbde26be 100644
--- a/libre/audacious-plugins-libre/PKGBUILD
+++ b/libre/audacious-plugins-libre/PKGBUILD
@@ -5,12 +5,12 @@
 # Parabola maintainer: Brendan Tildesley
 
 pkgname=audacious-plugins-libre
-pkgver=3.0.4
+pkgver=3.1
 pkgrel=1
 pkgdesc='Plugins for Audacious without unfree plugins'
 url='http://audacious-media-player.org/'
 arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'custom')
+license=('GPL' 'GPL3' 'LGPL' 'custom')
 
 # Licensing issues:
 # The plugins 'scrobbler', stereoplugin', 'wavepack' and 'plugin_echo' have no license notice
@@ -27,7 +27,7 @@ conflicts=("${pkgname%-libre}")
 
 makedepends=("audacious>=${pkgver}"
              'oss' 'alsa-lib' 'pulseaudio' 'jack2' 'lame' 'libvorbis' 'flac'
-             'mpg123' 'faad2' 'ffmpeg' 'fluidsynth' 'libcdio' 'libsidplay' 'wavpack'
+             'mpg123' 'faad2' 'ffmpeg' 'libmodplug' 'fluidsynth' 'libcdio' 'libsidplay' 'wavpack'
              'libnotify' 'lirc-utils' 'curl' 'libmtp'
              'neon' 'libmms' 'libcue')
 
@@ -42,6 +42,7 @@ optdepends=('oss: Open Sound System v4 output'
             'mpg123: MP3 input'
             'faad2: AAC input'
             'ffmpeg: ffaudio input'
+            'libmodplug: modplug input'
             'fluidsynth: MIDI FluidSynth backend input'
             'libcdio: CD Digital Audio input'
             'libsidplay: Commodore 64 audio input'
@@ -56,11 +57,10 @@ optdepends=('oss: Open Sound System v4 output'
             'libmms: libmms-based mms transport'
             'libcue: CUE playlist format')
 
-# Temporary source location
-source=("http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('eaf3fa55987ed60d1c99983453d2b89a30087b7e')
+source=("http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('d5f2ef19cda220d6fa7dd26c514c5c22c8dd7b42')
 
-# Retrieve upstream & remove plugins 'psf' & 'usf' due to unfree license. Repackage as -libre
+# Retrieve upstream & remove plugins 'psf' & 'usf' due to issues mentioned above. Repackage as -libre
 mksource(){
 	[ -f ${pkgname%-libre}-$pkgver.tar.gz ] || wget http://distfiles.atheme.org/${pkgname%-libre}-$pkgver.tar.gz
 	tar xzf ${pkgname%-libre}-${pkgver}.tar.gz
@@ -69,9 +69,9 @@ mksource(){
 	sed -i s/enable_psf=yes/enable_psf=no/ ${pkgname%-libre}-$pkgver/configure
 
 	mv -v ${pkgname%-libre}-$pkgver ${pkgname}-$pkgver
-	tar czf ${pkgname}-${pkgver}.tar.gz ${pkgname}-${pkgver}/
+	tar cJf ${pkgname}-${pkgver}.tar.xz ${pkgname}-${pkgver}/
 	rm -rf ${pkgname}-${pkgver}
-	echo "${pkgname}-${pkgver}.tar.gz is your new -libre source package."
+	echo "${pkgname}-${pkgver}.tar.xz is your new -libre source package."
 
 }
 
@@ -90,10 +90,8 @@ build() {
 	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 17 daemon/daemon.c		   | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.daemon
 	head -n 22 dockalbumart/dockalbumart.c	   | cut -c 4- | tail -n 21 > ${tmpdir}/LICENSE.dockalbumart
 	head -n 18 lyricwiki/lyricwiki.c	   | cut -c 4- | tail -n 17 > ${tmpdir}/LICENSE.lyricwiki
-	head -n 17 mixdown/mixdown.c		   | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.mixdown
 	head -n 19 mpg123/mpg123.c		   | cut -c 4- | tail -n 18 > ${tmpdir}/LICENSE.mpg123
 	head -n 17 openal/openal.c		   | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.openal
 	head -n 17 resample/resample.c		   | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.resample
@@ -111,10 +109,8 @@ build() {
 	install -m644 LICENSE.compressor $l
 	install -m644 LICENSE.crossfade $l
 	install -m644 LICENSE.crystalizer $l
-	install -m644 LICENSE.daemon $l
 	install -m644 LICENSE.dockalbumart $l
 	install -m644 LICENSE.lyricwiki $l
-	install -m644 LICENSE.mixdown $l
 	install -m644 LICENSE.mpg123 $l
 	install -m644 LICENSE.openal $l
 	install -m644 LICENSE.resample $l
@@ -123,8 +119,11 @@ build() {
 	install -m644 LICENSE.voice_removal $l
 	install -m644 LICENSE.xfs $l
 	popd
-	[[ ${CARCH} == x86_64 ]] && _extraopts='' || _extraopts='--disable-sse2'
-	./configure --prefix=/usr ${_extraopts}
+
+	./configure --prefix=/usr \
+ 		--enable-amidiplug \
+ 		--disable-adplug
+
 	make
 }