Re: gallium build problem

[Ryosuke Moro <szptvlfn%a-net.email.ne.jp@localhost>]

On Sun, 01 Nov 2015 08:48:50 +1100, matthew green wrote:
> is there a real problem you have with having it around?  the build
> seem to be fixed now.

$ mpv --vo=opengl-hq files


external/mit/xorg/lib/gallium/Makefile:
  CFLAGS.streaming-load-memcpy.c+= -msse4.1
contradicts external/mit/xorg/lib/asm.mk

Index: gallium/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/lib/gallium/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- gallium/Makefile	31 Oct 2015 20:13:45 -0000	1.11
+++ gallium/Makefile	1 Nov 2015 00:55:22 -0000
@@ -556,7 +556,7 @@ MESA_SRC_MODULES=  main math vbo state_t
 .PATH: ${X11SRCDIR.MesaLib}/src/mesa/x86
 SRCS+=	common_x86.c
 
-.if ${MACHINE} == "amd64" || ${MACHINE} == "i386"
+.if ${MACHINE} == "amd64"
 SRCS+=	streaming-load-memcpy.c
 CFLAGS.streaming-load-memcpy.c+= -msse4.1
 .endif


Index: libmesa.mk
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/lib/libmesa.mk,v
retrieving revision 1.1
diff -u -p -r1.1 libmesa.mk
--- libmesa.mk	18 Dec 2014 06:24:28 -0000	1.1
+++ libmesa.mk	1 Nov 2015 00:55:21 -0000
@@ -122,13 +122,13 @@ SRCS.main= \
 	version.c \
 	viewport.c \
 	vtxfmt.c \
-	es1_conversion.c \
+	es1_conversion.c
 
 # Build files
 .PATH:	${X11SRCDIR.MesaLib}/../src/mesa/main
 SRCS.main+= \
 	enums.c \
-	api_exec.c \
+	api_exec.c
 
 # XXX  avoid source name clashes with glx
 .PATH:		${X11SRCDIR.MesaLib}/src/mesa/main

right ?
--
Ryosuke