diff options
author | wm4 <wm4@nowhere> | 2017-04-21 07:30:03 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2017-04-21 07:30:03 +0200 |
commit | 927afa311d4a89b022305508acbf4e7325fe3928 (patch) | |
tree | 4c6aafa3fb81e67fffdfd991f9cf96693e6f3fda /wscript | |
parent | 4d1eab6e552681ef961ce48af74f6795e7077fc6 (diff) | |
download | mpv-927afa311d4a89b022305508acbf4e7325fe3928.tar.bz2 mpv-927afa311d4a89b022305508acbf4e7325fe3928.tar.xz |
build: make various x11 protocol extension libs mandatory
Reduces the ifdeffery, which is good and will avoid silent breakages, or
weird behavior if a lib is omitted.
Also reorder the x11_common.c include statements.
Diffstat (limited to 'wscript')
-rw-r--r-- | wscript | 26 |
1 files changed, 5 insertions, 21 deletions
@@ -579,33 +579,17 @@ video_output_features = [ } , { 'name': '--x11', 'desc': 'X11', - 'func': check_pkg_config('x11'), - } , { - 'name': '--xss', - 'desc': 'Xss screensaver extensions', - 'deps': [ 'x11' ], - 'func': check_pkg_config('xscrnsaver'), - } , { - 'name': '--xext', - 'desc': 'X extensions', - 'deps': [ 'x11' ], - 'func': check_pkg_config('xext'), + 'func': check_pkg_config('x11', '>= 1.0.0', + 'xscrnsaver', '>= 1.0.0', + 'xext', '>= 1.0.0', + 'xinerama', '>= 1.0.0', + 'xrandr', '>= 1.2.0'), } , { 'name': '--xv', 'desc': 'Xv video output', 'deps': [ 'x11' ], 'func': check_pkg_config('xv'), } , { - 'name': '--xinerama', - 'desc': 'Xinerama', - 'deps': [ 'x11' ], - 'func': check_pkg_config('xinerama'), - }, { - 'name': '--xrandr', - 'desc': 'Xrandr', - 'deps': [ 'x11' ], - 'func': check_pkg_config('xrandr', '>= 1.2.0'), - } , { 'name': '--gl-cocoa', 'desc': 'OpenGL Cocoa Backend', 'deps': [ 'cocoa' ], |