components/python/python26/patches/Python26-29-ossaudiodev.patch
author Brian Cameron <brian.cameron@oracle.com>
Tue, 02 Apr 2013 15:14:34 -0700
changeset 1246 164605dfef4e
permissions -rw-r--r--
15799279 - Some Python 2.6 and 2.7 "gmake test" tests fail 15713641 - Unexpected shebang in /usr/lib/python2.6/test/test_pep263.py 15620181 - pyCC injects CC pro incompatible flags RTI: 373415

This patch is needed to make Python understand it can build the OSS plugin.
Some OSS ioctls are not supported on Solaris, so they are commented out.

--- Python-2.6.8/Modules/ossaudiodev.c-orig	2012-12-20 12:18:06.404742520 -0600
+++ Python-2.6.8/Modules/ossaudiodev.c	2012-12-20 12:21:01.352610160 -0600
@@ -1038,6 +1038,7 @@ initossaudiodev(void)
     _EXPORT_INT(m, SOUND_MIXER_MONITOR);
 #endif
 
+#ifndef __sun
     /* Expose all the ioctl numbers for masochists who like to do this
        stuff directly. */
     _EXPORT_INT(m, SNDCTL_COPR_HALT);
@@ -1050,6 +1051,7 @@ initossaudiodev(void)
     _EXPORT_INT(m, SNDCTL_COPR_SENDMSG);
     _EXPORT_INT(m, SNDCTL_COPR_WCODE);
     _EXPORT_INT(m, SNDCTL_COPR_WDATA);
+#endif
 #ifdef SNDCTL_DSP_BIND_CHANNEL
     _EXPORT_INT(m, SNDCTL_DSP_BIND_CHANNEL);
 #endif
@@ -1071,8 +1073,12 @@ initossaudiodev(void)
     _EXPORT_INT(m, SNDCTL_DSP_GETSPDIF);
 #endif
     _EXPORT_INT(m, SNDCTL_DSP_GETTRIGGER);
+#ifdef SNDCTL_DSP_MAPINBUF
     _EXPORT_INT(m, SNDCTL_DSP_MAPINBUF);
+#endif
+#ifdef SNDCTL_DSP_MAPOUTBUF
     _EXPORT_INT(m, SNDCTL_DSP_MAPOUTBUF);
+#endif
     _EXPORT_INT(m, SNDCTL_DSP_NONBLOCK);
     _EXPORT_INT(m, SNDCTL_DSP_POST);
 #ifdef SNDCTL_DSP_PROFILE
@@ -1092,6 +1098,7 @@ initossaudiodev(void)
     _EXPORT_INT(m, SNDCTL_DSP_STEREO);
     _EXPORT_INT(m, SNDCTL_DSP_SUBDIVIDE);
     _EXPORT_INT(m, SNDCTL_DSP_SYNC);
+#ifndef __sun
     _EXPORT_INT(m, SNDCTL_FM_4OP_ENABLE);
     _EXPORT_INT(m, SNDCTL_FM_LOAD_INSTR);
     _EXPORT_INT(m, SNDCTL_MIDI_INFO);
@@ -1133,4 +1140,5 @@ initossaudiodev(void)
     _EXPORT_INT(m, SNDCTL_TMR_STOP);
     _EXPORT_INT(m, SNDCTL_TMR_TEMPO);
     _EXPORT_INT(m, SNDCTL_TMR_TIMEBASE);
+#endif
 }
--- Python-2.6.8/setup.py-orig	2012-12-20 12:18:00.466612795 -0600
+++ Python-2.6.8/setup.py	2012-12-20 12:18:54.828151818 -0600
@@ -1518,7 +1518,7 @@ class PyBuildExt(build_ext):
         else:
             missing.append('linuxaudiodev')
 
-        if platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6',
+        if platform in ('sunos5', 'linux2', 'freebsd4', 'freebsd5', 'freebsd6',
                         'freebsd7', 'freebsd8'):
             exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
         else: