Re: CVS commit: src/external/mit/xorg/lib

2020-09-20 Thread maya
On Wed, Sep 16, 2020 at 06:26:45PM +, m...@netbsd.org wrote:
> Since the background for this is an issue nobody else is experiencing,
> can you at least report a bug for how to reach it?

hello?

in the original proposal joerg already said it has a chance of making
opengl not reentrant. the use case which you have, of wayland (I had to
dig it up in my logs) isn't relevant for base xsrc.


Re: CVS commit: src/external/mit/xorg/lib

2020-09-16 Thread maya
Since the background for this is an issue nobody else is experiencing,
can you at least report a bug for how to reach it?

On Wed, Sep 16, 2020 at 06:19:24PM +, Nia Alarie wrote:
> Module Name:  src
> Committed By: nia
> Date: Wed Sep 16 18:19:24 UTC 2020
> 
> Modified Files:
>   src/external/mit/xorg/lib: libmesa.mk
>   src/external/mit/xorg/lib/libGL: Makefile
>   src/external/mit/xorg/lib/libglapi: Makefile
> 
> Log Message:
> disable use of ELF TLS in Mesa/libGL
> 
> this is an optimization that primarily benefits linux/glibc -
> most other systems have this disabled. in netbsd we've tried to
> patch around it to make things work, but there still appears to be
> some edge cases where libGL mysteriously crashes.
> 
> discussed on tech-x11 some time ago. already in place in pkgsrc.
> 
> 
> To generate a diff of this commit:
> cvs rdiff -u -r1.11 -r1.12 src/external/mit/xorg/lib/libmesa.mk
> cvs rdiff -u -r1.29 -r1.30 src/external/mit/xorg/lib/libGL/Makefile
> cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/libglapi/Makefile
> 
> Please note that diffs are not public domain; they are subject to the
> copyright notices on the relevant files.
> 

> Modified files:
> 
> Index: src/external/mit/xorg/lib/libmesa.mk
> diff -u src/external/mit/xorg/lib/libmesa.mk:1.11 
> src/external/mit/xorg/lib/libmesa.mk:1.12
> --- src/external/mit/xorg/lib/libmesa.mk:1.11 Sun Feb 23 02:03:19 2020
> +++ src/external/mit/xorg/lib/libmesa.mk  Wed Sep 16 18:19:23 2020
> @@ -1,4 +1,4 @@
> -#$NetBSD: libmesa.mk,v 1.11 2020/02/23 02:03:19 joerg Exp $
> +#$NetBSD: libmesa.mk,v 1.12 2020/09/16 18:19:23 nia Exp $
>  #
>  # Consumer of this Makefile should set MESA_SRC_MODULES.
>  
> @@ -526,7 +526,6 @@ CPPFLAGS+=\
>   -DHAVE_LIBDRM -DGLX_USE_DRM \
>   -DGLX_INDIRECT_RENDERING \
>   -DGLX_DIRECT_RENDERING \
> - -DGLX_USE_TLS \
>   -DHAVE_X11_PLATFORM \
>   -DHAVE_DRM_PLATFORM \
>   -DENABLE_SHADER_CACHE \
> 
> Index: src/external/mit/xorg/lib/libGL/Makefile
> diff -u src/external/mit/xorg/lib/libGL/Makefile:1.29 
> src/external/mit/xorg/lib/libGL/Makefile:1.30
> --- src/external/mit/xorg/lib/libGL/Makefile:1.29 Sun Mar 29 21:06:03 2020
> +++ src/external/mit/xorg/lib/libGL/Makefile  Wed Sep 16 18:19:23 2020
> @@ -1,4 +1,4 @@
> -#$NetBSD: Makefile,v 1.29 2020/03/29 21:06:03 maya Exp $
> +#$NetBSD: Makefile,v 1.30 2020/09/16 18:19:23 nia Exp $
>  
>  .include 
>  
> @@ -180,7 +180,7 @@ CPPFLAGS+=\
>   -DHAVE_FUNC_ATTRIBUTE_NORETURN=1 -DHAVE_ENDIAN_H=1 -DHAVE_DLADDR=1 \
>   -DHAVE_CLOCK_GETTIME=1 -DHAVE_PTHREAD_PRIO_INHERIT=1 \
>   -DHAVE_PTHREAD=1 -DENABLE_ST_OMX_BELLAGIO=0 -DENABLE_ST_OMX_TIZONIA=0 \
> - -DHAVE_TIMESPEC_GET -DGLX_USE_TLS
> + -DHAVE_TIMESPEC_GET
>  
>  .include "../asm.mk"
>  
> @@ -224,7 +224,7 @@ PKGCONFIG_SED_FLAGS= \
>   s,@GL_PKGCONF_LIB@,GL,; \
>   s,@GL_PC_LIB_PRIV@,-lm -lpthread -pthread,; \
>   s,@GL_PC_CFLAGS@,,; \
> - s,@GLX_TLS@,yes,"
> + s,@GLX_TLS@,no,"
>  
>  
>  CWARNFLAGS.clang+=   -Wno-tautological-compare -Wno-format 
> -Wno-constant-conversion \
> 
> Index: src/external/mit/xorg/lib/libglapi/Makefile
> diff -u src/external/mit/xorg/lib/libglapi/Makefile:1.7 
> src/external/mit/xorg/lib/libglapi/Makefile:1.8
> --- src/external/mit/xorg/lib/libglapi/Makefile:1.7   Sun Feb 23 02:02:32 2020
> +++ src/external/mit/xorg/lib/libglapi/Makefile   Wed Sep 16 18:19:24 2020
> @@ -1,4 +1,4 @@
> -#$NetBSD: Makefile,v 1.7 2020/02/23 02:02:32 joerg Exp $
> +#$NetBSD: Makefile,v 1.8 2020/09/16 18:19:24 nia Exp $
>  
>  .include 
>  
> @@ -68,7 +68,6 @@ CPPFLAGS+=  \
>   -DGLX_USE_DRM \
>   -DGLX_INDIRECT_RENDERING \
>   -DGLX_DIRECT_RENDERING \
> - -DGLX_USE_TLS \
>   -DHAVE_X11_PLATFORM \
>   -DHAVE_DRM_PLATFORM \
>   -DENABLE_SHADER_CACHE \
> 



Re: CVS commit: src/external/mit/xorg/lib/gallium

2020-02-03 Thread Joerg Sonnenberger
On Fri, Jan 31, 2020 at 09:13:40PM +, Jared D. McNeill wrote:
> Module Name:  src
> Committed By: jmcneill
> Date: Fri Jan 31 21:13:40 UTC 2020
> 
> Modified Files:
>   src/external/mit/xorg/lib/gallium: Makefile
> 
> Log Message:
> Bump MESA_LLVM_VERSION_STRING

Directly use ${LLVM_VERSION}?

Joerg


Re: CVS commit: src/external/mit/xorg/lib

2020-02-03 Thread Joerg Sonnenberger
On Fri, Jan 31, 2020 at 08:58:18PM +, Jared D. McNeill wrote:
> Module Name:  src
> Committed By: jmcneill
> Date: Fri Jan 31 20:58:18 UTC 2020
> 
> Modified Files:
>   src/external/mit/xorg/lib: libmesa.mk
>   src/external/mit/xorg/lib/libglapi: Makefile
> 
> Log Message:
> Change HAVE_LLVM from 0x0700 to 0x0900.

Can we change this to something like:

NUMERIC_LLVM_VERSION!=  ${LLVM_VERSION:R:R} * 256
-DHAVE_LLVM=${NUMERIC_LLVM_VERSION}

(not bothering with the minor, since it will be 0 anyway).

Joerg


CVS commit: src/external/mit/xorg/lib/gallium

2019-11-19 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Wed Nov 20 06:23:31 UTC 2019

Modified Files:
src/external/mit/xorg/lib/gallium: Makefile

Log Message:
Restrict -Wl,-z,defs to x86 and aarch64 for now to avoid global build
lossage. Suggested by mrg.


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/external/mit/xorg/lib/gallium/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/external/mit/xorg/lib/gallium

2019-11-19 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Wed Nov 20 06:23:31 UTC 2019

Modified Files:
src/external/mit/xorg/lib/gallium: Makefile

Log Message:
Restrict -Wl,-z,defs to x86 and aarch64 for now to avoid global build
lossage. Suggested by mrg.


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/external/mit/xorg/lib/gallium/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/lib/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.39 src/external/mit/xorg/lib/gallium/Makefile:1.40
--- src/external/mit/xorg/lib/gallium/Makefile:1.39	Tue Nov 19 08:59:18 2019
+++ src/external/mit/xorg/lib/gallium/Makefile	Wed Nov 20 06:23:31 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2019/11/19 08:59:18 martin Exp $
+# $NetBSD: Makefile,v 1.40 2019/11/20 06:23:31 martin Exp $
 
 # Link the gallium mega driver.
 
@@ -1086,7 +1086,10 @@ LLVMRT_LIBS+=	\
 
 .endif  # ${BUILD_LLVM_PIPE} == 1 || ${BUILD_RADEON} == 1
 
-LDFLAGS+=	-Wl,--version-script=${X11SRCDIR.Mesa}/src/gallium/targets/dri/dri.sym -Wl,-z,defs
+LDFLAGS+=	-Wl,--version-script=${X11SRCDIR.Mesa}/src/gallium/targets/dri/dri.sym
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || ${MACHINE_CPU} == "aarch64"
+LDFLAGS+=	-Wl,-z,defs
+.endif
 
 ##  build mesagallium parts
 MESA_SRC_MODULES=  main math vbo state_tracker program asm_s



CVS commit: src/external/mit/xorg/lib/gallium

2019-11-19 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Tue Nov 19 08:59:18 UTC 2019

Modified Files:
src/external/mit/xorg/lib/gallium: Makefile

Log Message:
Looks like this requires pthread.


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/external/mit/xorg/lib/gallium/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/lib/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.38 src/external/mit/xorg/lib/gallium/Makefile:1.39
--- src/external/mit/xorg/lib/gallium/Makefile:1.38	Mon Nov 18 22:26:15 2019
+++ src/external/mit/xorg/lib/gallium/Makefile	Tue Nov 19 08:59:18 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2019/11/18 22:26:15 joerg Exp $
+# $NetBSD: Makefile,v 1.39 2019/11/19 08:59:18 martin Exp $
 
 # Link the gallium mega driver.
 
@@ -23,6 +23,10 @@ CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/libd
 		-I${NETBSDSRCDIR}/external/apache2/llvm/dist/llvm/include \
 		-I${LLVM_INCLUDE_OBJDIR} -I${NETBSDSRCDIR}/external/apache2/llvm/config
 
+CFLAGS+=	-pthread
+LDFLAGS+=	-pthread
+LIBDPLIBS+=	pthread		${.CURDIR}/../../../../../lib/libpthread
+
 GALLIUM_SUBDIRS= \
 	auxiliary \
 	auxiliary/cso_cache \



CVS commit: src/external/mit/xorg/lib/gallium

2019-11-19 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Tue Nov 19 08:59:18 UTC 2019

Modified Files:
src/external/mit/xorg/lib/gallium: Makefile

Log Message:
Looks like this requires pthread.


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/external/mit/xorg/lib/gallium/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/external/mit/xorg/lib/gallium

2019-10-28 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Mon Oct 28 18:38:54 UTC 2019

Modified Files:
src/external/mit/xorg/lib/gallium: Makefile

Log Message:
another vax optimizer hack.


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/external/mit/xorg/lib/gallium/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/external/mit/xorg/lib/gallium

2019-10-28 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Mon Oct 28 18:38:54 UTC 2019

Modified Files:
src/external/mit/xorg/lib/gallium: Makefile

Log Message:
another vax optimizer hack.


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/external/mit/xorg/lib/gallium/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/lib/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.35 src/external/mit/xorg/lib/gallium/Makefile:1.36
--- src/external/mit/xorg/lib/gallium/Makefile:1.35	Tue Sep 24 15:29:41 2019
+++ src/external/mit/xorg/lib/gallium/Makefile	Mon Oct 28 14:38:54 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2019/09/24 19:29:41 maya Exp $
+# $NetBSD: Makefile,v 1.36 2019/10/28 18:38:54 christos Exp $
 
 # Link the gallium mega driver.
 
@@ -1186,6 +1186,9 @@ SYMLINKS+= gallium_dri.so.${SHLIB_MAJOR}
 COPTS+=	${${ACTIVE_CC} == "clang":? -Wa,-Av8plus  :}
 .endif
 
+.if ${MACHINE_ARCH} == "vax"
+COPTS.nir.c += -O1
+.endif
 
 .include 
 # Don't regenerate c files



CVS commit: src/external/mit/xorg/lib

2019-09-24 Thread Maya Rashish
Module Name:src
Committed By:   maya
Date:   Tue Sep 24 21:33:48 UTC 2019

Modified Files:
src/external/mit/xorg/lib: libmesa.mk

Log Message:
Adjust .PATH


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/libmesa.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/lib/libmesa.mk
diff -u src/external/mit/xorg/lib/libmesa.mk:1.8 src/external/mit/xorg/lib/libmesa.mk:1.9
--- src/external/mit/xorg/lib/libmesa.mk:1.8	Tue Sep 24 19:29:41 2019
+++ src/external/mit/xorg/lib/libmesa.mk	Tue Sep 24 21:33:48 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: libmesa.mk,v 1.8 2019/09/24 19:29:41 maya Exp $
+#	$NetBSD: libmesa.mk,v 1.9 2019/09/24 21:33:48 maya Exp $
 #
 # Consumer of this Makefile should set MESA_SRC_MODULES.
 
@@ -424,7 +424,7 @@ SRCS.state_tracker= \
 	st_tgsi_lower_yuv.c
 
 # Program sources
-PATHS.program=	mesa/program ../../src/mesa/main/program
+PATHS.program=	mesa/program ../../src/mesa/program
 INCLUDES.program=	glsl
 SRCS.program= \
 	arbprogparse.c \



CVS commit: src/external/mit/xorg/lib

2019-09-24 Thread Maya Rashish
Module Name:src
Committed By:   maya
Date:   Tue Sep 24 21:33:48 UTC 2019

Modified Files:
src/external/mit/xorg/lib: libmesa.mk

Log Message:
Adjust .PATH


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/libmesa.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/external/mit/xorg/lib

2019-09-24 Thread Maya Rashish
Module Name:src
Committed By:   maya
Date:   Tue Sep 24 19:29:42 UTC 2019

Modified Files:
src/external/mit/xorg/lib: driver.mk libglsl.mk libloader.mk libmesa.mk
src/external/mit/xorg/lib/dri: Makefile
src/external/mit/xorg/lib/gallium: Makefile
src/external/mit/xorg/lib/libEGL: Makefile
src/external/mit/xorg/lib/libGL: Makefile mesa-ver.mk
src/external/mit/xorg/lib/libgbm: Makefile
src/external/mit/xorg/lib/libglapi: Makefile

Log Message:
Update build logic for mesa 19.1.7.

A lot of files are now living outside of dist, since they're not in the
distributed sources: they're generated, usually by python/meson.

The remaining changes are due to files being moved around.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/driver.mk \
src/external/mit/xorg/lib/libloader.mk
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/libglsl.mk
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/libmesa.mk
cvs rdiff -u -r1.32 -r1.33 src/external/mit/xorg/lib/dri/Makefile
cvs rdiff -u -r1.34 -r1.35 src/external/mit/xorg/lib/gallium/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/libEGL/Makefile
cvs rdiff -u -r1.27 -r1.28 src/external/mit/xorg/lib/libGL/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/libGL/mesa-ver.mk
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/libgbm/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/libglapi/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/lib/driver.mk
diff -u src/external/mit/xorg/lib/driver.mk:1.3 src/external/mit/xorg/lib/driver.mk:1.4
--- src/external/mit/xorg/lib/driver.mk:1.3	Sun Mar 10 10:51:58 2019
+++ src/external/mit/xorg/lib/driver.mk	Tue Sep 24 19:29:41 2019
@@ -1,9 +1,10 @@
-#	$NetBSD: driver.mk,v 1.3 2019/03/10 10:51:58 mrg Exp $
+#	$NetBSD: driver.mk,v 1.4 2019/09/24 19:29:41 maya Exp $
 
 # stuff both dri and gallium drivers need.
 
 # util
 .PATH:		${X11SRCDIR.Mesa}/src/util
+.PATH:		${X11SRCDIR.Mesa}/../src/util
 
 SRCS.util=	\
 	hash_table.c \
@@ -49,3 +50,6 @@ SRCS+=	${SRCS.util}
 .PATH: ${X11SRCDIR.Mesa}/src/mesa/drivers/dri/common
 SRCS+=	utils.c dri_util.c xmlconfig.c
 SRCS+=	megadriver_stub.c
+
+CPPFLAGS.dri_util.c+=		-I${X11SRCDIR.Mesa}/../src/util
+
Index: src/external/mit/xorg/lib/libloader.mk
diff -u src/external/mit/xorg/lib/libloader.mk:1.3 src/external/mit/xorg/lib/libloader.mk:1.4
--- src/external/mit/xorg/lib/libloader.mk:1.3	Sun Mar 10 10:51:58 2019
+++ src/external/mit/xorg/lib/libloader.mk	Tue Sep 24 19:29:41 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: libloader.mk,v 1.3 2019/03/10 10:51:58 mrg Exp $
+#	$NetBSD: libloader.mk,v 1.4 2019/09/24 19:29:41 maya Exp $
 
 # makefile fragment for mesa src/loader
 
@@ -12,8 +12,11 @@ SRCS.loader += \
 
 .for _f in ${SRCS.loader}
 CPPFLAGS.${_f}= 	-I${X11SRCDIR.Mesa}/src/util \
+			-I${X11SRCDIR.Mesa}/../src/util \
 			-I${X11SRCDIR.Mesa}/src/mesa \
 			-I${X11SRCDIR.Mesa}/src \
+			-DGL_LIB_NAME=\"libGL.so.3\" \
+			-DDEFAULT_DRIVER_DIR=\"${X11USRLIBDIR}/modules/dri\" \
 			-DUSE_DRICONF
 .endfor
 

Index: src/external/mit/xorg/lib/libglsl.mk
diff -u src/external/mit/xorg/lib/libglsl.mk:1.5 src/external/mit/xorg/lib/libglsl.mk:1.6
--- src/external/mit/xorg/lib/libglsl.mk:1.5	Sun Apr  7 08:14:20 2019
+++ src/external/mit/xorg/lib/libglsl.mk	Tue Sep 24 19:29:41 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: libglsl.mk,v 1.5 2019/04/07 08:14:20 maya Exp $
+#	$NetBSD: libglsl.mk,v 1.6 2019/09/24 19:29:41 maya Exp $
 
 LIBGLSL_GENERATED_CXX_FILES = \
 	glsl_lexer.cpp \
@@ -8,7 +8,14 @@ LIBGLSL_GENERATED_CXX_FILES = \
 COPTS.vtn_glsl450.c+=	${${ACTIVE_CC} == "clang":? -Wno-error=enum-conversion :}
 
 CPPFLAGS+=	-I${X11SRCDIR.Mesa}/src/compiler \
-		-I${X11SRCDIR.Mesa}/src/compiler/nir
+		-I${X11SRCDIR.Mesa}/../src/compiler \
+		-I${X11SRCDIR.Mesa}/src/compiler/nir \
+		-I${X11SRCDIR.Mesa}/../src/compiler/nir \
+		-I${X11SRCDIR.Mesa}/src/compiler/glsl \
+		-I${X11SRCDIR.Mesa}/../src/compiler/glsl \
+		-I${X11SRCDIR.Mesa}/src/compiler/glsl/glcpp \
+		-I${X11SRCDIR.Mesa}/../src/compiler/glsl/glcpp \
+		-I${X11SRCDIR.Mesa}/src/compiler/spirv
 
 LIBGLSL_FILES = \
 	ast_array_index.cpp \
@@ -21,28 +28,30 @@ LIBGLSL_FILES = \
 	builtin_variables.cpp \
 	generate_ir.cpp \
 	gl_nir_lower_atomics.c \
-	gl_nir_lower_samplers.c \
-	gl_nir_lower_samplers_as_deref.c \
 	gl_nir_link_atomics.c \
 	gl_nir_link_uniform_initializers.c \
 	gl_nir_link_uniforms.c \
 	gl_nir_link_xfb.c \
 	gl_nir_linker.c \
+	gl_nir_lower_bindless_images.c \
+	gl_nir_lower_buffers.c \
+	gl_nir_lower_samplers.c \
+	gl_nir_lower_samplers_as_deref.c \
 	glsl_parser_extras.cpp \
 	glsl_symbol_table.cpp \
 	glsl_to_nir.cpp \
 	hir_field_selection.cpp \
+	ir.cpp \
 	ir_array_refcount.cpp \
 	ir_basic_block.cpp \
 	ir_builder.cpp \
 	ir_clone.cpp \
 	ir_constant_expression.cpp \
-	ir.cpp \
 	ir_equals.cpp \
 	

CVS commit: src/external/mit/xorg/lib

2019-09-24 Thread Maya Rashish
Module Name:src
Committed By:   maya
Date:   Tue Sep 24 19:29:42 UTC 2019

Modified Files:
src/external/mit/xorg/lib: driver.mk libglsl.mk libloader.mk libmesa.mk
src/external/mit/xorg/lib/dri: Makefile
src/external/mit/xorg/lib/gallium: Makefile
src/external/mit/xorg/lib/libEGL: Makefile
src/external/mit/xorg/lib/libGL: Makefile mesa-ver.mk
src/external/mit/xorg/lib/libgbm: Makefile
src/external/mit/xorg/lib/libglapi: Makefile

Log Message:
Update build logic for mesa 19.1.7.

A lot of files are now living outside of dist, since they're not in the
distributed sources: they're generated, usually by python/meson.

The remaining changes are due to files being moved around.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/driver.mk \
src/external/mit/xorg/lib/libloader.mk
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/libglsl.mk
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/libmesa.mk
cvs rdiff -u -r1.32 -r1.33 src/external/mit/xorg/lib/dri/Makefile
cvs rdiff -u -r1.34 -r1.35 src/external/mit/xorg/lib/gallium/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/libEGL/Makefile
cvs rdiff -u -r1.27 -r1.28 src/external/mit/xorg/lib/libGL/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/libGL/mesa-ver.mk
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/libgbm/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/libglapi/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/external/mit/xorg/lib/libdrm

2019-08-12 Thread Maya Rashish
Module Name:src
Committed By:   maya
Date:   Mon Aug 12 14:21:54 UTC 2019

Modified Files:
src/external/mit/xorg/lib/libdrm: Makefile

Log Message:
We need to link against libm for real, not just in spirit.

XXX pullup-9


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/external/mit/xorg/lib/libdrm/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/lib/libdrm/Makefile
diff -u src/external/mit/xorg/lib/libdrm/Makefile:1.16 src/external/mit/xorg/lib/libdrm/Makefile:1.17
--- src/external/mit/xorg/lib/libdrm/Makefile:1.16	Sun Sep  9 01:53:23 2018
+++ src/external/mit/xorg/lib/libdrm/Makefile	Mon Aug 12 14:21:54 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.16 2018/09/09 01:53:23 riastradh Exp $
+#	$NetBSD: Makefile,v 1.17 2019/08/12 14:21:54 maya Exp $
 
 .include 
 
@@ -23,7 +23,7 @@ COPTS.xf86drm.c+=	${${ACTIVE_CC} == "cla
 CWARNFLAGS.clang+=	-Wno-conversion -Wno-tautological-compare
 
 LIBDPLIBS=	m	${.CURDIR}/../../../../../lib/libm
-LIBDPLIBS=	pci	${.CURDIR}/../../../../../lib/libpci
+LIBDPLIBS+=	pci	${.CURDIR}/../../../../../lib/libpci
 
 .if 0
 MAN=		drm.7 \



CVS commit: src/external/mit/xorg/lib/libdrm

2019-08-12 Thread Maya Rashish
Module Name:src
Committed By:   maya
Date:   Mon Aug 12 14:21:54 UTC 2019

Modified Files:
src/external/mit/xorg/lib/libdrm: Makefile

Log Message:
We need to link against libm for real, not just in spirit.

XXX pullup-9


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/external/mit/xorg/lib/libdrm/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/external/mit/xorg/lib/libXt

2019-07-10 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Thu Jul 11 05:44:08 UTC 2019

Modified Files:
src/external/mit/xorg/lib/libXt: Makefile

Log Message:
define _CONST_X_STRING for libXt 1.2.0


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/libXt/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/lib/libXt/Makefile
diff -u src/external/mit/xorg/lib/libXt/Makefile:1.6 src/external/mit/xorg/lib/libXt/Makefile:1.7
--- src/external/mit/xorg/lib/libXt/Makefile:1.6	Sun Jul 19 07:55:08 2015
+++ src/external/mit/xorg/lib/libXt/Makefile	Thu Jul 11 05:44:07 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2015/07/19 07:55:08 mrg Exp $
+#	$NetBSD: Makefile,v 1.7 2019/07/11 05:44:07 mrg Exp $
 
 .include 
 
@@ -30,7 +30,7 @@ INCSDIR=${X11INCDIR}/X11
 CPPFLAGS+=	${X11FLAGS.THREADLIB}
 CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/X11
 CPPFLAGS+=	-DUSE_POLL -DUSE_SNPRINTF -DLIBXT -I.
-CPPFLAGS+=	-DHAVE_ASPRINTF
+CPPFLAGS+=	-DHAVE_ASPRINTF -D_CONST_X_STRING
 
 CPPFLAGS.Intrinsic.c=	-DXFILESEARCHPATHDEFAULT=\"${X11LIBDIR}/%L/%T/%N%C%S:${X11LIBDIR}/%l/%T/%N%C%S:${X11LIBDIR}/%T/%N%C%S:${X11LIBDIR}/%L/%T/%N%S:${X11LIBDIR}/%l/%T/%N%S:${X11LIBDIR}/%T/%N%S\"
 CPPFLAGS.Error.c=	-DERRORDB=\"${X11LIBDIR}/XtErrorDB\" \



CVS commit: src/external/mit/xorg/lib/libXt

2019-07-10 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Thu Jul 11 05:44:08 UTC 2019

Modified Files:
src/external/mit/xorg/lib/libXt: Makefile

Log Message:
define _CONST_X_STRING for libXt 1.2.0


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/libXt/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/external/mit/xorg/lib/libepoxy

2019-07-10 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Wed Jul 10 21:32:22 UTC 2019

Modified Files:
src/external/mit/xorg/lib/libepoxy: Makefile

Log Message:
handle @epoxy_has_glx@, @epoxy_has_egl@, and @epoxy_has_wgl@.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/libepoxy/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/lib/libepoxy/Makefile
diff -u src/external/mit/xorg/lib/libepoxy/Makefile:1.5 src/external/mit/xorg/lib/libepoxy/Makefile:1.6
--- src/external/mit/xorg/lib/libepoxy/Makefile:1.5	Tue Jul  9 22:12:40 2019
+++ src/external/mit/xorg/lib/libepoxy/Makefile	Wed Jul 10 21:32:22 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2019/07/09 22:12:40 mrg Exp $
+#	$NetBSD: Makefile,v 1.6 2019/07/10 21:32:22 mrg Exp $
 
 .include 
 
@@ -18,6 +18,9 @@ SRCS+= \
 	dispatch_egl.c \
 	egl_generated_dispatch.c
 CPPFLAGS+=	-DPLATFORM_HAS_EGL=1
+EGL=1
+.else
+EGL=0
 .endif
 
 INCSDIR=${X11INCDIR}/epoxy
@@ -33,7 +36,10 @@ CPPFLAGS+=	${X11FLAGS.CONNECTION}
 
 PKGCONFIG=	epoxy
 PKGCONFIG_SED_FLAGS= \
--e "s,@DLOPEN_LIBS@,,"
+-e "s,@DLOPEN_LIBS@,," \
+-e "s,@epoxy_has_glx@,1," \
+-e "s,@epoxy_has_egl@,${EGL}," \
+-e "s,@epoxy_has_wgl@,0,"
 
 .include 
 .include 



CVS commit: src/external/mit/xorg/lib/libepoxy

2019-07-10 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Wed Jul 10 21:32:22 UTC 2019

Modified Files:
src/external/mit/xorg/lib/libepoxy: Makefile

Log Message:
handle @epoxy_has_glx@, @epoxy_has_egl@, and @epoxy_has_wgl@.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/libepoxy/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/external/mit/xorg/lib/libepoxy

2019-07-09 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Tue Jul  9 22:12:40 UTC 2019

Modified Files:
src/external/mit/xorg/lib/libepoxy: Makefile shlib_version

Log Message:
updates for libepoxy 1.4.3.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/libepoxy/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libepoxy/shlib_version

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/lib/libepoxy/Makefile
diff -u src/external/mit/xorg/lib/libepoxy/Makefile:1.4 src/external/mit/xorg/lib/libepoxy/Makefile:1.5
--- src/external/mit/xorg/lib/libepoxy/Makefile:1.4	Thu Apr 18 10:10:33 2019
+++ src/external/mit/xorg/lib/libepoxy/Makefile	Tue Jul  9 22:12:40 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2019/04/18 10:10:33 mrg Exp $
+#	$NetBSD: Makefile,v 1.5 2019/07/09 22:12:40 mrg Exp $
 
 .include 
 
@@ -22,11 +22,13 @@ CPPFLAGS+=	-DPLATFORM_HAS_EGL=1
 
 INCSDIR=${X11INCDIR}/epoxy
 INCS= \
+	common.h \
 	gl.h gl_generated.h \
 	glx.h glx_generated.h \
 	egl.h egl_generated.h
 
 CPPFLAGS+=	-I${X11SRCDIR.${LIB}}/src
+CPPFLAGS+=	-I${X11SRCDIR.${LIB}}/../include
 CPPFLAGS+=	${X11FLAGS.CONNECTION}
 
 PKGCONFIG=	epoxy

Index: src/external/mit/xorg/lib/libepoxy/shlib_version
diff -u src/external/mit/xorg/lib/libepoxy/shlib_version:1.1 src/external/mit/xorg/lib/libepoxy/shlib_version:1.2
--- src/external/mit/xorg/lib/libepoxy/shlib_version:1.1	Thu Aug 18 07:44:32 2016
+++ src/external/mit/xorg/lib/libepoxy/shlib_version	Tue Jul  9 22:12:40 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: shlib_version,v 1.1 2016/08/18 07:44:32 mrg Exp $
+#	$NetBSD: shlib_version,v 1.2 2019/07/09 22:12:40 mrg Exp $
 #
 major=0
-minor=0
+minor=1



CVS commit: src/external/mit/xorg/lib/libepoxy

2019-07-09 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Tue Jul  9 22:12:40 UTC 2019

Modified Files:
src/external/mit/xorg/lib/libepoxy: Makefile shlib_version

Log Message:
updates for libepoxy 1.4.3.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/libepoxy/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libepoxy/shlib_version

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/external/mit/xorg/lib/libX11

2019-07-08 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Mon Jul  8 23:06:15 UTC 2019

Modified Files:
src/external/mit/xorg/lib/libX11: Makefile.libx11

Log Message:
update for libX11 1.6.8.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/external/mit/xorg/lib/libX11/Makefile.libx11

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/lib/libX11/Makefile.libx11
diff -u src/external/mit/xorg/lib/libX11/Makefile.libx11:1.18 src/external/mit/xorg/lib/libX11/Makefile.libx11:1.19
--- src/external/mit/xorg/lib/libX11/Makefile.libx11:1.18	Thu Feb 16 01:02:28 2017
+++ src/external/mit/xorg/lib/libX11/Makefile.libx11	Mon Jul  8 23:06:15 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.libx11,v 1.18 2017/02/16 01:02:28 rin Exp $
+#	$NetBSD: Makefile.libx11,v 1.19 2019/07/08 23:06:15 mrg Exp $
 
 LIB=	X11
 .PATH:	${X11SRCDIR.${LIB}}/src
@@ -402,6 +402,10 @@ CPPFLAGS+=	-DHAVE_SOCKLEN_T -DHAVE_STDLI
 CPPFLAGS+=	-DHAVE_STRING_H -DHAVE_STRTOL -DHAVE_SYS_PARAM_H
 CPPFLAGS+=	-DHAVE_SYS_SELECT_H -DHAVE_SYS_STAT_H -DHAVE_SYS_TYPES_H
 CPPFLAGS+=	-DHAVE_UNISTD_H
+CPPFLAGS+=	-DHAVE_STRCASECMP -DHAVE_STRLCPY -DHAVE_STRTOL
+CPPFLAGS+=	-DHAVE_SYS_FILIO_H -DHAVE_SYS_IOCTL_H -DHAVE_SYS_SOCKET_H
+
+CPPFLAGS+=	-DHAVE_REALLOCARRAY -D_OPENBSD_SOURCE
 
 CPPFLAGS+=	-DUSE_XCB
 SRCS+=	\



CVS commit: src/external/mit/xorg/lib/libX11

2019-07-08 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Mon Jul  8 23:06:15 UTC 2019

Modified Files:
src/external/mit/xorg/lib/libX11: Makefile.libx11

Log Message:
update for libX11 1.6.8.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/external/mit/xorg/lib/libX11/Makefile.libx11

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/external/mit/xorg/lib/gallium

2019-07-07 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Sun Jul  7 17:50:34 UTC 2019

Modified Files:
src/external/mit/xorg/lib/gallium: Makefile

Log Message:
re-add arm64 to the list of llvm-ok platforms.  fixes gallium_dri.so:

swrast_dri.so: Undefined symbol "lp_native_vector_width" (symnum = 388))


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/external/mit/xorg/lib/gallium/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/lib/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.33 src/external/mit/xorg/lib/gallium/Makefile:1.34
--- src/external/mit/xorg/lib/gallium/Makefile:1.33	Wed Jun 19 05:17:05 2019
+++ src/external/mit/xorg/lib/gallium/Makefile	Sun Jul  7 17:50:34 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2019/06/19 05:17:05 mrg Exp $
+# $NetBSD: Makefile,v 1.34 2019/07/07 17:50:34 mrg Exp $
 
 # Link the gallium mega driver.
 
@@ -103,6 +103,7 @@ BUILD_VDPAU=1
 ${MACHINE_ARCH} == "x86_64" || \
 ${MACHINE_ARCH} == "powerpc" || \
 ${MACHINE_ARCH} == "powerpc64" || \
+!empty(MACHINE_ARCH:Maarch64*) || \
 !empty(MACHINE_ARCH:Mmips*) || \
 !empty(MACHINE_ARCH:Mearm*) || \
 !empty(MACHINE_ARCH:Marm*)



CVS commit: src/external/mit/xorg/lib/gallium

2019-07-07 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Sun Jul  7 17:50:34 UTC 2019

Modified Files:
src/external/mit/xorg/lib/gallium: Makefile

Log Message:
re-add arm64 to the list of llvm-ok platforms.  fixes gallium_dri.so:

swrast_dri.so: Undefined symbol "lp_native_vector_width" (symnum = 388))


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/external/mit/xorg/lib/gallium/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/external/mit/xorg/lib/gallium

2019-06-18 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Wed Jun 19 05:17:05 UTC 2019

Modified Files:
src/external/mit/xorg/lib/gallium: Makefile

Log Message:
allow all arm platforms, not just evbarm, to build with MKLLVMRT.
allow mips and powerpc platforms as well.

amusingly, this allows my shark to finally have functional
if not usable GL :-)  glxgears gets 1fps.

status:
- arm32 and ppc have llvm dynamic linker patches.
- ppc is not yet working.
- mips untested.


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/external/mit/xorg/lib/gallium/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/external/mit/xorg/lib/gallium

2019-06-18 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Wed Jun 19 05:17:05 UTC 2019

Modified Files:
src/external/mit/xorg/lib/gallium: Makefile

Log Message:
allow all arm platforms, not just evbarm, to build with MKLLVMRT.
allow mips and powerpc platforms as well.

amusingly, this allows my shark to finally have functional
if not usable GL :-)  glxgears gets 1fps.

status:
- arm32 and ppc have llvm dynamic linker patches.
- ppc is not yet working.
- mips untested.


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/external/mit/xorg/lib/gallium/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/lib/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.32 src/external/mit/xorg/lib/gallium/Makefile:1.33
--- src/external/mit/xorg/lib/gallium/Makefile:1.32	Sun Jun  9 01:56:49 2019
+++ src/external/mit/xorg/lib/gallium/Makefile	Wed Jun 19 05:17:05 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2019/06/09 01:56:49 mrg Exp $
+# $NetBSD: Makefile,v 1.33 2019/06/19 05:17:05 mrg Exp $
 
 # Link the gallium mega driver.
 
@@ -97,6 +97,15 @@ BUILD_RADEON=1
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || ${MACHINE} == "evbarm"
 BUILD_NOUVEAU=1
 BUILD_VDPAU=1
+.endif
+
+.if ${MACHINE_ARCH} == "i386" || \
+${MACHINE_ARCH} == "x86_64" || \
+${MACHINE_ARCH} == "powerpc" || \
+${MACHINE_ARCH} == "powerpc64" || \
+!empty(MACHINE_ARCH:Mmips*) || \
+!empty(MACHINE_ARCH:Mearm*) || \
+!empty(MACHINE_ARCH:Marm*)
 . if ${MKLLVMRT} != "no"
 BUILD_LLVMPIPE=1
 . endif
@@ -998,7 +1007,6 @@ LLVMRT_LIBS+=	\
 .endif
 
 .if ${MACHINE_CPU} == "aarch64"
-# XXX duplicates
 LLVMRT_LIBS+=	\
 		AArch64AsmParser \
 		AArch64CodeGen \
@@ -1010,7 +1018,6 @@ LLVMRT_LIBS+=	\
 .endif
 
 .if ${MACHINE_CPU} == "arm"
-# XXX duplicates
 LLVMRT_LIBS+=	\
 		ARMCodeGen \
 		ARMDisassembler \
@@ -1021,6 +1028,26 @@ LLVMRT_LIBS+=	\
 		ARMUtils
 .endif
 
+.if ${MACHINE_CPU} == "mips"
+LLVMRT_LIBS+=	\
+		MipsCodeGen \
+		MipsDisassembler \
+		MipsAsmParser \
+		MipsMCTargetDesc \
+		MipsAsmPrinter \
+		MipsTargetInfo
+.endif
+
+.if ${MACHINE_CPU} == "powerpc"
+LLVMRT_LIBS+=	\
+		PowerPCCodeGen \
+		PowerPCDisassembler \
+		PowerPCTargetInfo \
+		PowerPCMCTargetDesc \
+		PowerPCAsmParser \
+		PowerPCAsmPrinter
+.endif
+
 LLVMRT_LIBS+=	\
 		GlobalISel \
 		MCDisassembler \



CVS commit: src/external/mit/xorg/lib

2019-06-18 Thread Maya Rashish
Module Name:src
Committed By:   maya
Date:   Tue Jun 18 11:28:30 UTC 2019

Modified Files:
src/external/mit/xorg/lib: libmesa.mk

Log Message:
Include mesa-ver.mk so MESA_VER doesn't get expanded into an empty string.

This changes the output of glGetString(GL_VERSION)
from: 3.1 Mesa
to: 3.1 Mesa 18.3.4

This means programs like firefox/libreoffice no longer blacklist our mesa
version as being too old.

Fixes WebGL on firefox with AMD CEDAR, reported by nia.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/libmesa.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/lib/libmesa.mk
diff -u src/external/mit/xorg/lib/libmesa.mk:1.6 src/external/mit/xorg/lib/libmesa.mk:1.7
--- src/external/mit/xorg/lib/libmesa.mk:1.6	Wed Apr  3 15:26:34 2019
+++ src/external/mit/xorg/lib/libmesa.mk	Tue Jun 18 11:28:30 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: libmesa.mk,v 1.6 2019/04/03 15:26:34 joerg Exp $
+#	$NetBSD: libmesa.mk,v 1.7 2019/06/18 11:28:30 maya Exp $
 #
 # Consumer of this Makefile should set MESA_SRC_MODULES.
 
@@ -543,3 +543,5 @@ CPPFLAGS+=	\
 	-DYYTEXT_POINTER=1
 
 CFLAGS+=	-fvisibility=hidden -fno-strict-aliasing -fno-builtin-memcmp
+
+.include "libGL/mesa-ver.mk"



CVS commit: src/external/mit/xorg/lib

2019-06-18 Thread Maya Rashish
Module Name:src
Committed By:   maya
Date:   Tue Jun 18 11:28:30 UTC 2019

Modified Files:
src/external/mit/xorg/lib: libmesa.mk

Log Message:
Include mesa-ver.mk so MESA_VER doesn't get expanded into an empty string.

This changes the output of glGetString(GL_VERSION)
from: 3.1 Mesa
to: 3.1 Mesa 18.3.4

This means programs like firefox/libreoffice no longer blacklist our mesa
version as being too old.

Fixes WebGL on firefox with AMD CEDAR, reported by nia.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/libmesa.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/external/mit/xorg/lib/gallium

2019-06-08 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Sun Jun  9 01:56:49 UTC 2019

Modified Files:
src/external/mit/xorg/lib/gallium: Makefile

Log Message:
add ARMDisassembler for the arm section.  fixes linkage issue.

unfortunately, this doesn't work.  something generates code
with an R_ARM_REL32 relocation and the
llvm::RuntimeDyldELF::resolveARMRelocation() function doesn not
support this and boom:

500   switch (Type) {
501   default:
502 llvm_unreachable("Not implemented relocation type!");


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/external/mit/xorg/lib/gallium/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/lib/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.31 src/external/mit/xorg/lib/gallium/Makefile:1.32
--- src/external/mit/xorg/lib/gallium/Makefile:1.31	Fri Jun  7 12:11:43 2019
+++ src/external/mit/xorg/lib/gallium/Makefile	Sun Jun  9 01:56:49 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2019/06/07 12:11:43 mrg Exp $
+# $NetBSD: Makefile,v 1.32 2019/06/09 01:56:49 mrg Exp $
 
 # Link the gallium mega driver.
 
@@ -1013,6 +1013,7 @@ LLVMRT_LIBS+=	\
 # XXX duplicates
 LLVMRT_LIBS+=	\
 		ARMCodeGen \
+		ARMDisassembler \
 		ARMTargetInfo \
 		ARMMCTargetDesc \
 		ARMAsmParser \



CVS commit: src/external/mit/xorg/lib/gallium

2019-06-07 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Fri Jun  7 12:11:43 UTC 2019

Modified Files:
src/external/mit/xorg/lib/gallium: Makefile

Log Message:
allow building arm llvmpipe.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/external/mit/xorg/lib/gallium/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/external/mit/xorg/lib/gallium

2019-06-07 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Fri Jun  7 12:11:43 UTC 2019

Modified Files:
src/external/mit/xorg/lib/gallium: Makefile

Log Message:
allow building arm llvmpipe.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/external/mit/xorg/lib/gallium/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/lib/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.30 src/external/mit/xorg/lib/gallium/Makefile:1.31
--- src/external/mit/xorg/lib/gallium/Makefile:1.30	Fri Jun  7 06:00:05 2019
+++ src/external/mit/xorg/lib/gallium/Makefile	Fri Jun  7 12:11:43 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2019/06/07 06:00:05 mrg Exp $
+# $NetBSD: Makefile,v 1.31 2019/06/07 12:11:43 mrg Exp $
 
 # Link the gallium mega driver.
 
@@ -1009,6 +1009,17 @@ LLVMRT_LIBS+=	\
 		AArch64TargetInfo
 .endif
 
+.if ${MACHINE_CPU} == "arm"
+# XXX duplicates
+LLVMRT_LIBS+=	\
+		ARMCodeGen \
+		ARMTargetInfo \
+		ARMMCTargetDesc \
+		ARMAsmParser \
+		ARMAsmPrinter \
+		ARMUtils
+.endif
+
 LLVMRT_LIBS+=	\
 		GlobalISel \
 		MCDisassembler \



CVS commit: src/external/mit/xorg/lib/gallium

2019-06-07 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Fri Jun  7 06:00:05 UTC 2019

Modified Files:
src/external/mit/xorg/lib/gallium: Makefile

Log Message:
put BUILD_LLVMPIPE and it's MKLLVMRT conditional inside the x86 + evbarm
section, so that arm* can build llvmpipe.

the default for arm* and MKLLVMRT remains "no", and for arm64 it does not
actually work yet (faults in "dc cvau", but i don't know why yet).

NFCI.


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/external/mit/xorg/lib/gallium/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/lib/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.29 src/external/mit/xorg/lib/gallium/Makefile:1.30
--- src/external/mit/xorg/lib/gallium/Makefile:1.29	Sun Jun  2 11:35:55 2019
+++ src/external/mit/xorg/lib/gallium/Makefile	Fri Jun  7 06:00:05 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2019/06/02 11:35:55 mrg Exp $
+# $NetBSD: Makefile,v 1.30 2019/06/07 06:00:05 mrg Exp $
 
 # Link the gallium mega driver.
 
@@ -90,14 +90,16 @@ BUILD_LLVMPIPE=0
 BUILD_I915=0
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
 BUILD_I915=1
-.if ${MKLLVMRT} != "no"
+. if ${MKLLVMRT} != "no"
 BUILD_RADEON=1
-BUILD_LLVMPIPE=1
-.endif
+. endif
 .endif
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || ${MACHINE} == "evbarm"
 BUILD_NOUVEAU=1
 BUILD_VDPAU=1
+. if ${MKLLVMRT} != "no"
+BUILD_LLVMPIPE=1
+. endif
 .endif
 
 DRIVERS=		kms_swrast swrast
@@ -994,6 +996,19 @@ LLVMRT_LIBS+=	\
 		X86TargetInfo \
 		X86Utils
 .endif
+
+.if ${MACHINE_CPU} == "aarch64"
+# XXX duplicates
+LLVMRT_LIBS+=	\
+		AArch64AsmParser \
+		AArch64CodeGen \
+		AArch64MCTargetDesc \
+		AArch64Utils \
+		AArch64AsmPrinter \
+		AArch64Disassembler \
+		AArch64TargetInfo
+.endif
+
 LLVMRT_LIBS+=	\
 		GlobalISel \
 		MCDisassembler \
@@ -1076,11 +1091,13 @@ CPPFLAGS.target.c += \
 CPPFLAGS.target.c += \
 	-DGALLIUM_LLVMPIPE
 .endif  #${BUILD_LLVMPIPE} == 1
+
 .if ${BUILD_I915} == 1
 CPPFLAGS.target.c += \
 	-DGALLIUM_I915 \
 	-DGALLIUM_ILO
 .endif
+
 .if ${BUILD_RADEON} == 1
 CPPFLAGS.target.c += \
 	-DGALLIUM_R200 \



CVS commit: src/external/mit/xorg/lib/gallium

2019-06-07 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Fri Jun  7 06:00:05 UTC 2019

Modified Files:
src/external/mit/xorg/lib/gallium: Makefile

Log Message:
put BUILD_LLVMPIPE and it's MKLLVMRT conditional inside the x86 + evbarm
section, so that arm* can build llvmpipe.

the default for arm* and MKLLVMRT remains "no", and for arm64 it does not
actually work yet (faults in "dc cvau", but i don't know why yet).

NFCI.


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/external/mit/xorg/lib/gallium/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/external/mit/xorg/lib

2019-05-31 Thread Maya Rashish
Module Name:src
Committed By:   maya
Date:   Fri May 31 11:13:27 UTC 2019

Modified Files:
src/external/mit/xorg/lib: Makefile

Log Message:
shuffle the build order: we need libX11 before gallium because we link
libX11-xcb in gallium.

Fixes recently introduced build failure.


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/external/mit/xorg/lib/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/lib/Makefile
diff -u src/external/mit/xorg/lib/Makefile:1.49 src/external/mit/xorg/lib/Makefile:1.50
--- src/external/mit/xorg/lib/Makefile:1.49	Tue Apr 16 21:20:51 2019
+++ src/external/mit/xorg/lib/Makefile	Fri May 31 11:13:27 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.49 2019/04/16 21:20:51 mrg Exp $
+#	$NetBSD: Makefile,v 1.50 2019/05/31 11:13:27 maya Exp $
 
 # build libraries for xorg
 
@@ -19,11 +19,13 @@ SUBDIR+=libdrm_radeon pixman
 SUBDIR+=xkeyboard-config
 .endif
 SUBDIR+=libxcb \
+	.WAIT \
+	libX11 \
 	.WAIT
 .if !defined(MLIBDIR)
 SUBDIR+=${EXTRA_DRI_DIRS} dri${OLD_PREFIX} gallium${OLD_PREFIX}
 .endif
-SUBDIR+=fontconfig libSM libX11 \
+SUBDIR+=fontconfig libSM \
 	.WAIT \
 	libXcomposite libXdamage libXext libXfixes libXt \
 	libxkbfile libepoxy \



CVS commit: src/external/mit/xorg/lib

2019-05-31 Thread Maya Rashish
Module Name:src
Committed By:   maya
Date:   Fri May 31 11:13:27 UTC 2019

Modified Files:
src/external/mit/xorg/lib: Makefile

Log Message:
shuffle the build order: we need libX11 before gallium because we link
libX11-xcb in gallium.

Fixes recently introduced build failure.


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/external/mit/xorg/lib/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/external/mit/xorg/lib/gallium

2019-05-30 Thread Maya Rashish
Module Name:src
Committed By:   maya
Date:   Thu May 30 23:15:46 UTC 2019

Modified Files:
src/external/mit/xorg/lib/gallium: Makefile

Log Message:
Add libraries to resolve missing xcb symbols
Fixes executing 'emulators/nestopia' on r600, reported by nia, thanks!

XXX we might want to get rid of the references instead.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/external/mit/xorg/lib/gallium/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/lib/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.27 src/external/mit/xorg/lib/gallium/Makefile:1.28
--- src/external/mit/xorg/lib/gallium/Makefile:1.27	Thu May 16 01:22:35 2019
+++ src/external/mit/xorg/lib/gallium/Makefile	Thu May 30 23:15:46 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2019/05/16 01:22:35 christos Exp $
+# $NetBSD: Makefile,v 1.28 2019/05/30 23:15:46 maya Exp $
 
 # Link the gallium mega driver.
 
@@ -959,6 +959,8 @@ LIBDPLIBS+=	expat		${.CURDIR}/../../../.
 LIBDPLIBS+=	terminfo	${.CURDIR}/../../../../../lib/libterminfo
 LIBDPLIBS+=	z		${.CURDIR}/../../../../../lib/libz
 LIBDPLIBS+=	execinfo	${.CURDIR}/../../../../../lib/libexecinfo
+LIBDPLIBS+=	X11-xcb ${.CURDIR}/../libX11/libX11-xcb
+LIBDPLIBS+=	xcb-dri2${.CURDIR}/../libxcb/dri2
 
 # gallium drivers requiring LLVM
 .if ${BUILD_LLVMPIPE} == 1 || ${BUILD_RADEON} == 1



CVS commit: src/external/mit/xorg/lib/gallium

2019-05-30 Thread Maya Rashish
Module Name:src
Committed By:   maya
Date:   Thu May 30 23:15:46 UTC 2019

Modified Files:
src/external/mit/xorg/lib/gallium: Makefile

Log Message:
Add libraries to resolve missing xcb symbols
Fixes executing 'emulators/nestopia' on r600, reported by nia, thanks!

XXX we might want to get rid of the references instead.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/external/mit/xorg/lib/gallium/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/external/mit/xorg/lib/libxcb

2019-05-29 Thread Maya Rashish
Module Name:src
Committed By:   maya
Date:   Wed May 29 13:15:53 UTC 2019

Modified Files:
src/external/mit/xorg/lib/libxcb: xcb.mk

Log Message:
Pick up xcb pkgconfig version automagically from the configure script
PACKAGE_VERSION.

We have failed to update it for netbsd-8 and netbsd-current, resulting
in fallout in pkgsrc, reported by Yasushi Oshima in PR xsrc/54249.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/libxcb/xcb.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/lib/libxcb/xcb.mk
diff -u src/external/mit/xorg/lib/libxcb/xcb.mk:1.4 src/external/mit/xorg/lib/libxcb/xcb.mk:1.5
--- src/external/mit/xorg/lib/libxcb/xcb.mk:1.4	Tue Feb  3 21:31:31 2015
+++ src/external/mit/xorg/lib/libxcb/xcb.mk	Wed May 29 13:15:53 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: xcb.mk,v 1.4 2015/02/03 21:31:31 jmcneill Exp $
+#	$NetBSD: xcb.mk,v 1.5 2019/05/29 13:15:53 maya Exp $
 
 # define XCBEXT to something before including this
 
@@ -17,8 +17,8 @@ LIBDPLIBS=\
 SHLIB_MAJOR?=	0
 SHLIB_MINOR?=	1
 
-PKGCONFIG=	xcb-${XCBEXT}
-PKGCONFIG_VERSION.${PKGCONFIG}= 1.10
+PKGCONFIG=		xcb-${XCBEXT}
+PKGDIST.xcb-${XCBEXT}=	${X11SRCDIR.xcb}
 
 .include 
 .include 



CVS commit: src/external/mit/xorg/lib/libxcb

2019-05-29 Thread Maya Rashish
Module Name:src
Committed By:   maya
Date:   Wed May 29 13:15:53 UTC 2019

Modified Files:
src/external/mit/xorg/lib/libxcb: xcb.mk

Log Message:
Pick up xcb pkgconfig version automagically from the configure script
PACKAGE_VERSION.

We have failed to update it for netbsd-8 and netbsd-current, resulting
in fallout in pkgsrc, reported by Yasushi Oshima in PR xsrc/54249.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/libxcb/xcb.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/external/mit/xorg/lib

2019-05-15 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Thu May 16 01:22:36 UTC 2019

Modified Files:
src/external/mit/xorg/lib: asm.mk
src/external/mit/xorg/lib/gallium: Makefile
src/external/mit/xorg/lib/libGL: Makefile
src/external/mit/xorg/lib/libpciaccess: Makefile

Log Message:
Fix MKCOMPATX11 build


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/asm.mk
cvs rdiff -u -r1.26 -r1.27 src/external/mit/xorg/lib/gallium/Makefile
cvs rdiff -u -r1.26 -r1.27 src/external/mit/xorg/lib/libGL/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/libpciaccess/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/external/mit/xorg/lib

2019-05-15 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Thu May 16 01:22:36 UTC 2019

Modified Files:
src/external/mit/xorg/lib: asm.mk
src/external/mit/xorg/lib/gallium: Makefile
src/external/mit/xorg/lib/libGL: Makefile
src/external/mit/xorg/lib/libpciaccess: Makefile

Log Message:
Fix MKCOMPATX11 build


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/asm.mk
cvs rdiff -u -r1.26 -r1.27 src/external/mit/xorg/lib/gallium/Makefile
cvs rdiff -u -r1.26 -r1.27 src/external/mit/xorg/lib/libGL/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/libpciaccess/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/lib/asm.mk
diff -u src/external/mit/xorg/lib/asm.mk:1.2 src/external/mit/xorg/lib/asm.mk:1.3
--- src/external/mit/xorg/lib/asm.mk:1.2	Fri Apr  5 06:31:53 2019
+++ src/external/mit/xorg/lib/asm.mk	Wed May 15 21:22:35 2019
@@ -1,17 +1,16 @@
-#	$NetBSD: asm.mk,v 1.2 2019/04/05 10:31:53 maya Exp $
+#	$NetBSD: asm.mk,v 1.3 2019/05/16 01:22:35 christos Exp $
 
 # Shared with libmesa.mk / libGL / libglapi
 
-.if ${MACHINE} == "amd64"
-CPPFLAGS+=	\
+X11ASM_CPPFLAGS.x86_64+=	\
 	-DUSE_SSE41 \
 	-DUSE_X86_64_ASM
-.elif ${MACHINE} == "i386"
-CPPFLAGS+=	\
+
+X11ASM_CPPFLAGS.i386+=	\
 	-DUSE_X86_ASM \
 	-DUSE_MMX_ASM \
 	-DUSE_3DNOW_ASM \
 	-DUSE_SSE_ASM \
 	-DGLX_X86_READONLY_TEXT
-.elif ${MACHINE} == "sparc" || ${MACHINE} == "sparc64"
-.endif
+
+CPPFLAGS+= ${X11ASM_CPPFLAGS.${XORG_MACHINE_ARCH:U${MACHINE_ARCH}}}

Index: src/external/mit/xorg/lib/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.26 src/external/mit/xorg/lib/gallium/Makefile:1.27
--- src/external/mit/xorg/lib/gallium/Makefile:1.26	Sat May 11 13:44:16 2019
+++ src/external/mit/xorg/lib/gallium/Makefile	Wed May 15 21:22:35 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2019/05/11 17:44:16 christos Exp $
+# $NetBSD: Makefile,v 1.27 2019/05/16 01:22:35 christos Exp $
 
 # Link the gallium mega driver.
 
@@ -1045,9 +1045,8 @@ CPPFLAGS.streaming-load-memcpy.c+= -msse
 .endif
 
 # Needs 64bit atomics
-.if ${MACHINE} == "i386"
-CPPFLAGS+=	-march=i586
-.endif
+CPPFLAGS.i386+= -march=i586
+CPPFLAGS+=	${CPPFLAGS.${XORG_MACHINE_ARCH:U${MACHINE_ARCH}}}
 
 .include "../driver.mk"
 

Index: src/external/mit/xorg/lib/libGL/Makefile
diff -u src/external/mit/xorg/lib/libGL/Makefile:1.26 src/external/mit/xorg/lib/libGL/Makefile:1.27
--- src/external/mit/xorg/lib/libGL/Makefile:1.26	Thu Apr 18 18:49:08 2019
+++ src/external/mit/xorg/lib/libGL/Makefile	Wed May 15 21:22:36 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.26 2019/04/18 22:49:08 mrg Exp $
+#	$NetBSD: Makefile,v 1.27 2019/05/16 01:22:36 christos Exp $
 
 .include 
 
@@ -60,12 +60,13 @@ BUILDSYMLINKS+=	${X11SRCDIR.Mesa}/src/ut
 SRCS.glapi=	glapi_gentable.c
 
 .PATH:		${X11SRCDIR.Mesa}/src/mapi/glapi
-.if ${MACHINE_ARCH} == "i386"
-SRCS.glx+=			glapi_x86.S
-.elif ${MACHINE_ARCH} == "x86_64"
-SRCS.glx+=			glapi_x86-64.S
-.elif ${MACHINE_ARCH} == "sparc"
-SRCS.glx+=			glapi_sparc.S
+
+SRCS.i386.glx=		glapi_x86.S
+SRCS.x86_64.glx=	glapi_x86-64.S
+SRCS.sparc.glx=		glapi_sparc.S
+
+.if !empty(SRCS.${MACHINE_ARCH}.glx)
+SRCS.glx += ${SRCS.${XORG_MACHINE_ARCH:U${MACHINE_ARCH}}.glx}
 .else
 SRCS.glapi+=			entry.c
 .endif

Index: src/external/mit/xorg/lib/libpciaccess/Makefile
diff -u src/external/mit/xorg/lib/libpciaccess/Makefile:1.8 src/external/mit/xorg/lib/libpciaccess/Makefile:1.9
--- src/external/mit/xorg/lib/libpciaccess/Makefile:1.8	Tue Jan  5 08:07:47 2016
+++ src/external/mit/xorg/lib/libpciaccess/Makefile	Wed May 15 21:22:36 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.8 2016/01/05 13:07:47 christos Exp $
+#	$NetBSD: Makefile,v 1.9 2019/05/16 01:22:36 christos Exp $
 
 .include 
 
@@ -6,8 +6,6 @@ LIB=	pciaccess
 .PATH:	${X11SRCDIR.${LIB}}/src
 .PATH:	${X11SRCDIR.${LIB}}/include
 
-XORG_MACHINE_ARCH?=${MACHINE_ARCH}
-
 SRCS=	common_bridge.c \
 	common_io.c \
 	common_iterator.c \
@@ -33,16 +31,9 @@ PKGDIST=	${LIB}
 LIBDPLIBS+=	pci	${NETBSDSRCDIR}/lib/libpci \
 		z	${NETBSDSRCDIR}/lib/libz
 
-.if ${XORG_MACHINE_ARCH} == "i386" || ${XORG_MACHINE_ARCH} == "x86_64"
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
 CPPFLAGS+=	-DHAVE_MTRR
-.endif
-
-.if ${XORG_MACHINE_ARCH} == "i386"
-LIBDPLIBS+=	i386 ${NETBSDSRCDIR}/lib/libarch
-.endif
-
-.if ${XORG_MACHINE_ARCH} == "x86_64"
-LIBDPLIBS+=	x86_64 ${NETBSDSRCDIR}/lib/libarch
+LIBDPLIBS+=	${XORG_MACHINE_ARCH:U${MACHINE_ARCH}} ${NETBSDSRCDIR}/lib/libarch
 .endif
 
 .include 



CVS commit: src/external/mit/xorg/lib/gallium

2019-05-11 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat May 11 17:44:16 UTC 2019

Modified Files:
src/external/mit/xorg/lib/gallium: Makefile

Log Message:
elide clang warnings


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/external/mit/xorg/lib/gallium/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/lib/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.25 src/external/mit/xorg/lib/gallium/Makefile:1.26
--- src/external/mit/xorg/lib/gallium/Makefile:1.25	Tue Apr 16 13:29:09 2019
+++ src/external/mit/xorg/lib/gallium/Makefile	Sat May 11 13:44:16 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2019/04/16 17:29:09 christos Exp $
+# $NetBSD: Makefile,v 1.26 2019/05/11 17:44:16 christos Exp $
 
 # Link the gallium mega driver.
 
@@ -15,6 +15,8 @@ DRIDEBUGDIR=	${DEBUGDIR}${X11USRLIBDIR}/
 
 LLVM_INCLUDE_OBJDIR!=	cd ${NETBSDSRCDIR}/external/bsd/llvm/include && ${PRINTOBJDIR}
 
+CWARNFLAGS.clang += -Wno-atomic-alignment -Wno-unknown-warning-option
+
 CXXFLAGS+=	-std=c++11
 CFLAGS+=	-std=gnu11
 CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/libdrm \



CVS commit: src/external/mit/xorg/lib/gallium

2019-05-11 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat May 11 17:44:16 UTC 2019

Modified Files:
src/external/mit/xorg/lib/gallium: Makefile

Log Message:
elide clang warnings


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/external/mit/xorg/lib/gallium/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



Re: CVS commit: src/external/mit/xorg/lib

2016-02-26 Thread Taylor R Campbell
   Date: Fri, 26 Feb 2016 23:08:14 +0100
   From: Joerg Sonnenberger 

   On Fri, Feb 26, 2016 at 09:20:17PM +, Taylor R Campbell wrote:
   > Disable C++11 warnings about `register' qualifiers in glsl_lexer.cpp.
   > 
   > glsl_lexer.cpp was generated by a flex that still uses it.  It is
   > harmless.

   Just use -Dregister=?

I considered that.  I wasn't sure in the five seconds I thought about
it that that would DTRT -- this change seemed safer.  Feel free to
undo and replace by -Dregister= if you'd rather.


Re: CVS commit: src/external/mit/xorg/lib

2016-02-26 Thread Joerg Sonnenberger
On Fri, Feb 26, 2016 at 09:20:17PM +, Taylor R Campbell wrote:
> Module Name:  src
> Committed By: riastradh
> Date: Fri Feb 26 21:20:17 UTC 2016
> 
> Modified Files:
>   src/external/mit/xorg/lib: libglsl.mk
> 
> Log Message:
> Disable C++11 warnings about `register' qualifiers in glsl_lexer.cpp.
> 
> glsl_lexer.cpp was generated by a flex that still uses it.  It is
> harmless.

Just use -Dregister=?

Joerg


re: CVS commit: src/external/mit/xorg/lib/libGLU

2015-01-30 Thread matthew green

Nathanial Sloss writes:
 Module Name:  src
 Committed By: nat
 Date: Thu Jan 29 22:51:56 UTC 2015
 
 Modified Files:
   src/external/mit/xorg/lib/libGLU: shlib_version
 
 Log Message:
 Fixes segfaults and crashing in applications that use libGLU.
 Minor version bump.
 
 This commit was approved by wiz@

why bump the version?  this was just a bug fix, not any change
or addition to the ABI, right?


.mrg.


re: CVS commit: src/external/mit/xorg/lib/dri

2015-01-05 Thread matthew green

Christos Zoulas writes:
 Module Name:  src
 Committed By: christos
 Date: Mon Jan  5 16:26:48 UTC 2015
 
 Modified Files:
   src/external/mit/xorg/lib/dri: Makefile
 
 Log Message:
 Prevent .y.c from regenerating c files from yacc.
 XXX: Why are we compiling glcpp-parse.c both here and in the gallium
 subdirectory?

you know of a way for convience libraries in netbsd to be all
linked together into a single library, like libtool provides?

no?  that's why.  :-)

sounds like the .y.c hack belongs in libglsl.mk, which is where
glcpp-parse.c is listed.


.mrg.


Re: CVS commit: src/external/mit/xorg/lib/dri

2015-01-05 Thread Christos Zoulas
In article 17212.1420481...@splode.eterna.com.au,
matthew green  m...@eterna.com.au wrote:

Christos Zoulas writes:
 Module Name: src
 Committed By:christos
 Date:Mon Jan  5 16:26:48 UTC 2015
 
 Modified Files:
  src/external/mit/xorg/lib/dri: Makefile
 
 Log Message:
 Prevent .y.c from regenerating c files from yacc.
 XXX: Why are we compiling glcpp-parse.c both here and in the gallium
 subdirectory?

you know of a way for convience libraries in netbsd to be all
linked together into a single library, like libtool provides?

no?  that's why.  :-)

sounds like the .y.c hack belongs in libglsl.mk, which is where
glcpp-parse.c is listed.

Or we can just change the SRCS to include glcpp-parse.y and remove the
generated files and the .y.c hacks. In general we should stop
depending on timestamps to be correct to handle pre-generated files.
It is an accident waiting to happen and I am afraid to break the
build for program_parse.y...

christos



re: CVS commit: src/external/mit/xorg/lib/pixman

2014-08-10 Thread matthew green

Jared D. McNeill writes:
 Module Name:  src
 Committed By: jmcneill
 Date: Sun Aug 10 14:10:38 UTC 2014
 
 Modified Files:
   src/external/mit/xorg/lib/pixman: Makefile
 
 Log Message:
 USE_SSSE3 not USE_SSE3

thanks.  i thought i'd already commited that!


.mrg.


re: CVS commit: src/external/mit/xorg/lib

2013-10-18 Thread matthew green

 Module Name:  src
 Committed By: riz
 Date: Fri Oct 18 01:12:00 UTC 2013
 
 Modified Files:
   src/external/mit/xorg/lib/libX11: Makefile.libx11
   src/external/mit/xorg/lib/libXi: Makefile
 
 Log Message:
 Before testing the value of HAVE_GCC, test if it's defined.

this probably should make sure to include bsd.own.mk then?


Re: CVS commit: src/external/mit/xorg/lib/fontconfig/src

2013-06-25 Thread Joerg Sonnenberger
On Tue, Jun 25, 2013 at 02:05:05PM +, Thomas Klausner wrote:
 Module Name:  src
 Committed By: wiz
 Date: Tue Jun 25 14:05:04 UTC 2013
 
 Modified Files:
   src/external/mit/xorg/lib/fontconfig/src: Makefile
 
 Log Message:
 Add -Wno-error=tautological-constant-out-of-range-compare for clang, to avoid
 ../external/mit/fontconfig/dist/src/fcname.c:89:18: error: comparison of 
 constant
 4294967295 with expression of type 'const FcType' (aka 'const enum _FcType') 
 is
 always false [-Werror,-Wtautological-constant-out-of-range-compare]
 if (t-type == (unsigned int) -1 || type == t-type)
 ~~~ ^  ~
 1 error generated.
 
 and a few others of the same type.

It should still be reported upstream, this is bogus...

Joerg


Re: CVS commit: src/external/mit/xorg/lib/fontconfig/src

2013-06-25 Thread Thomas Klausner
On Tue, Jun 25, 2013 at 04:24:27PM +0200, Joerg Sonnenberger wrote:
 On Tue, Jun 25, 2013 at 02:05:05PM +, Thomas Klausner wrote:
  Module Name:src
  Committed By:   wiz
  Date:   Tue Jun 25 14:05:04 UTC 2013
  
  Modified Files:
  src/external/mit/xorg/lib/fontconfig/src: Makefile
  
  Log Message:
  Add -Wno-error=tautological-constant-out-of-range-compare for clang, to 
  avoid
  ../external/mit/fontconfig/dist/src/fcname.c:89:18: error: comparison of 
  constant
  4294967295 with expression of type 'const FcType' (aka 'const enum 
  _FcType') is
  always false [-Werror,-Wtautological-constant-out-of-range-compare]
  if (t-type == (unsigned int) -1 || type == t-type)
  ~~~ ^  ~
  1 error generated.
  
  and a few others of the same type.
 
 It should still be reported upstream, this is bogus...

http://lists.freedesktop.org/archives/fontconfig/2013-June/004789.html

There are more, e.g. in Mesa.
external/mit/libX11/dist/src/Font.c:591:29: warning: comparison of constant 
768614336404564650 with expression of type 'CARD32' (aka 'unsigned int') is 
always true [-Wtautological-constant-out-of-range-compare]
   reply.nCharInfos  (LONG_MAX / sizeof(XCharStruct))
  ^ 

 Thomas


Re: CVS commit: src/external/mit/xorg/lib/fontconfig/src

2013-06-25 Thread Valery Ushakov
On Tue, Jun 25, 2013 at 17:54:05 +0200, Thomas Klausner wrote:

 There are more, e.g. in Mesa.
 external/mit/libX11/dist/src/Font.c:591:29: warning: comparison of constant 
 768614336404564650 with expression of type 'CARD32' (aka 'unsigned int') is 
 always true [-Wtautological-constant-out-of-range-compare]
reply.nCharInfos  (LONG_MAX / sizeof(XCharStruct))
   ^ 

Another instance of this is properly fixed in the same file, line 266 :)

-uwe


re: CVS commit: src/external/mit/xorg/lib/freetype/freetype

2013-06-07 Thread matthew green

 Module Name:  src
 Committed By: martin
 Date: Fri Jun  7 19:28:25 UTC 2013
 
 Modified Files:
   src/external/mit/xorg/lib/freetype/freetype: Makefile
 
 Log Message:
 Fix a few library substitutions

please revert this - i'd already fixed it by adding those
substitutions, and now they're duplicated and the % ones
are missing (but perhaps not needed...)


.mrg.


re: CVS commit: src/external/mit/xorg/lib/xkeyboard-config/rules

2011-09-26 Thread matthew green

 Module Name:  src
 Committed By: tsutsui
 Date: Mon Sep 26 15:19:45 UTC 2011
 
 Modified Files:
   src/external/mit/xorg/lib/xkeyboard-config/rules: base base.lst evdev
   evdev.lst
 
 Log Message:
 Regenerate these compiled files properly in our own
 xsrc/external/mit/xkeyboard-config/dist/ directory, i.e.
 - pull changes from xkeyboard-config 2.0 to 2.3
 - put back entries for sharp machines (zaurus and hpcarm wzero3s)
   removed in rev 1.4 (xkeyboard-config 2.0 merge)

oops.. thanks.

 XXX1: can't we generate these files during build?


sounds like a wonderful idea.. can you do it? :)


Re: CVS commit: src/external/mit/xorg/lib

2010-05-28 Thread David Holland
On Fri, May 28, 2010 at 06:22:05AM +, matthew green wrote:
  Modified Files:
   src/external/mit/xorg/lib/libGL: Makefile
   src/external/mit/xorg/lib/libGLU: Makefile
   src/external/mit/xorg/lib/libglut: Makefile
  
  Log Message:
  we're now at mesa 7.7.1.
  
  XXX: really really really need to make this in one place...

add libGL/Makefile.version and include it from all three?

-- 
David A. Holland
dholl...@netbsd.org


CVS commit: src/external/mit/xorg/lib/dri

2010-01-11 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Tue Jan 12 00:57:45 UTC 2010

Modified Files:
src/external/mit/xorg/lib/dri/i915: Makefile
src/external/mit/xorg/lib/dri/i965: Makefile

Log Message:
replace LIBS with LIBDPLIBS.  makes these actually link against drm_intel.
should fix a problem reported by s...@.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/dri/i915/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/dri/i965/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/external/mit/xorg/lib/dri/i965

2010-01-10 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Sun Jan 10 17:35:33 UTC 2010

Modified Files:
src/external/mit/xorg/lib/dri/i965: Makefile

Log Message:
fix a problem reported by jmorse:
- fix a line continuation that stopped SRCS= from working
- don't include intel_dri.c here


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/dri/i965/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.