CVS commit: pkgsrc/audio/flite

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Feb 20 18:24:56 UTC 2024

Modified Files:
        pkgsrc/audio/flite: Makefile distinfo
Added Files:
        pkgsrc/audio/flite/patches: patch-src_audio_au__sun.c
Removed Files:
        pkgsrc/audio/flite/patches: patch-ae

Log Message:
flite: add patch from adr on pkgsrc-users

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/audio/flite/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/audio/flite/distinfo
cvs rdiff -u -r1.4 -r0 pkgsrc/audio/flite/patches/patch-ae
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/flite/patches/patch-src_audio_au__sun.c

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

Modified files:

Index: pkgsrc/audio/flite/Makefile
diff -u pkgsrc/audio/flite/Makefile:1.13 pkgsrc/audio/flite/Makefile:1.14
--- pkgsrc/audio/flite/Makefile:1.13    Tue Jan 30 09:04:41 2024
+++ pkgsrc/audio/flite/Makefile Tue Feb 20 18:24:55 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2024/01/30 09:04:41 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2024/02/20 18:24:55 wiz Exp $
 
 DISTNAME=      flite-2.2
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    audio
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=festvox/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}

Index: pkgsrc/audio/flite/distinfo
diff -u pkgsrc/audio/flite/distinfo:1.15 pkgsrc/audio/flite/distinfo:1.16
--- pkgsrc/audio/flite/distinfo:1.15    Fri Feb 16 08:21:36 2024
+++ pkgsrc/audio/flite/distinfo Tue Feb 20 18:24:55 2024
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.15 2024/02/16 08:21:36 nia Exp $
+$NetBSD: distinfo,v 1.16 2024/02/20 18:24:55 wiz 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) = d577c657f0db256fd7c7c40c8b280fcffa1aff25
 SHA1 (patch-config_common__make__rules) = 949ec45c35872fd39c44864b484423ab28467898
+SHA1 (patch-src_audio_au__sun.c) = dedd5ecf339252a41aede6ebbe07efb558660108

Added files:

Index: pkgsrc/audio/flite/patches/patch-src_audio_au__sun.c
diff -u /dev/null pkgsrc/audio/flite/patches/patch-src_audio_au__sun.c:1.1
--- /dev/null   Tue Feb 20 18:24:56 2024
+++ pkgsrc/audio/flite/patches/patch-src_audio_au__sun.c        Tue Feb 20 18:24:55 2024
@@ -0,0 +1,50 @@
+$NetBSD: patch-src_audio_au__sun.c,v 1.1 2024/02/20 18:24:55 wiz 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,12 +45,18 @@
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #include <errno.h>
++#include <sys/ioctl.h>
+ #include <sys/filio.h>
+ #include <sys/audioio.h>
+ #include "cst_string.h"
+ #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();
+       }
+     }
+-    ioctl(fd,AUDIO_GETINFO,&ainfo);
++    AUDIO_INITINFO(&ainfo);
+ 
+     switch (fmt)
+     {
+@@ -166,9 +172,11 @@ int audio_flush_sun(cst_audiodev *ad)
+     return ioctl((int)ad->platform_data, AUDIO_DRAIN, 0);
+ }
+ 
+-/* FIXME... */
+ int audio_drain_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
+ }
+-