summaryrefslogtreecommitdiffstats
path: root/wscript
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-06-22 10:30:11 +0200
committerwm4 <wm4@nowhere>2017-06-22 13:17:14 +0200
commit5c038e69997affd46430970f943a604b92ee96df (patch)
tree71e0824bab55f7b69d4428f01f8367031ed75ebf /wscript
parent3e49133a257113c8d32f2b0d31cca471e8b14f08 (diff)
downloadmpv-5c038e69997affd46430970f943a604b92ee96df.tar.bz2
mpv-5c038e69997affd46430970f943a604b92ee96df.tar.xz
build: simplify OSS checks and remove changes by "bugmen0t"
The user bugmen0t was apparently a shared github account with publicly available login. Thus, we can't get LGPL relicensing permission from the people who used this account. To relicense successfully, we have to remove all their changes. This commit should remove 20d1fc13, f26fb009, defbe48d. It also should remove whatever test fragments were copied from the ancient configure, as well as some configure logic (potentially that device path stuff). I think this change still preserves the most important use-cases of OSS: BSDs, and the Linux OSS emulation (the latter for testing only). According to an OSS user, the 4front checks were probably broken anyway. The SunAudio stuff was probably for (Open)Solaris, which is dead. ao_oss.c itself will remain GPL, and still contains bugmen0t changes.
Diffstat (limited to 'wscript')
-rw-r--r--wscript39
1 files changed, 3 insertions, 36 deletions
diff --git a/wscript b/wscript
index 7a4ef0d4c9..5390596f8e 100644
--- a/wscript
+++ b/wscript
@@ -471,35 +471,10 @@ audio_output_features = [
'func': check_pkg_config('sdl'),
'default': 'disable'
}, {
- 'name': 'oss-audio-4front',
- 'desc': 'OSS (implementation from opensound.com)',
- 'func': check_oss_4front,
- 'groups' : [ 'oss-audio' ]
- }, {
- 'name': 'oss-audio-native',
- 'desc': 'OSS (platform-specific OSS implementation)',
- 'func': check_cc(header_name='sys/soundcard.h',
- defines=['PATH_DEV_DSP="/dev/dsp"',
- 'PATH_DEV_MIXER="/dev/mixer"'],
- fragment=load_fragment('oss_audio.c')),
- 'deps_neg': [ 'oss-audio-4front' ],
- 'groups' : [ 'oss-audio' ]
- }, {
- 'name': 'oss-audio-sunaudio',
- 'desc': 'OSS (emulation on top of SunAudio)',
- 'func': check_cc(header_name='soundcard.h',
- lib='ossaudio',
- defines=['PATH_DEV_DSP="/dev/sound"',
- 'PATH_DEV_MIXER="/dev/mixer"'],
- fragment=load_fragment('oss_audio_sunaudio.c')),
- 'deps_neg': [ 'oss-audio-4front', 'oss-audio-native' ],
- 'groups' : [ 'oss-audio' ]
- }, {
'name': '--oss-audio',
- 'desc': 'OSS audio output',
- 'func': check_true,
- 'deps_any': [ 'oss-audio-native', 'oss-audio-sunaudio',
- 'oss-audio-4front' ]
+ 'desc': 'OSS',
+ 'func': check_cc(header_name='sys/soundcard.h'),
+ 'deps': [ 'posix' ],
}, {
'name': '--rsound',
'desc': 'RSound audio output',
@@ -1007,14 +982,6 @@ def configure(ctx):
ctx.parse_dependencies(standalone_features)
- ctx.define('HAVE_SYS_SOUNDCARD_H',
- '(HAVE_OSS_AUDIO_NATIVE || HAVE_OSS_AUDIO_4FRONT)',
- quote=False)
-
- ctx.define('HAVE_SOUNDCARD_H',
- 'HAVE_OSS_AUDIO_SUNAUDIO',
- quote=False)
-
ctx.load('generators.headers')
if not ctx.dependency_satisfied('build-date'):