Commit ad30e6d5 authored by Bernd Kuhls's avatar Bernd Kuhls Committed by Thomas Petazzoni
Browse files

xdriver_xf86-video-intel: Bump version to 2.99.914 



- enable sna module by default
- optionally enable uxa module if DRI2 support is enabled
- add support for DRI3
- dependencies for DRI1/2/3 modules are provided by xserver_xorg-server,
  therefore remove mesa3d dependency
- clean-up ums/kms options, configure picks sane defaults
- replace dependencies xproto_randrproto & xproto_renderproto with xlib_libXrandr

Signed-off-by: default avatarBernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent f3880b98

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

+1 −7
Original line number Diff line number Diff line 
config BR2_PACKAGE_XDRIVER_XF86_VIDEO_INTEL

	bool "xf86-video-intel"

	depends on (BR2_i386 || BR2_x86_64)

	depends on BR2_PACKAGE_MESA3D

	select BR2_PACKAGE_XPROTO_FONTSPROTO

	select BR2_PACKAGE_XPROTO_RANDRPROTO

	select BR2_PACKAGE_XPROTO_RENDERPROTO

	select BR2_PACKAGE_XPROTO_XPROTO

	select BR2_PACKAGE_XLIB_LIBPCIACCESS

	select BR2_PACKAGE_LIBDRM

	select BR2_PACKAGE_LIBDRM_INTEL

	select BR2_PACKAGE_XLIB_LIBXRANDR

	help

	  Intel video driver
 


comment "xf86-video-intel needs mesa3d"

	depends on (BR2_i386 || BR2_x86_64)

	depends on !BR2_PACKAGE_MESA3D

package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk

+26 −7
Original line number Diff line number Diff line
@@ -4,25 +4,44 @@ 
#

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



XDRIVER_XF86_VIDEO_INTEL_VERSION = 2.99.907

XDRIVER_XF86_VIDEO_INTEL_VERSION = 2.99.914

XDRIVER_XF86_VIDEO_INTEL_SOURCE = xf86-video-intel-$(XDRIVER_XF86_VIDEO_INTEL_VERSION).tar.bz2

XDRIVER_XF86_VIDEO_INTEL_SITE = http://xorg.freedesktop.org/releases/individual/driver

XDRIVER_XF86_VIDEO_INTEL_LICENSE = MIT

XDRIVER_XF86_VIDEO_INTEL_LICENSE_FILES = COPYING

XDRIVER_XF86_VIDEO_INTEL_AUTORECONF = YES



XDRIVER_XF86_VIDEO_INTEL_CONF_OPT = \

	--enable-dri \

	--enable-kms-only \

	--disable-xvmc \

	--disable-ums-only \

	--enable-sna \

	--disable-uxa \

	--disable-glamor \

	--disable-xaa \

	--disable-dga \

	--disable-async-swap



XDRIVER_XF86_VIDEO_INTEL_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xproto libdrm xlib_libpciaccess

XDRIVER_XF86_VIDEO_INTEL_DEPENDENCIES = \

	libdrm \

	xlib_libXrandr \

	xlib_libpciaccess \

	xproto_fontsproto \

	xproto_xproto \

	xserver_xorg-server



# X.org server support for DRI depends on a Mesa3D DRI driver

ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),y)

XDRIVER_XF86_VIDEO_INTEL_CONF_OPT += --enable-dri --enable-dri1

# quote from configure.ac: "UXA doesn't build without DRI2 headers"

ifeq ($(BR2_PACKAGE_XPROTO_DRI2PROTO),y)

XDRIVER_XF86_VIDEO_INTEL_CONF_OPT += --enable-dri2 --enable-uxa

else

XDRIVER_XF86_VIDEO_INTEL_CONF_OPT += --disable-dri2 --disable-uxa

endif

ifeq ($(BR2_PACKAGE_XPROTO_DRI3PROTO),y)

XDRIVER_XF86_VIDEO_INTEL_CONF_OPT += --enable-dri3

else

XDRIVER_XF86_VIDEO_INTEL_CONF_OPT += --disable-dri3

endif

else

XDRIVER_XF86_VIDEO_INTEL_CONF_OPT += --disable-dri

endif



$(eval $(autotools-package))