Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_170807169611720"
MIME-Version: 1.0
Date: Fri, 16 Feb 2024 08:21:36 +0000
From: "Nia Alarie" <nia@netbsd.org>
Subject: CVS commit: pkgsrc/audio/flite
To: pkgsrc-changes@NetBSD.org
Reply-To: nia@netbsd.org
Message-Id: <20240216082136.79D43F9F2@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_170807169611720
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	nia
Date:		Fri Feb 16 08:21:36 UTC 2024

Modified Files:
	pkgsrc/audio/flite: distinfo
	pkgsrc/audio/flite/patches: patch-ae

Log Message:
flite: Fix audio_flush_sun on sun


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/audio/flite/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/audio/flite/patches/patch-ae

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_170807169611720
Content-Disposition: inline
Content-Length: 2651
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/audio/flite/distinfo
diff -u pkgsrc/audio/flite/distinfo:1.14 pkgsrc/audio/flite/distinfo:1.15
--- pkgsrc/audio/flite/distinfo:1.14	Tue Jan 30 09:04:41 2024
+++ pkgsrc/audio/flite/distinfo	Fri Feb 16 08:21:36 2024
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.14 2024/01/30 09:04:41 wiz Exp $
+$NetBSD: distinfo,v 1.15 2024/02/16 08:21:36 nia Exp $
 
 BLAKE2s (flite-2.2.tar.gz) = f7b2e3bb17750d8a7c384b70abc3f61a35bfa689937b80969c442a14d26a1ff2
 SHA512 (flite-2.2.tar.gz) = 1ca2f4145651490ef8405fdb830a3b42e885020a7603d965f6a5581b01bed41047d396b38c2ceab138fc0b28d28078db17acd2b5a84c6444cb99d65c581afa72
 Size (flite-2.2.tar.gz) = 20233792 bytes
 SHA1 (patch-ad) = e75da7826581a1d93d4f5efe75f257cc749358a7
-SHA1 (patch-ae) = e3eb4bc93c32eef8cc8c7d5e8014a473bc3f6752
+SHA1 (patch-ae) = d577c657f0db256fd7c7c40c8b280fcffa1aff25
 SHA1 (patch-config_common__make__rules) = 949ec45c35872fd39c44864b484423ab28467898

Index: pkgsrc/audio/flite/patches/patch-ae
diff -u pkgsrc/audio/flite/patches/patch-ae:1.3 pkgsrc/audio/flite/patches/patch-ae:1.4
--- pkgsrc/audio/flite/patches/patch-ae:1.3	Tue Jan 30 09:04:41 2024
+++ pkgsrc/audio/flite/patches/patch-ae	Fri Feb 16 08:21:36 2024
@@ -1,11 +1,11 @@
-$NetBSD: patch-ae,v 1.3 2024/01/30 09:04:41 wiz Exp $
+$NetBSD: patch-ae,v 1.4 2024/02/16 08:21:36 nia Exp $
 
 - Include missing header
 - Use AUDIO_INITINFO for parameter initialization
 
 --- src/audio/au_sun.c.orig	2020-08-13 00:17:09.000000000 +0000
 +++ src/audio/au_sun.c
-@@ -45,6 +45,7 @@
+@@ -45,12 +45,18 @@
  #include <sys/stat.h>
  #include <fcntl.h>
  #include <errno.h>
@@ -13,7 +13,18 @@ $NetBSD: patch-ae,v 1.3 2024/01/30 09:04
  #include <sys/filio.h>
  #include <sys/audioio.h>
  #include "cst_string.h"
-@@ -76,7 +77,7 @@ cst_audiodev *audio_open_sun(int sps, in
+ #include "cst_wave.h"
+ #include "cst_audio.h"
+ 
++#ifdef __sun
++#include <stropts.h>
++#include <sys/conf.h>
++#endif
++
+ static const char *sun_audio_device = "/dev/audio";
+ 
+ cst_audiodev *audio_open_sun(int sps, int channels, cst_audiofmt fmt)
+@@ -76,7 +82,7 @@ cst_audiodev *audio_open_sun(int sps, in
  	    cst_error();
  	}
      }
@@ -22,12 +33,16 @@ $NetBSD: patch-ae,v 1.3 2024/01/30 09:04
  
      switch (fmt)
      {
-@@ -163,7 +164,7 @@ int audio_write_sun(cst_audiodev *ad, vo
+@@ -163,7 +169,11 @@ int audio_write_sun(cst_audiodev *ad, vo
  
  int audio_flush_sun(cst_audiodev *ad)
  {
 -    return ioctl((int)ad->platform_data, AUDIO_DRAIN, 0);
++#ifdef __sun
++    return ioctl((int)ad->platform_data, I_FLUSH, FLUSHW);
++#else
 +    return ioctl((int)ad->platform_data, AUDIO_FLUSH, 0);
++#endif
  }
  
  /* FIXME... */


--_----------=_170807169611720--