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

Conflicts:
	community/fotoxx/PKGBUILD
	community/gtkdialog/PKGBUILD
	community/hubbub/PKGBUILD
	community/libgdamm/PKGBUILD
	community/libparserutils/PKGBUILD
	community/mingw32-binutils/PKGBUILD
	community/mingw32-gcc-base/PKGBUILD
	community/mingw32-gcc/PKGBUILD
	community/mtpaint/PKGBUILD
	community/netsurf/PKGBUILD
	community/patchage/PKGBUILD
	community/qgo/PKGBUILD
	community/tomoyo-tools/PKGBUILD
	community/tre/PKGBUILD
	community/virtualbox/PKGBUILD
	core/net-tools/PKGBUILD
	core/openldap/PKGBUILD
	extra/epiphany/PKGBUILD
	extra/evince/PKGBUILD
	extra/evolution-data-server/PKGBUILD
	extra/evolution/PKGBUILD
	extra/exiv2/PKGBUILD
	extra/folks/PKGBUILD
	extra/gimp-ufraw/PKGBUILD
	extra/gnome-control-center/PKGBUILD
	extra/gnome-power-manager/PKGBUILD
	extra/gnome-python-desktop/PKGBUILD
	extra/gnome-python-extras/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/jack/PKGBUILD
	extra/kdelibs/PKGBUILD
	extra/kdepim/PKGBUILD
	extra/koffice/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/libwebkit/PKGBUILD
	extra/mutter/PKGBUILD
	extra/nautilus/PKGBUILD
	extra/openmpi/PKGBUILD
	extra/pavucontrol/PKGBUILD
	extra/php/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/postgresql/PKGBUILD
	extra/pulseaudio/PKGBUILD
	extra/pygobject2/PKGBUILD
	extra/swt/PKGBUILD
	extra/tomcat/PKGBUILD
	extra/totem/PKGBUILD
	extra/vigra/PKGBUILD
	extra/vte/PKGBUILD
	extra/xulrunner/PKGBUILD
	kde-unstable/calligra/PKGBUILD
	kde-unstable/kdebase-workspace/PKGBUILD
	multilib/lib32-atk/PKGBUILD
	multilib/lib32-gdk-pixbuf2/PKGBUILD
	multilib/lib32-glew/PKGBUILD
	multilib/lib32-glib2/PKGBUILD
	multilib/lib32-jack/PKGBUILD
	multilib/lib32-libpulse/PKGBUILD
	multilib/lib32-pango/PKGBUILD
	multilib/wine/PKGBUILD
	social/miniupnpc/PKGBUILD
	testing/icedtea-web-java7/PKGBUILD
	testing/sqlite3/PKGBUILD
	~xihh/abiword/PKGBUILD

3 files changed, 80 insertions, 30 deletions

diff --git a/extra/pulseaudio/PKGBUILD b/extra/pulseaudio/PKGBUILD
index 713e1bc06..27e02658f 100644
--- a/extra/pulseaudio/PKGBUILD
+++ b/extra/pulseaudio/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 128442 2011-06-23 23:49:30Z heftig $
+# $Id: PKGBUILD 139658 2011-10-04 14:14:35Z heftig $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
@@ -6,26 +6,28 @@
 
 pkgbase=pulseaudio
 pkgname=(pulseaudio libpulse)
-pkgver=0.9.23
-pkgrel=1
-arch=(i686 x86_64 'mips64el')
+pkgdesc="A featureful, general-purpose sound server"
+pkgver=1.0
+pkgrel=3
+arch=(i686 x86_64 mips64el)
 url="http://pulseaudio.org/"
 license=(GPL LGPL)
-makedepends=(libasyncns libcap attr libxtst libsm libsndfile libtool rtkit
-             speex libsamplerate tdb udev dbus-core xcb-util avahi bluez
+makedepends=(libasyncns libcap attr libxtst libsm libsamplerate libtool rtkit
+             speex tdb udev dbus-core xcb-util avahi bluez gconf intltool jack
+             openssl fftw orc json-c)
              gconf intltool jack openssl)
 [ "$CARCH" = "mips64el" ] || makedepends+=(lirc-utils)
 options=(!emptydirs !libtool !makeflags)
-source=("http://freedesktop.org/software/$pkgbase/releases/$pkgbase-$pkgver.tar.gz"
-        $pkgbase.xinit)
-md5sums=('7391205a337d1e04a9ff38025f684034'
-         'eb1cfae28eb2e4d3fdbe45a90e4318ab')
+source=(http://freedesktop.org/software/$pkgbase/releases/$pkgbase-$pkgver.tar.xz
+        $pkgbase.xinit version-number.patch)
+sha256sums=('e63464f8a0975446e2b4cfe768b615a66735c8d092b2366d2bdc7a2a04a249be'
+            'a0db6cdc74fbf0ca10e2343c08e1e228f109221c6c0ff91b0bfade5c4bdf03cf'
+            '6b067ae9e8da703510fb24eae8ee53f3a7b6a90bcf88941ee50997ad679a4530')
 
 build() {
   cd "$srcdir/$pkgbase-$pkgver"
 
-  # Don't break circular dependency between libpulse and libpulsecommon
-  LDFLAGS="${LDFLAGS//-Wl,--as-needed}"
+  patch -Np1 -i "$srcdir/version-number.patch"
 
   ./configure --prefix=/usr \
     --sysconfdir=/etc \
@@ -41,14 +43,13 @@ build() {
 }
 
 package_pulseaudio() {
-  pkgdesc="A featureful, general-purpose sound server"
-  depends=("libpulse=$pkgver-$pkgrel" rtkit libtool speex libsamplerate tdb
-           udev)
+  depends=("libpulse=$pkgver-$pkgrel" rtkit libtool speex tdb udev fftw orc)
   optdepends=('avahi: zeroconf support'
               'bluez: bluetooth support'
-              'gconf: configuration through gconf'
+              'gconf: configuration through gconf (paprefs)'
               'jack: jack support'
-              'openssl: RAOP support')
+              'openssl: RAOP support'
+              'python2-pyqt: Equalizer GUI (qpaeq)')
 [ "$CARCH" = "mips64el" ] || optdepends+=('lirc-utils: infra-red support')
   backup=(etc/pulse/{daemon.conf,default.pa,system.pa})
   install=pulseaudio.install
@@ -62,23 +63,27 @@ package_pulseaudio() {
   # 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 "$pkgdir/usr/bin/start-$pkgbase-x11"
+      -i "$pkgdir/usr/bin/start-pulseaudio-x11"
 
-  # Make module-console-kit optional
+  # Make some modules optional
   sed -e $'/load-module module-console-kit/{i.nofail\n;a.fail\n;}' \
+      -e '/load-module module-jackdbus-detect/s/^/#/' \
       -i "$pkgdir/etc/pulse/default.pa"
 
-  install -Dm755 "$srcdir/$pkgbase.xinit" "$pkgdir/etc/X11/xinit/xinitrc.d/$pkgbase"
+  # Python fix
+  sed -i '1s:python$:&2:' "$pkgdir/usr/bin/qpaeq"
 
-  rm "$pkgdir/etc/dbus-1/system.d/$pkgbase-system.conf"
+  install -Dm755 "$srcdir/pulseaudio.xinit" "$pkgdir/etc/X11/xinit/xinitrc.d/pulseaudio"
+
+  rm "$pkgdir/etc/dbus-1/system.d/pulseaudio-system.conf"
 
 ### Split libpulse
 
-  mkdir -p "$srcdir"/libpulse/{etc/pulse,usr/{lib,share/{man/man5,vala/vapi}}}
+  mkdir -p "$srcdir"/libpulse/{etc/pulse,usr/{lib,share/man/man5}}
 
   mv {"$pkgdir","$srcdir/libpulse"}/etc/pulse/client.conf
 
-  mv "$pkgdir"/usr/lib/libpulse{,dsp,-simple,-browse,-mainloop-glib}.so* \
+  mv "$pkgdir"/usr/lib/libpulse{,dsp,-simple,-mainloop-glib}.so* \
      "$pkgdir"/usr/lib/libpulsecommon-*.so \
      "$srcdir/libpulse/usr/lib"
 
@@ -86,12 +91,12 @@ package_pulseaudio() {
   mv {"$pkgdir","$srcdir/libpulse"}/usr/include
 
   mv {"$pkgdir","$srcdir/libpulse"}/usr/share/man/man5/pulse-client.conf.5
-  mv {"$pkgdir","$srcdir/libpulse"}/usr/share/vala/vapi/libpulse.vapi
+  mv {"$pkgdir","$srcdir/libpulse"}/usr/share/vala
 }
 
 package_libpulse() {
-  pkgdesc="A featureful, general-purpose sound server (client library)"
-  depends=(dbus-core xcb-util libasyncns libcap libxtst libsm libsndfile)
+  pkgdesc="$pkgdesc (client library)"
+  depends=(dbus-core xcb-util libasyncns libcap libxtst libsm libsamplerate json-c)
   optdepends=('alsa-plugins: ALSA support'
               'avahi: zeroconf support')
   backup=(etc/pulse/client.conf)
diff --git a/extra/pulseaudio/pulseaudio.xinit b/extra/pulseaudio/pulseaudio.xinit
index ca510e882..2d30c0943 100644
--- a/extra/pulseaudio/pulseaudio.xinit
+++ b/extra/pulseaudio/pulseaudio.xinit
@@ -1,7 +1,12 @@
-#!/bin/sh
+#!/bin/bash
 
-case "$SESSION" in
-  GNOME|KDE*|xfce4) # PulseAudio is started via XDG Autostart
+case "$DESKTOP_SESSION" in
+  gnome|kde*|xfce*) # PulseAudio is started via XDG Autostart
+  ;;
+  *)
+    # Extra checks in case DESKTOP_SESSION is not set correctly
+    if [[ -z $KDE_FULL_SESSION && -z $GNOME_DESKTOP_SESSION_ID ]]; then
+      /usr/bin/start-pulseaudio-x11
+    fi
   ;;
-  *) /usr/bin/start-pulseaudio-x11 ;;
 esac
diff --git a/extra/pulseaudio/version-number.patch b/extra/pulseaudio/version-number.patch
new file mode 100644
index 000000000..473b252a9
--- /dev/null
+++ b/extra/pulseaudio/version-number.patch
@@ -0,0 +1,40 @@
+commit 7563e0bbb54fbac54e77f3a62d9761a70f3a559c
+Author: Colin Guthrie <colin@mageia.org>
+Date:   Sat Oct 1 12:03:44 2011 +0100
+
+    libpulse: Always return a three part version number in API calls.
+    
+    For both the headers and the library we should provide clean, three part
+    strings as this has been what we've previously done in the past
+    and some external systems apparently rely on this format. While it's not
+    something we've officially commented on before, there is no real advantage
+    to us to change it so let's not try to tidy things up too much
+    considering some third party apps (e.g. Skype) seem to dislike a two
+    part version string.
+
+diff --git a/src/pulse/context.c b/src/pulse/context.c
+index 25d04a1..af144aa 100644
+--- a/src/pulse/context.c
++++ b/src/pulse/context.c
+@@ -1281,7 +1281,7 @@ pa_operation* pa_context_set_name(pa_context *c, const char *name, pa_context_su
+ }
+ 
+ const char* pa_get_library_version(void) {
+-    return PACKAGE_VERSION;
++    return pa_get_headers_version();
+ }
+ 
+ const char* pa_context_get_server(pa_context *c) {
+diff --git a/src/pulse/version.h.in b/src/pulse/version.h.in
+index 7e00c5e..1be4c75 100644
+--- a/src/pulse/version.h.in
++++ b/src/pulse/version.h.in
+@@ -35,7 +35,7 @@ PA_C_DECL_BEGIN
+ /** Return the version of the header files. Keep in mind that this is
+ a macro and not a function, so it is impossible to get the pointer of
+ it. */
+-#define pa_get_headers_version() ("@PACKAGE_VERSION@")
++#define pa_get_headers_version() ("@PA_MAJOR@.@PA_MINOR@.0")
+ 
+ /** Return the version of the library the current application is
+  * linked to. */