author | Brian Cameron <brian.cameron@oracle.com> |
Tue, 02 Apr 2013 15:14:34 -0700 | |
changeset 1246 | 164605dfef4e |
permissions | -rw-r--r-- |
1246
164605dfef4e
15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
1 |
This patch is needed to make Python understand it can build the OSS plugin. |
164605dfef4e
15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
2 |
Some OSS ioctls are not supported on Solaris, so they are commented out. |
164605dfef4e
15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
3 |
|
164605dfef4e
15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
4 |
--- Python-2.6.8/Modules/ossaudiodev.c-orig 2012-12-20 12:18:06.404742520 -0600 |
164605dfef4e
15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
5 |
+++ Python-2.6.8/Modules/ossaudiodev.c 2012-12-20 12:21:01.352610160 -0600 |
164605dfef4e
15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
6 |
@@ -1038,6 +1038,7 @@ initossaudiodev(void) |
164605dfef4e
15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
7 |
_EXPORT_INT(m, SOUND_MIXER_MONITOR); |
164605dfef4e
15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
8 |
#endif |
164605dfef4e
15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
9 |
|
164605dfef4e
15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
10 |
+#ifndef __sun |
164605dfef4e
15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
11 |
/* Expose all the ioctl numbers for masochists who like to do this |
164605dfef4e
15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
12 |
stuff directly. */ |
164605dfef4e
15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
13 |
_EXPORT_INT(m, SNDCTL_COPR_HALT); |
164605dfef4e
15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
14 |
@@ -1050,6 +1051,7 @@ initossaudiodev(void) |
164605dfef4e
15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
15 |
_EXPORT_INT(m, SNDCTL_COPR_SENDMSG); |
164605dfef4e
15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
16 |
_EXPORT_INT(m, SNDCTL_COPR_WCODE); |
164605dfef4e
15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
17 |
_EXPORT_INT(m, SNDCTL_COPR_WDATA); |
164605dfef4e
15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
18 |
+#endif |
164605dfef4e
15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
19 |
#ifdef SNDCTL_DSP_BIND_CHANNEL |
164605dfef4e
15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
20 |
_EXPORT_INT(m, SNDCTL_DSP_BIND_CHANNEL); |
164605dfef4e
15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
21 |
#endif |
164605dfef4e
15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
22 |
@@ -1071,8 +1073,12 @@ initossaudiodev(void) |
164605dfef4e
15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
23 |
_EXPORT_INT(m, SNDCTL_DSP_GETSPDIF); |
164605dfef4e
15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
24 |
#endif |
164605dfef4e
15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
25 |
_EXPORT_INT(m, SNDCTL_DSP_GETTRIGGER); |
164605dfef4e
15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
26 |
+#ifdef SNDCTL_DSP_MAPINBUF |
164605dfef4e
15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
27 |
_EXPORT_INT(m, SNDCTL_DSP_MAPINBUF); |
164605dfef4e
15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
28 |
+#endif |
164605dfef4e
15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
29 |
+#ifdef SNDCTL_DSP_MAPOUTBUF |
164605dfef4e
15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
30 |
_EXPORT_INT(m, SNDCTL_DSP_MAPOUTBUF); |
164605dfef4e
15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
31 |
+#endif |
164605dfef4e
15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
32 |
_EXPORT_INT(m, SNDCTL_DSP_NONBLOCK); |
164605dfef4e
15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
33 |
_EXPORT_INT(m, SNDCTL_DSP_POST); |
164605dfef4e
15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
34 |
#ifdef SNDCTL_DSP_PROFILE |
164605dfef4e
15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
35 |
@@ -1092,6 +1098,7 @@ initossaudiodev(void) |
164605dfef4e
15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
36 |
_EXPORT_INT(m, SNDCTL_DSP_STEREO); |
164605dfef4e
15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
37 |
_EXPORT_INT(m, SNDCTL_DSP_SUBDIVIDE); |
164605dfef4e
15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
38 |
_EXPORT_INT(m, SNDCTL_DSP_SYNC); |
164605dfef4e
15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
39 |
+#ifndef __sun |
164605dfef4e
15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
40 |
_EXPORT_INT(m, SNDCTL_FM_4OP_ENABLE); |
164605dfef4e
15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
41 |
_EXPORT_INT(m, SNDCTL_FM_LOAD_INSTR); |
164605dfef4e
15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
42 |
_EXPORT_INT(m, SNDCTL_MIDI_INFO); |
164605dfef4e
15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
43 |
@@ -1133,4 +1140,5 @@ initossaudiodev(void) |
164605dfef4e
15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
44 |
_EXPORT_INT(m, SNDCTL_TMR_STOP); |
164605dfef4e
15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
45 |
_EXPORT_INT(m, SNDCTL_TMR_TEMPO); |
164605dfef4e
15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
46 |
_EXPORT_INT(m, SNDCTL_TMR_TIMEBASE); |
164605dfef4e
15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
47 |
+#endif |
164605dfef4e
15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
48 |
} |
164605dfef4e
15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
49 |
--- Python-2.6.8/setup.py-orig 2012-12-20 12:18:00.466612795 -0600 |
164605dfef4e
15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
50 |
+++ Python-2.6.8/setup.py 2012-12-20 12:18:54.828151818 -0600 |
164605dfef4e
15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
51 |
@@ -1518,7 +1518,7 @@ class PyBuildExt(build_ext): |
164605dfef4e
15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
52 |
else: |
164605dfef4e
15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
53 |
missing.append('linuxaudiodev') |
164605dfef4e
15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
54 |
|
164605dfef4e
15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
55 |
- if platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6', |
164605dfef4e
15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
56 |
+ if platform in ('sunos5', 'linux2', 'freebsd4', 'freebsd5', 'freebsd6', |
164605dfef4e
15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
57 |
'freebsd7', 'freebsd8'): |
164605dfef4e
15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
58 |
exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) ) |
164605dfef4e
15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff
changeset
|
59 |
else: |