Sorry, in my exuberance to get the first diff out, I created it from the
wrong directory. Here is a new diff for your consideration.
Hope I did this right this time around.
Regards,
Tracey
On Wed, Nov 29, 2017 at 12:36 PM, Base Pr1me <[email protected]> wrote:
> The attached diff fixes an error when building xenocara with
> XENOCARA_BUILD_GALLIUM=llvm set. Attaching instead of inline, as I've read
> on here the gmail mangles whitespace ... or something.
>
> Thanks,
> Tracey
>
Index: xenocara/xserver/hw/xfree86/glamor_egl/Makefile.am
===================================================================
RCS file: /cvs/xenocara/xserver/hw/xfree86/glamor_egl/Makefile.am,v
retrieving revision 1.2
diff -u -p -u -r1.2 Makefile.am
--- xenocara/xserver/hw/xfree86/glamor_egl/Makefile.am 16 Sep 2015 19:10:22
-0000 1.2
+++ xenocara/xserver/hw/xfree86/glamor_egl/Makefile.am 30 Nov 2017 21:33:27
-0000
@@ -39,6 +39,7 @@ libglamoregl_la_LIBADD = \
AM_CPPFLAGS = $(XORG_INCS) \
-I$(top_srcdir)/dri3 \
-I$(top_srcdir)/glamor \
+ @GL_CFLAGS@ \
$()
AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) $(GLAMOR_CFLAGS) $(GBM_CFLAGS)
Index: xenocara/xserver/hw/xfree86/glamor_egl/Makefile.in
===================================================================
RCS file: /cvs/xenocara/xserver/hw/xfree86/glamor_egl/Makefile.in,v
retrieving revision 1.5
diff -u -p -u -r1.5 Makefile.in
--- xenocara/xserver/hw/xfree86/glamor_egl/Makefile.in 11 Oct 2016 22:15:55
-0000 1.5
+++ xenocara/xserver/hw/xfree86/glamor_egl/Makefile.in 30 Nov 2017 21:33:27
-0000
@@ -543,6 +543,7 @@ libglamoregl_la_LIBADD = \
AM_CPPFLAGS = $(XORG_INCS) \
-I$(top_srcdir)/dri3 \
-I$(top_srcdir)/glamor \
+ @GL_CFLAGS@ \
$()
AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) $(GLAMOR_CFLAGS) $(GBM_CFLAGS)
