@@ -6,16 +6,15 @@ menuconfig BR2_PACKAGE_MESA3D
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
select BR2_PACKAGE_LIBDRM
select BR2_PACKAGE_EXPAT
- select BR2_PACKAGE_HAS_LIBGL if BR2_PACKAGE_XORG7
select BR2_PACKAGE_WAYLAND_PROTOCOLS if BR2_PACKAGE_WAYLAND
- select BR2_PACKAGE_XORGPROTO if BR2_PACKAGE_XORG7
- select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7
- select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7
- select BR2_PACKAGE_XLIB_LIBXDAMAGE if BR2_PACKAGE_XORG7
- select BR2_PACKAGE_XLIB_LIBXFIXES if BR2_PACKAGE_XORG7
- select BR2_PACKAGE_XLIB_LIBXRANDR if BR2_PACKAGE_XORG7
- select BR2_PACKAGE_XLIB_LIBXXF86VM if BR2_PACKAGE_XORG7
- select BR2_PACKAGE_LIBXCB if BR2_PACKAGE_XORG7
+ select BR2_PACKAGE_XORGPROTO if BR2_PACKAGE_MESA3D_OPENGL_GLX
+ select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_MESA3D_OPENGL_GLX
+ select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_MESA3D_OPENGL_GLX
+ select BR2_PACKAGE_XLIB_LIBXDAMAGE if BR2_PACKAGE_MESA3D_OPENGL_GLX
+ select BR2_PACKAGE_XLIB_LIBXFIXES if BR2_PACKAGE_MESA3D_OPENGL_GLX
+ select BR2_PACKAGE_XLIB_LIBXRANDR if BR2_PACKAGE_MESA3D_OPENGL_GLX
+ select BR2_PACKAGE_XLIB_LIBXXF86VM if BR2_PACKAGE_MESA3D_OPENGL_GLX
+ select BR2_PACKAGE_LIBXCB if BR2_PACKAGE_MESA3D_OPENGL_GLX
select BR2_PACKAGE_ZLIB
help
Mesa 3D, an open-source implementation of the OpenGL
@@ -281,6 +280,19 @@ comment "OSMesa classic requires dri (classic) swrast"
if BR2_PACKAGE_MESA3D_DRIVER
+comment "OpenGL API Support"
+
+config BR2_PACKAGE_MESA3D_OPENGL_GLX
+ bool "OpenGL GLX"
+ depends on BR2_PACKAGE_MESA3D_OPENGL_GLX
+ select BR2_PACKAGE_HAS_LIBGL
+ help
+ Enable GLX graphic acceleration (OpenGL + X11).
+ GLX support needs X11 and at least one DRI or Gallium driver.
+
+comment "OpenGL GLX support needs X11"
+ depends on !BR2_PACKAGE_MESA3D_OPENGL_GLX
+
comment "Additional API Support"
config BR2_PACKAGE_MESA3D_OPENGL_EGL
@@ -301,7 +313,7 @@ config BR2_PACKAGE_MESA3D_OPENGL_ES
endif # BR2_PACKAGE_MESA3D_DRIVER
config BR2_PACKAGE_PROVIDES_LIBGL
- default "mesa3d" if BR2_PACKAGE_XORG7
+ default "mesa3d" if BR2_PACKAGE_MESA3D_OPENGL_GLX
config BR2_PACKAGE_PROVIDES_LIBEGL
default "mesa3d" if BR2_PACKAGE_MESA3D_OPENGL_EGL
@@ -72,16 +72,7 @@ MESA3D_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -mno-compact-eh"
MESA3D_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -mno-compact-eh"
endif
-ifeq ($(BR2_PACKAGE_XORG7),y)
-MESA3D_DEPENDENCIES += \
- xlib_libX11 \
- xlib_libXext \
- xlib_libXdamage \
- xlib_libXfixes \
- xlib_libXrandr \
- xlib_libXxf86vm \
- xorgproto \
- libxcb
+ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_GLX),y)
MESA3D_CONF_OPTS += --enable-glx --disable-mangling
ifeq ($(BR2_PACKAGE_MESA3D_NEEDS_XA),y)
MESA3D_CONF_OPTS += --enable-xa
@@ -170,7 +161,7 @@ MESA3D_CONF_OPTS += --enable-opengl --enable-dri
MESA3D_CONF_OPTS += --disable-va
# libGL is only provided for a full xorg stack
-ifeq ($(BR2_PACKAGE_XORG7),y)
+ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_GLX),y)
MESA3D_PROVIDES += libgl
else
define MESA3D_REMOVE_OPENGL_HEADERS
@@ -195,7 +186,16 @@ ifeq ($(BR2_PACKAGE_WAYLAND),y)
MESA3D_DEPENDENCIES += wayland wayland-protocols
MESA3D_PLATFORMS += wayland
endif
-ifeq ($(BR2_PACKAGE_XORG7),y)
+ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_GLX),y)
+MESA3D_DEPENDENCIES += \
+ xlib_libX11 \
+ xlib_libXext \
+ xlib_libXdamage \
+ xlib_libXfixes \
+ xlib_libXrandr \
+ xlib_libXxf86vm \
+ xorgproto \
+ libxcb
MESA3D_PLATFORMS += x11
endif