On Sat, Aug 07, 2021 at 12:31:40PM +0100, Stuart Henderson wrote:
>
> On 2021/08/07 16:36, Kevin Lo wrote:
> > Here's an update of py-audio to 0.2.11:
> > - 0.2.9 bug fixes related to overflow error handling and IOError exception
> > arguments
> > - 0.2.10 bug fixes related to the Python GIL
> > - 0.2.11 bug fix related to memory management
> >
> > Tested on amd64.
> > ok?
>
> What is the new @conflict for?
Sorry my bad. I tested my ports tree in my repo :( Here's an updated diff:
Index: audio/py-audio/Makefile
===================================================================
RCS file: /cvs/ports/audio/py-audio/Makefile,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 Makefile
--- audio/py-audio/Makefile 4 Jan 2021 14:06:27 -0000 1.9
+++ audio/py-audio/Makefile 7 Aug 2021 13:59:16 -0000
@@ -2,11 +2,10 @@
COMMENT = Python bindings for PortAudio
-MODPY_EGG_VERSION = 0.2.8
-DISTNAME = pyaudio-${MODPY_EGG_VERSION}
-PKGNAME = ${DISTNAME:S/py/py-/}
+MODPY_EGG_VERSION = 0.2.11
+DISTNAME = PyAudio-${MODPY_EGG_VERSION}
+PKGNAME = py-audio-${MODPY_EGG_VERSION}
CATEGORIES = audio devel
-REVISION = 3
HOMEPAGE = http://people.csail.mit.edu/hubert/pyaudio/
@@ -15,15 +14,14 @@ PERMIT_PACKAGE = Yes
WANTLIB = portaudio pthread ${MODPY_WANTLIB}
-MASTER_SITES = ${HOMEPAGE}packages/
-
FLAVOR ?=
FLAVORS = python3
MODULES = lang/python
-LIB_DEPENDS = audio/portaudio-svn
+MODPY_PI = Yes
+MODPY_SETUPTOOLS= Yes
-WRKDIST = ${WRKDIR}/PyAudio-${MODPY_EGG_VERSION}
+LIB_DEPENDS = audio/portaudio-svn
.include <bsd.port.mk>
Index: audio/py-audio/distinfo
===================================================================
RCS file: /cvs/ports/audio/py-audio/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- audio/py-audio/distinfo 7 Nov 2014 09:36:28 -0000 1.2
+++ audio/py-audio/distinfo 7 Aug 2021 13:59:16 -0000
@@ -1,2 +1,2 @@
-SHA256 (pyaudio-0.2.8.tar.gz) = T4U2fPeWV2FmhEhwN5V6w4WC7MU4m4lCD+YdkBtxlVE=
-SIZE (pyaudio-0.2.8.tar.gz) = 235900
+SHA256 (PyAudio-0.2.11.tar.gz) = k7/eMOC2TmOkby/XfoXEH9URgqSjQT2e36+f+qJu+3Q=
+SIZE (PyAudio-0.2.11.tar.gz) = 37428
Index: audio/py-audio/patches/patch-setup_py
===================================================================
RCS file: /cvs/ports/audio/py-audio/patches/patch-setup_py,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-setup_py
--- audio/py-audio/patches/patch-setup_py 7 Nov 2014 09:36:28 -0000
1.2
+++ audio/py-audio/patches/patch-setup_py 7 Aug 2021 13:59:16 -0000
@@ -1,10 +1,12 @@
-$OpenBSD: patch-setup_py,v 1.2 2014/11/07 09:36:28 sthen Exp $
---- setup.py.orig Tue Feb 18 00:40:00 2014
-+++ setup.py Fri Nov 7 09:32:43 2014
-@@ -57,7 +57,7 @@ mac_sysroot_path = os.environ.get("SYSROOT_PATH", None
+$OpenBSD$
+
+Index: setup.py
+--- setup.py.orig
++++ setup.py
+@@ -56,7 +56,7 @@ portaudio_path = os.environ.get("PORTAUDIO_PATH", "./p
+ mac_sysroot_path = os.environ.get("SYSROOT_PATH", None)
pyaudio_module_sources = ['src/_portaudiomodule.c']
-
-include_dirs = []
+include_dirs = [os.path.join(os.environ.get('LOCALBASE'), 'include'),]
external_libraries = []
Index: audio/py-audio/pkg/PLIST
===================================================================
RCS file: /cvs/ports/audio/py-audio/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- audio/py-audio/pkg/PLIST 4 Jan 2021 14:06:27 -0000 1.3
+++ audio/py-audio/pkg/PLIST 7 Aug 2021 13:59:16 -0000
@@ -1,5 +1,9 @@
@comment $OpenBSD: PLIST,v 1.3 2021/01/04 14:06:27 sthen Exp $
-lib/python${MODPY_VERSION}/site-packages/PyAudio-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
+lib/python${MODPY_VERSION}/site-packages/PyAudio-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
+lib/python${MODPY_VERSION}/site-packages/PyAudio-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
+lib/python${MODPY_VERSION}/site-packages/PyAudio-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
+lib/python${MODPY_VERSION}/site-packages/PyAudio-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/PyAudio-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}pyaudio.${MODPY_PYC_MAGIC_TAG}pyc
@so
lib/python${MODPY_VERSION}/site-packages/_portaudio.${MODPY_PYC_MAGIC_TAG}so
