From bb8da0bc8964fd328bba04cfa64bb9c07d202a20 Mon Sep 17 00:00:00 2001 From: obache Date: Mon, 12 Aug 2013 07:09:59 +0000 Subject: Update libcanberra to 0.27 while here, add gtk3 option and enabled by default. News Fri 18 Feb 2011: Version 0.27 released; Gtk+ 3.x fixes; add new tool to implement boot-up sounds when used with systemd; other fixes --- audio/libcanberra/Makefile | 13 +++---------- audio/libcanberra/PLIST | 10 +++++++--- audio/libcanberra/buildlink3.mk | 11 +++++++++-- audio/libcanberra/distinfo | 12 ++++++------ audio/libcanberra/options.mk | 19 ++++++++++++++----- audio/libcanberra/patches/patch-aa | 22 +++++++++++++++++----- audio/libcanberra/patches/patch-ab | 8 +++++--- 7 files changed, 61 insertions(+), 34 deletions(-) (limited to 'audio/libcanberra') diff --git a/audio/libcanberra/Makefile b/audio/libcanberra/Makefile index baf92b93e0b..734a98f3e95 100644 --- a/audio/libcanberra/Makefile +++ b/audio/libcanberra/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.31 2013/06/06 12:53:54 wiz Exp $ +# $NetBSD: Makefile,v 1.32 2013/08/12 07:09:59 obache Exp $ -DISTNAME= libcanberra-0.26 -PKGREVISION= 14 +DISTNAME= libcanberra-0.27 CATEGORIES= audio MASTER_SITES= http://0pointer.de/lennart/projects/libcanberra/ @@ -15,14 +14,9 @@ USE_LIBTOOL= yes USE_TOOLS+= pkg-config gmake PKGCONFIG_OVERRIDE+= libcanberra-gtk.pc.in +PKGCONFIG_OVERRIDE+= libcanberra-gtk3.pc.in PKGCONFIG_OVERRIDE+= libcanberra.pc.in -SUBST_CLASSES+= ltdlc -SUBST_SED.ltdlc= -e "s,ltdlc,ltdl," -SUBST_FILES.ltdlc= configure -SUBST_MESSAGE.ltdlc= Fixing libtool convenience library name. -SUBST_STAGE.ltdlc= pre-configure - REPLACE_SH= src/libcanberra-logout-sound.sh.in CONFIGURE_ENV+= ac_cv_lib_ltdl_lt_dladvise_init=yes @@ -31,7 +25,6 @@ PLIST_VARS+= oss .include "options.mk" -#.include "../../devel/libltdl/convenience.mk" .include "../../devel/libltdl/buildlink3.mk" .include "../../devel/GConf/schemas.mk" .include "../../mk/oss.buildlink3.mk" diff --git a/audio/libcanberra/PLIST b/audio/libcanberra/PLIST index 4fdf9587d55..a0e3a565aea 100644 --- a/audio/libcanberra/PLIST +++ b/audio/libcanberra/PLIST @@ -1,15 +1,19 @@ -@comment $NetBSD: PLIST,v 1.7 2011/05/12 13:39:09 adam Exp $ -${PLIST.gtk}bin/canberra-gtk-play -${PLIST.gtk}include/canberra-gtk.h +@comment $NetBSD: PLIST,v 1.8 2013/08/12 07:09:59 obache Exp $ +${PLIST.gtk-any}bin/canberra-gtk-play +${PLIST.gtk-any}include/canberra-gtk.h include/canberra.h ${PLIST.gtk}lib/gtk-2.0/modules/libcanberra-gtk-module.la +${PLIST.gtk3}lib/gtk-3.0/modules/libcanberra-gtk-module.so +${PLIST.gtk3}lib/gtk-3.0/modules/libcanberra-gtk3-module.la lib/${PKGNAME}/libcanberra-gstreamer.la lib/${PKGNAME}/libcanberra-multi.la lib/${PKGNAME}/libcanberra-null.la ${PLIST.oss}lib/${PKGNAME}/libcanberra-oss.la ${PLIST.gtk}lib/libcanberra-gtk.la +${PLIST.gtk3}lib/libcanberra-gtk3.la lib/libcanberra.la ${PLIST.gtk}lib/pkgconfig/libcanberra-gtk.pc +${PLIST.gtk3}lib/pkgconfig/libcanberra-gtk3.pc lib/pkgconfig/libcanberra.pc share/doc/libcanberra/README ${PLIST.gtk}share/gconf/schemas/libcanberra.schemas diff --git a/audio/libcanberra/buildlink3.mk b/audio/libcanberra/buildlink3.mk index 10197a42e92..3ec57d63583 100644 --- a/audio/libcanberra/buildlink3.mk +++ b/audio/libcanberra/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.21 2013/06/06 12:53:54 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.22 2013/08/12 07:09:59 obache Exp $ BUILDLINK_TREE+= libcanberra @@ -9,8 +9,15 @@ BUILDLINK_API_DEPENDS.libcanberra+= libcanberra>=0.10 BUILDLINK_ABI_DEPENDS.libcanberra+= libcanberra>=0.26nb14 BUILDLINK_PKGSRCDIR.libcanberra?= ../../audio/libcanberra -#.include "../../multimedia/gstreamer0.10/buildlink3.mk" +pkgbase := libcanberra +.include "../../mk/pkg-build-options.mk" + +.if !empty(PKG_BUILD_OPTIONS.libcanberra:Mgtk) .include "../../x11/gtk2/buildlink3.mk" +.endif +.if !empty(PKG_BUILD_OPTIONS.libcanberra:Mgtk3) +.include "../../x11/gtk3/buildlink3.mk" +.endif .include "../../audio/libvorbis/buildlink3.mk" .include "../../devel/libltdl/buildlink3.mk" .endif # LIBCANBERRA_BUILDLINK3_MK diff --git a/audio/libcanberra/distinfo b/audio/libcanberra/distinfo index 72a46256816..40c5b182733 100644 --- a/audio/libcanberra/distinfo +++ b/audio/libcanberra/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.4 2010/11/28 21:12:54 adam Exp $ +$NetBSD: distinfo,v 1.5 2013/08/12 07:09:59 obache Exp $ -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 +SHA1 (libcanberra-0.27.tar.gz) = b2dc2b23109f32a11217b71f87c044f1ef9b7977 +RMD160 (libcanberra-0.27.tar.gz) = 1003bedf3fd6025ad046645f9a88af3d8653a0e5 +Size (libcanberra-0.27.tar.gz) = 490442 bytes +SHA1 (patch-aa) = ad38999e6c630d1c620c7395df9eb85410b68668 +SHA1 (patch-ab) = 2a5767e0aa29f5dc4f6b6fd15a0f2aaf1f5dd329 diff --git a/audio/libcanberra/options.mk b/audio/libcanberra/options.mk index 7b8b267952e..39a4b01c84b 100644 --- a/audio/libcanberra/options.mk +++ b/audio/libcanberra/options.mk @@ -1,15 +1,24 @@ -# $NetBSD: options.mk,v 1.1 2011/05/12 13:39:24 adam Exp $ +# $NetBSD: options.mk,v 1.2 2013/08/12 07:09:59 obache Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.libcanberra -PKG_SUPPORTED_OPTIONS= gtk -PKG_SUGGESTED_OPTIONS= gtk +PKG_SUPPORTED_OPTIONS= gtk gtk3 +PKG_SUGGESTED_OPTIONS= gtk gtk3 .include "../../mk/bsd.options.mk" -PLIST_VARS+= gtk +PLIST_VARS+= gtk-any gtk gtk3 -.if !empty(PKG_OPTIONS:Mgtk) +.if !empty(PKG_OPTIONS:Mgtk) || !empty(PKG_OPTIONS:Mgtk3) GCONF_SCHEMAS+= libcanberra.schemas +PLIST.gtk-any= yes +.endif + +.if !empty(PKG_OPTIONS:Mgtk) PLIST.gtk= yes .include "../../x11/gtk2/buildlink3.mk" .endif + +.if !empty(PKG_OPTIONS:Mgtk3) +PLIST.gtk3= yes +.include "../../x11/gtk3/buildlink3.mk" +.endif diff --git a/audio/libcanberra/patches/patch-aa b/audio/libcanberra/patches/patch-aa index 3c4f22b4be3..7bdae685002 100644 --- a/audio/libcanberra/patches/patch-aa +++ b/audio/libcanberra/patches/patch-aa @@ -1,13 +1,25 @@ -$NetBSD: patch-aa,v 1.2 2010/11/28 21:12:54 adam Exp $ +$NetBSD: patch-aa,v 1.3 2013/08/12 07:09:59 obache Exp $ ---- src/oss.c.orig 2010-02-19 23:39:40.000000000 +0000 +* configure OSS device name +* use more portable macro + +--- src/oss.c.orig 2011-02-09 21:02:40.000000000 +0000 +++ src/oss.c -@@ -243,7 +243,7 @@ static int open_oss(ca_context *c, struc - - p = PRIVATE(c); +@@ -240,7 +240,7 @@ static int open_oss(ca_context *c, struc + * multichannel streams. We cannot support those files hence */ + ca_return_val_if_fail(ca_sound_file_get_nchannels(out->file) <= 2, CA_ERROR_NOTSUPPORTED); - 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) +@@ -259,7 +259,7 @@ static int open_oss(ca_context *c, struc + val = AFMT_S16_NE; + break; + case CA_SAMPLE_S16RE: +-#if __BYTE_ORDER == __LITTLE_ENDIAN ++#if _BYTE_ORDER == _LITTLE_ENDIAN + val = AFMT_S16_BE; + #else + val = AFMT_S16_LE; diff --git a/audio/libcanberra/patches/patch-ab b/audio/libcanberra/patches/patch-ab index 8eaee69b116..b6bc27b09dc 100644 --- a/audio/libcanberra/patches/patch-ab +++ b/audio/libcanberra/patches/patch-ab @@ -1,8 +1,10 @@ -$NetBSD: patch-ab,v 1.2 2010/11/28 21:12:54 adam Exp $ +$NetBSD: patch-ab,v 1.3 2013/08/12 07:09:59 obache Exp $ ---- src/Makefile.in.orig 2010-10-04 17:52:31.000000000 +0000 +* configure OSS device and library name + +--- src/Makefile.in.orig 2011-02-18 00:14:23.000000000 +0000 +++ src/Makefile.in -@@ -692,10 +692,10 @@ plugin_LTLIBRARIES = $(am__append_7) $(a +@@ -732,10 +732,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 \ -- cgit v1.2.3