Changes 0.26:

* Gtk+ 3.x fixes.

Changes 0.25:
* Optionally build with Gtk+ 3.x in addition to Gtk+ 2.x.

Changes 0.24:
* GTK code is now fine with GSEAL. Minor fixes in the PulseAudio backend,
  other fixes.

Changes 0.23:
* various minor fixes in the pulse and gstreamer backends as well in the Vala
  API. Support for the recently standardized Vorbis 6.1/7.1 multichannel modes.

5 files changed, 22 insertions, 23 deletions

diff --git a/audio/libcanberra/Makefile b/audio/libcanberra/Makefile
index f42a356041a..5f002e5795d 100644
--- a/audio/libcanberra/Makefile
+++ b/audio/libcanberra/Makefile
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.12 2010/11/15 22:56:16 abs Exp $
-#
+# $NetBSD: Makefile,v 1.13 2010/11/28 21:12:54 adam Exp $
 
-DISTNAME=	libcanberra-0.22
-PKGREVISION=	4
+DISTNAME=	libcanberra-0.26
 CATEGORIES=	audio
 MASTER_SITES=	http://0pointer.de/lennart/projects/libcanberra/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://0pointer.de/lennart/projects/libcanberra/
 COMMENT=	Desktop event sound library
+LICENSE=	gnu-lgpl-v2.1
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/audio/libcanberra/buildlink3.mk b/audio/libcanberra/buildlink3.mk
index 1bd670098ab..d5e8e68e4f7 100644
--- a/audio/libcanberra/buildlink3.mk
+++ b/audio/libcanberra/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2010/11/15 22:56:16 abs Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2010/11/28 21:12:54 adam Exp $
 
 BUILDLINK_TREE+=	libcanberra
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libcanberra
 LIBCANBERRA_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libcanberra+=	libcanberra>=0.10
-BUILDLINK_ABI_DEPENDS.libcanberra?=	libcanberra>=0.22nb4
+BUILDLINK_ABI_DEPENDS.libcanberra+=	libcanberra>=0.22nb4
 BUILDLINK_PKGSRCDIR.libcanberra?=	../../audio/libcanberra
 
 #.include "../../multimedia/gstreamer0.10/buildlink3.mk"
diff --git a/audio/libcanberra/distinfo b/audio/libcanberra/distinfo
index 70d8a70661e..72a46256816 100644
--- a/audio/libcanberra/distinfo
+++ b/audio/libcanberra/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2009/10/29 17:51:09 drochner Exp $
+$NetBSD: distinfo,v 1.4 2010/11/28 21:12:54 adam Exp $
 
-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
+SHA1 (libcanberra-0.26.tar.gz) = 31a1cb8757e5da39b4cdc06e523d011578d7a3e3
+RMD160 (libcanberra-0.26.tar.gz) = f58fc2cfa4b35f6a6b2577057b969977f7de3b5d
+Size (libcanberra-0.26.tar.gz) = 463209 bytes
+SHA1 (patch-aa) = 9507099aed0a4609a31274fed219a6ab8e930e24
+SHA1 (patch-ab) = 9c9d6222354a60e39db61cf18f97fd95f1396f88
diff --git a/audio/libcanberra/patches/patch-aa b/audio/libcanberra/patches/patch-aa
index b64d6b19f56..3c4f22b4be3 100644
--- a/audio/libcanberra/patches/patch-aa
+++ b/audio/libcanberra/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.1 2009/10/29 17:51:09 drochner Exp $
+$NetBSD: patch-aa,v 1.2 2010/11/28 21:12:54 adam Exp $
 
---- src/oss.c.orig	2009-08-27 03:58:16.000000000 +0200
+--- src/oss.c.orig	2010-02-19 23:39:40.000000000 +0000
 +++ src/oss.c
-@@ -241,7 +241,7 @@ static int open_oss(ca_context *c, struc
+@@ -243,7 +243,7 @@ static int open_oss(ca_context *c, struc
  
-     p = PRIVATE(c);
+         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 ((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)
+         if ((mode = fcntl(out->pcm, F_GETFL)) < 0)
diff --git a/audio/libcanberra/patches/patch-ab b/audio/libcanberra/patches/patch-ab
index 04389445c6f..8eaee69b116 100644
--- a/audio/libcanberra/patches/patch-ab
+++ b/audio/libcanberra/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2009/10/29 17:51:09 drochner Exp $
+$NetBSD: patch-ab,v 1.2 2010/11/28 21:12:54 adam Exp $
 
---- src/Makefile.in.orig	2009-10-20 02:29:59.000000000 +0200
+--- src/Makefile.in.orig	2010-10-04 17:52:31.000000000 +0000
 +++ src/Makefile.in
-@@ -649,10 +649,10 @@ plugin_LTLIBRARIES = $(am__append_7) $(a
+@@ -692,10 +692,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 \