Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-staging/erlang/PKGBUILD
	community/bird/PKGBUILD
	community/chmsee/PKGBUILD
	extra/avahi/PKGBUILD
	extra/lirc/PKGBUILD
	libre/audacious-plugins-libre/PKGBUILD
	testing/btrfs-progs/PKGBUILD
	testing/gcc/PKGBUILD

2 files changed, 33 insertions, 43 deletions

diff --git a/libre/audacious-plugins-libre/PKGBUILD b/libre/audacious-plugins-libre/PKGBUILD
index 8dc995bdc..1953c1764 100644
--- a/libre/audacious-plugins-libre/PKGBUILD
+++ b/libre/audacious-plugins-libre/PKGBUILD
@@ -3,10 +3,12 @@
 # Arch Contributor: William Rea <sillywilly@gmail.com>
 # Arch maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Parabola maintainer: Brendan Tildesley
+# Contributor (Parabola): Jorge Lopez <jorginho@adinet.com.uy>
 
+_pkgname=audacious-plugins
 pkgname=audacious-plugins-libre
-pkgver=3.2
-pkgrel=1
+pkgver=3.2.2
+pkgrel=1.1
 pkgdesc='Plugins for Audacious without unfree plugins'
 url='http://audacious-media-player.org/'
 arch=('i686' 'x86_64')
@@ -15,7 +17,7 @@ license=('GPL' 'GPL3' 'LGPL' 'custom')
 # 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 plugin 'psf' is currently (Nov 2011) BSD+noncommercial, but is apparently being changed to GPL.
 # However, 'psf' is apparently an emulator for running non-free code, so I'm not rushing to fix it.
 #
@@ -57,47 +59,34 @@ optdepends=('oss: Open Sound System v4 output'
             'libmms: libmms-based mms transport'
             'libcue: CUE playlist format')
 
-source=("http://repo.parabolagnulinux.org/~brendan/src-libre/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('6375b65b975e2905a8ff1c0ddfaeee2a71bbef94')
-
-# Retrieve upstream & remove plugin 'psf' due to issues mentioned above. Repackage as -libre
-mksource(){
-	[ -f ${pkgname%-libre}-$pkgver.tar.bz2 ] || wget http://distfiles.audacious-media-player.org/${pkgname%-libre}-$pkgver.tar.bz2
-	tar xjf ${pkgname%-libre}-${pkgver}.tar.bz2
-
-	rm -rvf ${pkgname%-libre}-$pkgver/src/psf/
-	sed -i s/enable_psf=yes/enable_psf=no/ ${pkgname%-libre}-$pkgver/configure
-
-	mv -v ${pkgname%-libre}-$pkgver ${pkgname}-$pkgver
-	tar cJf ${pkgname}-${pkgver}.tar.xz ${pkgname}-${pkgver}/
-	rm -rf ${pkgname}-${pkgver}
-	echo "${pkgname}-${pkgver}.tar.xz is your new -libre source package."
-
-}
-
+source=("http://distfiles.audacious-media-player.org/${_pkgname}-${pkgver}.tar.bz2")
+sha1sums=('4518a6fdcba0c1b496e048b45ce5d87a46326c9b')
 build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
+	# Retrieve upstream & remove plugin 'psf' due to issues mentioned above.
+	sed -i s/enable_psf=yes/enable_psf=no/ ${_pkgname}-$pkgver/configure
+
+	cd "${srcdir}/${_pkgname}-${pkgver}"
 
 	# 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
+	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
+	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 ..
+	cd ..
 	pushd $tmpdir
 	install -m644 LICENSE.albumart $l
 	install -m644 LICENSE.alsa $l
@@ -118,12 +107,12 @@ build() {
 	./configure \
                 --prefix=/usr \
  		--enable-amidiplug \
- 		--disable-adplug
+ 		--disable-adplug \
 
 	make
 }
 
 package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
+	cd "${srcdir}/${_pkgname}-${pkgver}"
 	make DESTDIR="${pkgdir}" install
 }
diff --git a/libre/libquicktime-libre/PKGBUILD b/libre/libquicktime-libre/PKGBUILD
index d3f51d911..2a624348b 100644
--- a/libre/libquicktime-libre/PKGBUILD
+++ b/libre/libquicktime-libre/PKGBUILD
@@ -1,18 +1,19 @@
 # $Id$
 # Maintainer: Mateusz Herych <heniekk@gmail.com>
+# Contributor (Parabola): Jorge Lopez <jorginho@adinet.com.uy>
 
 pkgname=libquicktime-libre
 _pkgname=libquicktime
-pkgver=1.2.2
-pkgrel=3
+pkgver=1.2.4
+pkgrel=1
 pkgdesc="A library for reading and writing quicktime files (no unfree faac support)."
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://libquicktime.sourceforge.net/"
-depends=('gtk2'  'ffmpeg'  'alsa-lib' 'libxv' 'libgl' 'libxaw' 'x264' 'faad2')
+depends=('gtk2'  'ffmpeg' 'libxv' 'libgl' 'libxaw' 'x264' 'faad2')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/$_pkgname/$_pkgname-$pkgver.tar.gz)
-sha256sums=('a83ddaaeaf98231d9f224190dcb8810ebdabd3edb5c8cebe2fb083d25edb7436')
+sha256sums=('1c53359c33b31347b4d7b00d3611463fe5e942cae3ec0fefe0d2fd413fd47368')
 provides=("$_pkgname=$pkgver")
 conflicts=($_pkgname)
 replaces=($_pkgname)