Merge branch 'master' into testing

srcpkgs/alsa-plugins-ffmpeg

@@ -0,0 +1 @@
+alsa-plugins

srcpkgs/alsa-plugins-jack

@@ -0,0 +1 @@
+alsa-plugins

srcpkgs/alsa-plugins-pulseaudio

@@ -0,0 +1 @@
+alsa-plugins

srcpkgs/alsa-plugins-samplerate

@@ -0,0 +1 @@
+alsa-plugins

srcpkgs/alsa-plugins-speex

@@ -0,0 +1 @@
+alsa-plugins

srcpkgs/alsa-plugins/template

@@ -1,7 +1,7 @@
 # Template build file for 'alsa-plugins'.
 pkgname=alsa-plugins
 version=1.0.27
-revision=2
+revision=4
 build_style=gnu-configure
 configure_args="--disable-maemo-plugin --with-speex=lib"
 hostmakedepends="pkg-config"
@@ -13,19 +13,53 @@ license="GPL-2, LGPL-2.1"
 homepage="http://www.alsa-project.org"
 distfiles="ftp://ftp.alsa-project.org/pub/plugins/$pkgname-$version.tar.bz2"
 checksum=0bbd0c37c2dd7baf16363afb2e58169ffb0f9c0a70031b3b6235594630f3ab35
-long_desc="
- The Advanced Linux Sound Architecture (ALSA) provides audio and MIDI
- functionality to the Linux operating system.
 
- This package includes some ALSA extra plugins for PulseAudio, Speex,
+alsa-plugins-jack_package() {
- FFmpeg's libavcodec library and libsamplerate."
+	replaces="alsa-plugins<1.0.27_3"
+	short_desc+=" - Jack output plugin"
+	pkg_install() {
+		vmove "usr/lib/alsa-lib/*jack*"
+	}
+}
 
-post_install() {
+alsa-plugins-pulseaudio_package() {
+	replaces="alsa-plugins<1.0.27_3"
+	short_desc+=" - Pulseaudio output plugin"
+	conf_files="/etc/asound.conf"
+	depends="pulseaudio"
+	pkg_install() {
+		vmove "usr/lib/alsa-lib/*pulse*"
+		vmove "usr/share/alsa/alsa.conf.d/*pulse*"
 		vinstall ${FILESDIR}/asound.conf 644 etc
 	}
+}
+
+alsa-plugins-speex_package() {
+	replaces="alsa-plugins<1.0.27_3"
+	short_desc+=" - Speex resample plugin"
+	pkg_install() {
+		vmove "usr/lib/alsa-lib/*speex*"
+	}
+}
+
+alsa-plugins-samplerate_package() {
+	replaces="alsa-plugins<1.0.27_3"
+	short_desc+=" - libsamplerate resample plugin"
+	pkg_install() {
+		vmove "usr/lib/alsa-lib/*samplerate*"
+	}
+}
+
+alsa-plugins-ffmpeg_package() {
+	replaces="alsa-plugins<1.0.27_3"
+	short_desc+=" - libavcodec/a52 plugins"
+	pkg_install() {
+		vmove "usr/lib/alsa-lib/*lavc*"
+		vmove "usr/lib/alsa-lib/*a52*"
+	}
+}
 
 alsa-plugins_package() {
-	conf_files="/etc/asound.conf"
 	pkg_install() {
 		vmove all
 	}

srcpkgs/binutils/template

@@ -1,13 +1,13 @@
 # Template file for 'binutils'
 pkgname=binutils
-version=2.23.52.0.2
+version=2.24
-revision=7
+revision=1
 short_desc="GNU binary utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnu.org/software/binutils/"
 license="GPL-3"
-distfiles="${KERNEL_SITE}/devel/binutils/$pkgname-$version.tar.xz"
+distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz"
-checksum=c2229d5d4067c782b67cfaf7f049acd8361407c0870991bc5430be5c548f6825
+checksum=4930b2886309112c00a279483eaef2f0f8e1b1b62010e0239c16b22af7c346d4
 
 bootstrap=yes
 

srcpkgs/bleachbit/template

@@ -1,16 +1,17 @@
 # Template file for 'bleachbit'
 pkgname=bleachbit
-version=0.9.5
+version=1.0
-revision=2
+revision=1
 build_style=gnu-makefile
 make_install_args="prefix=/usr"
-hostmakedepends="pygtk>=2 desktop-file-utils gtk-update-icon-cache hicolor-icon-theme"
+hostmakedepends="desktop-file-utils gtk-update-icon-cache hicolor-icon-theme"
+makedepends="pygtk-devel"
 short_desc="Deletes unneeded files to free disk space and maintain privacy"
 maintainer="graysky <graysky AT archlinux DOT us>"
 license="GPL3"
 homepage="http://bleachbit.sourceforge.net"
 distfiles="http://downloads.sourceforge.net/$pkgname/$pkgname-$version.tar.bz2"
-checksum=dd8ecded6f078efb0e421c4d43a0481411e28ef6dac6d25653cd8e3cddf196f7
+checksum=1b18c7ae2eadbe6c799159f2cc04f5b99dfbb8d3b87af61fa7ac192a8ce38162
 
 bleachbit_package() {
 	noarch="yes"

srcpkgs/gimp/template

@@ -1,6 +1,6 @@
 # Template build file for 'gimp'.
 pkgname=gimp
-version=2.8.8
+version=2.8.10
 revision=1
 build_style=gnu-configure
 configure_args="--without-aa --without-gvfs --enable-gimp-console
@@ -16,13 +16,18 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gimp.org"
 license="GPL-3"
 distfiles="ftp://ftp.gimp.org/pub/gimp/v${version%.*}/gimp-$version.tar.bz2"
-checksum=74c4509bae55f07140bc46f16100fc1e0e052829c13d4d87dc31d07d3e696a67
+checksum=e7fd8b19f989138d826003c75f56bd5b6f136eef597e86e3978ede0bba470ae6
 long_desc="
  Powerful image manipulation program similar to Adobe Photoshop[tm].
  It supports layers, arbitrary image sizes and working on several images
  at the same time. It comes with a lot of useful plug-ins. Missing is CMYK
  support and more than 8 bits per channel."
 
+pre_configure() {
+	# Fix freetype>=2.5.1 build.
+	sed -e 's,freetype/tttables.h,freetype2/tttables.h,' -i app/text/gimpfont.c
+}
+
 gimp-devel_package() {
 	short_desc+=" - development files"
 	pkg_install() {

srcpkgs/libpcap/template

@@ -1,11 +1,11 @@
 # Template file for 'libpcap'
 pkgname=libpcap
 version=1.5.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-libnl --with-pcap=linux"
-hostmakedepends="pkg-config flex"
+hostmakedepends="pkg-config flex libnl3-devel"
-makedepends="libfl-devel libnl-devel dbus-devel"
+makedepends="libfl-devel libnl3-devel dbus-devel"
 short_desc="System-independent interface for user-level packet capture"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.tcpdump.org/"
@@ -49,7 +49,7 @@ else
 fi
 
 libpcap-devel_package() {
-	depends="libnl-devel libpcap>=${version}_${revision}"
+	depends="libnl3-devel libpcap>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

srcpkgs/mpv/template

@@ -1,6 +1,6 @@
 # Template file for 'mpv'
 pkgname=mpv
-version=0.2.2
+version=0.2.4
 revision=1
 short_desc="Video player based on MPlayer/mplayer2"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -18,8 +18,7 @@ hostmakedepends="which pkg-config python-docutils"
 makedepends="ffmpeg-devel>=2.1 libass-devel lcms2-devel libXinerama-devel libquvi-devel
  mpg123-devel libXv-devel libxkbcommon-devel libva-devel libvdpau-devel alsa-lib-devel
  libbluray-devel libcdio-devel libdvdread-devel pulseaudio-devel MesaLib-devel
- harfbuzz-devel libXScrnSaver-devel jack-devel libva-devel desktop-file-utils
+ harfbuzz-devel libXScrnSaver-devel jack-devel desktop-file-utils hicolor-icon-theme"
- hicolor-icon-theme"
 
 do_fetch() {
 	git clone -b v${version} git://github.com/mpv-player/mpv.git mpv-${version}

srcpkgs/ngircd/template

@@ -1,6 +1,6 @@
 # Template build file for 'ngircd'
 pkgname=ngircd
-version=20.3
+version=21
 revision=1
 build_style=gnu-configure
 configure_args="--enable-ipv6 --without-ident"
@@ -11,7 +11,7 @@ short_desc="Free, portable and lightweight Internet Relay Chat server"
 maintainer="pancake <pancake@nopcode.org>"
 license="GPL-2"
 distfiles="ftp://ftp.berlios.de/pub/$pkgname/$pkgname-$version.tar.gz"
-checksum=55d7c74c6df790b11a68c07f39836d581965087efb618d3e9a6bec855364c2f9
+checksum=0edbd41304186e43f9d907a7017b40520cc90c2ce29b1339bdcd7622fffe19a0
 
 # Package build options
 build_options="ssl"

srcpkgs/pulseaudio/INSTALL

@@ -1,28 +0,0 @@
-case "${ACTION}" in
-post)
-	cat <<_EOF
-=====================================================================
-
-To make ALSA use PulseAudio globally in your system you'd have to
-create /etc/asound.conf with the following contents:
-
-pcm.!default {
-	type pulse
-}
-
-ctl.!default {
-	type pulse
-}
-
-pcm.pulse {
-	type pulse
-}
-
-ctl.pulse {
-	type pulse
-}
-
-=====================================================================a
-_EOF
-	;;
-esac

srcpkgs/pulseaudio/template

@@ -1,7 +1,7 @@
 # Template file for 'pulseaudio'
 pkgname=pulseaudio
 version=4.0
-revision=4
+revision=6
 build_style=gnu-configure
 configure_args="--disable-oss-output --disable-oss-wrapper --disable-tcpwrap
  --enable-jack --disable-lirc --disable-hal-compat --disable-gconf --enable-orc
@@ -32,12 +32,24 @@ if [ "$CROSS_BUILD" ]; then
 fi
 
 post_install() {
-	vinstall ${FILESDIR}/pulseaudio.xinit 755 \
+	vinstall ${FILESDIR}/pulseaudio.xinit 755 etc/X11/xinit/xinitrc.d pulseaudio
-		etc/X11/xinit/xinitrc.d pulseaudio
 	rm -f ${DESTDIR}/etc/dbus-1/system.d/pulseaudio-system.conf
+
 	vmkdir usr/share/bash-completion/completions
 	mv ${DESTDIR}/etc/bash_completion.d/pulseaudio-bash-completion.sh \
 		${DESTDIR}/usr/share/bash-completion/completions/pulseaudio
+
+	# Disable autospawn by default
+	sed -e '/autospawn/iautospawn=no' -i ${DESTDIR}/etc/pulse/client.conf
+
+	# Speed up pulseaudio shutdown so that it exits immediately with
+	# the last user session (module-systemd-login keeps it alive)
+	sed -e '/exit-idle-time/iexit-idle-time=0' -i ${DESTDIR}/etc/pulse/daemon.conf
+
+	# Disable cork-request module, can result in e.g. media players unpausing
+	# when there's a Skype call incoming
+	sed -e 's|/usr/bin/pactl load-module module-x11-cork-request|#&|' \
+		-i ${DESTDIR}/usr/bin/start-pulseaudio-x11
 }
 
 libpulseaudio_package() {
@@ -51,8 +63,7 @@ libpulseaudio_package() {
 }
 
 pulseaudio-devel_package() {
-	depends="libasyncns-devel dbus-devel libXtst-devel
+	depends="libasyncns-devel dbus-devel libXtst-devel libpulseaudio>=${version}_${revision}"
-		libpulseaudio-${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

srcpkgs/python/template

@@ -1,7 +1,7 @@
 # Template build file for 'python'.
 pkgname=python
 version=2.7.6
-revision=2
+revision=3
 wrksrc="Python-${version}"
 short_desc="Interpreted, interactive, object-oriented programming language"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -28,8 +28,8 @@ pre_configure() {
 }
 
 do_configure() {
+	unset CC LD AR AS RANLIB
 	if [ "$CROSS_BUILD" ]; then
-		env CC=gcc LD=gcc AR=ar AS=as RANLIB=ranlib \
 		CFLAGS=-Os LDFLAGS= ./configure
 		make python
 		mkdir hostpython