Re: s/espeak/espeak-ng/g

[adr <adr%sdf.org@localhost>]

> On Tue, 12 Mar 2024, Thomas Klausner wrote:
> > >  ===================================================================
> > >  RCS file: /cvsroot/pkgsrc/audio/aeneas/Makefile,v
> > >  retrieving revision 1.23
> > >  diff -u -r1.23 Makefile
> > >  --- Makefile	22 Jan 2024 13:16:54 -0000	1.23
> > >  +++ Makefile	11 Mar 2024 16:47:31 -0000
> > >  @@ -24,7 +24,7 @@
> > >   PYTHON_VERSIONS_INCOMPATIBLE=	27 38
> > >
> > >  .include "../../lang/python/egg.mk"
> > >  -.include "../../audio/espeak/buildlink3.mk"
> > >  +.include "../../audio/espeak-ng/buildlink3.mk"
> > >   .include "../../math/py-numpy/buildlink3.mk"
> > >   .include "../../multimedia/ffmpeg3/buildlink3.mk"
> > >   .include "../../mk/bsd.pkg.mk"
> >
> >  That doesn't work:
> >
> >  ld: cannot find -lespeak: No such file or directory
> >  Thomas

These patches correct that:

patch-aeneas_cew_Makefile
===================================================================
$NetBSD$

* Substitute espeak for espeak-ng.

--- aeneas/cew/Makefile.orig	2017-03-16 12:48:53.000000000 +0000
+++ aeneas/cew/Makefile
@@ -25,7 +25,7 @@ DRIVER=$(PREFIX)_driver
 SETUP_PY=$(PREFIX)_setup.py

 SRCS=$(DRIVER).c $(FUNC).c ../cint/cint.c
-CLIBS=-lespeak
+CLIBS=-lespeak-ng

 CC=gcc
 CFLAGS=-Wall -pedantic -std=c99
===================================================================

cvs diff -Nu output:
===================================================================
RCS file: /cvsroot/pkgsrc/audio/aeneas/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- Makefile	22 Jan 2024 13:16:54 -0000	1.23
+++ Makefile	13 Mar 2024 14:02:11 -0000
@@ -24,7 +24,7 @@
 PYTHON_VERSIONS_INCOMPATIBLE=	27 38

 .include "../../lang/python/egg.mk"
-.include "../../audio/espeak/buildlink3.mk"
+.include "../../audio/espeak-ng/buildlink3.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../multimedia/ffmpeg3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/audio/aeneas/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo	26 Oct 2021 09:58:44 -0000	1.3
+++ distinfo	13 Mar 2024 14:02:11 -0000
@@ -3,4 +3,5 @@
 BLAKE2s (aeneas-1.7.3.tar.gz) = 38b8dab873feafdd462da97ae7d991f0954cb9e579b538e0291d831f60421e50
 SHA512 (aeneas-1.7.3.tar.gz) = 4b661831aa4b614b7953d320a33f07e4a133dfc63c89775dcf9c65eb028950dfe124452430af64d822b855162f3f859e93a9995eac18eb5dd943e9aec3f7a8fa
 Size (aeneas-1.7.3.tar.gz) = 31395640 bytes
-SHA1 (patch-setup.py) = 30980146a202c0b0f146c34fec9af1389acb1908
+SHA1 (patch-aeneas_cew_Makefile) = ff06994746419b79da94877066b7d56d00ec9ec8
+SHA1 (patch-setup.py) = 7b79c2847ab3a182a835df5c41d78fa1094471f6
Index: patches/patch-setup.py
===================================================================
RCS file: /cvsroot/pkgsrc/audio/aeneas/patches/patch-setup.py,v
retrieving revision 1.1
diff -u -r1.1 patch-setup.py
--- patches/patch-setup.py	28 Feb 2018 22:10:13 -0000	1.1
+++ patches/patch-setup.py	13 Mar 2024 14:02:11 -0000
@@ -4,6 +4,15 @@

 --- setup.py.orig	2017-03-16 12:48:53.000000000 +0000
 +++ setup.py
+@@ -234,7 +234,7 @@ EXTENSION_CEW = Extension(
+         "aeneas/cew/cew_func.c"
+     ],
+     libraries=[
+-        "espeak"
++        "espeak-ng"
+     ]
+ )
+ EXTENSION_CFW = Extension(
 @@ -297,7 +297,7 @@ elif FORCE_CEW:
      print("[INFO] ")
      EXTENSIONS.append(EXTENSION_CEW)

$NetBSD$

* Substitute espeak for espeak-ng.

--- aeneas/cew/Makefile.orig	2017-03-16 12:48:53.000000000 +0000
+++ aeneas/cew/Makefile
@@ -25,7 +25,7 @@ DRIVER=$(PREFIX)_driver
 SETUP_PY=$(PREFIX)_setup.py
 
 SRCS=$(DRIVER).c $(FUNC).c ../cint/cint.c
-CLIBS=-lespeak
+CLIBS=-lespeak-ng
 
 CC=gcc
 CFLAGS=-Wall -pedantic -std=c99

? work
? patches/patch-aeneas_cew_Makefile
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/audio/aeneas/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- Makefile	22 Jan 2024 13:16:54 -0000	1.23
+++ Makefile	13 Mar 2024 14:02:11 -0000
@@ -24,7 +24,7 @@
 PYTHON_VERSIONS_INCOMPATIBLE=	27 38
 
 .include "../../lang/python/egg.mk"
-.include "../../audio/espeak/buildlink3.mk"
+.include "../../audio/espeak-ng/buildlink3.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../multimedia/ffmpeg3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/audio/aeneas/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo	26 Oct 2021 09:58:44 -0000	1.3
+++ distinfo	13 Mar 2024 14:02:11 -0000
@@ -3,4 +3,5 @@
 BLAKE2s (aeneas-1.7.3.tar.gz) = 38b8dab873feafdd462da97ae7d991f0954cb9e579b538e0291d831f60421e50
 SHA512 (aeneas-1.7.3.tar.gz) = 4b661831aa4b614b7953d320a33f07e4a133dfc63c89775dcf9c65eb028950dfe124452430af64d822b855162f3f859e93a9995eac18eb5dd943e9aec3f7a8fa
 Size (aeneas-1.7.3.tar.gz) = 31395640 bytes
-SHA1 (patch-setup.py) = 30980146a202c0b0f146c34fec9af1389acb1908
+SHA1 (patch-aeneas_cew_Makefile) = ff06994746419b79da94877066b7d56d00ec9ec8
+SHA1 (patch-setup.py) = 7b79c2847ab3a182a835df5c41d78fa1094471f6
Index: patches/patch-setup.py
===================================================================
RCS file: /cvsroot/pkgsrc/audio/aeneas/patches/patch-setup.py,v
retrieving revision 1.1
diff -u -r1.1 patch-setup.py
--- patches/patch-setup.py	28 Feb 2018 22:10:13 -0000	1.1
+++ patches/patch-setup.py	13 Mar 2024 14:02:11 -0000
@@ -4,6 +4,15 @@
 
 --- setup.py.orig	2017-03-16 12:48:53.000000000 +0000
 +++ setup.py
+@@ -234,7 +234,7 @@ EXTENSION_CEW = Extension(
+         "aeneas/cew/cew_func.c"
+     ],
+     libraries=[
+-        "espeak"
++        "espeak-ng"
+     ]
+ )
+ EXTENSION_CFW = Extension(
 @@ -297,7 +297,7 @@ elif FORCE_CEW:
      print("[INFO] ")
      EXTENSIONS.append(EXTENSION_CEW)