Commit b35acfff authored by Spenser Gilliland's avatar Spenser Gilliland Committed by Peter Korsgaard
Browse files

libdrm: bump and add experimental ARM framebuffer support 



[Peter: adjust intel/ati drivers to match]
Signed-off-by: default avatarSpenser Gilliland <spenser@gillilanding.com>
Reviewed-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 5bbc83c6

package/libdrm/Config.in

+57 −11
Original line number Diff line number Diff line 
config BR2_PACKAGE_LIBDRM

	bool "libdrm"

	select BR2_PACKAGE_XLIB_LIBPTHREAD_STUBS

	depends on BR2_PACKAGE_XORG7

	depends on BR2_LARGEFILE

	select BR2_PACKAGE_XPROTO_GLPROTO

	select BR2_PACKAGE_XPROTO_XF86VIDMODEPROTO

	select BR2_PACKAGE_XLIB_LIBXXF86VM

	select BR2_PACKAGE_XLIB_LIBXMU

	select BR2_PACKAGE_XLIB_LIBPCIACCESS

	select BR2_PACKAGE_XPROTO_DRI2PROTO

	select BR2_PACKAGE_XLIB_LIBPTHREAD_STUBS

	# libatomic_ops is only available on a subset of the supported

	# architectures, and we make the assumption that the intel

	# driver can only be used on x86 and x86_64 machines.

	select BR2_PACKAGE_LIBATOMIC_OPS if (BR2_PACKAGE_XDRIVER_XF86_VIDEO_INTEL && (BR2_i386 || BR2_x86_64))

	help

	  Direct Rendering Manager



	  http://dri.freedesktop.org/libdrm/



if BR2_PACKAGE_LIBDRM



menu "DRM Drivers"



config BR2_PACKAGE_LIBDRM_INTEL

	bool "intel"

	select BR2_PACKAGE_LIBATOMIC_OPS

	select BR2_PACKAGE_XLIB_LIBPCIACCESS

	depends on BR2_i386 || BR2_x86_64

	help

	  installs intel graphics driver



config BR2_PACKAGE_LIBDRM_RADEON

	bool "radeon"

	select BR2_PACKAGE_LIBATOMIC_OPS

	select BR2_PACKAGE_XLIB_LIBPCIACCESS

	depends on BR2_i386 || BR2_x86_64

	help

	  install AMD/ATI graphics driver



config BR2_PACKAGE_LIBDRM_NOUVEAU

	bool "nouveau"

	select BR2_PACKAGE_XLIB_LIBPCIACCESS

	depends on BR2_i386 || BR2_x86_64

	help

	  install Nvidia graphics driver



config BR2_PACKAGE_LIBDRM_VMWGFX

	bool "vmwgfx"

	select BR2_PACKAGE_XLIB_LIBPCIACCESS

	depends on BR2_i386 || BR2_x86_64

	help

	  installs Vmware graphics driver



config BR2_PACKAGE_LIBDRM_OMAP

	bool "omap (experimental)"

	depends on BR2_arm

	help

	  install the TI OMAP driver using an experimental API.



config BR2_PACKAGE_LIBDRM_EXYNOS

	bool "exynos (experimental)"

	depends on BR2_arm

	help

	  installs Samsung Exynos driver using an experimental API.



config BR2_PACKAGE_LIBDRM_FREEDRENO

	bool "freedreno (experimental)"

	depends on BR2_arm

	help

	  install Qualcomm Snapdragon driver using an experimental API.



endmenu



endif



comment "libdrm requires a toolchain with LARGEFILE support"

	depends on BR2_PACKAGE_XORG7 && !BR2_LARGEFILE

package/libdrm/libdrm.mk

+43 −10
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
#

################################################################################



LIBDRM_VERSION = 2.4.38

LIBDRM_VERSION = 2.4.46

LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.bz2

LIBDRM_SITE = http://dri.freedesktop.org/libdrm/

LIBDRM_LICENSE = MIT
@@ -12,26 +12,59 @@ LIBDRM_LICENSE = MIT 
LIBDRM_INSTALL_STAGING = YES



LIBDRM_DEPENDENCIES = \

	xproto_glproto \

	xproto_xf86vidmodeproto \

	xlib_libXxf86vm \

	xlib_libXmu \

	xlib_libpciaccess \

	xproto_dri2proto \

	xlib_libpthread-stubs \

	host-pkgconf



ifeq ($(BR2_PACKAGE_XDRIVER_XF86_VIDEO_INTEL),y)

LIBDRM_CONF_OPT = \

	--disable-cairo-tests \

	--disable-manpages



ifeq ($(BR2_PACKAGE_LIBDRM_INTEL),y)

LIBDRM_CONF_OPT += --enable-intel

LIBDRM_DEPENDENCIES += libatomic_ops

LIBDRM_DEPENDENCIES += libatomic_ops xlib_libpciaccess

else

LIBDRM_CONF_OPT += --disable-intel

endif



ifneq ($(BR2_PACKAGE_XDRIVER_XF86_VIDEO_ATI),y)

ifeq ($(BR2_PACKAGE_LIBDRM_RADEON),y)

LIBDRM_CONF_OPT += --enable-radeon

LIBDRM_DEPENDENCIES += xlib_libpciaccess

else

LIBDRM_CONF_OPT += --disable-radeon

endif



ifeq ($(BR2_PACKAGE_LIBDRM_NOUVEAU),y)

LIBDRM_CONF_OPT += --enable-nouveau

LIBDRM_DEPENDENCIES += xlib_libpciaccess

else

LIBDRM_CONF_OPT += --disable-nouveau

endif



ifeq ($(BR2_PACKAGE_LIBDRM_VMWGFX),y)

LIBDRM_CONF_OPT += --enable-vmwgfx

LIBDRM_DEPENDENCIES += xlib_libpciaccess

else

LIBDRM_CONF_OPT += --enable-vmwgfx

endif



ifeq ($(BR2_PACKAGE_LIBDRM_OMAP),y)

LIBDRM_CONF_OPT += --enable-omap-experimental-api

else

LIBDRM_CONF_OPT += --disable-omap-experimental-api

endif



ifeq ($(BR2_PACKAGE_LIBDRM_EXYNOS),y)

LIBDRM_CONF_OPT += --enable-exynos-experimental-api

else

LIBDRM_CONF_OPT += --disable-exynos-experimental-api

endif



ifeq ($(BR2_PACKAGE_LIBDRM_FREEDRENO),y)

LIBDRM_CONF_OPT += --enable-freedreno-experimental-api

else

LIBDRM_CONF_OPT += --disable-freedreno-experimental-api

endif



ifeq ($(BR2_PACKAGE_UDEV),y)

LIBDRM_CONF_OPT += --enable-udev

LIBDRM_DEPENDENCIES += udev

package/x11r7/xdriver_xf86-video-ati/Config.in

+1 −0
Original line number Diff line number Diff line 
config BR2_PACKAGE_XDRIVER_XF86_VIDEO_ATI

	bool "xf86-video-ati"

	select BR2_PACKAGE_LIBDRM

	select BR2_PACKAGE_LIBDRM_RADEON

	select BR2_PACKAGE_MESA3D

	select BR2_PACKAGE_XPROTO_FONTSPROTO

	select BR2_PACKAGE_XPROTO_GLPROTO

package/x11r7/xdriver_xf86-video-intel/Config.in

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_INTEL 
	select BR2_PACKAGE_XPROTO_XPROTO

	select BR2_PACKAGE_XLIB_LIBPCIACCESS

	select BR2_PACKAGE_LIBDRM

	select BR2_PACKAGE_LIBDRM_INTEL

	select BR2_PACKAGE_MESA3D

	depends on (BR2_i386 || BR2_x86_64)

	help