RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-16 20:27:23 +00:00
Code Issues Releases Wiki Activity

build: Do not link to libGL for egl-drm

Browse Source 
Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
This commit is contained in:
Quentin Glidic 2016-05-20 10:56:23 +02:00 committed by wm4
parent e431a7bbfd
commit f0d7437412
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
waftools/checks/generic.py
View File

@ -4,7 +4,7 @@ from waflib.ConfigSet import ConfigSet
from waflib import Utils from waflib import Utils
__all__ = [ __all__ = [
"check_pkg_config", "check_cc", "check_statement", "check_libs", "check_pkg_config", "check_pkg_config_cflags", "check_cc", "check_statement", "check_libs",
"check_headers", "compose_checks", "check_true", "any_version", "check_headers", "compose_checks", "check_true", "any_version",
"load_fragment", "check_stub", "check_ctx_vars", "check_program"] "load_fragment", "check_stub", "check_ctx_vars", "check_program"]
@ -69,17 +69,23 @@ def check_cc(**kw_ext):
return fn return fn
def check_pkg_config(*args, **kw_ext): def check_pkg_config(*args, **kw_ext):
return _check_pkg_config(["--libs", "--cflags"], *args, **kw_ext)
def check_pkg_config_cflags(*args, **kw_ext):
return _check_pkg_config(["--cflags"], *args, **kw_ext)
def _check_pkg_config(_pkgc_args, *args, **kw_ext):
def fn(ctx, dependency_identifier, **kw): def fn(ctx, dependency_identifier, **kw):
argsl = list(args) argsl = list(args)
packages = args[::2] packages = args[::2]
verchecks = args[1::2] verchecks = args[1::2]
sargs = [] sargs = []
pkgc_args = _pkgc_args
for i in range(0, len(packages)): for i in range(0, len(packages)):
if i < len(verchecks): if i < len(verchecks):
sargs.append(packages[i] + ' ' + verchecks[i]) sargs.append(packages[i] + ' ' + verchecks[i])
else: else:
sargs.append(packages[i]) sargs.append(packages[i])
pkgc_args = ["--libs", "--cflags"]
if ctx.dependency_satisfied('static-build'): if ctx.dependency_satisfied('static-build'):
pkgc_args += ["--static"] pkgc_args += ["--static"]

5
wscript
View File

@ -677,7 +677,10 @@ video_output_features = [
'desc': 'OpenGL DRM EGL Backend', 'desc': 'OpenGL DRM EGL Backend',
'deps': [ 'drm', 'gbm' ], 'deps': [ 'drm', 'gbm' ],
'groups': [ 'gl' ], 'groups': [ 'gl' ],
'func': check_pkg_config('egl', 'gl'), 'func': compose_checks(
check_pkg_config('egl'),
check_pkg_config_cflags('gl')
)
} , { } , {
'name': '--gl-wayland', 'name': '--gl-wayland',
'desc': 'OpenGL Wayland Backend', 'desc': 'OpenGL Wayland Backend',