pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/audio/aubio
Module Name: pkgsrc
Committed By: adam
Date: Sun Oct 11 07:51:10 UTC 2026
Modified Files:
pkgsrc/audio/aubio: Makefile distinfo options.mk
Added Files:
pkgsrc/audio/aubio/patches: patch-waflib_ConfigSet.py
patch-waflib_Context.py
Log Message:
aubio: allow building with Python 3.11+
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 pkgsrc/audio/aubio/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/audio/aubio/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/audio/aubio/options.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/aubio/patches/patch-waflib_ConfigSet.py \
pkgsrc/audio/aubio/patches/patch-waflib_Context.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/aubio/Makefile
diff -u pkgsrc/audio/aubio/Makefile:1.43 pkgsrc/audio/aubio/Makefile:1.44
--- pkgsrc/audio/aubio/Makefile:1.43 Mon Jul 13 04:35:14 2026
+++ pkgsrc/audio/aubio/Makefile Sun Oct 11 07:51:10 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2026/07/13 04:35:14 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2026/10/11 07:51:10 adam Exp $
DISTNAME= aubio-0.4.9
PKGREVISION= 21
@@ -11,12 +11,12 @@ HOMEPAGE= https://aubio.org/
COMMENT= Extracting annotations from audio signals
LICENSE= gnu-gpl-v2
-TOOL_DEPENDS+= txt2man-[0-9]*:../../converters/txt2man
+TOOL_DEPENDS+= txt2man>=0:../../converters/txt2man
USE_TOOLS+= pkg-config
# avoid loads of html if doxygen is found in host
-TOOLS_PATH.doxygen= ${FALSE}
+TOOLS_PATH.doxygen= false
PKGCONFIG_OVERRIDE+= aubio.pc.in
@@ -24,22 +24,19 @@ WAF_ENV+= DOXYGEN=none
WAF_ENV+= SPHINX=none
WAF_ARGS+= --disable-tests
-TOOL_DEPENDS+= txt2man-[0-9]*:../../converters/txt2man
+TOOL_DEPENDS+= txt2man>=0:../../converters/txt2man
CPPFLAGS.SunOS+= -Du_int8_t=uint8_t -Du_int16_t=uint16_t -Du_int32_t=uint32_t -Du_int64_t=uint64_t
-# No module named 'imp'
-# https://github.com/aubio/aubio/issues/394
-PYTHON_VERSIONS_ACCEPTED= 310
PYTHON_FOR_BUILD_ONLY= tool
.include "options.mk"
-.include "../../devel/waf/waf.mk"
+
.include "../../audio/libsamplerate/buildlink3.mk"
.include "../../audio/libsndfile/buildlink3.mk"
.include "../../devel/swig/buildlink3.mk"
-.include "../../multimedia/ffmpeg4/buildlink3.mk"
-.include "../../lang/python/application.mk"
+.include "../../devel/waf/waf.mk"
.include "../../lang/python/pyversion.mk"
.include "../../math/fftw/buildlink3.mk"
+.include "../../multimedia/ffmpeg4/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/audio/aubio/distinfo
diff -u pkgsrc/audio/aubio/distinfo:1.6 pkgsrc/audio/aubio/distinfo:1.7
--- pkgsrc/audio/aubio/distinfo:1.6 Tue Oct 26 09:58:47 2021
+++ pkgsrc/audio/aubio/distinfo Sun Oct 11 07:51:10 2026
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.6 2021/10/26 09:58:47 nia Exp $
+$NetBSD: distinfo,v 1.7 2026/10/11 07:51:10 adam Exp $
BLAKE2s (aubio-0.4.9.tar.bz2) = 4ad2fbc00f1fa6cfa726b97344c66d8a7751529dc51743ac2066dc3644691f4e
SHA512 (aubio-0.4.9.tar.bz2) = 0cb81bb4b15051db3f3f4d160d500af56fdfb237e0a74e3f366f53c2870030aa0a7cee8469a611a9694c36b8866d3d42ffb48241c999de08f3fee43e6d903130
Size (aubio-0.4.9.tar.bz2) = 397604 bytes
SHA1 (patch-scripts_build__apple__frameworks) = d29858886b61dc2194e228c6113fbc6a54577b45
+SHA1 (patch-waflib_ConfigSet.py) = c487bea6c08ec8295722fda423b377fb0853fa83
+SHA1 (patch-waflib_Context.py) = 5d2f2fd4177fcfbf2d868f25fea469635d6efa00
Index: pkgsrc/audio/aubio/options.mk
diff -u pkgsrc/audio/aubio/options.mk:1.2 pkgsrc/audio/aubio/options.mk:1.3
--- pkgsrc/audio/aubio/options.mk:1.2 Sat Nov 2 21:09:12 2019
+++ pkgsrc/audio/aubio/options.mk Sun Oct 11 07:51:10 2026
@@ -1,5 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2019/11/02 21:09:12 rillig Exp $
-#
+# $NetBSD: options.mk,v 1.3 2026/10/11 07:51:10 adam Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.aubio
PKG_SUPPORTED_OPTIONS= jack alsa
Added files:
Index: pkgsrc/audio/aubio/patches/patch-waflib_ConfigSet.py
diff -u /dev/null pkgsrc/audio/aubio/patches/patch-waflib_ConfigSet.py:1.1
--- /dev/null Sun Oct 11 07:51:11 2026
+++ pkgsrc/audio/aubio/patches/patch-waflib_ConfigSet.py Sun Oct 11 07:51:10 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-waflib_ConfigSet.py,v 1.1 2026/10/11 07:51:10 adam Exp $
+
+Allow building with Python 3.11+.
+
+--- waflib/ConfigSet.py.orig 2026-10-11 07:39:17.319048166 +0000
++++ waflib/ConfigSet.py
+@@ -146,7 +146,7 @@ class ConfigSet(object):
+ Utils.writef(filename,''.join(buf))
+ def load(self,filename):
+ tbl=self.table
+- code=Utils.readf(filename,m='rU')
++ code=Utils.readf(filename,m='r')
+ for m in re_imp.finditer(code):
+ g=m.group
+ tbl[g(2)]=eval(g(3))
Index: pkgsrc/audio/aubio/patches/patch-waflib_Context.py
diff -u /dev/null pkgsrc/audio/aubio/patches/patch-waflib_Context.py:1.1
--- /dev/null Sun Oct 11 07:51:11 2026
+++ pkgsrc/audio/aubio/patches/patch-waflib_Context.py Sun Oct 11 07:51:10 2026
@@ -0,0 +1,36 @@
+$NetBSD: patch-waflib_Context.py,v 1.1 2026/10/11 07:51:10 adam Exp $
+
+Allow building with Python 3.11+.
+
+--- waflib/Context.py.orig 2018-12-23 11:11:54.000000000 +0000
++++ waflib/Context.py
+@@ -2,7 +2,7 @@
+ # encoding: utf-8
+ # WARNING! Do not edit! https://waf.io/book/index.html#_obtaining_the_waf_file
+
+-import os,re,imp,sys
++import os,re,sys,types
+ from waflib import Utils,Errors,Logs
+ import waflib.Node
+ HEXVERSION=0x2000e00
+@@ -106,7 +106,7 @@ class Context(ctx):
+ cache[node]=True
+ self.pre_recurse(node)
+ try:
+- function_code=node.read('rU',encoding)
++ function_code=node.read('r',encoding)
+ exec(compile(function_code,node.abspath(),'exec'),self.exec_dict)
+ finally:
+ self.post_recurse(node)
+@@ -344,9 +344,9 @@ def load_module(path,encoding=None):
+ return cache_modules[path]
+ except KeyError:
+ pass
+- module=imp.new_module(WSCRIPT_FILE)
++ module=types.ModuleType(WSCRIPT_FILE)
+ try:
+- code=Utils.readf(path,m='rU',encoding=encoding)
++ code=Utils.readf(path,m='r',encoding=encoding)
+ except EnvironmentError:
+ raise Errors.WafError('Could not read the file %r'%path)
+ module_dir=os.path.dirname(path)
Home |
Main Index |
Thread Index |
Old Index