make it work again (after changes to libao and Python)

4 files changed, 59 insertions, 8 deletions

diff --git a/audio/py-ao/Makefile b/audio/py-ao/Makefile
index 9893c494d98..848183aaa18 100644
--- a/audio/py-ao/Makefile
+++ b/audio/py-ao/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2008/06/12 02:14:14 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2010/05/19 21:00:02 drochner Exp $
 #
 
-DISTNAME=		pyao-0.81
+DISTNAME=		pyao-0.82
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=		3
 CATEGORIES=		audio python
-MASTER_SITES=		http://vorbis.com/files/1.0.1/unix/py/
+MASTER_SITES=		http://ekyo.nerim.net/software/pyogg/
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://vorbis.com/
diff --git a/audio/py-ao/distinfo b/audio/py-ao/distinfo
index 7f842942841..c3287a3a773 100644
--- a/audio/py-ao/distinfo
+++ b/audio/py-ao/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 20:39:50 agc Exp $
+$NetBSD: distinfo,v 1.3 2010/05/19 21:00:02 drochner Exp $
 
-SHA1 (pyao-0.81.tar.gz) = 56b453fdf6d628ccb283a2c9ffa4fced96afc32c
-RMD160 (pyao-0.81.tar.gz) = f171e3ed06184e79671ef9c3e2736b56c218d5c8
-Size (pyao-0.81.tar.gz) = 15302 bytes
+SHA1 (pyao-0.82.tar.gz) = 9b213da96030648a5fa589d5eab7e1791374e269
+RMD160 (pyao-0.82.tar.gz) = 6d602ef060ddc22b4cff841741c90fa88af45fed
+Size (pyao-0.82.tar.gz) = 15399 bytes
+SHA1 (patch-aa) = 6822564d118285470a5e4fd3dc7dcda250dc869a
+SHA1 (patch-ab) = 40aa185bbf638a09a8e55a9cea6e7a0fdfdfb7a2
diff --git a/audio/py-ao/patches/patch-aa b/audio/py-ao/patches/patch-aa
new file mode 100644
index 00000000000..18d73107710
--- /dev/null
+++ b/audio/py-ao/patches/patch-aa
@@ -0,0 +1,38 @@
+$NetBSD: patch-aa,v 1.1 2010/05/19 21:00:02 drochner Exp $
+
+--- src/aomodule.c.orig	2003-07-24 06:52:59.000000000 +0000
++++ src/aomodule.c
+@@ -64,6 +64,7 @@ parse_args(PyObject *args, PyObject *kwa
+   assert(overwrite != NULL);
+ 
+   /* Set the default values */
++  memset(format, 0, sizeof(*format));
+   format->bits = 16;
+   format->rate = 44100;
+   format->channels = 2;
+@@ -143,6 +144,7 @@ py_ao_new(PyObject *self, PyObject *args
+ 
+   retobj = (ao_Object *) PyObject_NEW(ao_Object, &ao_Type);
+   retobj->dev = dev;
++  retobj->driver_id = driver_id;
+   return (PyObject *) retobj;
+ }
+ 
+@@ -150,7 +152,7 @@ static void
+ py_ao_dealloc(ao_Object *self)
+ {
+   ao_close(self->dev);
+-  PyMem_DEL(self);
++  PyObject_DEL(self);
+ }
+ 
+ static PyObject *
+@@ -184,7 +186,7 @@ py_ao_driver_info(PyObject *self, PyObje
+ 
+     /* It's a method */
+     ao_Object *ao_self = (ao_Object *) self;
+-    info = ao_driver_info(ao_self->dev->driver_id);
++    info = ao_driver_info(ao_self->driver_id);
+ 
+   } else {
+ 
diff --git a/audio/py-ao/patches/patch-ab b/audio/py-ao/patches/patch-ab
new file mode 100644
index 00000000000..a4f5cccc131
--- /dev/null
+++ b/audio/py-ao/patches/patch-ab
@@ -0,0 +1,12 @@
+$NetBSD: patch-ab,v 1.1 2010/05/19 21:00:02 drochner Exp $
+
+--- src/aomodule.h.orig	2003-07-24 06:58:07.000000000 +0000
++++ src/aomodule.h
+@@ -9,6 +9,7 @@
+ typedef struct {
+   PyObject_HEAD
+   ao_device *dev;
++  int driver_id;
+ } ao_Object;
+ 
+ static PyObject *Py_aoError;