From 29dbd1148b6b114242586c4d619e406ae757e7ff Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Sat, 4 Apr 2015 11:44:21 -0500 Subject: [PATCH] scons: Fix build by disabling OpenVG (cherry pick missed in 10.5.2) --- src/SConscript | 2 -- src/gallium/SConscript | 1 - src/gallium/targets/egl-static/SConscript | 11 ----------- 3 files changed, 14 deletions(-) diff --git a/src/SConscript b/src/SConscript index c25adc7..188ab08 100644 --- a/src/SConscript +++ b/src/SConscript @@ -27,8 +27,6 @@ if env['platform'] in ['haiku']: SConscript('mesa/SConscript') -SConscript('mapi/vgapi/SConscript') - if not env['embedded']: if env['platform'] not in ('cygwin', 'darwin', 'freebsd', 'haiku', 'windows'): SConscript('glx/SConscript') diff --git a/src/gallium/SConscript b/src/gallium/SConscript index 25d0af6..baacd29 100644 --- a/src/gallium/SConscript +++ b/src/gallium/SConscript @@ -62,7 +62,6 @@ SConscript([ ]) if not env['embedded']: - SConscript('state_trackers/vega/SConscript') if env['platform'] not in ('cygwin', 'darwin', 'freebsd', 'sunos'): SConscript([ 'state_trackers/egl/SConscript', diff --git a/src/gallium/targets/egl-static/SConscript b/src/gallium/targets/egl-static/SConscript index e423d5d..bbeedaa 100644 --- a/src/gallium/targets/egl-static/SConscript +++ b/src/gallium/targets/egl-static/SConscript @@ -14,7 +14,6 @@ env.Append(CPPPATH = [ '#/src/gallium/include', '#/src/gallium/winsys', '#/src/gallium/state_trackers/egl', - '#/src/gallium/state_trackers/vega', '#/src/mesa', ]) @@ -74,14 +73,6 @@ if env['gles']: glapi_name = 'glapi' if env['platform'] != 'windows' else 'libglapi' env.Prepend(LIBS = [glapi_name, glsl, mesa]) -# OpenVG -if True: - env.Append(CPPDEFINES = ['FEATURE_VG=1']) - env.Prepend(LIBPATH = [openvg.dir]) - # manually add LIBPREFIX on windows - openvg_name = 'OpenVG' if env['platform'] != 'windows' else 'libOpenVG' - env.Prepend(LIBS = [openvg_name, st_vega]) - if env['HAVE_X11']: env.Prepend(LIBS = [ ws_xlib, @@ -107,8 +98,6 @@ egl_gallium = env.SharedLibrary( source = sources, ) -env.Depends(egl_gallium, [openvg]) - egl_gallium = env.InstallSharedLibrary(egl_gallium, version=(1, 4, 0)) env.Alias('egl-gallium', egl_gallium) -- 1.8.3.4