pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/audio/espeak-ng
Module Name: pkgsrc
Committed By: ryoon
Date: Sun May 11 12:31:24 UTC 2025
Modified Files:
pkgsrc/audio/espeak-ng: Makefile distinfo
Added Files:
pkgsrc/audio/espeak-ng/patches: patch-src_libespeak-ng_voices.c
Log Message:
audio/espeak-ng: Fix segfault during build under NetBSD/amd64 10.99.14
And some non-effective settings.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/audio/espeak-ng/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/audio/espeak-ng/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/audio/espeak-ng/patches/patch-src_libespeak-ng_voices.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/espeak-ng/Makefile
diff -u pkgsrc/audio/espeak-ng/Makefile:1.4 pkgsrc/audio/espeak-ng/Makefile:1.5
--- pkgsrc/audio/espeak-ng/Makefile:1.4 Wed Feb 12 06:44:21 2025
+++ pkgsrc/audio/espeak-ng/Makefile Sun May 11 12:31:23 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2025/02/12 06:44:21 ryoon Exp $
+# $NetBSD: Makefile,v 1.5 2025/05/11 12:31:23 ryoon Exp $
DISTNAME= espeak-ng-1.52.0
PKGREVISION= 1
@@ -13,8 +13,6 @@ LICENSE= gnu-gpl-v3 AND apache-2.0 AND 2
DEPENDS+= mbrola-[0-9]*:../../audio/mbrola
-WRKSRC= ${WRKDIR}/${DISTNAME}
-
USE_TOOLS+= autoconf automake autoreconf gmake
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
@@ -29,8 +27,6 @@ TEST_TARGET= check
CFLAGS+= -D_NETBSD_SOURCE
.endif
-CONFIGURE_ARGS+= CFLAGS=${CFLAGS:M*:Q}
-
PKGCONFIG_OVERRIDE+= espeak-ng.pc.in
# Makefile.am: error: required file './AUTHORS' not found
Index: pkgsrc/audio/espeak-ng/distinfo
diff -u pkgsrc/audio/espeak-ng/distinfo:1.3 pkgsrc/audio/espeak-ng/distinfo:1.4
--- pkgsrc/audio/espeak-ng/distinfo:1.3 Thu Dec 26 11:45:00 2024
+++ pkgsrc/audio/espeak-ng/distinfo Sun May 11 12:31:23 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2024/12/26 11:45:00 wiz Exp $
+$NetBSD: distinfo,v 1.4 2025/05/11 12:31:23 ryoon Exp $
BLAKE2s (espeak-ng-1.52.0.tar.gz) = 84417ee04860dd7242871a7df724e547641bfd6d128df493cb7f1051d8b12fd7
SHA512 (espeak-ng-1.52.0.tar.gz) = 28793503f2be00505c3fe1dada8197a4e2d3af0d143e31ef883130fe2685d048ae9dee8efab637cdbe972461d95e210d2277b8e8fed4ae580d0cca8b505b0662
@@ -6,3 +6,4 @@ Size (espeak-ng-1.52.0.tar.gz) = 1773980
SHA1 (patch-Makefile.am) = 734c3e1cc914cf9236eadf0e372ad7438845faa8
SHA1 (patch-src_include_compat_wctype.h) = 747a271c5f8e431cf3a02a7d3ea29eda8870e354
SHA1 (patch-src_libespeak-ng_speech.c) = 9424174bc4bc2f9947f6a280f4b3a16daf81670a
+SHA1 (patch-src_libespeak-ng_voices.c) = f6b158ae70030e663d3c46e31e1cccd56b7fc18f
Added files:
Index: pkgsrc/audio/espeak-ng/patches/patch-src_libespeak-ng_voices.c
diff -u /dev/null pkgsrc/audio/espeak-ng/patches/patch-src_libespeak-ng_voices.c:1.1
--- /dev/null Sun May 11 12:31:24 2025
+++ pkgsrc/audio/espeak-ng/patches/patch-src_libespeak-ng_voices.c Sun May 11 12:31:23 2025
@@ -0,0 +1,49 @@
+$NetBSD: patch-src_libespeak-ng_voices.c,v 1.1 2025/05/11 12:31:23 ryoon Exp $
+
+--- src/libespeak-ng/voices.c.orig 2024-12-12 13:28:01.000000000 +0000
++++ src/libespeak-ng/voices.c
+@@ -98,7 +98,7 @@ static char *fgets_strip(char *buf, int
+ }
+
+ len = strlen(buf);
+- while ((--len > 0) && isspace(buf[len]))
++ while ((--len > 0) && isspace((unsigned char)buf[len]))
+ buf[len] = 0;
+
+ if ((p = strstr(buf, "//")) != NULL)
+@@ -188,7 +188,7 @@ static espeak_VOICE *ReadVoiceFile(FILE
+ switch (LookupMnem(keyword_tab, linebuf))
+ {
+ case V_NAME:
+- while (isspace(*p)) p++;
++ while (isspace((unsigned char)*p)) p++;
+ strncpy0(vname, p, sizeof(vname));
+ break;
+ case V_LANGUAGE:
+@@ -383,7 +383,7 @@ void ReadNumbers(char *p, int *flags, in
+ // the meaning of the numbers is bit ordinals, not integer values
+ // give an error if number > maxValue is read
+ while (*p != 0) {
+- while (isspace(*p)) p++;
++ while (isspace((unsigned char)*p)) p++;
+ int n;
+ if ((n = atoi(p)) > 0) {
+ p++;
+@@ -508,7 +508,7 @@ voice_t *LoadVoice(const char *vname, in
+
+ while ((f_voice != NULL) && (fgets_strip(buf, sizeof(buf), f_voice) != NULL)) {
+ // isolate the attribute name
+- for (p = buf; (*p != 0) && !isspace(*p); p++) ;
++ for (p = buf; (*p != 0) && !isspace((unsigned char)*p); p++) ;
+ *p++ = 0;
+
+ if (buf[0] == 0) continue;
+@@ -561,7 +561,7 @@ voice_t *LoadVoice(const char *vname, in
+ break;
+ case V_NAME:
+ if (tone_only == 0) {
+- while (isspace(*p)) p++;
++ while (isspace((unsigned char)*p)) p++;
+ strncpy0(voice_name, p, sizeof(voice_name));
+ }
+ break;
Home |
Main Index |
Thread Index |
Old Index