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

package/x11r7/xserver_xorg-server: Fix compilation of modesetting driver 

Kernel modesettings support also depends on dri2, see
http://cgit.freedesktop.org/xorg/xserver/tree/hw/xfree86/drivers/modesetting/Makefile.am#n46

Fixes
http://autobuild.buildroot.net/results/f26/f26018d5ad62bc7b61623dd173dc1e92e2c958a4/



Signed-off-by: default avatarBernd Kuhls <bernd.kuhls@t-online.de>
Reviewed-by: default avatarVicente Olivert Riera <Vincent.Riera@imgtec.com>
Tested-by: default avatarVicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent fd89a8b7

package/x11r7/xserver_xorg-server/0001-modesettings-needs-dri2.patch

0 → 100644
+19 −0
Original line number Diff line number Diff line 
Kernel modesettings support also depends on dri2, see

http://cgit.freedesktop.org/xorg/xserver/tree/hw/xfree86/drivers/modesetting/Makefile.am#n46



Patch sent upstream: https://bugs.freedesktop.org/show_bug.cgi?id=91584



Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>



diff -uNr xorg-server-1.17.2.org/configure.ac xorg-server-1.17.2/configure.ac

--- xorg-server-1.17.2.org/configure.ac	2015-06-16 17:42:40.000000000 +0200

+++ xorg-server-1.17.2/configure.ac	2015-08-08 10:44:59.702382624 +0200

@@ -2036,7 +2036,7 @@

 	        XORG_SYS_LIBS="$XORG_SYS_LIBS $XORG_MODULES_LIBS"

 	fi

 

-	if test "x$DRM" = xyes; then

+	if test "x$DRM" = xyes -a "x$DRI2" = xyes; then

 		dnl 2.4.46 is required for cursor hotspot support.

 		PKG_CHECK_EXISTS(libdrm >= 2.4.46)

 		XORG_DRIVER_MODESETTING=yes

package/x11r7/xserver_xorg-server/xserver_xorg-server.mk

+5 −2
Original line number Diff line number Diff line
@@ -10,7 +10,10 @@ XSERVER_XORG_SERVER_SITE = http://xorg.freedesktop.org/releases/individual/xserv 
XSERVER_XORG_SERVER_LICENSE = MIT

XSERVER_XORG_SERVER_LICENSE_FILES = COPYING

XSERVER_XORG_SERVER_INSTALL_STAGING = YES

# xfont_font-util is needed only for autoreconf

XSERVER_XORG_SERVER_AUTORECONF = YES

XSERVER_XORG_SERVER_DEPENDENCIES = 	\

	xfont_font-util			\

	xutil_util-macros 		\

	xlib_libXfont 			\

	xlib_libX11 			\
@@ -143,8 +146,8 @@ endif 
ifeq ($(BR2_PACKAGE_HAS_UDEV),y)

XSERVER_XORG_SERVER_DEPENDENCIES += udev

XSERVER_XORG_SERVER_CONF_OPTS += --enable-config-udev

# udev kms support depends on libdrm

ifeq ($(BR2_PACKAGE_LIBDRM),y)

# udev kms support depends on libdrm and dri2

ifeq ($(BR2_PACKAGE_LIBDRM)$(BR2_PACKAGE_XPROTO_DRI2PROTO),yy)

XSERVER_XORG_SERVER_DEPENDENCIES += libdrm

XSERVER_XORG_SERVER_CONF_OPTS += --enable-config-udev-kms --enable-libdrm

else