CVS commit: pkgsrc/audio/aeneas

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Mar 13 14:38:13 UTC 2024

Modified Files:
        pkgsrc/audio/aeneas: Makefile PLIST distinfo
        pkgsrc/audio/aeneas/patches: patch-setup.py
Added Files:
        pkgsrc/audio/aeneas/patches: patch-aeneas_cew_Makefile

Log Message:
aeneas: switch to espeak-ng.

>From adr.

While here, switch to wheel.mk and ffmpeg6 instead of ffmpeg3.
Also, make it a plain dependency because it's not linked against.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 pkgsrc/audio/aeneas/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/aeneas/PLIST
cvs rdiff -u -r1.3 -r1.4 pkgsrc/audio/aeneas/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/aeneas/patches/patch-aeneas_cew_Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/aeneas/patches/patch-setup.py

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

Modified files:

Index: pkgsrc/audio/aeneas/Makefile
diff -u pkgsrc/audio/aeneas/Makefile:1.23 pkgsrc/audio/aeneas/Makefile:1.24
--- pkgsrc/audio/aeneas/Makefile:1.23   Mon Jan 22 13:16:54 2024
+++ pkgsrc/audio/aeneas/Makefile        Wed Mar 13 14:38:12 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2024/01/22 13:16:54 ryoon Exp $
+# $NetBSD: Makefile,v 1.24 2024/03/13 14:38:12 wiz Exp $
 
 DISTNAME=      aeneas-1.7.3
-PKGREVISION=   18
+PKGREVISION=   19
 CATEGORIES=    audio
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=readbeyond/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -11,20 +11,20 @@ HOMEPAGE=   https://github.com/readbeyond/
 COMMENT=       Automagically synchronize audio and text
 LICENSE=       gnu-agpl-v3
 
-USE_LANGUAGES= c c++
-
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
+TOOL_DEPENDS+= ${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
 DEPENDS+=      ${PYPKGPREFIX}-beautifulsoup4-[0-9]*:../../www/py-beautifulsoup4
 DEPENDS+=      ${PYPKGPREFIX}-lxml-[0-9]*:../../textproc/py-lxml
+DEPENDS+=      ffmpeg6-[0-9]*:../../multimedia/ffmpeg6
 
-MAKE_ENV+=     AENEAS_FORCE_CEW=True
-EGG_NAME=      ${DISTNAME}.0
+USE_LANGUAGES= c c++
 
-USE_PKG_RESOURCES=     yes
+MAKE_ENV+=     AENEAS_FORCE_CEW=True
+WHEEL_NAME=    ${DISTNAME}.0
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27 38
 
-.include "../../lang/python/egg.mk"
-.include "../../audio/espeak/buildlink3.mk"
+.include "../../lang/python/wheel.mk"
+.include "../../audio/espeak-ng/buildlink3.mk"
 .include "../../math/py-numpy/buildlink3.mk"
-.include "../../multimedia/ffmpeg3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/audio/aeneas/PLIST
diff -u pkgsrc/audio/aeneas/PLIST:1.1 pkgsrc/audio/aeneas/PLIST:1.2
--- pkgsrc/audio/aeneas/PLIST:1.1       Wed Feb 28 22:10:13 2018
+++ pkgsrc/audio/aeneas/PLIST   Wed Mar 13 14:38:12 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2018/02/28 22:10:13 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2024/03/13 14:38:12 wiz Exp $
 bin/aeneas_check_setup
 bin/aeneas_convert_syncmap
 bin/aeneas_download
@@ -7,11 +7,11 @@ bin/aeneas_execute_task
 bin/aeneas_plot_waveform
 bin/aeneas_synthesize_text
 bin/aeneas_validate
-${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
-${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
-${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/${EGG_INFODIR}/requires.txt
-${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/${WHEEL_INFODIR}/LICENSE
+${PYSITELIB}/${WHEEL_INFODIR}/METADATA
+${PYSITELIB}/${WHEEL_INFODIR}/RECORD
+${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
+${PYSITELIB}/${WHEEL_INFODIR}/top_level.txt
 ${PYSITELIB}/aeneas/README.md
 ${PYSITELIB}/aeneas/__init__.py
 ${PYSITELIB}/aeneas/__init__.pyc

Index: pkgsrc/audio/aeneas/distinfo
diff -u pkgsrc/audio/aeneas/distinfo:1.3 pkgsrc/audio/aeneas/distinfo:1.4
--- pkgsrc/audio/aeneas/distinfo:1.3    Tue Oct 26 09:58:44 2021
+++ pkgsrc/audio/aeneas/distinfo        Wed Mar 13 14:38:12 2024
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.3 2021/10/26 09:58:44 nia Exp $
+$NetBSD: distinfo,v 1.4 2024/03/13 14:38:12 wiz Exp $
 
 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: pkgsrc/audio/aeneas/patches/patch-setup.py
diff -u pkgsrc/audio/aeneas/patches/patch-setup.py:1.1 pkgsrc/audio/aeneas/patches/patch-setup.py:1.2
--- pkgsrc/audio/aeneas/patches/patch-setup.py:1.1      Wed Feb 28 22:10:13 2018
+++ pkgsrc/audio/aeneas/patches/patch-setup.py  Wed Mar 13 14:38:12 2024
@@ -1,9 +1,18 @@
-$NetBSD: patch-setup.py,v 1.1 2018/02/28 22:10:13 wiz Exp $
+$NetBSD: patch-setup.py,v 1.2 2024/03/13 14:38:12 wiz Exp $
 
 Always build C extension.
 
 --- 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)

Added files:

Index: pkgsrc/audio/aeneas/patches/patch-aeneas_cew_Makefile
diff -u /dev/null pkgsrc/audio/aeneas/patches/patch-aeneas_cew_Makefile:1.1
--- /dev/null   Wed Mar 13 14:38:13 2024
+++ pkgsrc/audio/aeneas/patches/patch-aeneas_cew_Makefile       Wed Mar 13 14:38:12 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-aeneas_cew_Makefile,v 1.1 2024/03/13 14:38:12 wiz Exp $
+
+* 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