From bb8da0bc8964fd328bba04cfa64bb9c07d202a20 Mon Sep 17 00:00:00 2001
From: obache <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/patches/patch-aa | 22 +++++++++++++++++-----
 audio/libcanberra/patches/patch-ab |  8 +++++---
 2 files changed, 22 insertions(+), 8 deletions(-)

(limited to 'audio/libcanberra/patches')

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