X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fegl%2Fmeson.build;h=e11e589b94561657746676ae645f3019e8a1efba;hb=a0f6a1194464611bd93491c6d066b07db0615f27;hp=8ea8a5bbb69580c7c9ead461f8b0cd5672b3eaf7;hpb=035ec7a2bb2d5e413ac945b8f012185a0e187d5e;p=mesa.git diff --git a/src/egl/meson.build b/src/egl/meson.build index 8ea8a5bbb69..e11e589b945 100644 --- a/src/egl/meson.build +++ b/src/egl/meson.build @@ -18,10 +18,14 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. +inc_egl = include_directories('.', 'main') +inc_egl_dri2 = include_directories('drivers/dri2') + c_args_for_egl = [] link_for_egl = [] deps_for_egl = [] -incs_for_egl = [] +incs_for_egl = [inc_include, inc_drm_uapi, inc_src, inc_egl] + files_egl = files( 'main/eglapi.c', 'main/eglapi.h', @@ -51,23 +55,6 @@ files_egl = files( 'main/eglsync.h', 'main/eglentrypoint.h', 'main/egltypedefs.h', - 'drivers/dri2/egl_dri2.c', - 'drivers/dri2/egl_dri2.h', - 'drivers/dri2/egl_dri2_fallbacks.h', -) - -linux_dmabuf_unstable_v1_protocol_c = custom_target( - 'linux-dmabuf-unstable-v1-protocol.c', - input : wayland_dmabuf_xml, - output : 'linux-dmabuf-unstable-v1-protocol.c', - command : [prog_wl_scanner, 'code', '@INPUT@', '@OUTPUT@'], -) - -linux_dmabuf_unstable_v1_client_protocol_h = custom_target( - 'linux-dmabuf-unstable-v1-client-protocol.h', - input : wayland_dmabuf_xml, - output : 'linux-dmabuf-unstable-v1-client-protocol.h', - command : [prog_wl_scanner, 'client-header', '@INPUT@', '@OUTPUT@'], ) g_egldispatchstubs_c = custom_target( @@ -78,7 +65,7 @@ g_egldispatchstubs_c = custom_target( ], output : 'g_egldispatchstubs.c', command : [ - prog_python2, '@INPUT0@', 'source', '@INPUT1@', '@INPUT2@', '@INPUT3@' + prog_python, '@INPUT0@', 'source', '@INPUT1@', '@INPUT2@', '@INPUT3@' ], depend_files : files('generate/genCommon.py'), capture : true, @@ -92,30 +79,44 @@ g_egldispatchstubs_h = custom_target( ], output : 'g_egldispatchstubs.h', command : [ - prog_python2, '@INPUT0@', 'header', '@INPUT1@', '@INPUT2@', '@INPUT3@' + prog_python, '@INPUT0@', 'header', '@INPUT1@', '@INPUT2@', '@INPUT3@' ], depend_files : files('generate/genCommon.py'), capture : true, ) +if with_dri2 + files_egl += files( + 'drivers/dri2/egl_dri2.c', + 'drivers/dri2/egl_dri2.h', + 'drivers/dri2/egl_dri2_fallbacks.h', + ) + c_args_for_egl += [ + '-DDEFAULT_DRIVER_DIR="@0@"'.format(dri_search_path), + ] +endif + if with_platform_x11 files_egl += files('drivers/dri2/platform_x11.c') + incs_for_egl += inc_loader if with_dri3 files_egl += files('drivers/dri2/platform_x11_dri3.c') link_for_egl += libloader_dri3_helper endif - deps_for_egl += [dep_xcb_dri2, dep_xcb_xfixes] + deps_for_egl += [dep_x11_xcb, dep_xcb_dri2, dep_xcb_xfixes] endif if with_platform_drm files_egl += files('drivers/dri2/platform_drm.c') - link_for_egl += libgbm - incs_for_egl += include_directories('../gbm/main') + link_for_egl += [libloader, libgbm, libxmlconfig] + incs_for_egl += [inc_loader, inc_gbm, include_directories('../gbm/main')] + deps_for_egl += dep_libdrm endif if with_platform_surfaceless files_egl += files('drivers/dri2/platform_surfaceless.c') + incs_for_egl += [inc_loader] endif if with_platform_wayland - deps_for_egl += [dep_wayland_client, dep_wayland_server] + deps_for_egl += [dep_wayland_client, dep_wayland_server, dep_wayland_egl_headers] link_for_egl += libwayland_drm files_egl += files('drivers/dri2/platform_wayland.c') files_egl += [ @@ -123,13 +124,22 @@ if with_platform_wayland linux_dmabuf_unstable_v1_client_protocol_h, wayland_drm_client_protocol_h, ] - incs_for_egl += include_directories( - 'wayland/wayland-egl', 'wayland/wayland-drm', - ) + incs_for_egl += include_directories('wayland/wayland-drm') +endif +if with_platform_android + deps_for_egl += dep_android + files_egl += files('drivers/dri2/platform_android.c') + incs_for_egl += [inc_loader] +endif +if with_platform_haiku + incs_for_egl += inc_haikugl + c_args_for_egl += [ + '-D_EGL_BUILT_IN_DRIVER_HAIKU', + ] + files_egl += files('drivers/haiku/egl_haiku.cpp') + link_for_egl += libgl + deps_for_egl += cpp.find_library('be') endif -# TODO: android - -# TODO: glvnd if cc.has_function('mincore') c_args_for_egl += '-DHAVE_MINCORE' @@ -140,7 +150,7 @@ if not with_glvnd egl_lib_version = '1.0.0' else egl_lib_name = 'EGL_mesa' - egl_lib_version = '0' + egl_lib_version = '0.0.0' files_egl += [g_egldispatchstubs_h, g_egldispatchstubs_c] files_egl += files('main/eglglvnd.c', 'main/egldispatchstubs.c') install_data( @@ -155,14 +165,9 @@ libegl = shared_library( c_args : [ c_vis_args, c_args_for_egl, - '-DDEFAULT_DRIVER_DIR="@0@"'.format(dri_driver_dir), - '-D_EGL_BUILT_IN_DRIVER_DRI2', '-D_EGL_NATIVE_PLATFORM=_EGL_PLATFORM_@0@'.format(egl_native_platform.to_upper()), ], - include_directories : [ - incs_for_egl, inc_include, inc_src, inc_loader, inc_gbm, - include_directories('main'), - ], + include_directories : incs_for_egl, link_with : [link_for_egl, libloader, libxmlconfig, libglapi, libmesa_util], link_args : [ld_args_bsymbolic, ld_args_gc_sections], dependencies : [deps_for_egl, dep_dl, dep_libdrm, dep_clock, dep_thread], @@ -170,17 +175,38 @@ libegl = shared_library( version : egl_lib_version, ) +# If using glvnd the pkg-config header should not point to EGL_mesa, it should +# point to EGL. glvnd is only available on unix like platforms so adding -l +# should be safe here +# TODO: in the glvnd case glvnd itself should really be providing this. +if with_glvnd + _egl = '-L${libdir} -lEGL' +else + _egl = libegl +endif + pkg.generate( name : 'egl', description : 'Mesa EGL Library', version : meson.project_version(), - libraries : libegl, + libraries : _egl, libraries_private: gl_priv_libs, requires_private : gl_priv_reqs, extra_cflags : gl_pkgconfig_c_flags, ) if with_tests - test('egl-symbols-check', find_program('egl-symbols-check')) - test('egl-entrypoint-check', find_program('egl-entrypoint-check')) + if with_glvnd + # TODO: add glvnd symbol check + else + test('egl-symbols-check', + find_program('egl-symbols-check'), + env : env_test, + args : libegl + ) + endif + test('egl-entrypoint-check', + find_program('egl-entrypoint-check'), + env : [ 'srcdir=' + meson.current_source_dir() ] + ) endif