Sun Nov 28 21:12:55 2010 UTC ()
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.


(adam)
diff -r1.12 -r1.13 pkgsrc/audio/libcanberra/Makefile
diff -r1.7 -r1.8 pkgsrc/audio/libcanberra/buildlink3.mk
diff -r1.3 -r1.4 pkgsrc/audio/libcanberra/distinfo
diff -r1.1 -r1.2 pkgsrc/audio/libcanberra/patches/patch-aa
diff -r1.1 -r1.2 pkgsrc/audio/libcanberra/patches/patch-ab
cvs diff -r1.12 -r1.13 pkgsrc/audio/libcanberra/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/libcanberra/Makefile 2010/11/15 22:56:16 1.12
+++ pkgsrc/audio/libcanberra/Makefile 2010/11/28 21:12:54 1.13
@@ -1,24 +1,23 @@ @@ -1,24 +1,23 @@
1# $NetBSD: Makefile,v 1.12 2010/11/15 22:56:16 abs Exp $ 1# $NetBSD: Makefile,v 1.13 2010/11/28 21:12:54 adam Exp $
2# 
3 2
4DISTNAME= libcanberra-0.22 3DISTNAME= libcanberra-0.26
5PKGREVISION= 4 
6CATEGORIES= audio 4CATEGORIES= audio
7MASTER_SITES= http://0pointer.de/lennart/projects/libcanberra/ 5MASTER_SITES= http://0pointer.de/lennart/projects/libcanberra/
8 6
9MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://0pointer.de/lennart/projects/libcanberra/ 8HOMEPAGE= http://0pointer.de/lennart/projects/libcanberra/
11COMMENT= Desktop event sound library 9COMMENT= Desktop event sound library
 10LICENSE= gnu-lgpl-v2.1
12 11
13PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
14 13
15GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
16USE_LIBTOOL= yes 15USE_LIBTOOL= yes
17USE_TOOLS+= pkg-config gmake 16USE_TOOLS+= pkg-config gmake
18GCONF_SCHEMAS+= libcanberra.schemas 17GCONF_SCHEMAS+= libcanberra.schemas
19 18
20PKGCONFIG_OVERRIDE+= libcanberra-gtk.pc.in 19PKGCONFIG_OVERRIDE+= libcanberra-gtk.pc.in
21PKGCONFIG_OVERRIDE+= libcanberra.pc.in 20PKGCONFIG_OVERRIDE+= libcanberra.pc.in
22 21
23SUBST_CLASSES+= ltdlc 22SUBST_CLASSES+= ltdlc
24SUBST_SED.ltdlc= -e "s,ltdlc,ltdl," 23SUBST_SED.ltdlc= -e "s,ltdlc,ltdl,"
cvs diff -r1.7 -r1.8 pkgsrc/audio/libcanberra/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/audio/libcanberra/buildlink3.mk 2010/11/15 22:56:16 1.7
+++ pkgsrc/audio/libcanberra/buildlink3.mk 2010/11/28 21:12:54 1.8
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: buildlink3.mk,v 1.7 2010/11/15 22:56:16 abs Exp $ 1# $NetBSD: buildlink3.mk,v 1.8 2010/11/28 21:12:54 adam Exp $
2 2
3BUILDLINK_TREE+= libcanberra 3BUILDLINK_TREE+= libcanberra
4 4
5.if !defined(LIBCANBERRA_BUILDLINK3_MK) 5.if !defined(LIBCANBERRA_BUILDLINK3_MK)
6LIBCANBERRA_BUILDLINK3_MK:= 6LIBCANBERRA_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.libcanberra+= libcanberra>=0.10 8BUILDLINK_API_DEPENDS.libcanberra+= libcanberra>=0.10
9BUILDLINK_ABI_DEPENDS.libcanberra?= libcanberra>=0.22nb4 9BUILDLINK_ABI_DEPENDS.libcanberra+= libcanberra>=0.22nb4
10BUILDLINK_PKGSRCDIR.libcanberra?= ../../audio/libcanberra 10BUILDLINK_PKGSRCDIR.libcanberra?= ../../audio/libcanberra
11 11
12#.include "../../multimedia/gstreamer0.10/buildlink3.mk" 12#.include "../../multimedia/gstreamer0.10/buildlink3.mk"
13.include "../../x11/gtk2/buildlink3.mk" 13.include "../../x11/gtk2/buildlink3.mk"
14.include "../../audio/libvorbis/buildlink3.mk" 14.include "../../audio/libvorbis/buildlink3.mk"
15.include "../../devel/libltdl/buildlink3.mk" 15.include "../../devel/libltdl/buildlink3.mk"
16.endif # LIBCANBERRA_BUILDLINK3_MK 16.endif # LIBCANBERRA_BUILDLINK3_MK
17 17
18BUILDLINK_TREE+= -libcanberra 18BUILDLINK_TREE+= -libcanberra
cvs diff -r1.3 -r1.4 pkgsrc/audio/libcanberra/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/libcanberra/distinfo 2009/10/29 17:51:09 1.3
+++ pkgsrc/audio/libcanberra/distinfo 2010/11/28 21:12:54 1.4
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.3 2009/10/29 17:51:09 drochner Exp $ 1$NetBSD: distinfo,v 1.4 2010/11/28 21:12:54 adam Exp $
2 2
3SHA1 (libcanberra-0.22.tar.gz) = b1c642b0e1322dcbf1a791d4d87dd92cdc002b12 3SHA1 (libcanberra-0.26.tar.gz) = 31a1cb8757e5da39b4cdc06e523d011578d7a3e3
4RMD160 (libcanberra-0.22.tar.gz) = 3cccf6b7955aa2926514d5f3e6f48849edea0c1f 4RMD160 (libcanberra-0.26.tar.gz) = f58fc2cfa4b35f6a6b2577057b969977f7de3b5d
5Size (libcanberra-0.22.tar.gz) = 459404 bytes 5Size (libcanberra-0.26.tar.gz) = 463209 bytes
6SHA1 (patch-aa) = 56bb345c67b0a5278bb06d1c64dafa8b62cba91d 6SHA1 (patch-aa) = 9507099aed0a4609a31274fed219a6ab8e930e24
7SHA1 (patch-ab) = 4a682899d521e17c61e95d7d39c3f3a59db28b72 7SHA1 (patch-ab) = 9c9d6222354a60e39db61cf18f97fd95f1396f88
cvs diff -r1.1 -r1.2 pkgsrc/audio/libcanberra/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/audio/libcanberra/patches/patch-aa 2009/10/29 17:51:09 1.1
+++ pkgsrc/audio/libcanberra/patches/patch-aa 2010/11/28 21:12:54 1.2
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-aa,v 1.1 2009/10/29 17:51:09 drochner Exp $ 1$NetBSD: patch-aa,v 1.2 2010/11/28 21:12:54 adam Exp $
2 2
3--- src/oss.c.orig 2009-08-27 03:58:16.000000000 +0200 3--- src/oss.c.orig 2010-02-19 23:39:40.000000000 +0000
4+++ src/oss.c 4+++ src/oss.c
5@@ -241,7 +241,7 @@ static int open_oss(ca_context *c, struc 5@@ -243,7 +243,7 @@ static int open_oss(ca_context *c, struc
6  6
7 p = PRIVATE(c); 7 p = PRIVATE(c);
8  8
9- if ((out->pcm = open(c->device ? c->device : "/dev/dsp", O_WRONLY | O_NONBLOCK, 0)) < 0) 9- if ((out->pcm = open(c->device ? c->device : "/dev/dsp", O_WRONLY | O_NONBLOCK, 0)) < 0)
10+ if ((out->pcm = open(c->device ? c->device : DEVOSSAUDIO, O_WRONLY | O_NONBLOCK, 0)) < 0) 10+ if ((out->pcm = open(c->device ? c->device : DEVOSSAUDIO, O_WRONLY | O_NONBLOCK, 0)) < 0)
11 goto finish_errno; 11 goto finish_errno;
12  12
13 if ((mode = fcntl(out->pcm, F_GETFL)) < 0) 13 if ((mode = fcntl(out->pcm, F_GETFL)) < 0)
cvs diff -r1.1 -r1.2 pkgsrc/audio/libcanberra/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/audio/libcanberra/patches/patch-ab 2009/10/29 17:51:09 1.1
+++ pkgsrc/audio/libcanberra/patches/patch-ab 2010/11/28 21:12:54 1.2
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: patch-ab,v 1.1 2009/10/29 17:51:09 drochner Exp $ 1$NetBSD: patch-ab,v 1.2 2010/11/28 21:12:54 adam Exp $
2 2
3--- src/Makefile.in.orig 2009-10-20 02:29:59.000000000 +0200 3--- src/Makefile.in.orig 2010-10-04 17:52:31.000000000 +0000
4+++ src/Makefile.in 4+++ src/Makefile.in
5@@ -649,10 +649,10 @@ plugin_LTLIBRARIES = $(am__append_7) $(a 5@@ -692,10 +692,10 @@ plugin_LTLIBRARIES = $(am__append_7) $(a
6 @BUILTIN_OSS_FALSE@@HAVE_OSS_TRUE@ -Ddriver_change_props=oss_driver_change_props \ 6 @BUILTIN_OSS_FALSE@@HAVE_OSS_TRUE@ -Ddriver_change_props=oss_driver_change_props \
7 @BUILTIN_OSS_FALSE@@HAVE_OSS_TRUE@ -Ddriver_play=oss_driver_play \ 7 @BUILTIN_OSS_FALSE@@HAVE_OSS_TRUE@ -Ddriver_play=oss_driver_play \
8 @BUILTIN_OSS_FALSE@@HAVE_OSS_TRUE@ -Ddriver_cancel=oss_driver_cancel \ 8 @BUILTIN_OSS_FALSE@@HAVE_OSS_TRUE@ -Ddriver_cancel=oss_driver_cancel \
9-@BUILTIN_OSS_FALSE@@HAVE_OSS_TRUE@ -Ddriver_cache=oss_driver_cache 9-@BUILTIN_OSS_FALSE@@HAVE_OSS_TRUE@ -Ddriver_cache=oss_driver_cache
10+@BUILTIN_OSS_FALSE@@HAVE_OSS_TRUE@ -Ddriver_cache=oss_driver_cache -DDEVOSSAUDIO=\"${DEVOSSAUDIO}\" 10+@BUILTIN_OSS_FALSE@@HAVE_OSS_TRUE@ -Ddriver_cache=oss_driver_cache -DDEVOSSAUDIO=\"${DEVOSSAUDIO}\"
11  11
12 @BUILTIN_OSS_FALSE@@HAVE_OSS_TRUE@libcanberra_oss_la_LIBADD = \ 12 @BUILTIN_OSS_FALSE@@HAVE_OSS_TRUE@libcanberra_oss_la_LIBADD = \
13-@BUILTIN_OSS_FALSE@@HAVE_OSS_TRUE@ libcanberra.la 13-@BUILTIN_OSS_FALSE@@HAVE_OSS_TRUE@ libcanberra.la
14+@BUILTIN_OSS_FALSE@@HAVE_OSS_TRUE@ libcanberra.la ${LIBOSSAUDIO} 14+@BUILTIN_OSS_FALSE@@HAVE_OSS_TRUE@ libcanberra.la ${LIBOSSAUDIO}
15  15
16 @BUILTIN_OSS_FALSE@@HAVE_OSS_TRUE@libcanberra_oss_la_LDFLAGS = \ 16 @BUILTIN_OSS_FALSE@@HAVE_OSS_TRUE@libcanberra_oss_la_LDFLAGS = \
17 @BUILTIN_OSS_FALSE@@HAVE_OSS_TRUE@ -avoid-version -module -export-dynamic 17 @BUILTIN_OSS_FALSE@@HAVE_OSS_TRUE@ -avoid-version -module -export-dynamic