All of lore.kernel.org
 help / color / mirror / Atom feed
From: Bernd Kuhls <bernd.kuhls@t-online.de>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 2/2] package/x11r7/xserver_xorg-server: libdrm needs dri2
Date: Mon, 25 Jul 2016 08:09:16 +0200	[thread overview]
Message-ID: <1469426956-23383-2-git-send-email-bernd.kuhls@t-online.de> (raw)
In-Reply-To: <1469426956-23383-1-git-send-email-bernd.kuhls@t-online.de>

While fixing
http://autobuild.buildroot.net/results/3b2/3b2b10314cde2ecacb7fd3949990a4cac2117f4c/
the build throws an error in the modesettings driver after libdrm CFLAGS
were fixed by the previous patch:

In file included from dri2.c:43:0:
./../../dri2/dri2.h:36:39: fatal error: X11/extensions/dri2tokens.h: No such file or directory
 #include <X11/extensions/dri2tokens.h>

According to configure.ac the modesettings driver is enabled if libdrm was
found:
https://cgit.freedesktop.org/xorg/xserver/commit/configure.ac?id=bc4b234d6f4b7b211f7a9750a97524e9652d0e6e

This patch adds the necessary dri2 dependency.

Fixes additional build error in
http://autobuild.buildroot.net/results/3b2/3b2b10314cde2ecacb7fd3949990a4cac2117f4c/

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index 0d14654..13f9087 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -97,7 +97,7 @@ endif
 ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR),y)
 XSERVER_XORG_SERVER_CONF_OPTS += --enable-xorg
 XSERVER_XORG_SERVER_DEPENDENCIES += libpciaccess
-ifeq ($(BR2_PACKAGE_LIBDRM),y)
+ifeq ($(BR2_PACKAGE_LIBDRM)$(BR2_PACKAGE_XPROTO_DRI2PROTO),yy)
 XSERVER_XORG_SERVER_DEPENDENCIES += libdrm
 XSERVER_XORG_SERVER_CONF_ENV += LIBDRM_CFLAGS="`$(PKG_CONFIG_HOST_BINARY) --cflags libdrm`"
 XSERVER_XORG_SERVER_CONF_OPTS += --enable-libdrm
-- 
2.8.1

  reply	other threads:[~2016-07-25  6:09 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-07-25  6:09 [Buildroot] [PATCH 1/2] package/x11r7/xserver_xorg-server: add libdrm-specific cflags Bernd Kuhls
2016-07-25  6:09 ` Bernd Kuhls [this message]
2016-07-25 20:46   ` [Buildroot] [PATCH 2/2] package/x11r7/xserver_xorg-server: libdrm needs dri2 Thomas Petazzoni
2016-07-25 20:45 ` [Buildroot] [PATCH 1/2] package/x11r7/xserver_xorg-server: add libdrm-specific cflags Thomas Petazzoni

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1469426956-23383-2-git-send-email-bernd.kuhls@t-online.de \
    --to=bernd.kuhls@t-online.de \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.