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

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