[arch-commits] Commit in pulseaudio/repos (7 files)

Jan Steffens heftig at archlinux.org
Fri Jan 6 17:00:29 UTC 2012


    Date: Friday, January 6, 2012 @ 12:00:29
  Author: heftig
Revision: 146235

db-move: moved pulseaudio from [testing] to [extra] (i686)

Added:
  pulseaudio/repos/extra-i686/PKGBUILD
    (from rev 146234, pulseaudio/repos/testing-i686/PKGBUILD)
  pulseaudio/repos/extra-i686/pulseaudio.install
    (from rev 146234, pulseaudio/repos/testing-i686/pulseaudio.install)
  pulseaudio/repos/extra-i686/pulseaudio.xinit
    (from rev 146234, pulseaudio/repos/testing-i686/pulseaudio.xinit)
Deleted:
  pulseaudio/repos/extra-i686/PKGBUILD
  pulseaudio/repos/extra-i686/pulseaudio.install
  pulseaudio/repos/extra-i686/pulseaudio.xinit
  pulseaudio/repos/testing-i686/

--------------------+
 PKGBUILD           |  204 ++++++++++++++++++++++++++-------------------------
 pulseaudio.install |   46 +++++------
 pulseaudio.xinit   |   24 +++---
 3 files changed, 139 insertions(+), 135 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2012-01-06 15:24:05 UTC (rev 146234)
+++ extra-i686/PKGBUILD	2012-01-06 17:00:29 UTC (rev 146235)
@@ -1,100 +0,0 @@
-# $Id$
-# Maintainer: Jan "heftig" Steffens <jan.steffens at gmail.com>
-# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
-# Contributor: Corrado Primier <bardo at aur.archlinux.org>
-# Contributor: William Rea <sillywilly at gmail.com>
-
-pkgbase=pulseaudio
-pkgname=(pulseaudio libpulse)
-pkgdesc="A featureful, general-purpose sound server"
-pkgver=1.1
-pkgrel=1
-arch=(i686 x86_64)
-url="http://pulseaudio.org/"
-license=(GPL LGPL)
-makedepends=(libasyncns libcap attr libxtst libsm libsamplerate libtool rtkit
-             speex tdb udev dbus-core xcb-util avahi bluez gconf intltool jack
-             lirc-utils openssl fftw orc json-c)
-options=(!emptydirs !libtool !makeflags)
-source=(http://freedesktop.org/software/$pkgbase/releases/$pkgbase-$pkgver.tar.xz
-        $pkgbase.xinit)
-sha256sums=('6fe531136f6ebce2d35872a2d2c914278cdc5dcdd5eea516dc52c81f9001f5ee'
-            'a0db6cdc74fbf0ca10e2343c08e1e228f109221c6c0ff91b0bfade5c4bdf03cf')
-
-build() {
-  cd "$srcdir/$pkgbase-$pkgver"
-
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --libexecdir=/usr/lib \
-    --localstatedir=/var \
-    --with-database=tdb \
-    --disable-hal \
-    --disable-tcpwrap \
-    --disable-rpath \
-    --disable-default-build-tests
-
-  make
-}
-
-package_pulseaudio() {
-  depends=("libpulse=$pkgver-$pkgrel" rtkit libtool speex tdb udev fftw orc
-           libsamplerate)
-  optdepends=('avahi: zeroconf support'
-              'bluez: bluetooth support'
-              'gconf: configuration through gconf (paprefs)'
-              'jack: jack support'
-              'lirc-utils: infra-red support'
-              'openssl: RAOP support'
-              'python2-pyqt: Equalizer GUI (qpaeq)')
-  backup=(etc/pulse/{daemon.conf,default.pa,system.pa})
-  install=pulseaudio.install
-  cd "$srcdir/$pkgbase-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  # Lower resample quality, saves CPU
-  sed -e '/resample-method/iresample-method=speex-float-0' \
-      -i "$pkgdir/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 "$pkgdir/usr/bin/start-pulseaudio-x11"
-
-  # 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"
-
-  # Python fix
-  sed -i '1s:python$:&2:' "$pkgdir/usr/bin/qpaeq"
-
-  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}}
-
-  mv {"$pkgdir","$srcdir/libpulse"}/etc/pulse/client.conf
-
-  mv "$pkgdir"/usr/lib/libpulse{,dsp,-simple,-mainloop-glib}.so* \
-     "$pkgdir"/usr/lib/libpulsecommon-*.so \
-     "$srcdir/libpulse/usr/lib"
-
-  mv {"$pkgdir","$srcdir/libpulse"}/usr/lib/pkgconfig
-  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
-}
-
-package_libpulse() {
-  pkgdesc="$pkgdesc (client library)"
-  depends=(dbus-core xcb-util libasyncns libcap libxtst libsm libsndfile json-c)
-  optdepends=('alsa-plugins: ALSA support'
-              'avahi: zeroconf support')
-  backup=(etc/pulse/client.conf)
-  mv "$srcdir"/libpulse/* "$pkgdir"
-}

Copied: pulseaudio/repos/extra-i686/PKGBUILD (from rev 146234, pulseaudio/repos/testing-i686/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2012-01-06 17:00:29 UTC (rev 146235)
@@ -0,0 +1,104 @@
+# $Id$
+# Maintainer: Jan "heftig" Steffens <jan.steffens at gmail.com>
+# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
+# Contributor: Corrado Primier <bardo at aur.archlinux.org>
+# Contributor: William Rea <sillywilly at gmail.com>
+
+pkgbase=pulseaudio
+pkgname=(pulseaudio libpulse)
+pkgdesc="A featureful, general-purpose sound server"
+pkgver=1.1
+pkgrel=2
+arch=(i686 x86_64)
+url="http://pulseaudio.org/"
+license=(GPL LGPL)
+makedepends=(libasyncns libcap attr libxtst libsm libsamplerate libtool rtkit
+             speex tdb udev dbus-core avahi bluez gconf intltool jack
+             lirc-utils openssl fftw orc json-c gtk2)
+options=(!emptydirs !libtool)
+source=(http://freedesktop.org/software/$pkgbase/releases/$pkgbase-$pkgver.tar.xz
+        $pkgbase.xinit)
+sha256sums=('6fe531136f6ebce2d35872a2d2c914278cdc5dcdd5eea516dc52c81f9001f5ee'
+            'a0db6cdc74fbf0ca10e2343c08e1e228f109221c6c0ff91b0bfade5c4bdf03cf')
+
+build() {
+  cd "$srcdir/$pkgbase-$pkgver"
+
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib \
+    --localstatedir=/var \
+    --with-database=tdb \
+    --disable-hal \
+    --disable-tcpwrap \
+    --disable-rpath \
+    --disable-default-build-tests
+
+  # fight unused direct deps
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+  make
+}
+
+package_pulseaudio() {
+  depends=("libpulse=$pkgver-$pkgrel" rtkit libtool speex tdb udev fftw orc
+           libsamplerate)
+  optdepends=('avahi: zeroconf support'
+              'bluez: bluetooth support'
+              'gconf: configuration through gconf (paprefs)'
+              'jack: jack support'
+              'lirc-utils: infra-red support'
+              'openssl: RAOP support'
+              'python2-pyqt: Equalizer GUI (qpaeq)')
+  backup=(etc/pulse/{daemon.conf,default.pa,system.pa})
+  install=pulseaudio.install
+
+  cd "$srcdir/$pkgbase-$pkgver"
+  make -j1 DESTDIR="$pkgdir" install
+
+  # Lower resample quality, saves CPU
+  sed -e '/resample-method/iresample-method=speex-float-0' \
+      -i "$pkgdir/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 "$pkgdir/usr/bin/start-pulseaudio-x11"
+
+  # Make ConsoleKit optional
+  sed -e $'/load-module module-console-kit/{i.nofail\n;a.fail\n;}' \
+      -i "$pkgdir/etc/pulse/default.pa"
+
+  # Python fix
+  sed -i '1s:python$:&2:' "$pkgdir/usr/bin/qpaeq"
+
+  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}}
+
+  mv {"$pkgdir","$srcdir/libpulse"}/etc/pulse/client.conf
+
+  mv "$pkgdir"/usr/lib/libpulse{,dsp,-simple,-mainloop-glib}.so* \
+     "$pkgdir"/usr/lib/libpulsecommon-*.so \
+     "$srcdir/libpulse/usr/lib"
+
+  mv {"$pkgdir","$srcdir/libpulse"}/usr/lib/pkgconfig
+  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
+}
+
+package_libpulse() {
+  pkgdesc="$pkgdesc (client library)"
+  depends=(dbus-core libasyncns libcap libxtst libsm libsndfile json-c)
+  optdepends=('alsa-plugins: ALSA support'
+              'avahi: zeroconf support')
+  backup=(etc/pulse/client.conf)
+
+  mv "$srcdir"/libpulse/* "$pkgdir"
+}

Deleted: extra-i686/pulseaudio.install
===================================================================
--- extra-i686/pulseaudio.install	2012-01-06 15:24:05 UTC (rev 146234)
+++ extra-i686/pulseaudio.install	2012-01-06 17:00:29 UTC (rev 146235)
@@ -1,23 +0,0 @@
-post_install() {
-  cat << MES
->>> See the wiki at http://wiki.archlinux.org/index.php/PulseAudio for details
-    on configuring your system for PulseAudio.
-
->>> Make sure to install pulseaudio-alsa to configure ALSA for PulseAudio.
-MES
-}
-
-post_upgrade() {
-  # Delete old users and groups
-  # System-wide daemon not supported anymore
-  if (( $(vercmp $2 0.9.22) < 0 )); then
-    getent passwd pulse &>/dev/null && usr/sbin/userdel -f pulse
-    getent group pulse-access &>/dev/null && usr/sbin/groupdel pulse-access
-    getent group pulse-rt &>/dev/null && usr/sbin/groupdel pulse-rt
-    getent group pulse &>/dev/null && usr/sbin/groupdel pulse
-  fi
-
-  true
-}
-
-# vim:set ts=2 sw=2 et:

Copied: pulseaudio/repos/extra-i686/pulseaudio.install (from rev 146234, pulseaudio/repos/testing-i686/pulseaudio.install)
===================================================================
--- extra-i686/pulseaudio.install	                        (rev 0)
+++ extra-i686/pulseaudio.install	2012-01-06 17:00:29 UTC (rev 146235)
@@ -0,0 +1,23 @@
+post_install() {
+  cat << MES
+>>> See the wiki at http://wiki.archlinux.org/index.php/PulseAudio for details
+    on configuring your system for PulseAudio.
+
+>>> Make sure to install pulseaudio-alsa to configure ALSA for PulseAudio.
+MES
+}
+
+post_upgrade() {
+  # Delete old users and groups
+  # System-wide daemon not supported anymore
+  if (( $(vercmp $2 0.9.22) < 0 )); then
+    getent passwd pulse &>/dev/null && usr/sbin/userdel -f pulse
+    getent group pulse-access &>/dev/null && usr/sbin/groupdel pulse-access
+    getent group pulse-rt &>/dev/null && usr/sbin/groupdel pulse-rt
+    getent group pulse &>/dev/null && usr/sbin/groupdel pulse
+  fi
+
+  true
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: extra-i686/pulseaudio.xinit
===================================================================
--- extra-i686/pulseaudio.xinit	2012-01-06 15:24:05 UTC (rev 146234)
+++ extra-i686/pulseaudio.xinit	2012-01-06 17:00:29 UTC (rev 146235)
@@ -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

Copied: pulseaudio/repos/extra-i686/pulseaudio.xinit (from rev 146234, pulseaudio/repos/testing-i686/pulseaudio.xinit)
===================================================================
--- extra-i686/pulseaudio.xinit	                        (rev 0)
+++ extra-i686/pulseaudio.xinit	2012-01-06 17:00:29 UTC (rev 146235)
@@ -0,0 +1,12 @@
+#!/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




More information about the arch-commits mailing list