author | John Beck <John.Beck@Oracle.COM> |
Wed, 25 Feb 2015 20:44:31 -0800 | |
branch | s11-update |
changeset 3876 | da37433d5103 |
parent 3786 | fa9d2da4d216 |
child 5229 | b7b91ddbbdce |
permissions | -rw-r--r-- |
3778 | 1 |
This patch is needed to make Python understand it can build the OSS plugin. |
2 |
Some OSS ioctls are not supported on Solaris, so they are ifdef'd out. As |
|
3 |
the patch is Solaris-specific, it is not suitable for upstream. |
|
4 |
||
3876
da37433d5103
20605341 update Python to 3.4.3
John Beck <John.Beck@Oracle.COM>
parents:
3786
diff
changeset
|
5 |
--- Python-3.4.3/setup.py.~6~ 2015-02-25 08:25:07.739704118 -0800 |
da37433d5103
20605341 update Python to 3.4.3
John Beck <John.Beck@Oracle.COM>
parents:
3786
diff
changeset
|
6 |
+++ Python-3.4.3/setup.py 2015-02-25 08:25:07.807400186 -0800 |
da37433d5103
20605341 update Python to 3.4.3
John Beck <John.Beck@Oracle.COM>
parents:
3786
diff
changeset
|
7 |
@@ -1596,7 +1596,7 @@ |
3778 | 8 |
# End multiprocessing |
9 |
||
10 |
# Platform-specific libraries |
|
11 |
- if host_platform.startswith(('linux', 'freebsd', 'gnukfreebsd')): |
|
12 |
+ if host_platform.startswith(('sunos5', 'linux', 'freebsd', 'gnukfreebsd')): |
|
13 |
exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) ) |
|
14 |
else: |
|
15 |
missing.append('ossaudiodev') |
|
16 |
--- Python-3.4.0/Modules/ossaudiodev.c.~1~ 2014-03-16 19:31:31.000000000 -0700 |
|
17 |
+++ Python-3.4.0/Modules/ossaudiodev.c 2014-03-17 13:48:16.395254733 -0700 |
|
18 |
@@ -1211,6 +1211,7 @@ |
|
19 |
_EXPORT_INT(m, SOUND_MIXER_MONITOR); |
|
20 |
#endif |
|
21 |
||
22 |
+#ifndef __sun |
|
23 |
/* Expose all the ioctl numbers for masochists who like to do this |
|
24 |
stuff directly. */ |
|
25 |
_EXPORT_INT(m, SNDCTL_COPR_HALT); |
|
26 |
@@ -1223,6 +1224,7 @@ |
|
27 |
_EXPORT_INT(m, SNDCTL_COPR_SENDMSG); |
|
28 |
_EXPORT_INT(m, SNDCTL_COPR_WCODE); |
|
29 |
_EXPORT_INT(m, SNDCTL_COPR_WDATA); |
|
30 |
+#endif |
|
31 |
#ifdef SNDCTL_DSP_BIND_CHANNEL |
|
32 |
_EXPORT_INT(m, SNDCTL_DSP_BIND_CHANNEL); |
|
33 |
#endif |
|
34 |
@@ -1244,8 +1246,12 @@ |
|
35 |
_EXPORT_INT(m, SNDCTL_DSP_GETSPDIF); |
|
36 |
#endif |
|
37 |
_EXPORT_INT(m, SNDCTL_DSP_GETTRIGGER); |
|
38 |
+#ifdef SNDCTL_DSP_MAPINBUF |
|
39 |
_EXPORT_INT(m, SNDCTL_DSP_MAPINBUF); |
|
40 |
+#endif |
|
41 |
+#ifdef SNDCTL_DSP_MAPOUTBUF |
|
42 |
_EXPORT_INT(m, SNDCTL_DSP_MAPOUTBUF); |
|
43 |
+#endif |
|
44 |
_EXPORT_INT(m, SNDCTL_DSP_NONBLOCK); |
|
45 |
_EXPORT_INT(m, SNDCTL_DSP_POST); |
|
46 |
#ifdef SNDCTL_DSP_PROFILE |
|
47 |
@@ -1265,6 +1271,7 @@ |
|
48 |
_EXPORT_INT(m, SNDCTL_DSP_STEREO); |
|
49 |
_EXPORT_INT(m, SNDCTL_DSP_SUBDIVIDE); |
|
50 |
_EXPORT_INT(m, SNDCTL_DSP_SYNC); |
|
51 |
+#ifndef __sun |
|
52 |
_EXPORT_INT(m, SNDCTL_FM_4OP_ENABLE); |
|
53 |
_EXPORT_INT(m, SNDCTL_FM_LOAD_INSTR); |
|
54 |
_EXPORT_INT(m, SNDCTL_MIDI_INFO); |
|
55 |
@@ -1306,5 +1313,6 @@ |
|
56 |
_EXPORT_INT(m, SNDCTL_TMR_STOP); |
|
57 |
_EXPORT_INT(m, SNDCTL_TMR_TEMPO); |
|
58 |
_EXPORT_INT(m, SNDCTL_TMR_TIMEBASE); |
|
59 |
+#endif |
|
60 |
return m; |
|
61 |
} |