CVS commit: pkgsrc/audio/aeneas

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Jul 23 17:29:31 UTC 2026

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

Log Message:
aeneas: fix build after numpy deprecated its distutils

>From upstream bug tracker comment that's gone already.

Remove BROKEN.

Fix PLIST while here.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 pkgsrc/audio/aeneas/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/audio/aeneas/PLIST
cvs rdiff -u -r1.4 -r1.5 pkgsrc/audio/aeneas/distinfo
cvs rdiff -u -r1.2 -r1.3 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.33 pkgsrc/audio/aeneas/Makefile:1.34
--- pkgsrc/audio/aeneas/Makefile:1.33   Mon Jul 13 04:35:13 2026
+++ pkgsrc/audio/aeneas/Makefile        Thu Jul 23 17:29:30 2026
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2026/07/13 04:35:13 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2026/07/23 17:29:30 wiz Exp $
 
 DISTNAME=      aeneas-1.7.3
-PKGREVISION=   22
+PKGREVISION=   23
 CATEGORIES=    audio
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=readbeyond/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -11,7 +11,7 @@ HOMEPAGE=     https://github.com/readbeyond/
 COMMENT=       Automagically synchronize audio and text
 LICENSE=       gnu-agpl-v3
 
-TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools>=78:../../devel/py-setuptools
 DEPENDS+=      ${PYPKGPREFIX}-beautifulsoup4-[0-9]*:../../www/py-beautifulsoup4
 DEPENDS+=      ${PYPKGPREFIX}-lxml-[0-9]*:../../textproc/py-lxml
 DEPENDS+=      ffmpeg6-[0-9]*:../../multimedia/ffmpeg6
@@ -23,11 +23,8 @@ WHEEL_NAME=  ${DISTNAME}.0
 
 PYTHON_VERSIONS_INCOMPATIBLE=  310 311
 
-# Tries to use deprecated numpy.distuils
-# https://github.com/readbeyond/aeneas/issues/312
-#PYTHON_VERSIONS_ACCEPTED=     310 311
-# does not work either
-BROKEN=                "Removes deprecated numpy.distutils"
+# as of 1.7.3
+# 100 failed, 724 passed, 105 warnings
 
 .include "../../lang/python/wheel.mk"
 .include "../../audio/espeak-ng/buildlink3.mk"

Index: pkgsrc/audio/aeneas/PLIST
diff -u pkgsrc/audio/aeneas/PLIST:1.2 pkgsrc/audio/aeneas/PLIST:1.3
--- pkgsrc/audio/aeneas/PLIST:1.2       Wed Mar 13 14:38:12 2024
+++ pkgsrc/audio/aeneas/PLIST   Thu Jul 23 17:29:30 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2024/03/13 14:38:12 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2026/07/23 17:29:30 wiz Exp $
 bin/aeneas_check_setup
 bin/aeneas_convert_syncmap
 bin/aeneas_download
@@ -7,10 +7,10 @@ bin/aeneas_execute_task
 bin/aeneas_plot_waveform
 bin/aeneas_synthesize_text
 bin/aeneas_validate
-${PYSITELIB}/${WHEEL_INFODIR}/LICENSE
 ${PYSITELIB}/${WHEEL_INFODIR}/METADATA
 ${PYSITELIB}/${WHEEL_INFODIR}/RECORD
 ${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
+${PYSITELIB}/${WHEEL_INFODIR}/licenses/LICENSE
 ${PYSITELIB}/${WHEEL_INFODIR}/top_level.txt
 ${PYSITELIB}/aeneas/README.md
 ${PYSITELIB}/aeneas/__init__.py

Index: pkgsrc/audio/aeneas/distinfo
diff -u pkgsrc/audio/aeneas/distinfo:1.4 pkgsrc/audio/aeneas/distinfo:1.5
--- pkgsrc/audio/aeneas/distinfo:1.4    Wed Mar 13 14:38:12 2024
+++ pkgsrc/audio/aeneas/distinfo        Thu Jul 23 17:29:30 2026
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2024/03/13 14:38:12 wiz Exp $
+$NetBSD: distinfo,v 1.5 2026/07/23 17:29:30 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-aeneas_cew_Makefile) = ff06994746419b79da94877066b7d56d00ec9ec8
-SHA1 (patch-setup.py) = 7b79c2847ab3a182a835df5c41d78fa1094471f6
+SHA1 (patch-setup.py) = 8219ba37d1fa536949858d59438981449f1d972a

Index: pkgsrc/audio/aeneas/patches/patch-setup.py
diff -u pkgsrc/audio/aeneas/patches/patch-setup.py:1.2 pkgsrc/audio/aeneas/patches/patch-setup.py:1.3
--- pkgsrc/audio/aeneas/patches/patch-setup.py:1.2      Wed Mar 13 14:38:12 2024
+++ pkgsrc/audio/aeneas/patches/patch-setup.py  Thu Jul 23 17:29:30 2026
@@ -1,10 +1,31 @@
-$NetBSD: patch-setup.py,v 1.2 2024/03/13 14:38:12 wiz Exp $
+$NetBSD: patch-setup.py,v 1.3 2026/07/23 17:29:30 wiz Exp $
+
+Fix for numpy.distutils deprecation from deleted
+upstream bug tracker comment.
+https://github.com/readbeyond/aeneas/issues/312
 
 Always build C extension.
 
 --- setup.py.orig      2017-03-16 12:48:53.000000000 +0000
 +++ setup.py
-@@ -234,7 +234,7 @@ EXTENSION_CEW = Extension(
+@@ -187,7 +187,6 @@ try:
+ # try importing numpy: if it fails, warn user and exit
+ try:
+     from numpy import get_include
+-    from numpy.distutils import misc_util
+ except ImportError:
+     print("[ERRO] You must install numpy before installing aeneas")
+     print("[INFO] Try the following command:")
+@@ -195,7 +194,7 @@ except ImportError:
+     sys.exit(1)
+ 
+ # to compile cdtw and cmfcc, we need to include the NumPy dirs
+-INCLUDE_DIRS = [misc_util.get_numpy_include_dirs()]
++INCLUDE_DIRS = [get_include()]
+ 
+ # scripts to be installed globally
+ # on Linux and Mac OS X, use the file without extension
+@@ -234,7 +233,7 @@ EXTENSION_CEW = Extension(
          "aeneas/cew/cew_func.c"
      ],
      libraries=[
@@ -13,7 +34,7 @@ Always build C extension.
      ]
  )
  EXTENSION_CFW = Extension(
-@@ -297,7 +297,7 @@ elif FORCE_CEW:
+@@ -297,7 +296,7 @@ else:
      print("[INFO] ")
      EXTENSIONS.append(EXTENSION_CEW)
  else: