jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-08-02 07:57:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

package/mesa3d: VDPAU needs x11

Browse Source 
Commit c898f95c275a105caacbb31adf92ef94bd4530c4 added support for
Gallium VDPAU state tracker by updating Config.in to add a dependency on
XORG7. However, mesa3d.mk was not updated to reflect this dependency.

XORG7 dependences is already managed under the ifeq
BR2_PACKAGE_MESA3D_OPENGL_GLX block so reuse this block by making ifeq
depends on a new BR2_PACKAGE_MESA3D_NEEDS_X11 hidden option

Fixes:
 - http://autobuild.buildroot.org/results/bbd102d59bbdca35fd1b5401df2790dd197d1e5f

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Fabrice Fontaine 2019-11-04 19:16:09 +01:00 committed by Thomas Petazzoni
parent 6ddad3ced9
commit e79ee3b0f9
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
package/mesa3d/Config.in
View File

@ -82,6 +82,19 @@ config BR2_PACKAGE_MESA3D_NEEDS_XA
config BR2_PACKAGE_MESA3D_GALLIUM_KMSRO config BR2_PACKAGE_MESA3D_GALLIUM_KMSRO
bool bool
# OpenGL GLX and Gallium VDPAU both needs X11
config BR2_PACKAGE_MESA3D_NEEDS_X11
bool
depends on BR2_PACKAGE_XORG7
select BR2_PACKAGE_LIBXCB
select BR2_PACKAGE_XLIB_LIBX11
select BR2_PACKAGE_XLIB_LIBXDAMAGE
select BR2_PACKAGE_XLIB_LIBXEXT
select BR2_PACKAGE_XLIB_LIBXFIXES
select BR2_PACKAGE_XLIB_LIBXRANDR
select BR2_PACKAGE_XLIB_LIBXXF86VM
select BR2_PACKAGE_XORGPROTO
comment "Gallium drivers" comment "Gallium drivers"
config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ETNAVIV config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ETNAVIV
@ -229,6 +242,7 @@ config BR2_PACKAGE_MESA3D_VDPAU
depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU \ depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU \
|| BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600 \ || BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600 \
|| BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI || BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI
select BR2_PACKAGE_MESA3D_NEEDS_X11
select BR2_PACKAGE_LIBVDPAU select BR2_PACKAGE_LIBVDPAU
help help
VDPAU state tracker (needs r600, radeonsi or nouveau gallium VDPAU state tracker (needs r600, radeonsi or nouveau gallium
@ -338,14 +352,7 @@ config BR2_PACKAGE_MESA3D_OPENGL_GLX
bool "OpenGL GLX" bool "OpenGL GLX"
depends on BR2_PACKAGE_XORG7 depends on BR2_PACKAGE_XORG7
select BR2_PACKAGE_HAS_LIBGL select BR2_PACKAGE_HAS_LIBGL
select BR2_PACKAGE_LIBXCB select BR2_PACKAGE_MESA3D_NEEDS_X11
select BR2_PACKAGE_XLIB_LIBX11
select BR2_PACKAGE_XLIB_LIBXDAMAGE
select BR2_PACKAGE_XLIB_LIBXEXT
select BR2_PACKAGE_XLIB_LIBXFIXES
select BR2_PACKAGE_XLIB_LIBXRANDR
select BR2_PACKAGE_XLIB_LIBXXF86VM
select BR2_PACKAGE_XORGPROTO
help help
Enable GLX graphic acceleration (OpenGL + X11). Enable GLX graphic acceleration (OpenGL + X11).

2
package/mesa3d/mesa3d.mk
View File

@ -183,7 +183,7 @@ MESA3D_DEPENDENCIES += wayland wayland-protocols
MESA3D_PLATFORMS += wayland MESA3D_PLATFORMS += wayland
MESA3D_CONF_OPTS += -Dwayland-scanner-path=$(HOST_DIR)/bin/wayland-scanner MESA3D_CONF_OPTS += -Dwayland-scanner-path=$(HOST_DIR)/bin/wayland-scanner
endif endif
ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_GLX),y) ifeq ($(BR2_PACKAGE_MESA3D_NEEDS_X11),y)
MESA3D_DEPENDENCIES += \ MESA3D_DEPENDENCIES += \
xlib_libX11 \ xlib_libX11 \
xlib_libXext \ xlib_libXext \