Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=600717d9fb40d343d5266fa4ad9fc34ec328a37d
commit 600717d9fb40d343d5266fa4ad9fc34ec328a37d Author: Devil505 <[email protected]> Date: Sun Aug 21 17:02:56 2011 +0200 pyao-0.82-6-i686 * added patch to fix build diff --git a/source/devel-extra/pyao/FrugalBuild b/source/devel-extra/pyao/FrugalBuild index 9670f40..0299f00 100644 --- a/source/devel-extra/pyao/FrugalBuild +++ b/source/devel-extra/pyao/FrugalBuild @@ -3,18 +3,20 @@ pkgname=pyao pkgver=0.82 -pkgrel=5 +pkgrel=6 pkgdesc="python bindings for the ao library" url="http://ekyo.nerim.net/software/pyogg/index.html" depends=('python' 'libao>=1.1.0') groups=('devel-extra') archs=('i686' 'x86_64') up2date="lynx -dump http://ekyo.nerim.net/software/pyogg/index.html | grep -m1 pyao | sed 's/.*o-\(.*\).t.*/\1/'" -source=(http://ekyo.nerim.net/software/pyogg/$pkgname-$pkgver.tar.gz) -sha1sums=('9b213da96030648a5fa589d5eab7e1791374e269') +source=(http://ekyo.nerim.net/software/pyogg/$pkgname-$pkgver.tar.gz pyao-0.82-gentoo.diff) +sha1sums=('9b213da96030648a5fa589d5eab7e1791374e269' \ + '31a43aec79ef6b305ca550eebe88c87763c02580') build() { Fcd + Fpatchall ./config_unix.py --prefix=$Fdestdir/usr || return 1 python setup.py install --prefix=$Fdestdir/usr || return 1 } diff --git a/source/devel-extra/pyao/pyao-0.82-gentoo.diff b/source/devel-extra/pyao/pyao-0.82-gentoo.diff new file mode 100644 index 0000000..7a77d0a --- /dev/null +++ b/source/devel-extra/pyao/pyao-0.82-gentoo.diff @@ -0,0 +1,71 @@ +http://bugs.gentoo.org/314627 +http://bugs.gentoo.org/257550 + +--- src/aomodule.c ++++ src/aomodule.c +@@ -4,7 +4,7 @@ + static ao_option * + dict_to_options(PyObject *dict) + { +- int pos = 0; ++ Py_ssize_t pos = 0; + PyObject *key, *val; + ao_option *head = NULL; + int ret; +@@ -71,7 +71,7 @@ + + *overwrite = 0; + +- if(PyArg_ParseTupleAndKeywords(args, kwargs, "s|llllO!sl", ++ if(PyArg_ParseTupleAndKeywords(args, kwargs, "s|iiiiO!si", + (char **) driver_name_kwlist, + &driver_name, + &format->bits, +@@ -84,7 +84,7 @@ + *driver_id = ao_driver_id(driver_name); + } else { + PyErr_Clear(); +- if(!(PyArg_ParseTupleAndKeywords(args, kwargs, "i|llllO!sl", ++ if(!(PyArg_ParseTupleAndKeywords(args, kwargs, "i|iiiiO!si", + (char **) driver_id_kwlist, + driver_id, + &format->bits, +@@ -141,8 +141,9 @@ + return NULL; + } + +- retobj = (ao_Object *) PyObject_NEW(ao_Object, &ao_Type); ++ retobj = (ao_Object *) PyObject_New(ao_Object, &ao_Type); + retobj->dev = dev; ++ retobj->driver_id = driver_id; + return (PyObject *) retobj; + } + +@@ -150,7 +151,7 @@ + py_ao_dealloc(ao_Object *self) + { + ao_close(self->dev); +- PyMem_DEL(self); ++ PyObject_Del(self); + } + + static PyObject * +@@ -184,7 +185,7 @@ + + /* 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 { + +--- src/aomodule.h ++++ src/aomodule.h +@@ -9,6 +9,7 @@ + typedef struct { + PyObject_HEAD + ao_device *dev; ++ uint32_t driver_id; + } ao_Object; + + static PyObject *Py_aoError; _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
