[arch-commits] Commit in libcanberra/trunk (PKGBUILD)

2020-05-07 Thread Jan Steffens via arch-commits 
Date: Thursday, May 7, 2020 @ 17:38:41
  Author: heftig
Revision: 382690

0.30+2+gc0620e4-3

Modified:
  libcanberra/trunk/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-05-07 17:33:34 UTC (rev 382689)
+++ PKGBUILD2020-05-07 17:38:41 UTC (rev 382690)
@@ -3,7 +3,7 @@
 pkgbase=libcanberra
 pkgname=(libcanberra libcanberra-pulse libcanberra-gstreamer)
 pkgver=0.30+2+gc0620e4
-pkgrel=2
+pkgrel=3
 pkgdesc="A small and lightweight implementation of the XDG Sound Theme 
Specification"
 arch=(x86_64)
 license=(LGPL)
@@ -42,6 +42,7 @@
 package_libcanberra() {
   optdepends=("$pkgbase-pulse: PulseAudio driver"
   "$pkgbase-gstreamer: GStreamer driver")
+  provides=(libcanberra{,-gtk,-gtk3}.so)
 
   cd $pkgbase

[arch-commits] Commit in libcanberra/trunk (PKGBUILD)

2018-11-09 Thread Evangelos Foutras via arch-commits 
Date: Friday, November 9, 2018 @ 21:20:20
  Author: foutrelis
Revision: 338559

PIE/BUILDINFO rebuild

Modified:
  libcanberra/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-11-09 21:19:52 UTC (rev 338558)
+++ PKGBUILD2018-11-09 21:20:20 UTC (rev 338559)
@@ -3,7 +3,7 @@
 pkgbase=libcanberra
 pkgname=(libcanberra libcanberra-pulse libcanberra-gstreamer)
 pkgver=0.30+2+gc0620e4
-pkgrel=1
+pkgrel=2
 pkgdesc="A small and lightweight implementation of the XDG Sound Theme 
Specification"
 arch=(x86_64)
 license=(LGPL)

[arch-commits] Commit in libcanberra/trunk (PKGBUILD)

2017-05-04 Thread Jan de Groot 
Date: Thursday, May 4, 2017 @ 22:02:28
  Author: jgc
Revision: 295311

upgpkg: libcanberra 0.30+2+gc0620e4-1

Remove login/logout sounds as we have no themes providing them.
Update to git snapshot to fix issues with Wayland

Modified:
  libcanberra/trunk/PKGBUILD

--+
 PKGBUILD |   23 ---
 1 file changed, 16 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-05-04 21:45:16 UTC (rev 295310)
+++ PKGBUILD2017-05-04 22:02:28 UTC (rev 295311)
@@ -3,8 +3,8 @@
 
 pkgbase=libcanberra
 pkgname=(libcanberra libcanberra-pulse libcanberra-gstreamer)
-pkgver=0.30
-pkgrel=8
+pkgver=0.30+2+gc0620e4
+pkgrel=1
 pkgdesc="A small and lightweight implementation of the XDG Sound Theme 
Specification"
 arch=(i686 x86_64)
 license=(LGPL)
@@ -13,12 +13,17 @@
 options=(!emptydirs libtool)
 url="http://0pointer.de/lennart/projects/libcanberra;
 _commit=c0620e432650e81062c1967cc669829dbd29b310  # master
-source=("git://git.0pointer.de/libcanberra.git#commit=$_commit" 
libcanberra.xinit)
+source=("git+http://git.0pointer.net/clone/libcanberra.git#commit=$_commit; 
libcanberra.xinit)
 sha256sums=('SKIP'
 'a0d0b135d3fea5c703a5f84208b79d66f671b082ae85f67b629ee2568a7ddc30')
 
-_plugindir=usr/lib/$pkgbase-$pkgver
+_plugindir=usr/lib/$pkgbase-0.30
 
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/^v//;s/-/+/g'
+}
+
 prepare() {
   cd $pkgbase
   ./autogen.sh
@@ -31,9 +36,7 @@
   --enable-alsa --enable-gstreamer --enable-pulse \
   --with-systemdsystemunitdir=/usr/lib/systemd/system --enable-gtk-doc
 
-  # Fight unused direct deps
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/if test 
"$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/  
func_append compile_command " -Wl,-O1,--as-needed"\n  func_append 
finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
-
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
 }
 
@@ -55,6 +58,12 @@
 mkdir ../$_p-plugin
 mv "$pkgdir/$_plugindir"/libcanberra-$_p.* ../$_p-plugin
   done
+
+  # FS#52370: Remove login, logout and system-ready sounds.
+  # We have no sound themes that include these so do not play them.
+  rm -f "$pkgdir/usr/share/gnome/autostart/libcanberra-login-sound.desktop"
+  rm -f "$pkgdir/usr/share/gnome/shutdown/libcanberra-logout-sound.sh"
+  rm -f 
"$pkgdir/usr/share/gdm/autostart/LoginWindow/libcanberra-ready-sound.desktop"
 }
 
 package_libcanberra-pulse() {

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

2017-01-27 Thread Jan Steffens 
Date: Saturday, January 28, 2017 @ 00:13:31
  Author: heftig
Revision: 287589

0.30-8

Modified:
  libcanberra/trunk/PKGBUILD
  libcanberra/trunk/libcanberra.xinit

---+
 PKGBUILD  |7 ---
 libcanberra.xinit |   12 
 2 files changed, 8 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-01-27 23:16:30 UTC (rev 287588)
+++ PKGBUILD2017-01-28 00:13:31 UTC (rev 287589)
@@ -4,7 +4,7 @@
 pkgbase=libcanberra
 pkgname=(libcanberra libcanberra-pulse libcanberra-gstreamer)
 pkgver=0.30
-pkgrel=7
+pkgrel=8
 pkgdesc="A small and lightweight implementation of the XDG Sound Theme 
Specification"
 arch=(i686 x86_64)
 license=(LGPL)
@@ -12,9 +12,10 @@
 makedepends=(gtk-doc libpulse gstreamer gtk2 gtk3 git)
 options=(!emptydirs libtool)
 url="http://0pointer.de/lennart/projects/libcanberra;
-source=("git://git.0pointer.de/libcanberra.git#commit=c0620e4" 
libcanberra.xinit)
+_commit=c0620e432650e81062c1967cc669829dbd29b310  # master
+source=("git://git.0pointer.de/libcanberra.git#commit=$_commit" 
libcanberra.xinit)
 sha256sums=('SKIP'
-'2158708f594ab1688d6207eb1659190b3e3a1f711191de1f8e45dd42be8ceb76')
+'a0d0b135d3fea5c703a5f84208b79d66f671b082ae85f67b629ee2568a7ddc30')
 
 _plugindir=usr/lib/$pkgbase-$pkgver
 

Modified: libcanberra.xinit
===
--- libcanberra.xinit   2017-01-27 23:16:30 UTC (rev 287588)
+++ libcanberra.xinit   2017-01-28 00:13:31 UTC (rev 287589)
@@ -1,16 +1,12 @@
-#!/bin/bash
+#!/bin/sh
 
 case "${DESKTOP_SESSION-}" in
-  gnome) # Done by gnome-settings-daemon
+  gnome*) # Done by gnome-settings-daemon
   ;;
   *)
 # Extra check in case DESKTOP_SESSION is not set correctly
-if [[ -z ${GNOME_DESKTOP_SESSION_ID-} ]]; then
-  if [[ -z ${GTK_MODULES-} ]]; then
-GTK_MODULES="canberra-gtk-module"
-  else
-GTK_MODULES="$GTK_MODULES:canberra-gtk-module"
-  fi
+if [ -z "${GNOME_DESKTOP_SESSION_ID-}" ]; then
+  GTK_MODULES="${GTK_MODULES:+$GTK_MODULES:}canberra-gtk-module"
   export GTK_MODULES
 fi
   ;;

[arch-commits] Commit in libcanberra/trunk (PKGBUILD libcanberra.install)

2016-07-28 Thread Jan Steffens 
Date: Thursday, July 28, 2016 @ 13:45:28
  Author: heftig
Revision: 272601

0.30-7

Modified:
  libcanberra/trunk/PKGBUILD
Deleted:
  libcanberra/trunk/libcanberra.install

-+
 PKGBUILD|3 +--
 libcanberra.install |5 -
 2 files changed, 1 insertion(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-07-28 13:42:30 UTC (rev 272600)
+++ PKGBUILD2016-07-28 13:45:28 UTC (rev 272601)
@@ -4,7 +4,7 @@
 pkgbase=libcanberra
 pkgname=(libcanberra libcanberra-pulse libcanberra-gstreamer)
 pkgver=0.30
-pkgrel=6
+pkgrel=7
 pkgdesc="A small and lightweight implementation of the XDG Sound Theme 
Specification"
 arch=(i686 x86_64)
 license=(LGPL)
@@ -37,7 +37,6 @@
 }
 
 package_libcanberra() {
-  install=libcanberra.install
   optdepends=("$pkgbase-pulse: PulseAudio driver"
   "$pkgbase-gstreamer: GStreamer driver")
 

Deleted: libcanberra.install
===
--- libcanberra.install 2016-07-28 13:42:30 UTC (rev 272600)
+++ libcanberra.install 2016-07-28 13:45:28 UTC (rev 272601)
@@ -1,5 +0,0 @@
-pre_upgrade() {
-  if [ -f usr/share/gconf/schemas/libcanberra.schemas ] && [ -x 
usr/sbin/gconfpkg ]; then
-usr/sbin/gconfpkg --uninstall libcanberra
-  fi
-}

[arch-commits] Commit in libcanberra/trunk (PKGBUILD)

2016-04-03 Thread Jan Steffens 
Date: Sunday, April 3, 2016 @ 19:22:38
  Author: heftig
Revision: 263838

Rebuild libcanberra to fix flash in firefox

Modified:
  libcanberra/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-04-03 14:53:54 UTC (rev 263837)
+++ PKGBUILD2016-04-03 17:22:38 UTC (rev 263838)
@@ -4,7 +4,7 @@
 pkgbase=libcanberra
 pkgname=(libcanberra libcanberra-pulse libcanberra-gstreamer)
 pkgver=0.30
-pkgrel=5
+pkgrel=6
 pkgdesc="A small and lightweight implementation of the XDG Sound Theme 
Specification"
 arch=(i686 x86_64)
 license=(LGPL)

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

2015-02-17 Thread Jan de Groot 
Date: Tuesday, February 17, 2015 @ 10:02:47
  Author: jgc
Revision: 231645

upgpkg: libcanberra 0.30-5

Do not remove needed .la files (change was not in a released package before), 
change xinit script extension (FS#41470), Fix errors when setting strict 
options (FS#37707)

Modified:
  libcanberra/trunk/PKGBUILD
  libcanberra/trunk/libcanberra.xinit

---+
 PKGBUILD  |8 
 libcanberra.xinit |6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-02-17 08:40:41 UTC (rev 231644)
+++ PKGBUILD2015-02-17 09:02:47 UTC (rev 231645)
@@ -4,7 +4,7 @@
 pkgbase=libcanberra
 pkgname=(libcanberra libcanberra-pulse libcanberra-gstreamer)
 pkgver=0.30
-pkgrel=4
+pkgrel=5
 pkgdesc=A small and lightweight implementation of the XDG Sound Theme 
Specification
 arch=(i686 x86_64)
 license=(LGPL)
@@ -14,7 +14,7 @@
 url=http://0pointer.de/lennart/projects/libcanberra;
 source=(git://git.0pointer.de/libcanberra.git#commit=c0620e4 
libcanberra.xinit)
 sha256sums=('SKIP'
-'68a68d66b7491f99d5aa09fe7c6ef4eb38352a2a8ff7997d184d1cbc5e80c0d3')
+'2158708f594ab1688d6207eb1659190b3e3a1f711191de1f8e45dd42be8ceb76')
 
 _plugindir=usr/lib/$pkgbase-$pkgver
 
@@ -44,11 +44,11 @@
   cd $pkgbase
 
   make -j1 DESTDIR=$pkgdir install
-  rm $pkgdir/usr/lib/*.la
+  rm $pkgdir/usr/lib/libcanberra-gtk*.la
   rm $pkgdir/usr/lib/gtk-{2,3}.0/modules/*.la
 
   install -D $srcdir/libcanberra.xinit \
-$pkgdir/etc/X11/xinit/xinitrc.d/40-libcanberra-gtk-module
+$pkgdir/etc/X11/xinit/xinitrc.d/40-libcanberra-gtk-module.sh
 
   # Split plugins
   for _p in pulse gstreamer; do

Modified: libcanberra.xinit
===
--- libcanberra.xinit   2015-02-17 08:40:41 UTC (rev 231644)
+++ libcanberra.xinit   2015-02-17 09:02:47 UTC (rev 231645)
@@ -1,12 +1,12 @@
 #!/bin/bash
 
-case $DESKTOP_SESSION in
+case ${DESKTOP_SESSION-} in
   gnome) # Done by gnome-settings-daemon
   ;;
   *)
 # Extra check in case DESKTOP_SESSION is not set correctly
-if [[ -z $GNOME_DESKTOP_SESSION_ID ]]; then
-  if [[ -z $GTK_MODULES ]]; then
+if [[ -z ${GNOME_DESKTOP_SESSION_ID-} ]]; then
+  if [[ -z ${GTK_MODULES-} ]]; then
 GTK_MODULES=canberra-gtk-module
   else
 GTK_MODULES=$GTK_MODULES:canberra-gtk-module

[arch-commits] Commit in libcanberra/trunk (PKGBUILD)

2013-10-20 Thread Jan Steffens 
Date: Monday, October 21, 2013 @ 04:41:12
  Author: heftig
Revision: 196897

add libtool options

Modified:
  libcanberra/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-10-21 02:38:25 UTC (rev 196896)
+++ PKGBUILD2013-10-21 02:41:12 UTC (rev 196897)
@@ -10,7 +10,7 @@
 license=(LGPL)
 depends=(libvorbis libltdl alsa-lib tdb sound-theme-freedesktop)
 makedepends=(gtk-doc libpulse gstreamer gtk2 gtk3 git)
-options=(!emptydirs)
+options=(!emptydirs libtool)
 url=http://0pointer.de/lennart/projects/libcanberra;
 source=(git://git.0pointer.de/libcanberra.git#commit=c0620e4 
libcanberra.xinit)
 sha256sums=('SKIP'

[arch-commits] Commit in libcanberra/trunk (PKGBUILD)

2013-10-20 Thread Jan Steffens 
Date: Monday, October 21, 2013 @ 04:44:38
  Author: heftig
Revision: 196898

remove unneeded libtool files

Modified:
  libcanberra/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-10-21 02:41:12 UTC (rev 196897)
+++ PKGBUILD2013-10-21 02:44:38 UTC (rev 196898)
@@ -44,7 +44,7 @@
   cd $pkgbase
 
   make -j1 DESTDIR=$pkgdir install
-  rm $pkgdir/usr/lib/libcanberra-gtk*.la
+  rm $pkgdir/usr/lib/*.la
   rm $pkgdir/usr/lib/gtk-{2,3}.0/modules/*.la
 
   install -D $srcdir/libcanberra.xinit \

[arch-commits] Commit in libcanberra/trunk (PKGBUILD)

2013-06-07 Thread Jan Steffens 
Date: Friday, June 7, 2013 @ 20:20:14
  Author: heftig
Revision: 187880

bump to git

Modified:
  libcanberra/trunk/PKGBUILD

--+
 PKGBUILD |   22 +-
 1 file changed, 13 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-06-07 17:15:50 UTC (rev 187879)
+++ PKGBUILD2013-06-07 18:20:14 UTC (rev 187880)
@@ -4,27 +4,31 @@
 pkgbase=libcanberra
 pkgname=(libcanberra libcanberra-pulse libcanberra-gstreamer)
 pkgver=0.30
-pkgrel=3
+pkgrel=4
 pkgdesc=A small and lightweight implementation of the XDG Sound Theme 
Specification
 arch=(i686 x86_64)
 license=(LGPL)
 depends=(libvorbis libltdl alsa-lib tdb sound-theme-freedesktop)
-makedepends=(gtk-doc libpulse gstreamer gtk2 gtk3)
+makedepends=(gtk-doc libpulse gstreamer gtk2 gtk3 git)
 options=(!emptydirs)
-url=http://0pointer.de/lennart/projects/libcanberra
-source=($url/$pkgbase-$pkgver.tar.xz
-libcanberra.xinit)
-sha256sums=('c2b671e67e0c288a69fc33dc1b6f1b534d07882c2aceed37004bf48c601afa72'
+url=http://0pointer.de/lennart/projects/libcanberra;
+source=(git://git.0pointer.de/libcanberra.git#commit=c0620e4 
libcanberra.xinit)
+sha256sums=('SKIP'
 '68a68d66b7491f99d5aa09fe7c6ef4eb38352a2a8ff7997d184d1cbc5e80c0d3')
 
 _plugindir=usr/lib/$pkgbase-$pkgver
 
+prepare() {
+  cd $pkgbase
+  ./autogen.sh
+}
+
 build() {
-  cd $pkgbase-$pkgver
+  cd $pkgbase
   ./configure --sysconfdir=/etc --prefix=/usr --localstatedir=/var \
   --disable-static --with-builtin=dso --enable-null --disable-oss \
   --enable-alsa --enable-gstreamer --enable-pulse \
-  --with-systemdsystemunitdir=/usr/lib/systemd/system
+  --with-systemdsystemunitdir=/usr/lib/systemd/system --enable-gtk-doc
 
   # Fight unused direct deps
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/if test 
$export_dynamic = yes  test -n $export_dynamic_flag_spec; then/  
func_append compile_command  -Wl,-O1,--as-needed\n  func_append 
finalize_command  -Wl,-O1,--as-needed\n\0/' libtool
@@ -37,7 +41,7 @@
   optdepends=($pkgbase-pulse: PulseAudio driver
   $pkgbase-gstreamer: GStreamer driver)
 
-  cd $pkgbase-$pkgver
+  cd $pkgbase
 
   make -j1 DESTDIR=$pkgdir install
   rm $pkgdir/usr/lib/libcanberra-gtk*.la

[arch-commits] Commit in libcanberra/trunk (PKGBUILD)

2012-12-10 Thread Jan de Groot 
Date: Monday, December 10, 2012 @ 06:59:45
  Author: jgc
Revision: 173081

upgpkg: libcanberra 0.30-3

Add sound-theme-freedesktop dependency (FS#32931)

Modified:
  libcanberra/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-12-10 11:56:21 UTC (rev 173080)
+++ PKGBUILD2012-12-10 11:59:45 UTC (rev 173081)
@@ -4,11 +4,11 @@
 pkgbase=libcanberra
 pkgname=(libcanberra libcanberra-pulse libcanberra-gstreamer)
 pkgver=0.30
-pkgrel=2
+pkgrel=3
 pkgdesc=A small and lightweight implementation of the XDG Sound Theme 
Specification
 arch=(i686 x86_64)
 license=(LGPL)
-depends=(libvorbis libltdl alsa-lib tdb)
+depends=(libvorbis libltdl alsa-lib tdb sound-theme-freedesktop)
 makedepends=(gtk-doc libpulse gstreamer gtk2 gtk3)
 options=(!emptydirs)
 url=http://0pointer.de/lennart/projects/libcanberra

[arch-commits] Commit in libcanberra/trunk (PKGBUILD)

2012-11-06 Thread Jan Steffens 
Date: Wednesday, November 7, 2012 @ 02:09:43
  Author: heftig
Revision: 170400

PKGBUILD fixes

Modified:
  libcanberra/trunk/PKGBUILD

--+
 PKGBUILD |   51 +++
 1 file changed, 27 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-11-07 01:42:13 UTC (rev 170399)
+++ PKGBUILD2012-11-07 07:09:43 UTC (rev 170400)
@@ -4,25 +4,31 @@
 pkgbase=libcanberra
 pkgname=(libcanberra libcanberra-pulse libcanberra-gstreamer)
 pkgver=0.30
-pkgrel=1
+pkgrel=2
 pkgdesc=A small and lightweight implementation of the XDG Sound Theme 
Specification
 arch=(i686 x86_64)
-license=('LGPL')
-depends=('libvorbis' 'libltdl' 'alsa-lib' 'tdb')
-makedepends=('gtk-doc' 'libpulse' 'gstreamer' 'gtk2' 'gtk3')
+license=(LGPL)
+depends=(libvorbis libltdl alsa-lib tdb)
+makedepends=(gtk-doc libpulse gstreamer gtk2 gtk3)
 options=(!emptydirs)
 url=http://0pointer.de/lennart/projects/libcanberra
-source=(http://0pointer.de/lennart/projects/${pkgbase}/${pkgbase}-${pkgver}.tar.xz
+source=($url/$pkgbase-$pkgver.tar.xz
 libcanberra.xinit)
 sha256sums=('c2b671e67e0c288a69fc33dc1b6f1b534d07882c2aceed37004bf48c601afa72'
 '68a68d66b7491f99d5aa09fe7c6ef4eb38352a2a8ff7997d184d1cbc5e80c0d3')
 
+_plugindir=usr/lib/$pkgbase-$pkgver
+
 build() {
-  cd ${srcdir}/${pkgbase}-${pkgver}
+  cd $pkgbase-$pkgver
   ./configure --sysconfdir=/etc --prefix=/usr --localstatedir=/var \
   --disable-static --with-builtin=dso --enable-null --disable-oss \
   --enable-alsa --enable-gstreamer --enable-pulse \
   --with-systemdsystemunitdir=/usr/lib/systemd/system
+
+  # Fight unused direct deps
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/if test 
$export_dynamic = yes  test -n $export_dynamic_flag_spec; then/  
func_append compile_command  -Wl,-O1,--as-needed\n  func_append 
finalize_command  -Wl,-O1,--as-needed\n\0/' libtool
+
   make
 }
 
@@ -31,37 +37,34 @@
   optdepends=($pkgbase-pulse: PulseAudio driver
   $pkgbase-gstreamer: GStreamer driver)
 
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  make -j1 DESTDIR=${pkgdir} install
-  rm -f ${pkgdir}/usr/lib/libcanberra-gtk*.la
-  rm -f ${pkgdir}/usr/lib/gtk-{2,3}.0/modules/*.la
+  cd $pkgbase-$pkgver
 
-  install -D ${srcdir}/libcanberra.xinit \
-${pkgdir}/etc/X11/xinit/xinitrc.d/40-libcanberra-gtk-module
+  make -j1 DESTDIR=$pkgdir install
+  rm $pkgdir/usr/lib/libcanberra-gtk*.la
+  rm $pkgdir/usr/lib/gtk-{2,3}.0/modules/*.la
 
+  install -D $srcdir/libcanberra.xinit \
+$pkgdir/etc/X11/xinit/xinitrc.d/40-libcanberra-gtk-module
+
   # Split plugins
   for _p in pulse gstreamer; do
-mkdir $_p-plugin
-mv ${pkgdir}/usr/lib/${pkgbase}-${pkgver}/${pkgbase}-$_p.* $_p-plugin
+mkdir ../$_p-plugin
+mv $pkgdir/$_plugindir/libcanberra-$_p.* ../$_p-plugin
   done
 }
 
 package_libcanberra-pulse() {
   pkgdesc=PulseAudio plugin for libcanberra
-  depends=($pkgbase=$pkgver-$pkgrel 'libpulse')
+  depends=($pkgbase=$pkgver-$pkgrel libpulse)
 
-  cd ${srcdir}/${pkgbase}-${pkgver}
-
-  mkdir -p ${pkgdir}/usr/lib/${pkgbase}-${pkgver}
-  mv pulse-plugin/* ${pkgdir}/usr/lib/${pkgbase}-${pkgver} 
+  install -d $pkgdir/$_plugindir
+  mv pulse-plugin/* $pkgdir/$_plugindir
 }
 
 package_libcanberra-gstreamer() {
   pkgdesc=GStreamer plugin for libcanberra
-  depends=($pkgbase=$pkgver-$pkgrel 'gstreamer')
+  depends=($pkgbase=$pkgver-$pkgrel gstreamer)
 
-  cd ${srcdir}/${pkgbase}-${pkgver}
-
-  mkdir -p ${pkgdir}/usr/lib/${pkgbase}-${pkgver}
-  mv gstreamer-plugin/* ${pkgdir}/usr/lib/${pkgbase}-${pkgver} 
+  install -d $pkgdir/$_plugindir
+  mv gstreamer-plugin/* $pkgdir/$_plugindir
 }

[arch-commits] Commit in libcanberra/trunk (PKGBUILD libcanberra.install)

2012-10-31 Thread Jan de Groot 
Date: Wednesday, October 31, 2012 @ 06:32:45
  Author: jgc
Revision: 170058

upgpkg: libcanberra 0.30-1

Update to 0.30, uses GStreamer 1.0 now

Modified:
  libcanberra/trunk/PKGBUILD
  libcanberra/trunk/libcanberra.install

-+
 PKGBUILD|   15 ++-
 libcanberra.install |   22 ++
 2 files changed, 8 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-10-31 10:24:44 UTC (rev 170057)
+++ PKGBUILD2012-10-31 10:32:45 UTC (rev 170058)
@@ -3,18 +3,18 @@
 
 pkgbase=libcanberra
 pkgname=(libcanberra libcanberra-pulse libcanberra-gstreamer)
-pkgver=0.28
-pkgrel=5
+pkgver=0.30
+pkgrel=1
 pkgdesc=A small and lightweight implementation of the XDG Sound Theme 
Specification
 arch=(i686 x86_64)
 license=('LGPL')
 depends=('libvorbis' 'libltdl' 'alsa-lib' 'tdb')
-makedepends=('gtk-doc' 'libpulse' 'gstreamer0.10' 'gtk2' 'gtk3')
+makedepends=('gtk-doc' 'libpulse' 'gstreamer' 'gtk2' 'gtk3')
 options=(!emptydirs)
 url=http://0pointer.de/lennart/projects/libcanberra
-source=(http://0pointer.de/lennart/projects/${pkgbase}/${pkgbase}-${pkgver}.tar.gz
+source=(http://0pointer.de/lennart/projects/${pkgbase}/${pkgbase}-${pkgver}.tar.xz
 libcanberra.xinit)
-sha256sums=('eb1f8b2cabad7f07b6e44d606a91d73e1efca4b46daf92bd553e7222bc68868c'
+sha256sums=('c2b671e67e0c288a69fc33dc1b6f1b534d07882c2aceed37004bf48c601afa72'
 '68a68d66b7491f99d5aa09fe7c6ef4eb38352a2a8ff7997d184d1cbc5e80c0d3')
 
 build() {
@@ -36,9 +36,6 @@
   rm -f ${pkgdir}/usr/lib/libcanberra-gtk*.la
   rm -f ${pkgdir}/usr/lib/gtk-{2,3}.0/modules/*.la
 
-  install -d ${pkgdir}/usr/share/gconf 
-  mv ${pkgdir}/etc/gconf/schemas ${pkgdir}/usr/share/gconf/
-
   install -D ${srcdir}/libcanberra.xinit \
 ${pkgdir}/etc/X11/xinit/xinitrc.d/40-libcanberra-gtk-module
 
@@ -61,7 +58,7 @@
 
 package_libcanberra-gstreamer() {
   pkgdesc=GStreamer plugin for libcanberra
-  depends=($pkgbase=$pkgver-$pkgrel 'gstreamer0.10')
+  depends=($pkgbase=$pkgver-$pkgrel 'gstreamer')
 
   cd ${srcdir}/${pkgbase}-${pkgver}
 

Modified: libcanberra.install
===
--- libcanberra.install 2012-10-31 10:24:44 UTC (rev 170057)
+++ libcanberra.install 2012-10-31 10:32:45 UTC (rev 170058)
@@ -1,23 +1,5 @@
-pkgname=libcanberra
-
-post_install() {
-  if [ -x usr/sbin/gconfpkg ]; then
-usr/sbin/gconfpkg --install ${pkgname}
-  fi
-}
-
 pre_upgrade() {
-  if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
-pre_remove
+  if [ -f usr/share/gconf/schemas/libcanberra.schemas ]  [ -x 
usr/sbin/gconfpkg ]; then
+usr/sbin/gconfpkg --uninstall libcanberra
   fi
 }
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  if [ -x usr/sbin/gconfpkg ]; then
-usr/sbin/gconfpkg --uninstall ${pkgname}
-  fi
-}

[arch-commits] Commit in libcanberra/trunk (PKGBUILD)

2012-05-26 Thread Dave Reisner 
Date: Sunday, May 27, 2012 @ 00:33:53
  Author: dreisner
Revision: 159795

upgpkg: libcanberra 0.28-5

- rebuild for libudev.so.1.0.0

Modified:
  libcanberra/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-05-27 04:30:34 UTC (rev 159794)
+++ PKGBUILD2012-05-27 04:33:53 UTC (rev 159795)
@@ -4,7 +4,7 @@
 pkgbase=libcanberra
 pkgname=(libcanberra libcanberra-pulse libcanberra-gstreamer)
 pkgver=0.28
-pkgrel=4
+pkgrel=5
 pkgdesc=A small and lightweight implementation of the XDG Sound Theme 
Specification
 arch=(i686 x86_64)
 license=('LGPL')
@@ -35,7 +35,7 @@
   make -j1 DESTDIR=${pkgdir} install
   rm -f ${pkgdir}/usr/lib/libcanberra-gtk*.la
   rm -f ${pkgdir}/usr/lib/gtk-{2,3}.0/modules/*.la
-  
+
   install -d ${pkgdir}/usr/share/gconf 
   mv ${pkgdir}/etc/gconf/schemas ${pkgdir}/usr/share/gconf/

[arch-commits] Commit in libcanberra/trunk (PKGBUILD)

2012-05-03 Thread Jan Steffens 
Date: Thursday, May 3, 2012 @ 09:14:45
  Author: heftig
Revision: 158130

libltdl dep

Modified:
  libcanberra/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-05-03 13:11:10 UTC (rev 158129)
+++ PKGBUILD2012-05-03 13:14:45 UTC (rev 158130)
@@ -4,11 +4,11 @@
 pkgbase=libcanberra
 pkgname=(libcanberra libcanberra-pulse libcanberra-gstreamer)
 pkgver=0.28
-pkgrel=3
+pkgrel=4
 pkgdesc=A small and lightweight implementation of the XDG Sound Theme 
Specification
 arch=(i686 x86_64)
 license=('LGPL')
-depends=('libvorbis' 'libtool' 'alsa-lib' 'tdb')
+depends=('libvorbis' 'libltdl' 'alsa-lib' 'tdb')
 makedepends=('gtk-doc' 'libpulse' 'gstreamer0.10' 'gtk2' 'gtk3')
 options=(!emptydirs)
 url=http://0pointer.de/lennart/projects/libcanberra

[arch-commits] Commit in libcanberra/trunk (PKGBUILD)

2012-04-29 Thread Allan McRae 
Date: Sunday, April 29, 2012 @ 06:02:17
  Author: allan
Revision: 157774

upgpkg: libcanberra 0.28-3

move systemd files ti /usr/lib

Modified:
  libcanberra/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-04-29 09:45:01 UTC (rev 157773)
+++ PKGBUILD2012-04-29 10:02:17 UTC (rev 157774)
@@ -4,7 +4,7 @@
 pkgbase=libcanberra
 pkgname=(libcanberra libcanberra-pulse libcanberra-gstreamer)
 pkgver=0.28
-pkgrel=2
+pkgrel=3
 pkgdesc=A small and lightweight implementation of the XDG Sound Theme 
Specification
 arch=(i686 x86_64)
 license=('LGPL')
@@ -22,7 +22,7 @@
   ./configure --sysconfdir=/etc --prefix=/usr --localstatedir=/var \
   --disable-static --with-builtin=dso --enable-null --disable-oss \
   --enable-alsa --enable-gstreamer --enable-pulse \
-  --with-systemdsystemunitdir=/lib/systemd/system
+  --with-systemdsystemunitdir=/usr/lib/systemd/system
   make
 }

[arch-commits] Commit in libcanberra/trunk (PKGBUILD libcanberra-quit-add.patch)

2011-02-14 Thread Ionut Biru 
Date: Monday, February 14, 2011 @ 03:47:45
  Author: ibiru
Revision: 109949

upgpkg: libcanberra 0.26-5
make gtk3 module load

Added:
  libcanberra/trunk/libcanberra-quit-add.patch
Modified:
  libcanberra/trunk/PKGBUILD(contents, properties)

+
 PKGBUILD   |   10 ++
 libcanberra-quit-add.patch |   24 
 2 files changed, 30 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-02-14 07:40:30 UTC (rev 109948)
+++ PKGBUILD2011-02-14 08:47:45 UTC (rev 109949)
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 13455 2008-09-27 11:03:58Z jgc $
+# $Id$
 # Maintainer: Jan de Groot j...@archlinux.org
 
 pkgbase=libcanberra
 pkgname=(libcanberra libcanberra-pulse libcanberra-gstreamer)
 pkgver=0.26
-pkgrel=4
+pkgrel=5
 pkgdesc=A small and lightweight implementation of the XDG Sound Theme 
Specification
 arch=(i686 x86_64)
 license=('LGPL')
@@ -13,12 +13,14 @@
 options=(!emptydirs)
 url=http://0pointer.de/lennart/projects/libcanberra
 
source=(http://0pointer.de/lennart/projects/${pkgbase}/${pkgbase}-${pkgver}.tar.gz
-libcanberra-gtk-module.sh)
+libcanberra-gtk-module.sh libcanberra-quit-add.patch)
 md5sums=('ee2c66ada7c851a4e7b6eb1682285a24'
- 'a54799e624aac814b9343ab05f25c38b')
+ 'a54799e624aac814b9343ab05f25c38b'
+ 'a147bce8a7addcd40b21faaaf028819b')
 
 build() {
   cd ${srcdir}/${pkgbase}-${pkgver}
+  patch -Np1 -i ${srcdir}/libcanberra-quit-add.patch
   ./configure --sysconfdir=/etc --prefix=/usr --localstatedir=/var \
   --disable-static --with-builtin=dso --enable-null --disable-oss \
   --enable-alsa --enable-gstreamer --enable-pulse


Property changes on: libcanberra/trunk/PKGBUILD
___
Added: svn:keywords
   + Id

Added: libcanberra-quit-add.patch
===
--- libcanberra-quit-add.patch  (rev 0)
+++ libcanberra-quit-add.patch  2011-02-14 08:47:45 UTC (rev 109949)
@@ -0,0 +1,24 @@
+diff -up libcanberra-0.26/src/canberra-gtk-module.c.quit-add 
libcanberra-0.26/src/canberra-gtk-module.c
+--- libcanberra-0.26/src/canberra-gtk-module.c.quit-add2011-01-07 
22:48:49.388992626 -0500
 libcanberra-0.26/src/canberra-gtk-module.c 2011-01-07 22:49:02.339995153 
-0500
+@@ -932,11 +932,6 @@ static void connect_settings(void) {
+ connected = TRUE;
+ }
+ 
+-static gboolean quit_handler(gpointer data) {
+-dispatch_queue();
+-return FALSE;
+-}
+-
+ G_MODULE_EXPORT void gtk_module_init(gint *argc, gchar ***argv[]) {
+ 
+ /* This is the same quark libgnomeui uses! */
+@@ -963,8 +958,6 @@ G_MODULE_EXPORT void gtk_module_init(gin
+ install_hook(GTK_TYPE_WIDGET, drag-drop, 
signal_id_widget_drag_drop);
+ install_hook(GTK_TYPE_WIDGET, drag-failed, 
signal_id_widget_drag_failed);
+ install_hook(GTK_TYPE_EXPANDER, activate, 
signal_id_expander_activate);
+-
+-gtk_quit_add(1, quit_handler, NULL);
+ }
+ 
+ G_MODULE_EXPORT gchar* g_module_check_init(GModule *module);

[arch-commits] Commit in libcanberra/trunk (PKGBUILD)

2011-02-11 Thread Jan Steffens 
Date: Friday, February 11, 2011 @ 11:53:12
  Author: heftig
Revision: 109638

upgpkg: libcanberra 0.26-4
Build for gtk3. Split gstreamer.

Modified:
  libcanberra/trunk/PKGBUILD

--+
 PKGBUILD |   32 ++--
 1 file changed, 22 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-02-11 15:37:34 UTC (rev 109637)
+++ PKGBUILD2011-02-11 16:53:12 UTC (rev 109638)
@@ -2,14 +2,14 @@
 # Maintainer: Jan de Groot j...@archlinux.org
 
 pkgbase=libcanberra
-pkgname=(libcanberra libcanberra-pulse)
+pkgname=(libcanberra libcanberra-pulse libcanberra-gstreamer)
 pkgver=0.26
-pkgrel=3
+pkgrel=4
 pkgdesc=A small and lightweight implementation of the XDG Sound Theme 
Specification
 arch=(i686 x86_64)
 license=('LGPL')
-depends=('libvorbis=1.3.1' 'gstreamer0.10=0.10.30' 'libtool=2.2.10' 
'gtk2=2.21.8' 'alsa-lib=1.0.23' 'tdb=1.2.1')
-makedepends=('gtk-doc' 'libpulse')
+depends=('libvorbis=1.3.1' 'libtool=2.2.10' 'alsa-lib=1.0.23' 'tdb=1.2.1')
+makedepends=('gtk-doc' 'libpulse' 'gstreamer0.10=0.10.30' 'gtk2=2.21.8' 
'gtk3=3.0.0')
 options=(!emptydirs)
 url=http://0pointer.de/lennart/projects/libcanberra
 
source=(http://0pointer.de/lennart/projects/${pkgbase}/${pkgbase}-${pkgver}.tar.gz
@@ -27,12 +27,13 @@
 
 package_libcanberra() {
   install=libcanberra.install
-  optdepends=($pkgbase-pulse: PulseAudio driver)
+  optdepends=($pkgbase-pulse: PulseAudio driver
+  $pkgbase-gstreamer: GStreamer driver)
 
   cd ${srcdir}/${pkgbase}-${pkgver}
   make -j1 DESTDIR=${pkgdir} install
-  rm -f ${pkgdir}/usr/lib/libcanberra-gtk.la
-  rm -f ${pkgdir}/usr/lib/gtk-2.0/modules/*.la
+  rm -f ${pkgdir}/usr/lib/libcanberra-gtk*.la
+  rm -f ${pkgdir}/usr/lib/gtk-{2,3}.0/modules/*.la
   
   install -m755 -d ${pkgdir}/usr/share/gconf 
   mv ${pkgdir}/etc/gconf/schemas ${pkgdir}/usr/share/gconf/
@@ -40,9 +41,11 @@
   install -m755 -d ${pkgdir}/etc/X11/xinit/xinitrc.d
   install -m755 ${srcdir}/libcanberra-gtk-module.sh 
${pkgdir}/etc/X11/xinit/xinitrc.d/40-libcanberra-gtk-module
 
-  # Split libcanberra-pulse
-  mkdir pulse-plugin
-  mv ${pkgdir}/usr/lib/${pkgbase}-${pkgver}/${pkgbase}-pulse.* pulse-plugin
+  # Split plugins
+  for _p in pulse gstreamer; do
+mkdir $_p-plugin
+mv ${pkgdir}/usr/lib/${pkgbase}-${pkgver}/${pkgbase}-$_p.* $_p-plugin
+  done
 }
 
 package_libcanberra-pulse() {
@@ -56,3 +59,12 @@
   mv pulse-plugin/* ${pkgdir}/usr/lib/${pkgbase}-${pkgver} 
 }
 
+package_libcanberra-gstreamer() {
+  pkgdesc=GStreamer plugin for libcanberra
+  depends=($pkgbase=$pkgver-$pkgrel 'gstreamer0.10=0.10.30')
+
+  cd ${srcdir}/${pkgbase}-${pkgver}
+
+  mkdir -p ${pkgdir}/usr/lib/${pkgbase}-${pkgver}
+  mv gstreamer-plugin/* ${pkgdir}/usr/lib/${pkgbase}-${pkgver} 
+}

[arch-commits] Commit in libcanberra/trunk (PKGBUILD)

2011-02-11 Thread Jan Steffens 
Date: Friday, February 11, 2011 @ 11:56:42
  Author: heftig
Revision: 109641

Oops, fix dep

Modified:
  libcanberra/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-02-11 16:54:00 UTC (rev 109640)
+++ PKGBUILD2011-02-11 16:56:42 UTC (rev 109641)
@@ -9,7 +9,7 @@
 arch=(i686 x86_64)
 license=('LGPL')
 depends=('libvorbis=1.3.1' 'libtool=2.2.10' 'alsa-lib=1.0.23' 'tdb=1.2.1')
-makedepends=('gtk-doc' 'libpulse' 'gstreamer0.10=0.10.30' 'gtk2=2.21.8' 
'gtk3=3.0.0')
+makedepends=('gtk-doc' 'libpulse' 'gstreamer0.10=0.10.30' 'gtk2=2.21.8' 
'gtk3=3.0.0')
 options=(!emptydirs)
 url=http://0pointer.de/lennart/projects/libcanberra
 
source=(http://0pointer.de/lennart/projects/${pkgbase}/${pkgbase}-${pkgver}.tar.gz

[arch-commits] Commit in libcanberra/trunk (PKGBUILD)

2011-02-11 Thread Jan Steffens 
Date: Friday, February 11, 2011 @ 12:34:55
  Author: heftig
Revision: 109657

Remove versions

Modified:
  libcanberra/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-02-11 17:34:10 UTC (rev 109656)
+++ PKGBUILD2011-02-11 17:34:55 UTC (rev 109657)
@@ -8,8 +8,8 @@
 pkgdesc=A small and lightweight implementation of the XDG Sound Theme 
Specification
 arch=(i686 x86_64)
 license=('LGPL')
-depends=('libvorbis=1.3.1' 'libtool=2.2.10' 'alsa-lib=1.0.23' 'tdb=1.2.1')
-makedepends=('gtk-doc' 'libpulse' 'gstreamer0.10=0.10.30' 'gtk2=2.21.8' 
'gtk3=3.0.0')
+depends=('libvorbis' 'libtool' 'alsa-lib' 'tdb')
+makedepends=('gtk-doc' 'libpulse' 'gstreamer0.10' 'gtk2' 'gtk3')
 options=(!emptydirs)
 url=http://0pointer.de/lennart/projects/libcanberra
 
source=(http://0pointer.de/lennart/projects/${pkgbase}/${pkgbase}-${pkgver}.tar.gz
@@ -61,7 +61,7 @@
 
 package_libcanberra-gstreamer() {
   pkgdesc=GStreamer plugin for libcanberra
-  depends=($pkgbase=$pkgver-$pkgrel 'gstreamer0.10=0.10.30')
+  depends=($pkgbase=$pkgver-$pkgrel 'gstreamer0.10')
 
   cd ${srcdir}/${pkgbase}-${pkgver}

[arch-commits] Commit in libcanberra/trunk (PKGBUILD)

2010-12-23 Thread Jan Steffens 
Date: Thursday, December 23, 2010 @ 17:48:44
  Author: heftig
Revision: 103941

Add optdepend

Modified:
  libcanberra/trunk/PKGBUILD

--+
 PKGBUILD |1 +
 1 file changed, 1 insertion(+)

Modified: PKGBUILD
===
--- PKGBUILD2010-12-23 22:46:23 UTC (rev 103940)
+++ PKGBUILD2010-12-23 22:48:44 UTC (rev 103941)
@@ -27,6 +27,7 @@
 
 package_libcanberra() {
   install=libcanberra.install
+  optdepends=($pkgbase-pulse: PulseAudio driver)
 
   cd ${srcdir}/${pkgbase}-${pkgver}
   make -j1 DESTDIR=${pkgdir} install

[arch-commits] Commit in libcanberra/trunk (PKGBUILD)

2010-11-27 Thread Jan Steffens 
Date: Saturday, November 27, 2010 @ 20:48:19
  Author: heftig
Revision: 101105

upgpkg: libcanberra 0.26-3
Unbreak libcanberra. Doesn't do fallback properly, so split out pulse plugin 
again

Modified:
  libcanberra/trunk/PKGBUILD

--+
 PKGBUILD |   35 +--
 1 file changed, 25 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-11-27 23:06:34 UTC (rev 101104)
+++ PKGBUILD2010-11-28 01:48:19 UTC (rev 101105)
@@ -1,35 +1,34 @@
 # $Id: PKGBUILD 13455 2008-09-27 11:03:58Z jgc $
 # Maintainer: Jan de Groot j...@archlinux.org
 
-pkgname=libcanberra
+pkgbase=libcanberra
+pkgname=(libcanberra libcanberra-pulse)
 pkgver=0.26
-pkgrel=2
+pkgrel=3
 pkgdesc=A small and lightweight implementation of the XDG Sound Theme 
Specification
 arch=(i686 x86_64)
 license=('LGPL')
 depends=('libvorbis=1.3.1' 'gstreamer0.10=0.10.30' 'libtool=2.2.10' 
'gtk2=2.21.8' 'alsa-lib=1.0.23' 'tdb=1.2.1')
 makedepends=('gtk-doc' 'libpulse')
-install=libcanberra.install
 options=(!emptydirs)
 url=http://0pointer.de/lennart/projects/libcanberra
-replaces=(libcanberra-pulse)
-provides=(libcanberra-pulse=$pkgver-$pkgrel)
-conflicts=(libcanberra-pulse)
-source=(http://0pointer.de/lennart/projects/${pkgname}/${pkgname}-${pkgver}.tar.gz
+source=(http://0pointer.de/lennart/projects/${pkgbase}/${pkgbase}-${pkgver}.tar.gz
 libcanberra-gtk-module.sh)
 md5sums=('ee2c66ada7c851a4e7b6eb1682285a24'
  'a54799e624aac814b9343ab05f25c38b')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd ${srcdir}/${pkgbase}-${pkgver}
   ./configure --sysconfdir=/etc --prefix=/usr --localstatedir=/var \
   --disable-static --with-builtin=dso --enable-null --disable-oss \
   --enable-alsa --enable-gstreamer --enable-pulse
   make
 }
 
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+package_libcanberra() {
+  install=libcanberra.install
+
+  cd ${srcdir}/${pkgbase}-${pkgver}
   make -j1 DESTDIR=${pkgdir} install
   rm -f ${pkgdir}/usr/lib/libcanberra-gtk.la
   rm -f ${pkgdir}/usr/lib/gtk-2.0/modules/*.la
@@ -39,4 +38,20 @@
 
   install -m755 -d ${pkgdir}/etc/X11/xinit/xinitrc.d
   install -m755 ${srcdir}/libcanberra-gtk-module.sh 
${pkgdir}/etc/X11/xinit/xinitrc.d/40-libcanberra-gtk-module
+
+  # Split libcanberra-pulse
+  mkdir pulse-plugin
+  mv ${pkgdir}/usr/lib/${pkgbase}-${pkgver}/${pkgbase}-pulse.* pulse-plugin
 }
+
+package_libcanberra-pulse() {
+  pkgdesc=PulseAudio plugin for libcanberra
+  depends=($pkgbase=$pkgver-$pkgrel 'libpulse')
+  groups=('pulseaudio-gnome')
+
+  cd ${srcdir}/${pkgbase}-${pkgver}
+
+  mkdir -p ${pkgdir}/usr/lib/${pkgbase}-${pkgver}
+  mv pulse-plugin/* ${pkgdir}/usr/lib/${pkgbase}-${pkgver} 
+}
+

[arch-commits] Commit in libcanberra/trunk (PKGBUILD)

2010-11-19 Thread Jan Steffens 
Date: Friday, November 19, 2010 @ 11:58:22
  Author: heftig
Revision: 99984

upgpkg: libcanberra 0.26-1
Add pulseaudio support

Modified:
  libcanberra/trunk/PKGBUILD

--+
 PKGBUILD |   21 -
 1 file changed, 12 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-11-19 16:58:02 UTC (rev 99983)
+++ PKGBUILD2010-11-19 16:58:22 UTC (rev 99984)
@@ -2,29 +2,32 @@
 # Maintainer: Jan de Groot j...@archlinux.org
 
 pkgname=libcanberra
-pkgver=0.25
+pkgver=0.26
 pkgrel=1
 pkgdesc=A small and lightweight implementation of the XDG Sound Theme 
Specification
 arch=(i686 x86_64)
 license=('LGPL')
 depends=('libvorbis=1.3.1' 'gstreamer0.10=0.10.30' 'libtool=2.2.10' 
'gtk2=2.21.8' 'alsa-lib=1.0.23' 'tdb=1.2.1')
-makedepends=('gtk-doc')
+makedepends=('gtk-doc' 'libpulse')
 install=libcanberra.install
 options=(!emptydirs)
 url=http://0pointer.de/lennart/projects/libcanberra
 
source=(http://0pointer.de/lennart/projects/${pkgname}/${pkgname}-${pkgver}.tar.gz
 libcanberra-gtk-module.sh)
-md5sums=('d7a158d22d0b44fb2a67aadae74e28ab'
+md5sums=('ee2c66ada7c851a4e7b6eb1682285a24'
  'a54799e624aac814b9343ab05f25c38b')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --sysconfdir=/etc --prefix=/usr --localstatedir=/var \
-  --disable-static \
-  --enable-alsa --enable-null --enable-gstreamer --disable-oss \
-  --with-builtin=dso || return 1
-  make || return 1
-  make -j1 DESTDIR=${pkgdir} install || return 1
+  --disable-static --with-builtin=dso --enable-null --disable-oss \
+  --enable-alsa --enable-gstreamer --enable-pulse
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make -j1 DESTDIR=${pkgdir} install
   rm -f ${pkgdir}/usr/lib/libcanberra-gtk.la
   rm -f ${pkgdir}/usr/lib/gtk-2.0/modules/*.la
   
@@ -32,5 +35,5 @@
   mv ${pkgdir}/etc/gconf/schemas ${pkgdir}/usr/share/gconf/
 
   install -m755 -d ${pkgdir}/etc/X11/xinit/xinitrc.d
-  install -m755 ${srcdir}/libcanberra-gtk-module.sh 
${pkgdir}/etc/X11/xinit/xinitrc.d/40-libcanberra-gtk-module || return 1
+  install -m755 ${srcdir}/libcanberra-gtk-module.sh 
${pkgdir}/etc/X11/xinit/xinitrc.d/40-libcanberra-gtk-module
 }

[arch-commits] Commit in libcanberra/trunk (PKGBUILD)

2010-11-19 Thread Jan Steffens 
Date: Friday, November 19, 2010 @ 14:12:17
  Author: heftig
Revision: 100011

upgpkg: libcanberra 0.26-2
Replace libcanberra-pulse

Modified:
  libcanberra/trunk/PKGBUILD

--+
 PKGBUILD |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-11-19 19:09:35 UTC (rev 100010)
+++ PKGBUILD2010-11-19 19:12:17 UTC (rev 100011)
@@ -3,7 +3,7 @@
 
 pkgname=libcanberra
 pkgver=0.26
-pkgrel=1
+pkgrel=2
 pkgdesc=A small and lightweight implementation of the XDG Sound Theme 
Specification
 arch=(i686 x86_64)
 license=('LGPL')
@@ -12,6 +12,9 @@
 install=libcanberra.install
 options=(!emptydirs)
 url=http://0pointer.de/lennart/projects/libcanberra
+replaces=(libcanberra-pulse)
+provides=(libcanberra-pulse=$pkgver-$pkgrel)
+conflicts=(libcanberra-pulse)
 
source=(http://0pointer.de/lennart/projects/${pkgname}/${pkgname}-${pkgver}.tar.gz
 libcanberra-gtk-module.sh)
 md5sums=('ee2c66ada7c851a4e7b6eb1682285a24'

[arch-commits] Commit in libcanberra/trunk (PKGBUILD)

2010-09-15 Thread Jan de Groot 
Date: Wednesday, September 15, 2010 @ 08:52:15
  Author: jgc
Revision: 90693

upgpkg: libcanberra 0.25-1
Update to 0.25, compile against latest gtk2

Modified:
  libcanberra/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-09-15 11:56:58 UTC (rev 90692)
+++ PKGBUILD2010-09-15 12:52:15 UTC (rev 90693)
@@ -2,19 +2,19 @@
 # Maintainer: Jan de Groot j...@archlinux.org
 
 pkgname=libcanberra
-pkgver=0.23
+pkgver=0.25
 pkgrel=1
 pkgdesc=A small and lightweight implementation of the XDG Sound Theme 
Specification
 arch=(i686 x86_64)
 license=('LGPL')
-depends=('libvorbis=1.2.1rc1' 'gstreamer0.10=0.10.24' 'libtool=2.2.6a' 
'gtk2=2.18.2' 'alsa-lib=1.0.20' 'tdb')
+depends=('libvorbis=1.3.1' 'gstreamer0.10=0.10.30' 'libtool=2.2.10' 
'gtk2=2.21.8' 'alsa-lib=1.0.23' 'tdb=1.2.1')
 makedepends=('gtk-doc')
 install=libcanberra.install
 options=(!emptydirs)
 url=http://0pointer.de/lennart/projects/libcanberra
 
source=(http://0pointer.de/lennart/projects/${pkgname}/${pkgname}-${pkgver}.tar.gz
 libcanberra-gtk-module.sh)
-md5sums=('83fb2fb7608c77f91904e12a867534fd'
+md5sums=('d7a158d22d0b44fb2a67aadae74e28ab'
  'a54799e624aac814b9343ab05f25c38b')
 
 build() {

[arch-commits] Commit in libcanberra/trunk (PKGBUILD)

2010-03-07 Thread Jan de Groot 
Date: Sunday, March 7, 2010 @ 10:55:30
  Author: jgc
Revision: 71512

upgpkg: libcanberra 0.23-1
Update to 0.23

Modified:
  libcanberra/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-03-07 15:51:51 UTC (rev 71511)
+++ PKGBUILD2010-03-07 15:55:30 UTC (rev 71512)
@@ -2,8 +2,8 @@
 # Maintainer: Jan de Groot j...@archlinux.org
 
 pkgname=libcanberra
-pkgver=0.21
-pkgrel=2
+pkgver=0.23
+pkgrel=1
 pkgdesc=A small and lightweight implementation of the XDG Sound Theme 
Specification
 arch=(i686 x86_64)
 license=('LGPL')
@@ -14,7 +14,7 @@
 url=http://0pointer.de/lennart/projects/libcanberra
 
source=(http://0pointer.de/lennart/projects/${pkgname}/${pkgname}-${pkgver}.tar.gz
 libcanberra-gtk-module.sh)
-md5sums=('6d7b5eb6be8fca491008da529a02f5d5'
+md5sums=('83fb2fb7608c77f91904e12a867534fd'
  'a54799e624aac814b9343ab05f25c38b')
 
 build() {

[arch-commits] Commit in libcanberra/trunk (PKGBUILD)

2010-01-14 Thread Tobias Powalowski 
Date: Thursday, January 14, 2010 @ 13:44:16
  Author: tpowa
Revision: 63106

upgpkg: libcanberra 0.21-2
rebuild against latest tdb

Modified:
  libcanberra/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-01-14 17:23:27 UTC (rev 63105)
+++ PKGBUILD2010-01-14 18:44:16 UTC (rev 63106)
@@ -3,11 +3,11 @@
 
 pkgname=libcanberra
 pkgver=0.21
-pkgrel=1
+pkgrel=2
 pkgdesc=A small and lightweight implementation of the XDG Sound Theme 
Specification
 arch=(i686 x86_64)
 license=('LGPL')
-depends=('libvorbis=1.2.1rc1' 'gstreamer0.10=0.10.24' 'libtool=2.2.6a' 
'gtk2=2.18.2' 'alsa-lib=1.0.20' 'tdb=3.3.8')
+depends=('libvorbis=1.2.1rc1' 'gstreamer0.10=0.10.24' 'libtool=2.2.6a' 
'gtk2=2.18.2' 'alsa-lib=1.0.20' 'tdb')
 makedepends=('gtk-doc')
 install=libcanberra.install
 options=(!emptydirs)