Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/avifile/PKGBUILD
	community/blackbox/PKGBUILD
	community/blobby2/PKGBUILD
	community/chmsee/PKGBUILD
	community/extrema/PKGBUILD
	community/floyd/PKGBUILD
	community/gnash/PKGBUILD
	community/gq/PKGBUILD
	community/gsql/PKGBUILD
	community/haddock/PKGBUILD
	community/hashcash/PKGBUILD
	community/kvpnc/PKGBUILD
	community/uptimed/PKGBUILD
	community/wol/PKGBUILD
	core/jfsutils/PKGBUILD
	core/reiserfsprogs/PKGBUILD
	extra/gtk2/PKGBUILD
	extra/libcroco/PKGBUILD
	extra/libffado/PKGBUILD
	extra/librsvg/PKGBUILD
	extra/lua/PKGBUILD
	extra/mesa/PKGBUILD
	extra/valgrind/PKGBUILD
	extra/xorg-server/PKGBUILD
	libre/audacious-plugins-libre/PKGBUILD
	libre/texlive-bin-libre/PKGBUILD
	multilib/lib32-gtk2/PKGBUILD
	multilib/lib32-mesa/PKGBUILD
	multilib/wine/PKGBUILD
	multilib/wine_gecko/PKGBUILD

4 files changed, 45 insertions, 23 deletions

diff --git a/libre/audacious-plugins-libre/PKGBUILD b/libre/audacious-plugins-libre/PKGBUILD
index 006c39cdf..e0607a940 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' 'mips64el')
-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
 }
 
diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD
index 8798778d5..d5f6be604 100644
--- a/libre/mplayer-libre/PKGBUILD
+++ b/libre/mplayer-libre/PKGBUILD
@@ -5,7 +5,7 @@
 _pkgbase=mplayer
 pkgbase=mplayer-libre
 pkgname=('mplayer-libre' 'mencoder-libre')
-pkgver=34174
+pkgver=34344
 pkgrel=1
 arch=('i686' 'x86_64')
 makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'cdparanoia' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient'
@@ -18,9 +18,9 @@ makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'cdparanoia' 'libxinerama' 'sdl
 'libpulse' 'fribidi' 'unzip' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass')
 license=('GPL')
 url="http://www.mplayerhq.hu/"
-options=(!buildflags !emptydirs !distcc)
+options=(!buildflags !emptydirs)
 source=(ftp://ftp.archlinux.org/other/${_pkgbase}/${_pkgbase}-${pkgver}.tar.xz mplayer.desktop)
-md5sums=('73225e0be6c5db51d7cbf2a0dd1d25a2'
+md5sums=('e4016248418b8f9d55b540d68b6cfee2'
          'c0d6ef795cf6de48e3b87ff7c23f0319')
 
 build() {
@@ -39,6 +39,7 @@ build() {
         --disable-mga \
         --disable-ass-internal \
         --enable-xvmc \
+        --enable-radio \
         --language=all \
         --confdir=/etc/mplayer
     [ "$CARCH" = "i686" ] &&  sed 's|-march=i486|-march=i686|g' -i config.mak
diff --git a/libre/texlive-bin-libre/PKGBUILD b/libre/texlive-bin-libre/PKGBUILD
index 55cf77538..dd1c32a40 100644
--- a/libre/texlive-bin-libre/PKGBUILD
+++ b/libre/texlive-bin-libre/PKGBUILD
@@ -5,11 +5,11 @@
 pkgname=texlive-bin-libre
 pkgver=2011.1
 _luatex_ver=0.70.1
-pkgrel=3
+pkgrel=4
 pkgdesc="TeX Live binaries"
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
-depends=('t1lib' 'gd' 'libgraphite' 'poppler>=0.18' 'libsigsegv' 'zziplib')
+depends=('t1lib' 'gd' 'libgraphite' 'poppler>=0.18.1' 'libsigsegv' 'zziplib')
 makedepends=('perl' 'clisp' 'ffcall' 'pkg-config')
 optdepends=('ed: for texconfig')
 provides=('lcdf-typetools' 'kpathsea' 'xindy' 'pdfjam' 'texlive-bin')
@@ -22,10 +22,10 @@ source=('texmf.cnf'
         'fix-fontforge-encoding.patch'
         '09-texlive-fonts.conf'
         'archlinux-build.patch'
-        'ftp://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-source-20110724.tar.xz'
-        'ftp://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-texmf-20110724.tar.xz'
+        'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-source-20110724.tar.xz'
+        'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-texmf-20110724.tar.xz'
         # "http://foundry.supelec.fr/gf/download/frsrelease/392/1730/luatex-beta-${_luatex_ver}.tar.bz2"
-        'ftp://ftp.archlinux.org/other/texlive/luatex-svn4356.tar.xz'
+        'http://ftp.archlinux.org/other/texlive/luatex-svn4356.tar.xz'
 )
 backup=(etc/texmf/web2c/texmf.cnf \
   etc/texmf/chktex/chktexrc \
diff --git a/libre/ununrar/PKGBUILD b/libre/ununrar/PKGBUILD
new file mode 100644
index 000000000..050cfb484
--- /dev/null
+++ b/libre/ununrar/PKGBUILD
@@ -0,0 +1,22 @@
+# Maintainer: Michał Masłowski  <mtjm@mtjm.eu>
+
+pkgname=ununrar
+pkgver=0.0a0dev20110715
+pkgrel=1
+pkgdesc="An unrar-compatible interface to Unarchiver"
+arch=('any')
+url="http://hg.mtjm.eu/ununrar/"
+license=('AGPL')
+depends=('python2' 'python2-distribute' 'unarchiver')
+provides=('unrar' 'unrar-libre')
+conflicts=('unrar' 'unrar-libre')
+options=(!emptydirs)
+source=("http://mtjm.eu/releases/Ununrar-${pkgver}.tar.gz")
+sha512sums=('ea2a6805c16be3aad81b18e5e9e044d73ca2f8f87ce078c35e64cdffb12d5f0e4c96e66901af54f388349edbb88c6252ed0e0329e9813cce5e7b9b480802cf44')
+
+package() {
+  cd "$srcdir/Ununrar-$pkgver"
+  python2 setup.py install --root=$pkgdir/ --optimize=1
+}
+
+# vim:set ts=2 sw=2 et: