components/python/python27/patches/16-ossaudiodev.patch
author John Beck <John.Beck@Oracle.COM>
Tue, 29 Jul 2014 08:41:01 -0700
changeset 2028 6fa8f5812e20
parent 1954 32663e59626d
child 3555 76f4672c5e4b
permissions -rw-r--r--
19308541 update Python 2.7 line to version 2.7.8 19284990 python 2.7.7 segfaults while under memory stress
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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.  
1954
32663e59626d 19004605 update Python 2.7 line to version 2.7.7
John Beck <John.Beck@Oracle.COM>
parents: 1914
diff changeset
     2
Some OSS ioctls are not supported on Solaris, so they are ifdef'f out.  As
32663e59626d 19004605 update Python 2.7 line to version 2.7.7
John Beck <John.Beck@Oracle.COM>
parents: 1914
diff changeset
     3
the patch is Solaris-specific, it is not suitable for upstream.
1246
164605dfef4e 15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff changeset
     4
1954
32663e59626d 19004605 update Python 2.7 line to version 2.7.7
John Beck <John.Beck@Oracle.COM>
parents: 1914
diff changeset
     5
--- Python-2.7.7/Modules/ossaudiodev.c.~1~	2014-05-31 11:58:40.000000000 -0700
32663e59626d 19004605 update Python 2.7 line to version 2.7.7
John Beck <John.Beck@Oracle.COM>
parents: 1914
diff changeset
     6
+++ Python-2.7.7/Modules/ossaudiodev.c	2014-06-02 10:58:12.132478970 -0700
32663e59626d 19004605 update Python 2.7 line to version 2.7.7
John Beck <John.Beck@Oracle.COM>
parents: 1914
diff changeset
     7
@@ -1037,6 +1037,7 @@
1246
164605dfef4e 15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff changeset
     8
     _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
     9
 #endif
164605dfef4e 15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff changeset
    10
 
164605dfef4e 15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff changeset
    11
+#ifndef __sun
164605dfef4e 15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff changeset
    12
     /* 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
    13
        stuff directly. */
164605dfef4e 15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff changeset
    14
     _EXPORT_INT(m, SNDCTL_COPR_HALT);
1954
32663e59626d 19004605 update Python 2.7 line to version 2.7.7
John Beck <John.Beck@Oracle.COM>
parents: 1914
diff changeset
    15
@@ -1049,6 +1050,7 @@
1246
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_SENDMSG);
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_WCODE);
164605dfef4e 15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff changeset
    18
     _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
    19
+#endif
164605dfef4e 15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff changeset
    20
 #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
    21
     _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
    22
 #endif
1954
32663e59626d 19004605 update Python 2.7 line to version 2.7.7
John Beck <John.Beck@Oracle.COM>
parents: 1914
diff changeset
    23
@@ -1070,8 +1072,12 @@
1246
164605dfef4e 15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff changeset
    24
     _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
    25
 #endif
164605dfef4e 15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff changeset
    26
     _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
    27
+#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
    28
     _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
    29
+#endif
164605dfef4e 15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff changeset
    30
+#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
    31
     _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
    32
+#endif
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_NONBLOCK);
164605dfef4e 15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff changeset
    34
     _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
    35
 #ifdef SNDCTL_DSP_PROFILE
1954
32663e59626d 19004605 update Python 2.7 line to version 2.7.7
John Beck <John.Beck@Oracle.COM>
parents: 1914
diff changeset
    36
@@ -1091,6 +1097,7 @@
1246
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_STEREO);
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_SUBDIVIDE);
164605dfef4e 15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff changeset
    39
     _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
    40
+#ifndef __sun
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_4OP_ENABLE);
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_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
    43
     _EXPORT_INT(m, SNDCTL_MIDI_INFO);
1954
32663e59626d 19004605 update Python 2.7 line to version 2.7.7
John Beck <John.Beck@Oracle.COM>
parents: 1914
diff changeset
    44
@@ -1132,4 +1139,5 @@
1246
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_STOP);
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_TEMPO);
164605dfef4e 15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff changeset
    47
     _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
    48
+#endif
164605dfef4e 15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff changeset
    49
 }
2028
6fa8f5812e20 19308541 update Python 2.7 line to version 2.7.8
John Beck <John.Beck@Oracle.COM>
parents: 1954
diff changeset
    50
--- Python-2.7.8/setup.py.~5~	2014-07-17 20:47:50.251398063 -0700
6fa8f5812e20 19308541 update Python 2.7 line to version 2.7.8
John Beck <John.Beck@Oracle.COM>
parents: 1954
diff changeset
    51
+++ Python-2.7.8/setup.py	2014-07-17 20:47:50.359537973 -0700
6fa8f5812e20 19308541 update Python 2.7 line to version 2.7.8
John Beck <John.Beck@Oracle.COM>
parents: 1954
diff changeset
    52
@@ -1638,8 +1638,8 @@
1246
164605dfef4e 15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff changeset
    53
         else:
164605dfef4e 15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff changeset
    54
             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
    55
 
1914
00e8dbcb9b1e PSARC 2014/183 Python 2.7.6
John Beck <John.Beck@Oracle.COM>
parents: 1246
diff changeset
    56
-        if (host_platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6',
00e8dbcb9b1e PSARC 2014/183 Python 2.7.6
John Beck <John.Beck@Oracle.COM>
parents: 1246
diff changeset
    57
-                        'freebsd7', 'freebsd8')
00e8dbcb9b1e PSARC 2014/183 Python 2.7.6
John Beck <John.Beck@Oracle.COM>
parents: 1246
diff changeset
    58
+        if (host_platform in ('sunos5', 'linux2', 'freebsd4', 'freebsd5',
00e8dbcb9b1e PSARC 2014/183 Python 2.7.6
John Beck <John.Beck@Oracle.COM>
parents: 1246
diff changeset
    59
+                        'freebsd6', 'freebsd7', 'freebsd8')
00e8dbcb9b1e PSARC 2014/183 Python 2.7.6
John Beck <John.Beck@Oracle.COM>
parents: 1246
diff changeset
    60
             or host_platform.startswith("gnukfreebsd")):
1246
164605dfef4e 15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail
Brian Cameron <brian.cameron@oracle.com>
parents:
diff changeset
    61
             exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
1914
00e8dbcb9b1e PSARC 2014/183 Python 2.7.6
John Beck <John.Beck@Oracle.COM>
parents: 1246
diff changeset
    62
         else: