update to 0.22

changes:
-many bugfixes
-multichannel support; gtk multihead support
-add new ca_context_playing() call

pkgsrc change: make the OSS backend work

5 files changed, 46 insertions, 9 deletions

diff --git a/audio/libcanberra/Makefile b/audio/libcanberra/Makefile
index dd302335bd2..254ac533d22 100644
--- a/audio/libcanberra/Makefile
+++ b/audio/libcanberra/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2009/08/26 19:56:55 sno Exp $
+# $NetBSD: Makefile,v 1.6 2009/10/29 17:51:09 drochner Exp $
 #
 
-DISTNAME=	libcanberra-0.11
-PKGREVISION=	2
+DISTNAME=	libcanberra-0.22
 CATEGORIES=	audio
 MASTER_SITES=	http://0pointer.de/lennart/projects/libcanberra/
 
@@ -26,7 +25,10 @@ SUBST_FILES.ltdlc=	configure
 SUBST_MESSAGE.ltdlc=	Fixing libtool convenience library name.
 SUBST_STAGE.ltdlc=	pre-configure
 
-.include "../../devel/libltdl/convenience.mk"
+CONFIGURE_ENV+=	ac_cv_lib_ltdl_lt_dladvise_init=yes
+
+#.include "../../devel/libltdl/convenience.mk"
+.include "../../devel/libltdl/buildlink3.mk"
 .include "../../devel/GConf/schemas.mk"
 .include "../../mk/oss.buildlink3.mk"
 .include "../../multimedia/gstreamer0.10/buildlink3.mk"
diff --git a/audio/libcanberra/PLIST b/audio/libcanberra/PLIST
index af520048180..e51d7da80a3 100644
--- a/audio/libcanberra/PLIST
+++ b/audio/libcanberra/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:10:29 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2009/10/29 17:51:09 drochner Exp $
 bin/canberra-gtk-play
 include/canberra-gtk.h
 include/canberra.h
@@ -13,6 +13,7 @@ lib/pkgconfig/libcanberra-gtk.pc
 lib/pkgconfig/libcanberra.pc
 share/doc/libcanberra/README
 share/gconf/schemas/libcanberra.schemas
+share/gdm/autostart/LoginWindow/libcanberra-ready-sound.desktop
 share/gnome/autostart/libcanberra-login-sound.desktop
 share/gnome/shutdown/libcanberra-logout-sound.sh
 share/gtk-doc/html/libcanberra/ch01.html
@@ -27,3 +28,5 @@ share/gtk-doc/html/libcanberra/libcanberra.devhelp2
 share/gtk-doc/html/libcanberra/right.png
 share/gtk-doc/html/libcanberra/style.css
 share/gtk-doc/html/libcanberra/up.png
+share/vala/vapi/libcanberra-gtk.vapi
+share/vala/vapi/libcanberra.vapi
diff --git a/audio/libcanberra/distinfo b/audio/libcanberra/distinfo
index d173504a438..70d8a70661e 100644
--- a/audio/libcanberra/distinfo
+++ b/audio/libcanberra/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.2 2009/02/27 22:08:57 wiz Exp $
+$NetBSD: distinfo,v 1.3 2009/10/29 17:51:09 drochner Exp $
 
-SHA1 (libcanberra-0.11.tar.gz) = 009b0c914970bf6f0fa19158483b6f7dfdf7021f
-RMD160 (libcanberra-0.11.tar.gz) = 77a38ec12d0c9e5f2ee460fc2150298a81e595c7
-Size (libcanberra-0.11.tar.gz) = 530273 bytes
+SHA1 (libcanberra-0.22.tar.gz) = b1c642b0e1322dcbf1a791d4d87dd92cdc002b12
+RMD160 (libcanberra-0.22.tar.gz) = 3cccf6b7955aa2926514d5f3e6f48849edea0c1f
+Size (libcanberra-0.22.tar.gz) = 459404 bytes
+SHA1 (patch-aa) = 56bb345c67b0a5278bb06d1c64dafa8b62cba91d
+SHA1 (patch-ab) = 4a682899d521e17c61e95d7d39c3f3a59db28b72
diff --git a/audio/libcanberra/patches/patch-aa b/audio/libcanberra/patches/patch-aa
new file mode 100644
index 00000000000..b64d6b19f56
--- /dev/null
+++ b/audio/libcanberra/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2009/10/29 17:51:09 drochner Exp $
+
+--- src/oss.c.orig	2009-08-27 03:58:16.000000000 +0200
++++ src/oss.c
+@@ -241,7 +241,7 @@ static int open_oss(ca_context *c, struc
+ 
+     p = PRIVATE(c);
+ 
+-    if ((out->pcm = open(c->device ? c->device : "/dev/dsp", O_WRONLY | O_NONBLOCK, 0)) < 0)
++    if ((out->pcm = open(c->device ? c->device : DEVOSSAUDIO, O_WRONLY | O_NONBLOCK, 0)) < 0)
+         goto finish_errno;
+ 
+     if ((mode = fcntl(out->pcm, F_GETFL)) < 0)
diff --git a/audio/libcanberra/patches/patch-ab b/audio/libcanberra/patches/patch-ab
new file mode 100644
index 00000000000..04389445c6f
--- /dev/null
+++ b/audio/libcanberra/patches/patch-ab
@@ -0,0 +1,17 @@
+$NetBSD: patch-ab,v 1.1 2009/10/29 17:51:09 drochner Exp $
+
+--- src/Makefile.in.orig	2009-10-20 02:29:59.000000000 +0200
++++ src/Makefile.in
+@@ -649,10 +649,10 @@ plugin_LTLIBRARIES = $(am__append_7) $(a
+ @BUILTIN_OSS_FALSE@@HAVE_OSS_TRUE@	 -Ddriver_change_props=oss_driver_change_props \
+ @BUILTIN_OSS_FALSE@@HAVE_OSS_TRUE@	 -Ddriver_play=oss_driver_play \
+ @BUILTIN_OSS_FALSE@@HAVE_OSS_TRUE@	 -Ddriver_cancel=oss_driver_cancel \
+-@BUILTIN_OSS_FALSE@@HAVE_OSS_TRUE@	 -Ddriver_cache=oss_driver_cache
++@BUILTIN_OSS_FALSE@@HAVE_OSS_TRUE@	 -Ddriver_cache=oss_driver_cache -DDEVOSSAUDIO=\"${DEVOSSAUDIO}\"
+ 
+ @BUILTIN_OSS_FALSE@@HAVE_OSS_TRUE@libcanberra_oss_la_LIBADD = \
+-@BUILTIN_OSS_FALSE@@HAVE_OSS_TRUE@	libcanberra.la
++@BUILTIN_OSS_FALSE@@HAVE_OSS_TRUE@	libcanberra.la ${LIBOSSAUDIO}
+ 
+ @BUILTIN_OSS_FALSE@@HAVE_OSS_TRUE@libcanberra_oss_la_LDFLAGS = \
+ @BUILTIN_OSS_FALSE@@HAVE_OSS_TRUE@	-avoid-version -module -export-dynamic