[arch-commits] Commit in pulseaudio/trunk (PKGBUILD pulseaudio.xinit)

[Jan Steffens]

    Date: Wednesday, February 12, 2014 @ 10:28:10
  Author: heftig
Revision: 205876

4.99.3, also fixing lots of bugs

Modified:
  pulseaudio/trunk/PKGBUILD
Deleted:
  pulseaudio/trunk/pulseaudio.xinit

------------------+
 PKGBUILD         |   23 +++++++----------------
 pulseaudio.xinit |   12 ------------
 2 files changed, 7 insertions(+), 28 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-02-12 08:00:43 UTC (rev 205875)
+++ PKGBUILD	2014-02-12 09:28:10 UTC (rev 205876)
@@ -7,8 +7,8 @@
 pkgbase=pulseaudio
 pkgname=(pulseaudio libpulse)
 pkgdesc="A featureful, general-purpose sound server"
-pkgver=4.0
-pkgrel=6
+pkgver=4.99.3
+pkgrel=1
 arch=(i686 x86_64)
 url="http://www.freedesktop.org/wiki/Software/PulseAudio"
 license=(LGPL AGPL3)
@@ -17,16 +17,12 @@
              lirc-utils openssl fftw orc json-c gtk3 webrtc-audio-processing
              check git)
 options=(!emptydirs)
-#source=(http://freedesktop.org/software/$pkgbase/releases/$pkgbase-$pkgver.tar.xz
-source=($pkgbase-$pkgver::git://anongit.freedesktop.org/pulseaudio/pulseaudio#commit=09e88de
-        pulseaudio.xinit)
-sha256sums=('SKIP'
-            'a0db6cdc74fbf0ca10e2343c08e1e228f109221c6c0ff91b0bfade5c4bdf03cf')
+#source=(http://freedesktop.org/software/$pkgbase/releases/$pkgbase-$pkgver.tar.xz)
+source=($pkgbase-$pkgver::git://anongit.freedesktop.org/pulseaudio/pulseaudio#commit=6021ce3)
+sha256sums=('SKIP')
 
 prepare() {
   cd $pkgbase-$pkgver
-  # ABI break https://bugs.freedesktop.org/show_bug.cgi?id=71047
-  git revert -n 16886bb b98a2e1
 }
 
 build() {
@@ -39,6 +35,7 @@
     --with-udev-rules-dir=/usr/lib/udev/rules.d \
     --with-database=tdb \
     --disable-tcpwrap \
+    --disable-bluez4 \
     --disable-rpath \
     --disable-default-build-tests
 
@@ -58,7 +55,7 @@
               'jack: jack support'
               'lirc-utils: infra-red support'
               'openssl: RAOP support'
-              'python-pyqt: Equalizer GUI (qpaeq)')
+              'python-pyqt4: Equalizer GUI (qpaeq)')
   backup=(etc/pulse/{daemon.conf,default.pa,system.pa})
   install=pulseaudio.install
 
@@ -66,10 +63,6 @@
   make -j1 DESTDIR="$pkgdir" install \
     bashcompletiondir=/usr/share/bash-completion/completions
 
-  # Disable autospawn by default
-  sed -e '/autospawn/iautospawn=no' \
-      -i "$pkgdir/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' \
@@ -80,8 +73,6 @@
   sed -e 's|/usr/bin/pactl load-module module-x11-cork-request|#&|' \
       -i "$pkgdir/usr/bin/start-pulseaudio-x11"
 
-  install -Dm755 "$srcdir/pulseaudio.xinit" "$pkgdir/etc/X11/xinit/xinitrc.d/pulseaudio"
-
   rm "$pkgdir/etc/dbus-1/system.d/pulseaudio-system.conf"
 
   install -Dm644 shell-completion/pulseaudio-zsh-completion.zsh \

Deleted: pulseaudio.xinit
===================================================================
--- pulseaudio.xinit	2014-02-12 08:00:43 UTC (rev 205875)
+++ pulseaudio.xinit	2014-02-12 09:28:10 UTC (rev 205876)
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-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
-  ;;
-esac