Thu Apr 28 19:23:21 2016 UTC ()
Fix building with Python 3.x.


(adam)
diff -r1.8 -r1.9 pkgsrc/audio/py-audiotools/distinfo
diff -r0 -r1.1 pkgsrc/audio/py-audiotools/patches/patch-src_output_core__audio.c
diff -r1.1 -r1.2 pkgsrc/audio/py-audiotools/patches/patch-src_samplerate_src__sinc.c
cvs diff -r1.8 -r1.9 pkgsrc/audio/py-audiotools/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/py-audiotools/Attic/distinfo 2015/11/04 16:45:52 1.8
+++ pkgsrc/audio/py-audiotools/Attic/distinfo 2016/04/28 19:23:21 1.9
@@ -1,8 +1,9 @@ @@ -1,8 +1,9 @@
1$NetBSD: distinfo,v 1.8 2015/11/04 16:45:52 adam Exp $ 1$NetBSD: distinfo,v 1.9 2016/04/28 19:23:21 adam Exp $
2 2
3SHA1 (audiotools-3.1.1.tar.gz) = 61e9107acd0c2d0630de1bf099a170254119c253 3SHA1 (audiotools-3.1.1.tar.gz) = 61e9107acd0c2d0630de1bf099a170254119c253
4RMD160 (audiotools-3.1.1.tar.gz) = 86436a2e6d80b35153168699a2bd32299ed1a254 4RMD160 (audiotools-3.1.1.tar.gz) = 86436a2e6d80b35153168699a2bd32299ed1a254
5SHA512 (audiotools-3.1.1.tar.gz) = dfba0dab8ef1573a12366bb4d46552eeb6c23c4abde34d9df51238fc97f573135b564cc3e5dbcaf7691c4502d8173dc926d8eb5ecd169fe619278ae89ff24c3a 5SHA512 (audiotools-3.1.1.tar.gz) = dfba0dab8ef1573a12366bb4d46552eeb6c23c4abde34d9df51238fc97f573135b564cc3e5dbcaf7691c4502d8173dc926d8eb5ecd169fe619278ae89ff24c3a
6Size (audiotools-3.1.1.tar.gz) = 6325408 bytes 6Size (audiotools-3.1.1.tar.gz) = 6325408 bytes
7SHA1 (patch-src_cdiomodule.h) = f7624e9c0923dfeceb422039a711e95697548e5a 7SHA1 (patch-src_cdiomodule.h) = f7624e9c0923dfeceb422039a711e95697548e5a
8SHA1 (patch-src_samplerate_src__sinc.c) = c069c78096f444fc686f5ea6d5319a6e5ed458d1 8SHA1 (patch-src_output_core__audio.c) = 24b2c727ccefc859a1a728f1a04eba1cb1736a41
 9SHA1 (patch-src_samplerate_src__sinc.c) = a888e23da6dd5dc4628eb3adfc53c66c2ef1e5e1
File Added: pkgsrc/audio/py-audiotools/patches/Attic/patch-src_output_core__audio.c
$NetBSD: patch-src_output_core__audio.c,v 1.1 2016/04/28 19:23:21 adam Exp $

Fix building with Python 3.x.

--- src/output/core_audio.c.orig	2015-10-31 21:51:57.000000000 +0000
+++ src/output/core_audio.c
@@ -95,31 +95,10 @@ CoreAudio_init(output_CoreAudio *self, P
           at init-time, we'll need to temporarily redirect
           stdout to /dev/null*/
 
-        /*first, determine the location of /dev/null from os.devnull*/
-        if ((os_module_obj = PyImport_ImportModule("os")) == NULL) {
-            return -1;
-        }
-        if ((devnull_obj =
-             PyObject_GetAttrString(os_module_obj, "devnull")) == NULL) {
-            Py_DECREF(os_module_obj);
-            return -1;
-        }
-        if ((devnull = PyString_AsString(devnull_obj)) == NULL) {
-            Py_DECREF(os_module_obj);
-            Py_DECREF(devnull_obj);
-            return -1;
-        }
-
         /*open /dev/null*/
-        if ((devnull_stdout = open(devnull, O_WRONLY | O_TRUNC)) == -1) {
-            Py_DECREF(os_module_obj);
-            Py_DECREF(devnull_obj);
+        if ((devnull_stdout = open("/dev/null", O_WRONLY | O_TRUNC)) == -1) {
             PyErr_SetFromErrno(PyExc_IOError);
             return -1;
-        } else {
-            /*close unneeded Python objects once descriptor is open*/
-            Py_DECREF(os_module_obj);
-            Py_DECREF(devnull_obj);
         }
 
         /*swap file descriptors*/
cvs diff -r1.1 -r1.2 pkgsrc/audio/py-audiotools/patches/Attic/patch-src_samplerate_src__sinc.c (expand / switch to unified diff)

--- pkgsrc/audio/py-audiotools/patches/Attic/patch-src_samplerate_src__sinc.c 2014/02/24 13:05:39 1.1
+++ pkgsrc/audio/py-audiotools/patches/Attic/patch-src_samplerate_src__sinc.c 2016/04/28 19:23:21 1.2
@@ -1,15 +1,16 @@ @@ -1,15 +1,16 @@
1$NetBSD: patch-src_samplerate_src__sinc.c,v 1.1 2014/02/24 13:05:39 wiedi Exp $ 1$NetBSD: patch-src_samplerate_src__sinc.c,v 1.2 2016/04/28 19:23:21 adam Exp $
2 2
3Needed for int32_t on SunOS 3Needed for int32_t on SunOS
 4
4--- src/samplerate/src_sinc.c.orig 2013-08-19 23:51:25.000000000 +0000 5--- src/samplerate/src_sinc.c.orig 2013-08-19 23:51:25.000000000 +0000
5+++ src/samplerate/src_sinc.c 6+++ src/samplerate/src_sinc.c
6@@ -26,6 +26,9 @@ 7@@ -26,6 +26,9 @@
7 #include <stdio.h> 8 #include <stdio.h>
8 #include <stdlib.h> 9 #include <stdlib.h>
9 #include <string.h> 10 #include <string.h>
10+#if defined(__sun) 11+#if defined(__sun)
11+#include <sys/types.h> 12+#include <sys/types.h>
12+#endif 13+#endif
13  14
14 #include "float_cast.h" 15 #include "float_cast.h"
15 #include "common.h" 16 #include "common.h"