X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fegl%2Fmeson.build;h=97d79823b663e15cbc4698d76b513720837109eb;hb=cc4b68a80193e2a132cb62309292984a9428f2bb;hp=6cd04567b0d116cc46c7ab33f6284910ca51ed7e;hpb=d7235ef83b92175537e3b538634ffcff29bf0dce;p=mesa.git diff --git a/src/egl/meson.build b/src/egl/meson.build index 6cd04567b0d..97d79823b66 100644 --- a/src/egl/meson.build +++ b/src/egl/meson.build @@ -1,4 +1,4 @@ -# Copyright © 2017 Intel Corporation +# Copyright © 2017 Intel Corporation # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -18,12 +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 = [ - inc_include, inc_src, inc_loader, inc_gbm, include_directories('main'), -] +incs_for_egl = [inc_include, inc_src, inc_egl] + files_egl = files( 'main/eglapi.c', 'main/eglapi.h', @@ -36,11 +38,12 @@ files_egl = files( 'main/eglcurrent.c', 'main/eglcurrent.h', 'main/egldefines.h', + 'main/egldevice.c', + 'main/egldevice.h', 'main/egldisplay.c', 'main/egldisplay.h', 'main/egldriver.c', 'main/egldriver.h', - 'main/eglfallbacks.c', 'main/eglglobals.c', 'main/eglglobals.h', 'main/eglimage.c', @@ -53,95 +56,94 @@ 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( 'g_egldispatchstubs.c', input : [ - 'generate/gen_egl_dispatch.py', 'generate/eglFunctionList.py', + 'generate/gen_egl_dispatch.py', 'generate/egl.xml', 'generate/egl_other.xml' ], output : 'g_egldispatchstubs.c', command : [ - prog_python2, '@INPUT0@', 'source', '@INPUT1@', '@INPUT2@', '@INPUT3@' + prog_python, '@INPUT0@', 'source', '@INPUT1@', '@INPUT2@', ], - depend_files : files('generate/genCommon.py'), + depend_files : [ files('generate/eglFunctionList.py'), genCommon_py, ], capture : true, ) g_egldispatchstubs_h = custom_target( 'g_egldispatchstubs.h', input : [ - 'generate/gen_egl_dispatch.py', 'generate/eglFunctionList.py', + 'generate/gen_egl_dispatch.py', 'generate/egl.xml', 'generate/egl_other.xml' ], output : 'g_egldispatchstubs.h', command : [ - prog_python2, '@INPUT0@', 'header', '@INPUT1@', '@INPUT2@', '@INPUT3@' + prog_python, '@INPUT0@', 'header', '@INPUT1@', '@INPUT2@', ], - depend_files : files('generate/genCommon.py'), + depend_files : [ files('generate/eglFunctionList.py'), genCommon_py, ], capture : true, ) -if with_platform_x11 - files_egl += files('drivers/dri2/platform_x11.c') - if with_dri3 - files_egl += files('drivers/dri2/platform_x11_dri3.c') - link_for_egl += libloader_dri3_helper +if with_dri2 + files_egl += files( + 'drivers/dri2/egl_dri2.c', + 'drivers/dri2/egl_dri2.h', + 'drivers/dri2/egl_dri2_fallbacks.h', + ) + link_for_egl += [libloader, libxmlconfig] + incs_for_egl += inc_loader + + files_egl += files('drivers/dri2/platform_device.c') + if with_platform_x11 + files_egl += files('drivers/dri2/platform_x11.c') + if with_dri3 + files_egl += files('drivers/dri2/platform_x11_dri3.c') + link_for_egl += libloader_dri3_helper + endif + deps_for_egl += [dep_x11_xcb, dep_xcb_dri2, dep_xcb_xfixes] endif - 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') -endif -if with_platform_surfaceless - files_egl += files('drivers/dri2/platform_surfaceless.c') -endif -if with_platform_wayland - deps_for_egl += [dep_wayland_client, dep_wayland_server] - link_for_egl += libwayland_drm - files_egl += files('drivers/dri2/platform_wayland.c') - files_egl += [ - linux_dmabuf_unstable_v1_protocol_c, - linux_dmabuf_unstable_v1_client_protocol_h, - wayland_drm_client_protocol_h, + if with_platform_drm + files_egl += files('drivers/dri2/platform_drm.c') + link_for_egl += libgbm + incs_for_egl += [inc_gbm, include_directories('../gbm/main')] + deps_for_egl += dep_libdrm + endif + if with_platform_surfaceless + files_egl += files('drivers/dri2/platform_surfaceless.c') + endif + if with_platform_wayland + 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 += [ + linux_dmabuf_unstable_v1_protocol_c, + linux_dmabuf_unstable_v1_client_protocol_h, + wayland_drm_client_protocol_h, + ] + 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') + endif +elif with_platform_haiku + incs_for_egl += inc_haikugl + c_args_for_egl += [ + '-D_EGL_BUILT_IN_DRIVER_HAIKU', ] - incs_for_egl += include_directories( - 'wayland/wayland-egl', 'wayland/wayland-drm', - ) -endif -if with_platform_android - deps_for_egl += dep_android - files_egl += files('drivers/dri2/platform_android.c') + files_egl += files('drivers/haiku/egl_haiku.cpp') + link_for_egl += libgl + deps_for_egl += cpp.find_library('be') endif -# TODO: glvnd - if cc.has_function('mincore') c_args_for_egl += '-DHAVE_MINCORE' endif if not with_glvnd - egl_lib_name = 'EGL' + egl_lib_name = 'EGL' + get_option('egl-lib-suffix') egl_lib_version = '1.0.0' else egl_lib_name = 'EGL_mesa' @@ -160,43 +162,50 @@ libegl = shared_library( c_args : [ c_vis_args, c_args_for_egl, - '-DDEFAULT_DRIVER_DIR="@0@"'.format(dri_search_path), - '-D_EGL_BUILT_IN_DRIVER_DRI2', '-D_EGL_NATIVE_PLATFORM=_EGL_PLATFORM_@0@'.format(egl_native_platform.to_upper()), ], include_directories : incs_for_egl, - link_with : [link_for_egl, libloader, libxmlconfig, libglapi, libmesa_util], + link_with : [link_for_egl, libglapi, libmesa_util], link_args : [ld_args_bsymbolic, ld_args_gc_sections], dependencies : [deps_for_egl, dep_dl, dep_libdrm, dep_clock, dep_thread], install : true, 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_platform_wayland - subdir('wayland/wayland-egl') -endif - -if with_tests +if with_tests and prog_nm.found() if with_glvnd # TODO: add glvnd symbol check else test('egl-symbols-check', find_program('egl-symbols-check'), - args : libegl + env : env_test, + args : libegl, + suite : ['egl'], ) endif test('egl-entrypoint-check', find_program('egl-entrypoint-check'), - env : [ 'srcdir=' + meson.current_source_dir() ] + env : ['srcdir=' + meson.current_source_dir()], + suite : ['egl'], ) endif