fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-21 09:20:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

st/egl: Fix udev linkage when egl_dri2 is not build

Browse source
This commit is contained in:
Benjamin Franzke 2011-05-31 11:14:46 +02:00 • committed by Kristian Høgsberg
parent aa87a938fb
commit a7cd65fb38
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
configure.ac
View file

@ -1202,6 +1202,9 @@ if test "x$enable_egl" = xyes; then
PKG_CHECK_MODULES([LIBUDEV], [libudev > 150], PKG_CHECK_MODULES([LIBUDEV], [libudev > 150],
[have_libudev=yes],[have_libudev=no]) [have_libudev=yes],[have_libudev=no])
if test "$have_libudev" = yes; then
DEFINES="$DEFINES -DHAVE_LIBUDEV"
fi
if test "$mesa_driver" = dri; then if test "$mesa_driver" = dri; then
# build egl_dri2 when xcb-dri2 is available # build egl_dri2 when xcb-dri2 is available
PKG_CHECK_MODULES([XCB_DRI2], [x11-xcb xcb-dri2 xcb-xfixes], PKG_CHECK_MODULES([XCB_DRI2], [x11-xcb xcb-dri2 xcb-xfixes],
@ -1210,9 +1213,6 @@ if test "x$enable_egl" = xyes; then
if test "$have_xcb_dri2" = yes; then if test "$have_xcb_dri2" = yes; then
EGL_DRIVER_DRI2=dri2 EGL_DRIVER_DRI2=dri2
DEFINES="$DEFINES -DHAVE_XCB_DRI2" DEFINES="$DEFINES -DHAVE_XCB_DRI2"
if test "$have_libudev" = yes; then
DEFINES="$DEFINES -DHAVE_LIBUDEV"
fi
# workaround a bug in xcb-dri2 generated by xcb-proto 1.6 # workaround a bug in xcb-dri2 generated by xcb-proto 1.6
AC_CHECK_LIB(xcb-dri2, xcb_dri2_connect_alignment_pad, [], AC_CHECK_LIB(xcb-dri2, xcb_dri2_connect_alignment_pad, [],
[DEFINES="$DEFINES -DXCB_DRI2_CONNECT_DEVICE_NAME_BROKEN"]) [DEFINES="$DEFINES -DXCB_DRI2_CONNECT_DEVICE_NAME_BROKEN"])

2
src/gallium/targets/egl/Makefile
View file

@ -52,7 +52,7 @@ egl_LIBS += $(TOP)/src/gallium/winsys/sw/wayland/libws_wayland.a
egl_LIBS += $(TOP)/src/egl/wayland/wayland-drm/libwayland-drm.a egl_LIBS += $(TOP)/src/egl/wayland/wayland-drm/libwayland-drm.a
endif endif
ifneq ($(findstring drm, $(EGL_PLATFORMS)),) ifneq ($(findstring drm, $(EGL_PLATFORMS)),)
egl_SYS += $(LIBDRM_LIB) egl_SYS += $(LIBUDEV_LIBS) $(LIBDRM_LIB)
endif endif
ifneq ($(findstring fbdev, $(EGL_PLATFORMS)),) ifneq ($(findstring fbdev, $(EGL_PLATFORMS)),)
egl_LIBS += $(TOP)/src/gallium/winsys/sw/fbdev/libfbdev.a egl_LIBS += $(TOP)/src/gallium/winsys/sw/fbdev/libfbdev.a