the ossaudiodev python module doesn't seem used/useful. It exposes
an os-dependent interface (we're about to drop), which makes python
scripts using it as portable as C code using oss ioctl is.
OK to remove it?
Index: Makefile.inc
===================================================================
RCS file: /cvs/ports/lang/python/Makefile.inc,v
retrieving revision 1.107
diff -u -p -u -p -r1.107 Makefile.inc
--- Makefile.inc 5 Nov 2014 12:09:07 -0000 1.107
+++ Makefile.inc 6 Nov 2014 17:53:03 -0000
@@ -73,9 +73,7 @@ RUN_DEPENDS-main =
WANTLIB-main = bz2 c crypto expat ffi m ncursesw panelw pthread \
readline sqlite3 ssl stdc++ util z \
${MODGETTEXT_WANTLIB}
-.if ${VERSION} == "2.7"
-WANTLIB-main += ossaudio
-.elif ${VERSION} == "3.4"
+.if ${VERSION} == "3.4"
LIB_DEPENDS-main += archivers/xz
WANTLIB-main += lzma
.endif
Index: 2.7/Makefile
===================================================================
RCS file: /cvs/ports/lang/python/2.7/Makefile,v
retrieving revision 1.35
diff -u -p -u -p -r1.35 Makefile
--- 2.7/Makefile 11 Jul 2014 06:59:42 -0000 1.35
+++ 2.7/Makefile 6 Nov 2014 17:53:03 -0000
@@ -2,6 +2,7 @@
VERSION = 2.7
PATCHLEVEL = .8
+REVISION = 0
SHARED_LIBS = python2.7 0.0
VERSION_SPEC = >=2.7,<2.8
Index: 2.7/patches/patch-Modules_ossaudiodev_c
===================================================================
RCS file: 2.7/patches/patch-Modules_ossaudiodev_c
diff -N 2.7/patches/patch-Modules_ossaudiodev_c
--- 2.7/patches/patch-Modules_ossaudiodev_c 11 Jul 2014 06:59:43 -0000
1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,82 +0,0 @@
-$OpenBSD: patch-Modules_ossaudiodev_c,v 1.3 2014/07/11 06:59:43 rpointel Exp $
---- Modules/ossaudiodev.c.orig Mon Jun 30 04:05:43 2014
-+++ Modules/ossaudiodev.c Wed Jul 9 11:41:16 2014
-@@ -30,7 +30,7 @@
- #endif
-
- #include <sys/ioctl.h>
--#include <sys/soundcard.h>
-+#include <soundcard.h>
-
- #if defined(linux)
-
-@@ -1039,6 +1039,7 @@ initossaudiodev(void)
-
- /* Expose all the ioctl numbers for masochists who like to do this
- stuff directly. */
-+#ifdef SNDCTL_COPR_HALT
- _EXPORT_INT(m, SNDCTL_COPR_HALT);
- _EXPORT_INT(m, SNDCTL_COPR_LOAD);
- _EXPORT_INT(m, SNDCTL_COPR_RCODE);
-@@ -1049,6 +1050,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
-@@ -1091,18 +1093,25 @@ initossaudiodev(void)
- _EXPORT_INT(m, SNDCTL_DSP_STEREO);
- _EXPORT_INT(m, SNDCTL_DSP_SUBDIVIDE);
- _EXPORT_INT(m, SNDCTL_DSP_SYNC);
-+#ifdef SNDCTL_FM_4OP_ENABLE
- _EXPORT_INT(m, SNDCTL_FM_4OP_ENABLE);
- _EXPORT_INT(m, SNDCTL_FM_LOAD_INSTR);
-+#endif
-+#ifdef SNDCTL_MIDI_INFO
- _EXPORT_INT(m, SNDCTL_MIDI_INFO);
- _EXPORT_INT(m, SNDCTL_MIDI_MPUCMD);
- _EXPORT_INT(m, SNDCTL_MIDI_MPUMODE);
- _EXPORT_INT(m, SNDCTL_MIDI_PRETIME);
-+#endif
-+#ifdef SNDCTL_SEQ_CTRLRATE
- _EXPORT_INT(m, SNDCTL_SEQ_CTRLRATE);
- _EXPORT_INT(m, SNDCTL_SEQ_GETINCOUNT);
- _EXPORT_INT(m, SNDCTL_SEQ_GETOUTCOUNT);
-+#endif
- #ifdef SNDCTL_SEQ_GETTIME
- _EXPORT_INT(m, SNDCTL_SEQ_GETTIME);
- #endif
-+#ifdef SNDCTL_SEQ_NRMIDIS
- _EXPORT_INT(m, SNDCTL_SEQ_NRMIDIS);
- _EXPORT_INT(m, SNDCTL_SEQ_NRSYNTHS);
- _EXPORT_INT(m, SNDCTL_SEQ_OUTOFBAND);
-@@ -1113,17 +1122,21 @@ initossaudiodev(void)
- _EXPORT_INT(m, SNDCTL_SEQ_SYNC);
- _EXPORT_INT(m, SNDCTL_SEQ_TESTMIDI);
- _EXPORT_INT(m, SNDCTL_SEQ_THRESHOLD);
-+#endif
- #ifdef SNDCTL_SYNTH_CONTROL
- _EXPORT_INT(m, SNDCTL_SYNTH_CONTROL);
- #endif
- #ifdef SNDCTL_SYNTH_ID
- _EXPORT_INT(m, SNDCTL_SYNTH_ID);
- #endif
-+#ifdef SNDCTL_SYNTH_INFO
- _EXPORT_INT(m, SNDCTL_SYNTH_INFO);
- _EXPORT_INT(m, SNDCTL_SYNTH_MEMAVL);
-+#endif
- #ifdef SNDCTL_SYNTH_REMOVESAMPLE
- _EXPORT_INT(m, SNDCTL_SYNTH_REMOVESAMPLE);
- #endif
-+#ifdef SNDCTL_TMR_CONTINUE
- _EXPORT_INT(m, SNDCTL_TMR_CONTINUE);
- _EXPORT_INT(m, SNDCTL_TMR_METRONOME);
- _EXPORT_INT(m, SNDCTL_TMR_SELECT);
-@@ -1132,4 +1145,5 @@ initossaudiodev(void)
- _EXPORT_INT(m, SNDCTL_TMR_STOP);
- _EXPORT_INT(m, SNDCTL_TMR_TEMPO);
- _EXPORT_INT(m, SNDCTL_TMR_TIMEBASE);
-+#endif
- }
Index: 2.7/patches/patch-setup_py
===================================================================
RCS file: /cvs/ports/lang/python/2.7/patches/patch-setup_py,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 patch-setup_py
--- 2.7/patches/patch-setup_py 11 Jul 2014 06:59:43 -0000 1.9
+++ 2.7/patches/patch-setup_py 6 Nov 2014 17:53:03 -0000
@@ -75,16 +75,6 @@ $OpenBSD: patch-setup_py,v 1.9 2014/07/1
data = open(f).read()
m = re.search(r"#s*define\s+HASHVERSION\s+2\s*", data)
if m is not None:
-@@ -1606,6 +1616,9 @@ class PyBuildExt(build_ext):
- 'freebsd7', 'freebsd8')
- or host_platform.startswith("gnukfreebsd")):
- exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
-+ if host_platform.startswith('openbsd'):
-+ exts.append( Extension('ossaudiodev', ['ossaudiodev.c'],
-+ libraries = ['ossaudio'],) )
- else:
- missing.append('ossaudiodev')
-
@@ -1818,7 +1831,7 @@ class PyBuildExt(build_ext):
# For 8.4a2, the X11 headers are not included. Rather than include a
# complicated search, this is a hard-coded path. It could bail out
Index: 2.7/pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/lang/python/2.7/pkg/PLIST-main,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 PLIST-main
--- 2.7/pkg/PLIST-main 11 Jul 2014 06:59:43 -0000 1.11
+++ 2.7/pkg/PLIST-main 6 Nov 2014 17:53:06 -0000
@@ -1586,7 +1586,6 @@ lib/python2.7/lib-dynload/math.so
lib/python2.7/lib-dynload/mmap.so
lib/python2.7/lib-dynload/nis.so
lib/python2.7/lib-dynload/operator.so
-lib/python2.7/lib-dynload/ossaudiodev.so
lib/python2.7/lib-dynload/parser.so
lib/python2.7/lib-dynload/pyexpat.so
lib/python2.7/lib-dynload/readline.so
