git.libre-soc.org Git - buildroot.git/blob

   1 From 49456e0a37fac7bc9d1f01bc1519fb0d699956db Mon Sep 17 00:00:00 2001
   2 From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
   3 Date: Fri, 27 Dec 2019 23:33:37 +0100
   4 Subject: [PATCH] hw/xfree86/common/xf86Init.c: fix build without glx
   5
   6 Since commit d8ec33fe0542141aed1d9016d2ecaf52da944b4b, an include on
   7 glxvndabi.h has been added to hw/xfree86/common/xf86Init.c
   8
   9 However, if glx is disabled through --disable-glx and GLX headers are
  10 not installed in the build's environment, build fails on:
  11
  12 In file included from xf86Init.c:81:
  13 ../../../include/glxvndabi.h:64:10: fatal error: GL/glxproto.h: No such file or directory
  14    64 | #include <GL/glxproto.h>
  15       |          ^~~~~~~~~~~~~~~
  16
  17 Fix this failure by removing this include which does not seem to be
  18 needed (an other option would have been to keep it under an ifdef GLXEXT
  19 block)
  20
  21 Fixes:
  22  - http://autobuild.buildroot.org/results/de838a843f97673d1381a55fd4e9b07164693913
  23
  24 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  25 [Retrieved from:
  26 https://gitlab.freedesktop.org/xorg/xserver/commit/49456e0a37fac7bc9d1f01bc1519fb0d699956db]
  27 ---
  28  hw/xfree86/common/xf86Init.c | 1 -
  29  1 file changed, 1 deletion(-)
  30
  31 diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
  32 index 0631c7237..e6fb11398 100644
  33 --- a/hw/xfree86/common/xf86Init.c
  34 +++ b/hw/xfree86/common/xf86Init.c
  35 @@ -74,7 +74,6 @@
  36  #include "xf86Crtc.h"
  37  #include "picturestr.h"
  38  #include "randrstr.h"
  39 -#include "glxvndabi.h"
  40  #include "xf86Bus.h"
  41  #ifdef XSERVER_LIBPCIACCESS
  42  #include "xf86VGAarbiter.h"
  43 --
  44 2.24.1
  45