Module: Mesa Branch: 9.2 Commit: 7d6dcb61cdaba3a158b2b9635bf029a17cc8543d URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7d6dcb61cdaba3a158b2b9635bf029a17cc8543d
Author: Armin K <[email protected]> Date: Tue Aug 13 15:38:56 2013 -0700 gbm: Link to libwayland-drm if Wayland EGL platform is enabled We were relying on libEGL to pull in libwayland-client symbols, but with commit 2c2e64edaba0f6aeb181ca5b51eb8dea8e9b39f9 cleaned up the symbol leak. CC: "9.2" <[email protected]> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=67962 Tested-by: Bryce Harrington <[email protected]> Reviewed-by: Chad Versace <[email protected]> (cherry picked from commit f423eba46e080b975a2b8366b490d99dee4729ad) --- src/Makefile.am | 4 ++++ src/egl/Makefile.am | 4 ---- src/gbm/Makefile.am | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index b3dc44d..76280a0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -29,6 +29,10 @@ if HAVE_DRI_GLX SUBDIRS += glx endif +if HAVE_EGL_PLATFORM_WAYLAND +SUBDIRS += egl/wayland +endif + if HAVE_GBM SUBDIRS += gbm endif diff --git a/src/egl/Makefile.am b/src/egl/Makefile.am index e6380ec..cff943f 100644 --- a/src/egl/Makefile.am +++ b/src/egl/Makefile.am @@ -21,8 +21,4 @@ SUBDIRS= -if HAVE_EGL_PLATFORM_WAYLAND -SUBDIRS += wayland -endif - SUBDIRS += drivers main diff --git a/src/gbm/Makefile.am b/src/gbm/Makefile.am index e22c55c..1282b14 100644 --- a/src/gbm/Makefile.am +++ b/src/gbm/Makefile.am @@ -24,6 +24,7 @@ libgbm_la_LIBADD = $(LIBUDEV_LIBS) $(LIBKMS_LIBS) $(DLOPEN_LIBS) if HAVE_EGL_PLATFORM_WAYLAND AM_CPPFLAGS = -DHAVE_WAYLAND_PLATFORM AM_CFLAGS += $(WAYLAND_CFLAGS) +libgbm_la_LIBADD += $(top_builddir)/src/egl/wayland/wayland-drm/libwayland-drm.la $(WAYLAND_LIBS) endif if HAVE_DRI @@ -38,7 +39,7 @@ libgbm_dri_la_CFLAGS = \ $(LIBDRM_CFLAGS) libgbm_la_LIBADD += \ - libgbm_dri.la $(top_builddir)/src/mapi/shared-glapi/libglapi.la + libgbm_dri.la $(top_builddir)/src/mapi/shared-glapi/libglapi.la $(LIBDRM_LIBS) endif all-local: libgbm.la _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
