History log of /netbsd-current/external/mit/xorg/lib/libGL/Makefile
Revision (<<< Hide revision tags) (Show revision tags >>>) Date Author Comments
# 1.35 22-Apr-2024 maya

mesa21: link against libxcb-sync for missing symbols

Not super obvious in practice, but it does show if you run GL programs
with LD_BIND_NOW.


# 1.34 16-Jul-2023 rjs

Make most of MesaLib build.


# 1.33 03-Jun-2023 lukem

adapt to ${CC_WNO_STRINGOP_OVERFLOW}

Use ${CC_WNO_STRINGOP_OVERFLOW} instead of
the older style more complex expressions.

Remove workarounds if they were only for gcc < 10.


Revision tags: netbsd-10-0-RELEASE netbsd-10-0-RC6 netbsd-10-0-RC5 netbsd-10-0-RC4 netbsd-10-0-RC3 netbsd-10-0-RC2 netbsd-10-0-RC1 netbsd-10-base
# 1.32 11-Jul-2021 mrg

xorg/lib stuff to enable mesa.old, prepare for new mesa

- rename OLD_PREFIX to OLD_SUFFIX, since it is
- include mesa-which.mk and use ${OLD_SUFFIX} in several places
- remove mesa < 18 support


Revision tags: cjep_sun2x-base1 cjep_sun2x-base cjep_staticlib_x-base1 cjep_staticlib_x-base
# 1.31 31-Oct-2020 nia

mesa: re-enable GLX TLS to help i386

mesa's assembly code for i386 only seems to be position independent
when compiled with ELF TLS, so having it disabled causes worse problems
than the edge cases ELF TLS causes.

potentially the assembly code could be fixed (it looks like it not
being safe is a bug), it could also be disabled, but i don't currently
have the means to measure the impact of that.


# 1.30 16-Sep-2020 nia

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.


Revision tags: phil-wifi-20200421 phil-wifi-20200411 phil-wifi-20200406
# 1.29 29-Mar-2020 maya

Define GL_LIB_NAME somewhere that applies to dri_common.c, which is the
file that needs it.


Revision tags: is-mlppp-base phil-wifi-20191119
# 1.28 24-Sep-2019 maya

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.


Revision tags: netbsd-9-4-RELEASE netbsd-9-3-RELEASE netbsd-9-2-RELEASE netbsd-9-1-RELEASE netbsd-9-0-RELEASE netbsd-9-0-RC2 netbsd-9-0-RC1 netbsd-9-base phil-wifi-20190609
# 1.27 16-May-2019 christos

Fix MKCOMPATX11 build


# 1.26 18-Apr-2019 mrg

remove now dated comment.


# 1.25 11-Apr-2019 maya

the drivers we dlopen need pthread.
I'm not sure about the exact scenario causing failure, but using the
libc pthread stubs isn't sufficient.

fixes one of the glmark2 crashes (at startup with llvmpipe)


# 1.24 09-Apr-2019 maya

Expand all @@ things in pkgconfig file.
claim TLS.
pick up the list of private libs from pkgsrc mesalib
GL_LIB got renamed to GL_PKGCONF_LIB.


# 1.23 10-Mar-2019 mrg

pull across most of the new build infrastruture for mesa18 from maya's
git tree. this includes may of the changes from the changes below:


commit 52d85e74a1197aace38cc7acb705509e969120e6
Author: coypu <coypu@sdf.org>
Date: Mon Mar 4 12:25:33 2019 +0200

Make 32bit archs happier.

except i386, which now suffers from locked atomics because we
don't have clever ifunc tricks in libc.

commit ee9b4c19c58127934ed3548ad0d68934cc95ccc7
Author: coypu <coypu@sdf.org>
Date: Mon Mar 4 09:08:35 2019 +0200

Adjust includes, append rather than replace, appease clang ppc builds

commit a5341a3ad42572c78b6a2e6e5545bd323d7f2e4c
Author: coypu <coypu@sdf.org>
Date: Sun Mar 3 11:52:19 2019 +0200

Resolve i386 atomic issue and set lists.

XXX libGL in i386 is still causing issues
XXX pkgconfig file for vdpau
XXX set lists for arm32

commit 27bffc20bc15186c92cc5b8d5cc08d7299966b34
Author: coypu <coypu@sdf.org>
Date: Sat Mar 2 21:52:45 2019 +0200

make llvm sources x86 specific

hopefully not breaking non-x86 clang builds, which
have MKLLVM set.

commit f9d34922619cc8f2a224c0138a73985e50daf87f
Author: coypu <coypu@sdf.org>
Date: Sat Mar 2 21:33:31 2019 +0200

move hack to build llvm libraries soon enough.

add u_process.c to libGL specifically (dri, gallium and libGL all need
it).

Add some missing includes for pipe-loader when it moved to gallium

commit 2b1083d0d538bb5d5dd88ab2ca0ca6c331e5dd5b
Author: coypu <coypu@sdf.org>
Date: Sat Mar 2 16:47:58 2019 +0200

shuffle around:

some files move from shared driver.mk/loader.mk into gallium.
others move to shared.

add i915 files.

now i965 glxgears works (amd64).

commit 1897a90569b30b294bcbedadb3745092eca0bb33
Author: Maya Rashish <maya@NetBSD.org>
Date: Sun Feb 24 23:36:26 2019 +0200

Progress towards glxgears on i915

commit 28c9c99a236404de41ae74e88ea6d9578c088b92
Author: Maya Rashish <maya@NetBSD.org>
Date: Sun Feb 24 21:55:56 2019 +0200

rototill i965/i915 causing it to no longer startx.

Now missing sw_screen_create in the dri driver.

commit 48eb746983a5a7967fba221e7b167808af36f44a
Author: Maya Rashish <maya@NetBSD.org>
Date: Sun Feb 24 09:31:22 2019 +0200

More of vdpau. Cogs spin.

commit d9fbba8f61a43648d32f160c5fa62626788566ff
Author: Maya Rashish <maya@NetBSD.org>
Date: Sat Feb 23 22:36:37 2019 +0200

Adjust for MesaLib 18.

Build llvmpipe driver on x86 (the driver itself is x86-only).
build llvm on all x86, even on GCC builds.
galahad driver removed (upstream).
Don't build mesa 7 at all.


# 1.22 10-Mar-2019 mrg

move mesa10 build into .old scheme:

- add ${X11SRCDIR.MesaLib.old} and introduce ${X11SRCDIR.Mesa} as an
alias for either the former or the non old. this allows many of
the makefiles to simply use ${X11SRCDIR.Mesa} (but does not really
enable much sharing of makefiles, but reduces their diffs.)

- use mesa-which.mk to define ${OLD_PREFIX} to either "" or ".old",
and to know if to build 'dri7' (.old only.) ${OLD_PREFIX} is used
by other code (eg, LIBDPLIBS) to pick the right subdir.


Revision tags: netbsd-8-2-RELEASE netbsd-8-1-RELEASE netbsd-8-1-RC1 pgoyette-compat-merge-20190127 pgoyette-compat-20190127 pgoyette-compat-20190118 pgoyette-compat-1226 pgoyette-compat-1126 pgoyette-compat-1020 pgoyette-compat-0930 pgoyette-compat-0906 pgoyette-compat-0728 netbsd-8-0-RELEASE phil-wifi-base pgoyette-compat-0625 netbsd-8-0-RC2 pgoyette-compat-0521 pgoyette-compat-0502 pgoyette-compat-0422 netbsd-8-0-RC1 pgoyette-compat-0415 pgoyette-compat-0407 pgoyette-compat-0330 pgoyette-compat-0322 pgoyette-compat-0315 pgoyette-compat-base matt-nb8-mediatek-base perseant-stdc-iso10646-base netbsd-8-base prg-localcount2-base3 prg-localcount2-base2 prg-localcount2-base1 prg-localcount2-base pgoyette-localcount-20170426 bouyer-socketcan-base1 pgoyette-localcount-20170320 bouyer-socketcan-base pgoyette-localcount-20170107 pgoyette-localcount-20161104 localcount-20160914 pgoyette-localcount-20160806 pgoyette-localcount-20160726 pgoyette-localcount-base
# 1.21 18-Dec-2014 mrg

branches: 1.21.16;
update sets and reachover makefiles for mesa 10.3.5.


# 1.20 15-Dec-2014 mrg

delete tools/glsl, is hasn't been used for a while.
move Makefile.glsl into libGL.


Revision tags: netbsd-7-base tls-earlyentropy-base tls-maxphys-base
# 1.19 09-Jul-2014 riastradh

branches: 1.19.2;
Update reachover makefiles for MesaLib 7.11.2.

With the new GL shader compiler, glsl-compile is no longer needed as
a tool, but the shader compiler is now duplicated in several
libraries, so (XXX) external/mit/xorg/tools/glsl should be turned
into a proper library that libGL and libmesa can link against.


Revision tags: yamt-pagecache-base9 riastradh-xf86-video-intel-2-7-1-pre-2-21-15 riastradh-drm2-base3 riastradh-drm2-base2 riastradh-drm2-base1 riastradh-drm2-base agc-symver-base yamt-pagecache-base8 yamt-pagecache-base7 yamt-pagecache-base6 yamt-pagecache-base5 yamt-pagecache-base4
# 1.18 22-Mar-2012 joerg

branches: 1.18.2; 1.18.8;
Disable a bunch of additional warnings for now for the clang build.


Revision tags: netbsd-6-0-6-RELEASE netbsd-6-1-5-RELEASE netbsd-6-1-4-RELEASE netbsd-6-0-5-RELEASE netbsd-6-1-3-RELEASE netbsd-6-0-4-RELEASE netbsd-6-1-2-RELEASE netbsd-6-0-3-RELEASE netbsd-6-1-1-RELEASE netbsd-6-0-2-RELEASE netbsd-6-1-RELEASE netbsd-6-1-RC4 netbsd-6-1-RC3 netbsd-6-1-RC2 netbsd-6-1-RC1 netbsd-6-0-1-RELEASE matt-nb6-plus-nbase netbsd-6-0-RELEASE netbsd-6-0-RC2 matt-nb6-plus-base netbsd-6-0-RC1 netbsd-6-base yamt-pagecache-base3 yamt-pagecache-base2 yamt-pagecache-base
# 1.17 11-Aug-2011 joerg

branches: 1.17.2;
Various warning adjustments for clang


Revision tags: cherry-xenmp-base bouyer-quota2-nbase bouyer-quota2-base matt-mips64-premerge-20101231
# 1.16 22-Nov-2010 mrg

install dri.pc.
put the Mesa version into it's own makefile, and share it. there
are now 4 references to it.


# 1.15 19-Jul-2010 mrg

updates for Mesa 7.8.2:
- build glsl as a host tool
- add the glsl objects to libmesa
- add/remove new/deleted sources for various components
- adjust the libmesa/libGL builds to pull in the new glsl objects
- re-apply the BUILDSYMLINK hack for eval.c/pixel.c/pixelstore.c
- use glsl to build the slang headers on the fly


# 1.14 28-May-2010 mrg

we're now at mesa 7.7.1.

XXX: really really really need to make this in one place...


# 1.13 23-May-2010 mrg

we have Mesa 7.4.4.


# 1.12 22-May-2010 mrg

updates for changed header locations for libdrm.


# 1.11 22-May-2010 mrg

install GL/internal/sarea.h and GL/internal/dri_interface.h, like Mesa does.


Revision tags: matt-premerge-20091211
# 1.10 08-Oct-2009 snj

Move libdrm headers up one level (out of the X11 directory) to match
the rest of the world and fix the inconsistency with libdrm.pc.
Fixes PR xsrc/42126.


# 1.9 11-Jun-2009 mrg

add glapi_getproc.c.


# 1.8 11-Jun-2009 mrg

fix up the Mesa version for the gl*.pc files.


# 1.7 11-Jun-2009 mrg

build fixes for Mesa 7.4.2.


Revision tags: jym-xensuspend-nbase jym-xensuspend-base
# 1.6 14-Feb-2009 abs

Use MACHINE_ARCH rather than MACHINE where relevant. At least one file had a nice mixture of amd64 and x86_64 tests...


Revision tags: netbsd-5-0-2-RELEASE matt-nb5-mips64-premerge-20091211 matt-nb5-mips64-u2-k2-k4-k7-k8-k9 matt-nb4-mips64-k7-u2a-k9b matt-nb5-mips64-u1-k1-k5 netbsd-5-0-1-RELEASE netbsd-5-0-RELEASE netbsd-5-0-RC4 netbsd-5-0-RC3 netbsd-5-0-RC2 netbsd-5-0-RC1 haad-dm-base haad-dm-base2 haad-nbase2 netbsd-5-base matt-mips64-base2 haad-dm-base1
# 1.5 21-Sep-2008 cube

branches: 1.5.4; 1.5.6; 1.5.8; 1.5.12;
Note the proper location of the DRI modules.


# 1.4 20-Sep-2008 cube

Don't install osmesa.h from here, libOSMesa will do it.


Revision tags: wrstuden-revivesa-base-3
# 1.3 13-Sep-2008 cube

branches: 1.3.2;
Install pkgconfig files. Where applicable, remove .if 0 code that tried to
do the same thing.


Revision tags: wrstuden-revivesa-base-2
# 1.2 02-Aug-2008 rtr

* don't build glapi_x86.S for now on i386.
* when preprorcessed glapi_x86.S ends up being invalid assembler input
because of whitespace problems in concatenation macros. normally the
use of these macros as they are wouldn't be a problem except we are
receiving -traditional-cpp from share/mk and the spaces are being
passed.

XXX further discussion needs to occur in order for this to be properly
fixed


# 1.1 29-Jul-2008 mrg

branches: 1.1.1;
Initial revision


# 1.34 16-Jul-2023 rjs

Make most of MesaLib build.


# 1.33 03-Jun-2023 lukem

adapt to ${CC_WNO_STRINGOP_OVERFLOW}

Use ${CC_WNO_STRINGOP_OVERFLOW} instead of
the older style more complex expressions.

Remove workarounds if they were only for gcc < 10.


Revision tags: netbsd-10-base
# 1.32 11-Jul-2021 mrg

xorg/lib stuff to enable mesa.old, prepare for new mesa

- rename OLD_PREFIX to OLD_SUFFIX, since it is
- include mesa-which.mk and use ${OLD_SUFFIX} in several places
- remove mesa < 18 support


Revision tags: cjep_sun2x-base1 cjep_sun2x-base cjep_staticlib_x-base1 cjep_staticlib_x-base
# 1.31 31-Oct-2020 nia

mesa: re-enable GLX TLS to help i386

mesa's assembly code for i386 only seems to be position independent
when compiled with ELF TLS, so having it disabled causes worse problems
than the edge cases ELF TLS causes.

potentially the assembly code could be fixed (it looks like it not
being safe is a bug), it could also be disabled, but i don't currently
have the means to measure the impact of that.


# 1.30 16-Sep-2020 nia

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.


Revision tags: phil-wifi-20200421 phil-wifi-20200411 phil-wifi-20200406
# 1.29 29-Mar-2020 maya

Define GL_LIB_NAME somewhere that applies to dri_common.c, which is the
file that needs it.


Revision tags: is-mlppp-base phil-wifi-20191119
# 1.28 24-Sep-2019 maya

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.


Revision tags: netbsd-9-3-RELEASE netbsd-9-2-RELEASE netbsd-9-1-RELEASE netbsd-9-0-RELEASE netbsd-9-0-RC2 netbsd-9-0-RC1 netbsd-9-base phil-wifi-20190609
# 1.27 16-May-2019 christos

Fix MKCOMPATX11 build


# 1.26 18-Apr-2019 mrg

remove now dated comment.


# 1.25 11-Apr-2019 maya

the drivers we dlopen need pthread.
I'm not sure about the exact scenario causing failure, but using the
libc pthread stubs isn't sufficient.

fixes one of the glmark2 crashes (at startup with llvmpipe)


# 1.24 09-Apr-2019 maya

Expand all @@ things in pkgconfig file.
claim TLS.
pick up the list of private libs from pkgsrc mesalib
GL_LIB got renamed to GL_PKGCONF_LIB.


# 1.23 10-Mar-2019 mrg

pull across most of the new build infrastruture for mesa18 from maya's
git tree. this includes may of the changes from the changes below:


commit 52d85e74a1197aace38cc7acb705509e969120e6
Author: coypu <coypu@sdf.org>
Date: Mon Mar 4 12:25:33 2019 +0200

Make 32bit archs happier.

except i386, which now suffers from locked atomics because we
don't have clever ifunc tricks in libc.

commit ee9b4c19c58127934ed3548ad0d68934cc95ccc7
Author: coypu <coypu@sdf.org>
Date: Mon Mar 4 09:08:35 2019 +0200

Adjust includes, append rather than replace, appease clang ppc builds

commit a5341a3ad42572c78b6a2e6e5545bd323d7f2e4c
Author: coypu <coypu@sdf.org>
Date: Sun Mar 3 11:52:19 2019 +0200

Resolve i386 atomic issue and set lists.

XXX libGL in i386 is still causing issues
XXX pkgconfig file for vdpau
XXX set lists for arm32

commit 27bffc20bc15186c92cc5b8d5cc08d7299966b34
Author: coypu <coypu@sdf.org>
Date: Sat Mar 2 21:52:45 2019 +0200

make llvm sources x86 specific

hopefully not breaking non-x86 clang builds, which
have MKLLVM set.

commit f9d34922619cc8f2a224c0138a73985e50daf87f
Author: coypu <coypu@sdf.org>
Date: Sat Mar 2 21:33:31 2019 +0200

move hack to build llvm libraries soon enough.

add u_process.c to libGL specifically (dri, gallium and libGL all need
it).

Add some missing includes for pipe-loader when it moved to gallium

commit 2b1083d0d538bb5d5dd88ab2ca0ca6c331e5dd5b
Author: coypu <coypu@sdf.org>
Date: Sat Mar 2 16:47:58 2019 +0200

shuffle around:

some files move from shared driver.mk/loader.mk into gallium.
others move to shared.

add i915 files.

now i965 glxgears works (amd64).

commit 1897a90569b30b294bcbedadb3745092eca0bb33
Author: Maya Rashish <maya@NetBSD.org>
Date: Sun Feb 24 23:36:26 2019 +0200

Progress towards glxgears on i915

commit 28c9c99a236404de41ae74e88ea6d9578c088b92
Author: Maya Rashish <maya@NetBSD.org>
Date: Sun Feb 24 21:55:56 2019 +0200

rototill i965/i915 causing it to no longer startx.

Now missing sw_screen_create in the dri driver.

commit 48eb746983a5a7967fba221e7b167808af36f44a
Author: Maya Rashish <maya@NetBSD.org>
Date: Sun Feb 24 09:31:22 2019 +0200

More of vdpau. Cogs spin.

commit d9fbba8f61a43648d32f160c5fa62626788566ff
Author: Maya Rashish <maya@NetBSD.org>
Date: Sat Feb 23 22:36:37 2019 +0200

Adjust for MesaLib 18.

Build llvmpipe driver on x86 (the driver itself is x86-only).
build llvm on all x86, even on GCC builds.
galahad driver removed (upstream).
Don't build mesa 7 at all.


# 1.22 10-Mar-2019 mrg

move mesa10 build into .old scheme:

- add ${X11SRCDIR.MesaLib.old} and introduce ${X11SRCDIR.Mesa} as an
alias for either the former or the non old. this allows many of
the makefiles to simply use ${X11SRCDIR.Mesa} (but does not really
enable much sharing of makefiles, but reduces their diffs.)

- use mesa-which.mk to define ${OLD_PREFIX} to either "" or ".old",
and to know if to build 'dri7' (.old only.) ${OLD_PREFIX} is used
by other code (eg, LIBDPLIBS) to pick the right subdir.


Revision tags: netbsd-8-2-RELEASE netbsd-8-1-RELEASE netbsd-8-1-RC1 pgoyette-compat-merge-20190127 pgoyette-compat-20190127 pgoyette-compat-20190118 pgoyette-compat-1226 pgoyette-compat-1126 pgoyette-compat-1020 pgoyette-compat-0930 pgoyette-compat-0906 pgoyette-compat-0728 netbsd-8-0-RELEASE phil-wifi-base pgoyette-compat-0625 netbsd-8-0-RC2 pgoyette-compat-0521 pgoyette-compat-0502 pgoyette-compat-0422 netbsd-8-0-RC1 pgoyette-compat-0415 pgoyette-compat-0407 pgoyette-compat-0330 pgoyette-compat-0322 pgoyette-compat-0315 pgoyette-compat-base matt-nb8-mediatek-base perseant-stdc-iso10646-base netbsd-8-base prg-localcount2-base3 prg-localcount2-base2 prg-localcount2-base1 prg-localcount2-base pgoyette-localcount-20170426 bouyer-socketcan-base1 pgoyette-localcount-20170320 bouyer-socketcan-base pgoyette-localcount-20170107 pgoyette-localcount-20161104 localcount-20160914 pgoyette-localcount-20160806 pgoyette-localcount-20160726 pgoyette-localcount-base
# 1.21 18-Dec-2014 mrg

branches: 1.21.16;
update sets and reachover makefiles for mesa 10.3.5.


# 1.20 15-Dec-2014 mrg

delete tools/glsl, is hasn't been used for a while.
move Makefile.glsl into libGL.


Revision tags: netbsd-7-base tls-earlyentropy-base tls-maxphys-base
# 1.19 09-Jul-2014 riastradh

branches: 1.19.2;
Update reachover makefiles for MesaLib 7.11.2.

With the new GL shader compiler, glsl-compile is no longer needed as
a tool, but the shader compiler is now duplicated in several
libraries, so (XXX) external/mit/xorg/tools/glsl should be turned
into a proper library that libGL and libmesa can link against.


Revision tags: yamt-pagecache-base9 riastradh-xf86-video-intel-2-7-1-pre-2-21-15 riastradh-drm2-base3 riastradh-drm2-base2 riastradh-drm2-base1 riastradh-drm2-base agc-symver-base yamt-pagecache-base8 yamt-pagecache-base7 yamt-pagecache-base6 yamt-pagecache-base5 yamt-pagecache-base4
# 1.18 22-Mar-2012 joerg

branches: 1.18.2; 1.18.8;
Disable a bunch of additional warnings for now for the clang build.


Revision tags: netbsd-6-0-6-RELEASE netbsd-6-1-5-RELEASE netbsd-6-1-4-RELEASE netbsd-6-0-5-RELEASE netbsd-6-1-3-RELEASE netbsd-6-0-4-RELEASE netbsd-6-1-2-RELEASE netbsd-6-0-3-RELEASE netbsd-6-1-1-RELEASE netbsd-6-0-2-RELEASE netbsd-6-1-RELEASE netbsd-6-1-RC4 netbsd-6-1-RC3 netbsd-6-1-RC2 netbsd-6-1-RC1 netbsd-6-0-1-RELEASE matt-nb6-plus-nbase netbsd-6-0-RELEASE netbsd-6-0-RC2 matt-nb6-plus-base netbsd-6-0-RC1 netbsd-6-base yamt-pagecache-base3 yamt-pagecache-base2 yamt-pagecache-base
# 1.17 11-Aug-2011 joerg

branches: 1.17.2;
Various warning adjustments for clang


Revision tags: cherry-xenmp-base bouyer-quota2-nbase bouyer-quota2-base matt-mips64-premerge-20101231
# 1.16 22-Nov-2010 mrg

install dri.pc.
put the Mesa version into it's own makefile, and share it. there
are now 4 references to it.


# 1.15 19-Jul-2010 mrg

updates for Mesa 7.8.2:
- build glsl as a host tool
- add the glsl objects to libmesa
- add/remove new/deleted sources for various components
- adjust the libmesa/libGL builds to pull in the new glsl objects
- re-apply the BUILDSYMLINK hack for eval.c/pixel.c/pixelstore.c
- use glsl to build the slang headers on the fly


# 1.14 28-May-2010 mrg

we're now at mesa 7.7.1.

XXX: really really really need to make this in one place...


# 1.13 23-May-2010 mrg

we have Mesa 7.4.4.


# 1.12 22-May-2010 mrg

updates for changed header locations for libdrm.


# 1.11 22-May-2010 mrg

install GL/internal/sarea.h and GL/internal/dri_interface.h, like Mesa does.


Revision tags: matt-premerge-20091211
# 1.10 08-Oct-2009 snj

Move libdrm headers up one level (out of the X11 directory) to match
the rest of the world and fix the inconsistency with libdrm.pc.
Fixes PR xsrc/42126.


# 1.9 11-Jun-2009 mrg

add glapi_getproc.c.


# 1.8 11-Jun-2009 mrg

fix up the Mesa version for the gl*.pc files.


# 1.7 11-Jun-2009 mrg

build fixes for Mesa 7.4.2.


Revision tags: jym-xensuspend-nbase jym-xensuspend-base
# 1.6 14-Feb-2009 abs

Use MACHINE_ARCH rather than MACHINE where relevant. At least one file had a nice mixture of amd64 and x86_64 tests...


Revision tags: netbsd-5-0-2-RELEASE matt-nb5-mips64-premerge-20091211 matt-nb5-mips64-u2-k2-k4-k7-k8-k9 matt-nb4-mips64-k7-u2a-k9b matt-nb5-mips64-u1-k1-k5 netbsd-5-0-1-RELEASE netbsd-5-0-RELEASE netbsd-5-0-RC4 netbsd-5-0-RC3 netbsd-5-0-RC2 netbsd-5-0-RC1 haad-dm-base haad-dm-base2 haad-nbase2 netbsd-5-base matt-mips64-base2 haad-dm-base1
# 1.5 21-Sep-2008 cube

branches: 1.5.4; 1.5.6; 1.5.8; 1.5.12;
Note the proper location of the DRI modules.


# 1.4 20-Sep-2008 cube

Don't install osmesa.h from here, libOSMesa will do it.


Revision tags: wrstuden-revivesa-base-3
# 1.3 13-Sep-2008 cube

branches: 1.3.2;
Install pkgconfig files. Where applicable, remove .if 0 code that tried to
do the same thing.


Revision tags: wrstuden-revivesa-base-2
# 1.2 02-Aug-2008 rtr

* don't build glapi_x86.S for now on i386.
* when preprorcessed glapi_x86.S ends up being invalid assembler input
because of whitespace problems in concatenation macros. normally the
use of these macros as they are wouldn't be a problem except we are
receiving -traditional-cpp from share/mk and the spaces are being
passed.

XXX further discussion needs to occur in order for this to be properly
fixed


# 1.1 29-Jul-2008 mrg

branches: 1.1.1;
Initial revision


# 1.33 03-Jun-2023 lukem

adapt to ${CC_WNO_STRINGOP_OVERFLOW}

Use ${CC_WNO_STRINGOP_OVERFLOW} instead of
the older style more complex expressions.

Remove workarounds if they were only for gcc < 10.


Revision tags: netbsd-10-base
# 1.32 11-Jul-2021 mrg

xorg/lib stuff to enable mesa.old, prepare for new mesa

- rename OLD_PREFIX to OLD_SUFFIX, since it is
- include mesa-which.mk and use ${OLD_SUFFIX} in several places
- remove mesa < 18 support


Revision tags: cjep_sun2x-base1 cjep_sun2x-base cjep_staticlib_x-base1 cjep_staticlib_x-base
# 1.31 31-Oct-2020 nia

mesa: re-enable GLX TLS to help i386

mesa's assembly code for i386 only seems to be position independent
when compiled with ELF TLS, so having it disabled causes worse problems
than the edge cases ELF TLS causes.

potentially the assembly code could be fixed (it looks like it not
being safe is a bug), it could also be disabled, but i don't currently
have the means to measure the impact of that.


# 1.30 16-Sep-2020 nia

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.


Revision tags: phil-wifi-20200421 phil-wifi-20200411 phil-wifi-20200406
# 1.29 29-Mar-2020 maya

Define GL_LIB_NAME somewhere that applies to dri_common.c, which is the
file that needs it.


Revision tags: is-mlppp-base phil-wifi-20191119
# 1.28 24-Sep-2019 maya

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.


Revision tags: netbsd-9-3-RELEASE netbsd-9-2-RELEASE netbsd-9-1-RELEASE netbsd-9-0-RELEASE netbsd-9-0-RC2 netbsd-9-0-RC1 netbsd-9-base phil-wifi-20190609
# 1.27 16-May-2019 christos

Fix MKCOMPATX11 build


# 1.26 18-Apr-2019 mrg

remove now dated comment.


# 1.25 11-Apr-2019 maya

the drivers we dlopen need pthread.
I'm not sure about the exact scenario causing failure, but using the
libc pthread stubs isn't sufficient.

fixes one of the glmark2 crashes (at startup with llvmpipe)


# 1.24 09-Apr-2019 maya

Expand all @@ things in pkgconfig file.
claim TLS.
pick up the list of private libs from pkgsrc mesalib
GL_LIB got renamed to GL_PKGCONF_LIB.


# 1.23 10-Mar-2019 mrg

pull across most of the new build infrastruture for mesa18 from maya's
git tree. this includes may of the changes from the changes below:


commit 52d85e74a1197aace38cc7acb705509e969120e6
Author: coypu <coypu@sdf.org>
Date: Mon Mar 4 12:25:33 2019 +0200

Make 32bit archs happier.

except i386, which now suffers from locked atomics because we
don't have clever ifunc tricks in libc.

commit ee9b4c19c58127934ed3548ad0d68934cc95ccc7
Author: coypu <coypu@sdf.org>
Date: Mon Mar 4 09:08:35 2019 +0200

Adjust includes, append rather than replace, appease clang ppc builds

commit a5341a3ad42572c78b6a2e6e5545bd323d7f2e4c
Author: coypu <coypu@sdf.org>
Date: Sun Mar 3 11:52:19 2019 +0200

Resolve i386 atomic issue and set lists.

XXX libGL in i386 is still causing issues
XXX pkgconfig file for vdpau
XXX set lists for arm32

commit 27bffc20bc15186c92cc5b8d5cc08d7299966b34
Author: coypu <coypu@sdf.org>
Date: Sat Mar 2 21:52:45 2019 +0200

make llvm sources x86 specific

hopefully not breaking non-x86 clang builds, which
have MKLLVM set.

commit f9d34922619cc8f2a224c0138a73985e50daf87f
Author: coypu <coypu@sdf.org>
Date: Sat Mar 2 21:33:31 2019 +0200

move hack to build llvm libraries soon enough.

add u_process.c to libGL specifically (dri, gallium and libGL all need
it).

Add some missing includes for pipe-loader when it moved to gallium

commit 2b1083d0d538bb5d5dd88ab2ca0ca6c331e5dd5b
Author: coypu <coypu@sdf.org>
Date: Sat Mar 2 16:47:58 2019 +0200

shuffle around:

some files move from shared driver.mk/loader.mk into gallium.
others move to shared.

add i915 files.

now i965 glxgears works (amd64).

commit 1897a90569b30b294bcbedadb3745092eca0bb33
Author: Maya Rashish <maya@NetBSD.org>
Date: Sun Feb 24 23:36:26 2019 +0200

Progress towards glxgears on i915

commit 28c9c99a236404de41ae74e88ea6d9578c088b92
Author: Maya Rashish <maya@NetBSD.org>
Date: Sun Feb 24 21:55:56 2019 +0200

rototill i965/i915 causing it to no longer startx.

Now missing sw_screen_create in the dri driver.

commit 48eb746983a5a7967fba221e7b167808af36f44a
Author: Maya Rashish <maya@NetBSD.org>
Date: Sun Feb 24 09:31:22 2019 +0200

More of vdpau. Cogs spin.

commit d9fbba8f61a43648d32f160c5fa62626788566ff
Author: Maya Rashish <maya@NetBSD.org>
Date: Sat Feb 23 22:36:37 2019 +0200

Adjust for MesaLib 18.

Build llvmpipe driver on x86 (the driver itself is x86-only).
build llvm on all x86, even on GCC builds.
galahad driver removed (upstream).
Don't build mesa 7 at all.


# 1.22 10-Mar-2019 mrg

move mesa10 build into .old scheme:

- add ${X11SRCDIR.MesaLib.old} and introduce ${X11SRCDIR.Mesa} as an
alias for either the former or the non old. this allows many of
the makefiles to simply use ${X11SRCDIR.Mesa} (but does not really
enable much sharing of makefiles, but reduces their diffs.)

- use mesa-which.mk to define ${OLD_PREFIX} to either "" or ".old",
and to know if to build 'dri7' (.old only.) ${OLD_PREFIX} is used
by other code (eg, LIBDPLIBS) to pick the right subdir.


Revision tags: netbsd-8-2-RELEASE netbsd-8-1-RELEASE netbsd-8-1-RC1 pgoyette-compat-merge-20190127 pgoyette-compat-20190127 pgoyette-compat-20190118 pgoyette-compat-1226 pgoyette-compat-1126 pgoyette-compat-1020 pgoyette-compat-0930 pgoyette-compat-0906 pgoyette-compat-0728 netbsd-8-0-RELEASE phil-wifi-base pgoyette-compat-0625 netbsd-8-0-RC2 pgoyette-compat-0521 pgoyette-compat-0502 pgoyette-compat-0422 netbsd-8-0-RC1 pgoyette-compat-0415 pgoyette-compat-0407 pgoyette-compat-0330 pgoyette-compat-0322 pgoyette-compat-0315 pgoyette-compat-base matt-nb8-mediatek-base perseant-stdc-iso10646-base netbsd-8-base prg-localcount2-base3 prg-localcount2-base2 prg-localcount2-base1 prg-localcount2-base pgoyette-localcount-20170426 bouyer-socketcan-base1 pgoyette-localcount-20170320 bouyer-socketcan-base pgoyette-localcount-20170107 pgoyette-localcount-20161104 localcount-20160914 pgoyette-localcount-20160806 pgoyette-localcount-20160726 pgoyette-localcount-base
# 1.21 18-Dec-2014 mrg

branches: 1.21.16;
update sets and reachover makefiles for mesa 10.3.5.


# 1.20 15-Dec-2014 mrg

delete tools/glsl, is hasn't been used for a while.
move Makefile.glsl into libGL.


Revision tags: netbsd-7-base tls-earlyentropy-base tls-maxphys-base
# 1.19 09-Jul-2014 riastradh

branches: 1.19.2;
Update reachover makefiles for MesaLib 7.11.2.

With the new GL shader compiler, glsl-compile is no longer needed as
a tool, but the shader compiler is now duplicated in several
libraries, so (XXX) external/mit/xorg/tools/glsl should be turned
into a proper library that libGL and libmesa can link against.


Revision tags: yamt-pagecache-base9 riastradh-xf86-video-intel-2-7-1-pre-2-21-15 riastradh-drm2-base3 riastradh-drm2-base2 riastradh-drm2-base1 riastradh-drm2-base agc-symver-base yamt-pagecache-base8 yamt-pagecache-base7 yamt-pagecache-base6 yamt-pagecache-base5 yamt-pagecache-base4
# 1.18 22-Mar-2012 joerg

branches: 1.18.2; 1.18.8;
Disable a bunch of additional warnings for now for the clang build.


Revision tags: netbsd-6-0-6-RELEASE netbsd-6-1-5-RELEASE netbsd-6-1-4-RELEASE netbsd-6-0-5-RELEASE netbsd-6-1-3-RELEASE netbsd-6-0-4-RELEASE netbsd-6-1-2-RELEASE netbsd-6-0-3-RELEASE netbsd-6-1-1-RELEASE netbsd-6-0-2-RELEASE netbsd-6-1-RELEASE netbsd-6-1-RC4 netbsd-6-1-RC3 netbsd-6-1-RC2 netbsd-6-1-RC1 netbsd-6-0-1-RELEASE matt-nb6-plus-nbase netbsd-6-0-RELEASE netbsd-6-0-RC2 matt-nb6-plus-base netbsd-6-0-RC1 netbsd-6-base yamt-pagecache-base3 yamt-pagecache-base2 yamt-pagecache-base
# 1.17 11-Aug-2011 joerg

branches: 1.17.2;
Various warning adjustments for clang


Revision tags: cherry-xenmp-base bouyer-quota2-nbase bouyer-quota2-base matt-mips64-premerge-20101231
# 1.16 22-Nov-2010 mrg

install dri.pc.
put the Mesa version into it's own makefile, and share it. there
are now 4 references to it.


# 1.15 19-Jul-2010 mrg

updates for Mesa 7.8.2:
- build glsl as a host tool
- add the glsl objects to libmesa
- add/remove new/deleted sources for various components
- adjust the libmesa/libGL builds to pull in the new glsl objects
- re-apply the BUILDSYMLINK hack for eval.c/pixel.c/pixelstore.c
- use glsl to build the slang headers on the fly


# 1.14 28-May-2010 mrg

we're now at mesa 7.7.1.

XXX: really really really need to make this in one place...


# 1.13 23-May-2010 mrg

we have Mesa 7.4.4.


# 1.12 22-May-2010 mrg

updates for changed header locations for libdrm.


# 1.11 22-May-2010 mrg

install GL/internal/sarea.h and GL/internal/dri_interface.h, like Mesa does.


Revision tags: matt-premerge-20091211
# 1.10 08-Oct-2009 snj

Move libdrm headers up one level (out of the X11 directory) to match
the rest of the world and fix the inconsistency with libdrm.pc.
Fixes PR xsrc/42126.


# 1.9 11-Jun-2009 mrg

add glapi_getproc.c.


# 1.8 11-Jun-2009 mrg

fix up the Mesa version for the gl*.pc files.


# 1.7 11-Jun-2009 mrg

build fixes for Mesa 7.4.2.


Revision tags: jym-xensuspend-nbase jym-xensuspend-base
# 1.6 14-Feb-2009 abs

Use MACHINE_ARCH rather than MACHINE where relevant. At least one file had a nice mixture of amd64 and x86_64 tests...


Revision tags: netbsd-5-0-2-RELEASE matt-nb5-mips64-premerge-20091211 matt-nb5-mips64-u2-k2-k4-k7-k8-k9 matt-nb4-mips64-k7-u2a-k9b matt-nb5-mips64-u1-k1-k5 netbsd-5-0-1-RELEASE netbsd-5-0-RELEASE netbsd-5-0-RC4 netbsd-5-0-RC3 netbsd-5-0-RC2 netbsd-5-0-RC1 haad-dm-base haad-dm-base2 haad-nbase2 netbsd-5-base matt-mips64-base2 haad-dm-base1
# 1.5 21-Sep-2008 cube

branches: 1.5.4; 1.5.6; 1.5.8; 1.5.12;
Note the proper location of the DRI modules.


# 1.4 20-Sep-2008 cube

Don't install osmesa.h from here, libOSMesa will do it.


Revision tags: wrstuden-revivesa-base-3
# 1.3 13-Sep-2008 cube

branches: 1.3.2;
Install pkgconfig files. Where applicable, remove .if 0 code that tried to
do the same thing.


Revision tags: wrstuden-revivesa-base-2
# 1.2 02-Aug-2008 rtr

* don't build glapi_x86.S for now on i386.
* when preprorcessed glapi_x86.S ends up being invalid assembler input
because of whitespace problems in concatenation macros. normally the
use of these macros as they are wouldn't be a problem except we are
receiving -traditional-cpp from share/mk and the spaces are being
passed.

XXX further discussion needs to occur in order for this to be properly
fixed


# 1.1 29-Jul-2008 mrg

branches: 1.1.1;
Initial revision


# 1.32 11-Jul-2021 mrg

xorg/lib stuff to enable mesa.old, prepare for new mesa

- rename OLD_PREFIX to OLD_SUFFIX, since it is
- include mesa-which.mk and use ${OLD_SUFFIX} in several places
- remove mesa < 18 support


Revision tags: cjep_sun2x-base1 cjep_sun2x-base cjep_staticlib_x-base1 cjep_staticlib_x-base
# 1.31 31-Oct-2020 nia

mesa: re-enable GLX TLS to help i386

mesa's assembly code for i386 only seems to be position independent
when compiled with ELF TLS, so having it disabled causes worse problems
than the edge cases ELF TLS causes.

potentially the assembly code could be fixed (it looks like it not
being safe is a bug), it could also be disabled, but i don't currently
have the means to measure the impact of that.


# 1.30 16-Sep-2020 nia

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.


Revision tags: phil-wifi-20200421 phil-wifi-20200411 phil-wifi-20200406
# 1.29 29-Mar-2020 maya

Define GL_LIB_NAME somewhere that applies to dri_common.c, which is the
file that needs it.


Revision tags: is-mlppp-base phil-wifi-20191119
# 1.28 24-Sep-2019 maya

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.


Revision tags: netbsd-9-2-RELEASE netbsd-9-1-RELEASE netbsd-9-0-RELEASE netbsd-9-0-RC2 netbsd-9-0-RC1 netbsd-9-base phil-wifi-20190609
# 1.27 16-May-2019 christos

Fix MKCOMPATX11 build


# 1.26 18-Apr-2019 mrg

remove now dated comment.


# 1.25 11-Apr-2019 maya

the drivers we dlopen need pthread.
I'm not sure about the exact scenario causing failure, but using the
libc pthread stubs isn't sufficient.

fixes one of the glmark2 crashes (at startup with llvmpipe)


# 1.24 09-Apr-2019 maya

Expand all @@ things in pkgconfig file.
claim TLS.
pick up the list of private libs from pkgsrc mesalib
GL_LIB got renamed to GL_PKGCONF_LIB.


# 1.23 10-Mar-2019 mrg

pull across most of the new build infrastruture for mesa18 from maya's
git tree. this includes may of the changes from the changes below:


commit 52d85e74a1197aace38cc7acb705509e969120e6
Author: coypu <coypu@sdf.org>
Date: Mon Mar 4 12:25:33 2019 +0200

Make 32bit archs happier.

except i386, which now suffers from locked atomics because we
don't have clever ifunc tricks in libc.

commit ee9b4c19c58127934ed3548ad0d68934cc95ccc7
Author: coypu <coypu@sdf.org>
Date: Mon Mar 4 09:08:35 2019 +0200

Adjust includes, append rather than replace, appease clang ppc builds

commit a5341a3ad42572c78b6a2e6e5545bd323d7f2e4c
Author: coypu <coypu@sdf.org>
Date: Sun Mar 3 11:52:19 2019 +0200

Resolve i386 atomic issue and set lists.

XXX libGL in i386 is still causing issues
XXX pkgconfig file for vdpau
XXX set lists for arm32

commit 27bffc20bc15186c92cc5b8d5cc08d7299966b34
Author: coypu <coypu@sdf.org>
Date: Sat Mar 2 21:52:45 2019 +0200

make llvm sources x86 specific

hopefully not breaking non-x86 clang builds, which
have MKLLVM set.

commit f9d34922619cc8f2a224c0138a73985e50daf87f
Author: coypu <coypu@sdf.org>
Date: Sat Mar 2 21:33:31 2019 +0200

move hack to build llvm libraries soon enough.

add u_process.c to libGL specifically (dri, gallium and libGL all need
it).

Add some missing includes for pipe-loader when it moved to gallium

commit 2b1083d0d538bb5d5dd88ab2ca0ca6c331e5dd5b
Author: coypu <coypu@sdf.org>
Date: Sat Mar 2 16:47:58 2019 +0200

shuffle around:

some files move from shared driver.mk/loader.mk into gallium.
others move to shared.

add i915 files.

now i965 glxgears works (amd64).

commit 1897a90569b30b294bcbedadb3745092eca0bb33
Author: Maya Rashish <maya@NetBSD.org>
Date: Sun Feb 24 23:36:26 2019 +0200

Progress towards glxgears on i915

commit 28c9c99a236404de41ae74e88ea6d9578c088b92
Author: Maya Rashish <maya@NetBSD.org>
Date: Sun Feb 24 21:55:56 2019 +0200

rototill i965/i915 causing it to no longer startx.

Now missing sw_screen_create in the dri driver.

commit 48eb746983a5a7967fba221e7b167808af36f44a
Author: Maya Rashish <maya@NetBSD.org>
Date: Sun Feb 24 09:31:22 2019 +0200

More of vdpau. Cogs spin.

commit d9fbba8f61a43648d32f160c5fa62626788566ff
Author: Maya Rashish <maya@NetBSD.org>
Date: Sat Feb 23 22:36:37 2019 +0200

Adjust for MesaLib 18.

Build llvmpipe driver on x86 (the driver itself is x86-only).
build llvm on all x86, even on GCC builds.
galahad driver removed (upstream).
Don't build mesa 7 at all.


# 1.22 10-Mar-2019 mrg

move mesa10 build into .old scheme:

- add ${X11SRCDIR.MesaLib.old} and introduce ${X11SRCDIR.Mesa} as an
alias for either the former or the non old. this allows many of
the makefiles to simply use ${X11SRCDIR.Mesa} (but does not really
enable much sharing of makefiles, but reduces their diffs.)

- use mesa-which.mk to define ${OLD_PREFIX} to either "" or ".old",
and to know if to build 'dri7' (.old only.) ${OLD_PREFIX} is used
by other code (eg, LIBDPLIBS) to pick the right subdir.


Revision tags: netbsd-8-2-RELEASE netbsd-8-1-RELEASE netbsd-8-1-RC1 pgoyette-compat-merge-20190127 pgoyette-compat-20190127 pgoyette-compat-20190118 pgoyette-compat-1226 pgoyette-compat-1126 pgoyette-compat-1020 pgoyette-compat-0930 pgoyette-compat-0906 pgoyette-compat-0728 netbsd-8-0-RELEASE phil-wifi-base pgoyette-compat-0625 netbsd-8-0-RC2 pgoyette-compat-0521 pgoyette-compat-0502 pgoyette-compat-0422 netbsd-8-0-RC1 pgoyette-compat-0415 pgoyette-compat-0407 pgoyette-compat-0330 pgoyette-compat-0322 pgoyette-compat-0315 pgoyette-compat-base matt-nb8-mediatek-base perseant-stdc-iso10646-base netbsd-8-base prg-localcount2-base3 prg-localcount2-base2 prg-localcount2-base1 prg-localcount2-base pgoyette-localcount-20170426 bouyer-socketcan-base1 pgoyette-localcount-20170320 bouyer-socketcan-base pgoyette-localcount-20170107 pgoyette-localcount-20161104 localcount-20160914 pgoyette-localcount-20160806 pgoyette-localcount-20160726 pgoyette-localcount-base
# 1.21 18-Dec-2014 mrg

branches: 1.21.16;
update sets and reachover makefiles for mesa 10.3.5.


# 1.20 15-Dec-2014 mrg

delete tools/glsl, is hasn't been used for a while.
move Makefile.glsl into libGL.


Revision tags: netbsd-7-base tls-earlyentropy-base tls-maxphys-base
# 1.19 09-Jul-2014 riastradh

branches: 1.19.2;
Update reachover makefiles for MesaLib 7.11.2.

With the new GL shader compiler, glsl-compile is no longer needed as
a tool, but the shader compiler is now duplicated in several
libraries, so (XXX) external/mit/xorg/tools/glsl should be turned
into a proper library that libGL and libmesa can link against.


Revision tags: yamt-pagecache-base9 riastradh-xf86-video-intel-2-7-1-pre-2-21-15 riastradh-drm2-base3 riastradh-drm2-base2 riastradh-drm2-base1 riastradh-drm2-base agc-symver-base yamt-pagecache-base8 yamt-pagecache-base7 yamt-pagecache-base6 yamt-pagecache-base5 yamt-pagecache-base4
# 1.18 22-Mar-2012 joerg

branches: 1.18.2; 1.18.8;
Disable a bunch of additional warnings for now for the clang build.


Revision tags: netbsd-6-0-6-RELEASE netbsd-6-1-5-RELEASE netbsd-6-1-4-RELEASE netbsd-6-0-5-RELEASE netbsd-6-1-3-RELEASE netbsd-6-0-4-RELEASE netbsd-6-1-2-RELEASE netbsd-6-0-3-RELEASE netbsd-6-1-1-RELEASE netbsd-6-0-2-RELEASE netbsd-6-1-RELEASE netbsd-6-1-RC4 netbsd-6-1-RC3 netbsd-6-1-RC2 netbsd-6-1-RC1 netbsd-6-0-1-RELEASE matt-nb6-plus-nbase netbsd-6-0-RELEASE netbsd-6-0-RC2 matt-nb6-plus-base netbsd-6-0-RC1 netbsd-6-base yamt-pagecache-base3 yamt-pagecache-base2 yamt-pagecache-base
# 1.17 11-Aug-2011 joerg

branches: 1.17.2;
Various warning adjustments for clang


Revision tags: cherry-xenmp-base bouyer-quota2-nbase bouyer-quota2-base matt-mips64-premerge-20101231
# 1.16 22-Nov-2010 mrg

install dri.pc.
put the Mesa version into it's own makefile, and share it. there
are now 4 references to it.


# 1.15 19-Jul-2010 mrg

updates for Mesa 7.8.2:
- build glsl as a host tool
- add the glsl objects to libmesa
- add/remove new/deleted sources for various components
- adjust the libmesa/libGL builds to pull in the new glsl objects
- re-apply the BUILDSYMLINK hack for eval.c/pixel.c/pixelstore.c
- use glsl to build the slang headers on the fly


# 1.14 28-May-2010 mrg

we're now at mesa 7.7.1.

XXX: really really really need to make this in one place...


# 1.13 23-May-2010 mrg

we have Mesa 7.4.4.


# 1.12 22-May-2010 mrg

updates for changed header locations for libdrm.


# 1.11 22-May-2010 mrg

install GL/internal/sarea.h and GL/internal/dri_interface.h, like Mesa does.


Revision tags: matt-premerge-20091211
# 1.10 08-Oct-2009 snj

Move libdrm headers up one level (out of the X11 directory) to match
the rest of the world and fix the inconsistency with libdrm.pc.
Fixes PR xsrc/42126.


# 1.9 11-Jun-2009 mrg

add glapi_getproc.c.


# 1.8 11-Jun-2009 mrg

fix up the Mesa version for the gl*.pc files.


# 1.7 11-Jun-2009 mrg

build fixes for Mesa 7.4.2.


Revision tags: jym-xensuspend-nbase jym-xensuspend-base
# 1.6 14-Feb-2009 abs

Use MACHINE_ARCH rather than MACHINE where relevant. At least one file had a nice mixture of amd64 and x86_64 tests...


Revision tags: netbsd-5-0-2-RELEASE matt-nb5-mips64-premerge-20091211 matt-nb5-mips64-u2-k2-k4-k7-k8-k9 matt-nb4-mips64-k7-u2a-k9b matt-nb5-mips64-u1-k1-k5 netbsd-5-0-1-RELEASE netbsd-5-0-RELEASE netbsd-5-0-RC4 netbsd-5-0-RC3 netbsd-5-0-RC2 netbsd-5-0-RC1 haad-dm-base haad-dm-base2 haad-nbase2 netbsd-5-base matt-mips64-base2 haad-dm-base1
# 1.5 21-Sep-2008 cube

branches: 1.5.4; 1.5.6; 1.5.8; 1.5.12;
Note the proper location of the DRI modules.


# 1.4 20-Sep-2008 cube

Don't install osmesa.h from here, libOSMesa will do it.


Revision tags: wrstuden-revivesa-base-3
# 1.3 13-Sep-2008 cube

branches: 1.3.2;
Install pkgconfig files. Where applicable, remove .if 0 code that tried to
do the same thing.


Revision tags: wrstuden-revivesa-base-2
# 1.2 02-Aug-2008 rtr

* don't build glapi_x86.S for now on i386.
* when preprorcessed glapi_x86.S ends up being invalid assembler input
because of whitespace problems in concatenation macros. normally the
use of these macros as they are wouldn't be a problem except we are
receiving -traditional-cpp from share/mk and the spaces are being
passed.

XXX further discussion needs to occur in order for this to be properly
fixed


# 1.1 29-Jul-2008 mrg

branches: 1.1.1;
Initial revision


# 1.31 31-Oct-2020 nia

mesa: re-enable GLX TLS to help i386

mesa's assembly code for i386 only seems to be position independent
when compiled with ELF TLS, so having it disabled causes worse problems
than the edge cases ELF TLS causes.

potentially the assembly code could be fixed (it looks like it not
being safe is a bug), it could also be disabled, but i don't currently
have the means to measure the impact of that.


# 1.30 16-Sep-2020 nia

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.


Revision tags: phil-wifi-20200421 phil-wifi-20200411 phil-wifi-20200406
# 1.29 29-Mar-2020 maya

Define GL_LIB_NAME somewhere that applies to dri_common.c, which is the
file that needs it.


Revision tags: is-mlppp-base phil-wifi-20191119
# 1.28 24-Sep-2019 maya

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.


Revision tags: netbsd-9-1-RELEASE netbsd-9-0-RELEASE netbsd-9-0-RC2 netbsd-9-0-RC1 netbsd-9-base phil-wifi-20190609
# 1.27 16-May-2019 christos

Fix MKCOMPATX11 build


# 1.26 18-Apr-2019 mrg

remove now dated comment.


# 1.25 11-Apr-2019 maya

the drivers we dlopen need pthread.
I'm not sure about the exact scenario causing failure, but using the
libc pthread stubs isn't sufficient.

fixes one of the glmark2 crashes (at startup with llvmpipe)


# 1.24 09-Apr-2019 maya

Expand all @@ things in pkgconfig file.
claim TLS.
pick up the list of private libs from pkgsrc mesalib
GL_LIB got renamed to GL_PKGCONF_LIB.


# 1.23 10-Mar-2019 mrg

pull across most of the new build infrastruture for mesa18 from maya's
git tree. this includes may of the changes from the changes below:


commit 52d85e74a1197aace38cc7acb705509e969120e6
Author: coypu <coypu@sdf.org>
Date: Mon Mar 4 12:25:33 2019 +0200

Make 32bit archs happier.

except i386, which now suffers from locked atomics because we
don't have clever ifunc tricks in libc.

commit ee9b4c19c58127934ed3548ad0d68934cc95ccc7
Author: coypu <coypu@sdf.org>
Date: Mon Mar 4 09:08:35 2019 +0200

Adjust includes, append rather than replace, appease clang ppc builds

commit a5341a3ad42572c78b6a2e6e5545bd323d7f2e4c
Author: coypu <coypu@sdf.org>
Date: Sun Mar 3 11:52:19 2019 +0200

Resolve i386 atomic issue and set lists.

XXX libGL in i386 is still causing issues
XXX pkgconfig file for vdpau
XXX set lists for arm32

commit 27bffc20bc15186c92cc5b8d5cc08d7299966b34
Author: coypu <coypu@sdf.org>
Date: Sat Mar 2 21:52:45 2019 +0200

make llvm sources x86 specific

hopefully not breaking non-x86 clang builds, which
have MKLLVM set.

commit f9d34922619cc8f2a224c0138a73985e50daf87f
Author: coypu <coypu@sdf.org>
Date: Sat Mar 2 21:33:31 2019 +0200

move hack to build llvm libraries soon enough.

add u_process.c to libGL specifically (dri, gallium and libGL all need
it).

Add some missing includes for pipe-loader when it moved to gallium

commit 2b1083d0d538bb5d5dd88ab2ca0ca6c331e5dd5b
Author: coypu <coypu@sdf.org>
Date: Sat Mar 2 16:47:58 2019 +0200

shuffle around:

some files move from shared driver.mk/loader.mk into gallium.
others move to shared.

add i915 files.

now i965 glxgears works (amd64).

commit 1897a90569b30b294bcbedadb3745092eca0bb33
Author: Maya Rashish <maya@NetBSD.org>
Date: Sun Feb 24 23:36:26 2019 +0200

Progress towards glxgears on i915

commit 28c9c99a236404de41ae74e88ea6d9578c088b92
Author: Maya Rashish <maya@NetBSD.org>
Date: Sun Feb 24 21:55:56 2019 +0200

rototill i965/i915 causing it to no longer startx.

Now missing sw_screen_create in the dri driver.

commit 48eb746983a5a7967fba221e7b167808af36f44a
Author: Maya Rashish <maya@NetBSD.org>
Date: Sun Feb 24 09:31:22 2019 +0200

More of vdpau. Cogs spin.

commit d9fbba8f61a43648d32f160c5fa62626788566ff
Author: Maya Rashish <maya@NetBSD.org>
Date: Sat Feb 23 22:36:37 2019 +0200

Adjust for MesaLib 18.

Build llvmpipe driver on x86 (the driver itself is x86-only).
build llvm on all x86, even on GCC builds.
galahad driver removed (upstream).
Don't build mesa 7 at all.


# 1.22 10-Mar-2019 mrg

move mesa10 build into .old scheme:

- add ${X11SRCDIR.MesaLib.old} and introduce ${X11SRCDIR.Mesa} as an
alias for either the former or the non old. this allows many of
the makefiles to simply use ${X11SRCDIR.Mesa} (but does not really
enable much sharing of makefiles, but reduces their diffs.)

- use mesa-which.mk to define ${OLD_PREFIX} to either "" or ".old",
and to know if to build 'dri7' (.old only.) ${OLD_PREFIX} is used
by other code (eg, LIBDPLIBS) to pick the right subdir.


Revision tags: netbsd-8-2-RELEASE netbsd-8-1-RELEASE netbsd-8-1-RC1 pgoyette-compat-merge-20190127 pgoyette-compat-20190127 pgoyette-compat-20190118 pgoyette-compat-1226 pgoyette-compat-1126 pgoyette-compat-1020 pgoyette-compat-0930 pgoyette-compat-0906 pgoyette-compat-0728 netbsd-8-0-RELEASE phil-wifi-base pgoyette-compat-0625 netbsd-8-0-RC2 pgoyette-compat-0521 pgoyette-compat-0502 pgoyette-compat-0422 netbsd-8-0-RC1 pgoyette-compat-0415 pgoyette-compat-0407 pgoyette-compat-0330 pgoyette-compat-0322 pgoyette-compat-0315 pgoyette-compat-base matt-nb8-mediatek-base perseant-stdc-iso10646-base netbsd-8-base prg-localcount2-base3 prg-localcount2-base2 prg-localcount2-base1 prg-localcount2-base pgoyette-localcount-20170426 bouyer-socketcan-base1 pgoyette-localcount-20170320 bouyer-socketcan-base pgoyette-localcount-20170107 pgoyette-localcount-20161104 localcount-20160914 pgoyette-localcount-20160806 pgoyette-localcount-20160726 pgoyette-localcount-base
# 1.21 18-Dec-2014 mrg

branches: 1.21.16;
update sets and reachover makefiles for mesa 10.3.5.


# 1.20 15-Dec-2014 mrg

delete tools/glsl, is hasn't been used for a while.
move Makefile.glsl into libGL.


Revision tags: netbsd-7-base tls-earlyentropy-base tls-maxphys-base
# 1.19 09-Jul-2014 riastradh

branches: 1.19.2;
Update reachover makefiles for MesaLib 7.11.2.

With the new GL shader compiler, glsl-compile is no longer needed as
a tool, but the shader compiler is now duplicated in several
libraries, so (XXX) external/mit/xorg/tools/glsl should be turned
into a proper library that libGL and libmesa can link against.


Revision tags: yamt-pagecache-base9 riastradh-xf86-video-intel-2-7-1-pre-2-21-15 riastradh-drm2-base3 riastradh-drm2-base2 riastradh-drm2-base1 riastradh-drm2-base agc-symver-base yamt-pagecache-base8 yamt-pagecache-base7 yamt-pagecache-base6 yamt-pagecache-base5 yamt-pagecache-base4
# 1.18 22-Mar-2012 joerg

branches: 1.18.2; 1.18.8;
Disable a bunch of additional warnings for now for the clang build.


Revision tags: netbsd-6-0-6-RELEASE netbsd-6-1-5-RELEASE netbsd-6-1-4-RELEASE netbsd-6-0-5-RELEASE netbsd-6-1-3-RELEASE netbsd-6-0-4-RELEASE netbsd-6-1-2-RELEASE netbsd-6-0-3-RELEASE netbsd-6-1-1-RELEASE netbsd-6-0-2-RELEASE netbsd-6-1-RELEASE netbsd-6-1-RC4 netbsd-6-1-RC3 netbsd-6-1-RC2 netbsd-6-1-RC1 netbsd-6-0-1-RELEASE matt-nb6-plus-nbase netbsd-6-0-RELEASE netbsd-6-0-RC2 matt-nb6-plus-base netbsd-6-0-RC1 netbsd-6-base yamt-pagecache-base3 yamt-pagecache-base2 yamt-pagecache-base
# 1.17 11-Aug-2011 joerg

branches: 1.17.2;
Various warning adjustments for clang


Revision tags: cherry-xenmp-base bouyer-quota2-nbase bouyer-quota2-base matt-mips64-premerge-20101231
# 1.16 22-Nov-2010 mrg

install dri.pc.
put the Mesa version into it's own makefile, and share it. there
are now 4 references to it.


# 1.15 19-Jul-2010 mrg

updates for Mesa 7.8.2:
- build glsl as a host tool
- add the glsl objects to libmesa
- add/remove new/deleted sources for various components
- adjust the libmesa/libGL builds to pull in the new glsl objects
- re-apply the BUILDSYMLINK hack for eval.c/pixel.c/pixelstore.c
- use glsl to build the slang headers on the fly


# 1.14 28-May-2010 mrg

we're now at mesa 7.7.1.

XXX: really really really need to make this in one place...


# 1.13 23-May-2010 mrg

we have Mesa 7.4.4.


# 1.12 22-May-2010 mrg

updates for changed header locations for libdrm.


# 1.11 22-May-2010 mrg

install GL/internal/sarea.h and GL/internal/dri_interface.h, like Mesa does.


Revision tags: matt-premerge-20091211
# 1.10 08-Oct-2009 snj

Move libdrm headers up one level (out of the X11 directory) to match
the rest of the world and fix the inconsistency with libdrm.pc.
Fixes PR xsrc/42126.


# 1.9 11-Jun-2009 mrg

add glapi_getproc.c.


# 1.8 11-Jun-2009 mrg

fix up the Mesa version for the gl*.pc files.


# 1.7 11-Jun-2009 mrg

build fixes for Mesa 7.4.2.


Revision tags: jym-xensuspend-nbase jym-xensuspend-base
# 1.6 14-Feb-2009 abs

Use MACHINE_ARCH rather than MACHINE where relevant. At least one file had a nice mixture of amd64 and x86_64 tests...


Revision tags: netbsd-5-0-2-RELEASE matt-nb5-mips64-premerge-20091211 matt-nb5-mips64-u2-k2-k4-k7-k8-k9 matt-nb4-mips64-k7-u2a-k9b matt-nb5-mips64-u1-k1-k5 netbsd-5-0-1-RELEASE netbsd-5-0-RELEASE netbsd-5-0-RC4 netbsd-5-0-RC3 netbsd-5-0-RC2 netbsd-5-0-RC1 haad-dm-base haad-dm-base2 haad-nbase2 netbsd-5-base matt-mips64-base2 haad-dm-base1
# 1.5 21-Sep-2008 cube

branches: 1.5.4; 1.5.6; 1.5.8; 1.5.12;
Note the proper location of the DRI modules.


# 1.4 20-Sep-2008 cube

Don't install osmesa.h from here, libOSMesa will do it.


Revision tags: wrstuden-revivesa-base-3
# 1.3 13-Sep-2008 cube

branches: 1.3.2;
Install pkgconfig files. Where applicable, remove .if 0 code that tried to
do the same thing.


Revision tags: wrstuden-revivesa-base-2
# 1.2 02-Aug-2008 rtr

* don't build glapi_x86.S for now on i386.
* when preprorcessed glapi_x86.S ends up being invalid assembler input
because of whitespace problems in concatenation macros. normally the
use of these macros as they are wouldn't be a problem except we are
receiving -traditional-cpp from share/mk and the spaces are being
passed.

XXX further discussion needs to occur in order for this to be properly
fixed


# 1.1 29-Jul-2008 mrg

branches: 1.1.1;
Initial revision


# 1.30 16-Sep-2020 nia

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.


Revision tags: phil-wifi-20200421 phil-wifi-20200411 phil-wifi-20200406
# 1.29 29-Mar-2020 maya

Define GL_LIB_NAME somewhere that applies to dri_common.c, which is the
file that needs it.


Revision tags: is-mlppp-base phil-wifi-20191119
# 1.28 24-Sep-2019 maya

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.


Revision tags: netbsd-9-0-RELEASE netbsd-9-0-RC2 netbsd-9-0-RC1 netbsd-9-base phil-wifi-20190609
# 1.27 16-May-2019 christos

Fix MKCOMPATX11 build


# 1.26 18-Apr-2019 mrg

remove now dated comment.


# 1.25 11-Apr-2019 maya

the drivers we dlopen need pthread.
I'm not sure about the exact scenario causing failure, but using the
libc pthread stubs isn't sufficient.

fixes one of the glmark2 crashes (at startup with llvmpipe)


# 1.24 09-Apr-2019 maya

Expand all @@ things in pkgconfig file.
claim TLS.
pick up the list of private libs from pkgsrc mesalib
GL_LIB got renamed to GL_PKGCONF_LIB.


# 1.23 10-Mar-2019 mrg

pull across most of the new build infrastruture for mesa18 from maya's
git tree. this includes may of the changes from the changes below:


commit 52d85e74a1197aace38cc7acb705509e969120e6
Author: coypu <coypu@sdf.org>
Date: Mon Mar 4 12:25:33 2019 +0200

Make 32bit archs happier.

except i386, which now suffers from locked atomics because we
don't have clever ifunc tricks in libc.

commit ee9b4c19c58127934ed3548ad0d68934cc95ccc7
Author: coypu <coypu@sdf.org>
Date: Mon Mar 4 09:08:35 2019 +0200

Adjust includes, append rather than replace, appease clang ppc builds

commit a5341a3ad42572c78b6a2e6e5545bd323d7f2e4c
Author: coypu <coypu@sdf.org>
Date: Sun Mar 3 11:52:19 2019 +0200

Resolve i386 atomic issue and set lists.

XXX libGL in i386 is still causing issues
XXX pkgconfig file for vdpau
XXX set lists for arm32

commit 27bffc20bc15186c92cc5b8d5cc08d7299966b34
Author: coypu <coypu@sdf.org>
Date: Sat Mar 2 21:52:45 2019 +0200

make llvm sources x86 specific

hopefully not breaking non-x86 clang builds, which
have MKLLVM set.

commit f9d34922619cc8f2a224c0138a73985e50daf87f
Author: coypu <coypu@sdf.org>
Date: Sat Mar 2 21:33:31 2019 +0200

move hack to build llvm libraries soon enough.

add u_process.c to libGL specifically (dri, gallium and libGL all need
it).

Add some missing includes for pipe-loader when it moved to gallium

commit 2b1083d0d538bb5d5dd88ab2ca0ca6c331e5dd5b
Author: coypu <coypu@sdf.org>
Date: Sat Mar 2 16:47:58 2019 +0200

shuffle around:

some files move from shared driver.mk/loader.mk into gallium.
others move to shared.

add i915 files.

now i965 glxgears works (amd64).

commit 1897a90569b30b294bcbedadb3745092eca0bb33
Author: Maya Rashish <maya@NetBSD.org>
Date: Sun Feb 24 23:36:26 2019 +0200

Progress towards glxgears on i915

commit 28c9c99a236404de41ae74e88ea6d9578c088b92
Author: Maya Rashish <maya@NetBSD.org>
Date: Sun Feb 24 21:55:56 2019 +0200

rototill i965/i915 causing it to no longer startx.

Now missing sw_screen_create in the dri driver.

commit 48eb746983a5a7967fba221e7b167808af36f44a
Author: Maya Rashish <maya@NetBSD.org>
Date: Sun Feb 24 09:31:22 2019 +0200

More of vdpau. Cogs spin.

commit d9fbba8f61a43648d32f160c5fa62626788566ff
Author: Maya Rashish <maya@NetBSD.org>
Date: Sat Feb 23 22:36:37 2019 +0200

Adjust for MesaLib 18.

Build llvmpipe driver on x86 (the driver itself is x86-only).
build llvm on all x86, even on GCC builds.
galahad driver removed (upstream).
Don't build mesa 7 at all.


# 1.22 10-Mar-2019 mrg

move mesa10 build into .old scheme:

- add ${X11SRCDIR.MesaLib.old} and introduce ${X11SRCDIR.Mesa} as an
alias for either the former or the non old. this allows many of
the makefiles to simply use ${X11SRCDIR.Mesa} (but does not really
enable much sharing of makefiles, but reduces their diffs.)

- use mesa-which.mk to define ${OLD_PREFIX} to either "" or ".old",
and to know if to build 'dri7' (.old only.) ${OLD_PREFIX} is used
by other code (eg, LIBDPLIBS) to pick the right subdir.


Revision tags: netbsd-8-2-RELEASE netbsd-8-1-RELEASE netbsd-8-1-RC1 pgoyette-compat-merge-20190127 pgoyette-compat-20190127 pgoyette-compat-20190118 pgoyette-compat-1226 pgoyette-compat-1126 pgoyette-compat-1020 pgoyette-compat-0930 pgoyette-compat-0906 pgoyette-compat-0728 netbsd-8-0-RELEASE phil-wifi-base pgoyette-compat-0625 netbsd-8-0-RC2 pgoyette-compat-0521 pgoyette-compat-0502 pgoyette-compat-0422 netbsd-8-0-RC1 pgoyette-compat-0415 pgoyette-compat-0407 pgoyette-compat-0330 pgoyette-compat-0322 pgoyette-compat-0315 pgoyette-compat-base matt-nb8-mediatek-base perseant-stdc-iso10646-base netbsd-8-base prg-localcount2-base3 prg-localcount2-base2 prg-localcount2-base1 prg-localcount2-base pgoyette-localcount-20170426 bouyer-socketcan-base1 pgoyette-localcount-20170320 bouyer-socketcan-base pgoyette-localcount-20170107 pgoyette-localcount-20161104 localcount-20160914 pgoyette-localcount-20160806 pgoyette-localcount-20160726 pgoyette-localcount-base
# 1.21 18-Dec-2014 mrg

branches: 1.21.16;
update sets and reachover makefiles for mesa 10.3.5.


# 1.20 15-Dec-2014 mrg

delete tools/glsl, is hasn't been used for a while.
move Makefile.glsl into libGL.


Revision tags: netbsd-7-base tls-earlyentropy-base tls-maxphys-base
# 1.19 09-Jul-2014 riastradh

branches: 1.19.2;
Update reachover makefiles for MesaLib 7.11.2.

With the new GL shader compiler, glsl-compile is no longer needed as
a tool, but the shader compiler is now duplicated in several
libraries, so (XXX) external/mit/xorg/tools/glsl should be turned
into a proper library that libGL and libmesa can link against.


Revision tags: yamt-pagecache-base9 riastradh-xf86-video-intel-2-7-1-pre-2-21-15 riastradh-drm2-base3 riastradh-drm2-base2 riastradh-drm2-base1 riastradh-drm2-base agc-symver-base yamt-pagecache-base8 yamt-pagecache-base7 yamt-pagecache-base6 yamt-pagecache-base5 yamt-pagecache-base4
# 1.18 22-Mar-2012 joerg

branches: 1.18.2; 1.18.8;
Disable a bunch of additional warnings for now for the clang build.


Revision tags: netbsd-6-0-6-RELEASE netbsd-6-1-5-RELEASE netbsd-6-1-4-RELEASE netbsd-6-0-5-RELEASE netbsd-6-1-3-RELEASE netbsd-6-0-4-RELEASE netbsd-6-1-2-RELEASE netbsd-6-0-3-RELEASE netbsd-6-1-1-RELEASE netbsd-6-0-2-RELEASE netbsd-6-1-RELEASE netbsd-6-1-RC4 netbsd-6-1-RC3 netbsd-6-1-RC2 netbsd-6-1-RC1 netbsd-6-0-1-RELEASE matt-nb6-plus-nbase netbsd-6-0-RELEASE netbsd-6-0-RC2 matt-nb6-plus-base netbsd-6-0-RC1 netbsd-6-base yamt-pagecache-base3 yamt-pagecache-base2 yamt-pagecache-base
# 1.17 11-Aug-2011 joerg

branches: 1.17.2;
Various warning adjustments for clang


Revision tags: cherry-xenmp-base bouyer-quota2-nbase bouyer-quota2-base matt-mips64-premerge-20101231
# 1.16 22-Nov-2010 mrg

install dri.pc.
put the Mesa version into it's own makefile, and share it. there
are now 4 references to it.


# 1.15 19-Jul-2010 mrg

updates for Mesa 7.8.2:
- build glsl as a host tool
- add the glsl objects to libmesa
- add/remove new/deleted sources for various components
- adjust the libmesa/libGL builds to pull in the new glsl objects
- re-apply the BUILDSYMLINK hack for eval.c/pixel.c/pixelstore.c
- use glsl to build the slang headers on the fly


# 1.14 28-May-2010 mrg

we're now at mesa 7.7.1.

XXX: really really really need to make this in one place...


# 1.13 23-May-2010 mrg

we have Mesa 7.4.4.


# 1.12 22-May-2010 mrg

updates for changed header locations for libdrm.


# 1.11 22-May-2010 mrg

install GL/internal/sarea.h and GL/internal/dri_interface.h, like Mesa does.


Revision tags: matt-premerge-20091211
# 1.10 08-Oct-2009 snj

Move libdrm headers up one level (out of the X11 directory) to match
the rest of the world and fix the inconsistency with libdrm.pc.
Fixes PR xsrc/42126.


# 1.9 11-Jun-2009 mrg

add glapi_getproc.c.


# 1.8 11-Jun-2009 mrg

fix up the Mesa version for the gl*.pc files.


# 1.7 11-Jun-2009 mrg

build fixes for Mesa 7.4.2.


Revision tags: jym-xensuspend-nbase jym-xensuspend-base
# 1.6 14-Feb-2009 abs

Use MACHINE_ARCH rather than MACHINE where relevant. At least one file had a nice mixture of amd64 and x86_64 tests...


Revision tags: netbsd-5-0-2-RELEASE matt-nb5-mips64-premerge-20091211 matt-nb5-mips64-u2-k2-k4-k7-k8-k9 matt-nb4-mips64-k7-u2a-k9b matt-nb5-mips64-u1-k1-k5 netbsd-5-0-1-RELEASE netbsd-5-0-RELEASE netbsd-5-0-RC4 netbsd-5-0-RC3 netbsd-5-0-RC2 netbsd-5-0-RC1 haad-dm-base haad-dm-base2 haad-nbase2 netbsd-5-base matt-mips64-base2 haad-dm-base1
# 1.5 21-Sep-2008 cube

branches: 1.5.4; 1.5.6; 1.5.8; 1.5.12;
Note the proper location of the DRI modules.


# 1.4 20-Sep-2008 cube

Don't install osmesa.h from here, libOSMesa will do it.


Revision tags: wrstuden-revivesa-base-3
# 1.3 13-Sep-2008 cube

branches: 1.3.2;
Install pkgconfig files. Where applicable, remove .if 0 code that tried to
do the same thing.


Revision tags: wrstuden-revivesa-base-2
# 1.2 02-Aug-2008 rtr

* don't build glapi_x86.S for now on i386.
* when preprorcessed glapi_x86.S ends up being invalid assembler input
because of whitespace problems in concatenation macros. normally the
use of these macros as they are wouldn't be a problem except we are
receiving -traditional-cpp from share/mk and the spaces are being
passed.

XXX further discussion needs to occur in order for this to be properly
fixed


# 1.1 29-Jul-2008 mrg

branches: 1.1.1;
Initial revision


# 1.29 29-Mar-2020 maya

Define GL_LIB_NAME somewhere that applies to dri_common.c, which is the
file that needs it.


Revision tags: phil-wifi-20191119
# 1.28 24-Sep-2019 maya

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.


Revision tags: netbsd-9-0-RELEASE netbsd-9-0-RC2 netbsd-9-0-RC1 netbsd-9-base phil-wifi-20190609
# 1.27 16-May-2019 christos

Fix MKCOMPATX11 build


# 1.26 18-Apr-2019 mrg

remove now dated comment.


# 1.25 11-Apr-2019 maya

the drivers we dlopen need pthread.
I'm not sure about the exact scenario causing failure, but using the
libc pthread stubs isn't sufficient.

fixes one of the glmark2 crashes (at startup with llvmpipe)


# 1.24 09-Apr-2019 maya

Expand all @@ things in pkgconfig file.
claim TLS.
pick up the list of private libs from pkgsrc mesalib
GL_LIB got renamed to GL_PKGCONF_LIB.


# 1.23 10-Mar-2019 mrg

pull across most of the new build infrastruture for mesa18 from maya's
git tree. this includes may of the changes from the changes below:


commit 52d85e74a1197aace38cc7acb705509e969120e6
Author: coypu <coypu@sdf.org>
Date: Mon Mar 4 12:25:33 2019 +0200

Make 32bit archs happier.

except i386, which now suffers from locked atomics because we
don't have clever ifunc tricks in libc.

commit ee9b4c19c58127934ed3548ad0d68934cc95ccc7
Author: coypu <coypu@sdf.org>
Date: Mon Mar 4 09:08:35 2019 +0200

Adjust includes, append rather than replace, appease clang ppc builds

commit a5341a3ad42572c78b6a2e6e5545bd323d7f2e4c
Author: coypu <coypu@sdf.org>
Date: Sun Mar 3 11:52:19 2019 +0200

Resolve i386 atomic issue and set lists.

XXX libGL in i386 is still causing issues
XXX pkgconfig file for vdpau
XXX set lists for arm32

commit 27bffc20bc15186c92cc5b8d5cc08d7299966b34
Author: coypu <coypu@sdf.org>
Date: Sat Mar 2 21:52:45 2019 +0200

make llvm sources x86 specific

hopefully not breaking non-x86 clang builds, which
have MKLLVM set.

commit f9d34922619cc8f2a224c0138a73985e50daf87f
Author: coypu <coypu@sdf.org>
Date: Sat Mar 2 21:33:31 2019 +0200

move hack to build llvm libraries soon enough.

add u_process.c to libGL specifically (dri, gallium and libGL all need
it).

Add some missing includes for pipe-loader when it moved to gallium

commit 2b1083d0d538bb5d5dd88ab2ca0ca6c331e5dd5b
Author: coypu <coypu@sdf.org>
Date: Sat Mar 2 16:47:58 2019 +0200

shuffle around:

some files move from shared driver.mk/loader.mk into gallium.
others move to shared.

add i915 files.

now i965 glxgears works (amd64).

commit 1897a90569b30b294bcbedadb3745092eca0bb33
Author: Maya Rashish <maya@NetBSD.org>
Date: Sun Feb 24 23:36:26 2019 +0200

Progress towards glxgears on i915

commit 28c9c99a236404de41ae74e88ea6d9578c088b92
Author: Maya Rashish <maya@NetBSD.org>
Date: Sun Feb 24 21:55:56 2019 +0200

rototill i965/i915 causing it to no longer startx.

Now missing sw_screen_create in the dri driver.

commit 48eb746983a5a7967fba221e7b167808af36f44a
Author: Maya Rashish <maya@NetBSD.org>
Date: Sun Feb 24 09:31:22 2019 +0200

More of vdpau. Cogs spin.

commit d9fbba8f61a43648d32f160c5fa62626788566ff
Author: Maya Rashish <maya@NetBSD.org>
Date: Sat Feb 23 22:36:37 2019 +0200

Adjust for MesaLib 18.

Build llvmpipe driver on x86 (the driver itself is x86-only).
build llvm on all x86, even on GCC builds.
galahad driver removed (upstream).
Don't build mesa 7 at all.


# 1.22 10-Mar-2019 mrg

move mesa10 build into .old scheme:

- add ${X11SRCDIR.MesaLib.old} and introduce ${X11SRCDIR.Mesa} as an
alias for either the former or the non old. this allows many of
the makefiles to simply use ${X11SRCDIR.Mesa} (but does not really
enable much sharing of makefiles, but reduces their diffs.)

- use mesa-which.mk to define ${OLD_PREFIX} to either "" or ".old",
and to know if to build 'dri7' (.old only.) ${OLD_PREFIX} is used
by other code (eg, LIBDPLIBS) to pick the right subdir.


Revision tags: netbsd-8-1-RELEASE netbsd-8-1-RC1 pgoyette-compat-merge-20190127 pgoyette-compat-20190127 pgoyette-compat-20190118 pgoyette-compat-1226 pgoyette-compat-1126 pgoyette-compat-1020 pgoyette-compat-0930 pgoyette-compat-0906 pgoyette-compat-0728 netbsd-8-0-RELEASE phil-wifi-base pgoyette-compat-0625 netbsd-8-0-RC2 pgoyette-compat-0521 pgoyette-compat-0502 pgoyette-compat-0422 netbsd-8-0-RC1 pgoyette-compat-0415 pgoyette-compat-0407 pgoyette-compat-0330 pgoyette-compat-0322 pgoyette-compat-0315 pgoyette-compat-base matt-nb8-mediatek-base perseant-stdc-iso10646-base netbsd-8-base prg-localcount2-base3 prg-localcount2-base2 prg-localcount2-base1 prg-localcount2-base pgoyette-localcount-20170426 bouyer-socketcan-base1 pgoyette-localcount-20170320 bouyer-socketcan-base pgoyette-localcount-20170107 pgoyette-localcount-20161104 localcount-20160914 pgoyette-localcount-20160806 pgoyette-localcount-20160726 pgoyette-localcount-base
# 1.21 18-Dec-2014 mrg

branches: 1.21.16;
update sets and reachover makefiles for mesa 10.3.5.


# 1.20 15-Dec-2014 mrg

delete tools/glsl, is hasn't been used for a while.
move Makefile.glsl into libGL.


Revision tags: netbsd-7-base tls-earlyentropy-base tls-maxphys-base
# 1.19 09-Jul-2014 riastradh

branches: 1.19.2;
Update reachover makefiles for MesaLib 7.11.2.

With the new GL shader compiler, glsl-compile is no longer needed as
a tool, but the shader compiler is now duplicated in several
libraries, so (XXX) external/mit/xorg/tools/glsl should be turned
into a proper library that libGL and libmesa can link against.


Revision tags: yamt-pagecache-base9 riastradh-xf86-video-intel-2-7-1-pre-2-21-15 riastradh-drm2-base3 riastradh-drm2-base2 riastradh-drm2-base1 riastradh-drm2-base agc-symver-base yamt-pagecache-base8 yamt-pagecache-base7 yamt-pagecache-base6 yamt-pagecache-base5 yamt-pagecache-base4
# 1.18 22-Mar-2012 joerg

branches: 1.18.2; 1.18.8;
Disable a bunch of additional warnings for now for the clang build.


Revision tags: netbsd-6-0-6-RELEASE netbsd-6-1-5-RELEASE netbsd-6-1-4-RELEASE netbsd-6-0-5-RELEASE netbsd-6-1-3-RELEASE netbsd-6-0-4-RELEASE netbsd-6-1-2-RELEASE netbsd-6-0-3-RELEASE netbsd-6-1-1-RELEASE netbsd-6-0-2-RELEASE netbsd-6-1-RELEASE netbsd-6-1-RC4 netbsd-6-1-RC3 netbsd-6-1-RC2 netbsd-6-1-RC1 netbsd-6-0-1-RELEASE matt-nb6-plus-nbase netbsd-6-0-RELEASE netbsd-6-0-RC2 matt-nb6-plus-base netbsd-6-0-RC1 netbsd-6-base yamt-pagecache-base3 yamt-pagecache-base2 yamt-pagecache-base
# 1.17 11-Aug-2011 joerg

branches: 1.17.2;
Various warning adjustments for clang


Revision tags: cherry-xenmp-base bouyer-quota2-nbase bouyer-quota2-base matt-mips64-premerge-20101231
# 1.16 22-Nov-2010 mrg

install dri.pc.
put the Mesa version into it's own makefile, and share it. there
are now 4 references to it.


# 1.15 19-Jul-2010 mrg

updates for Mesa 7.8.2:
- build glsl as a host tool
- add the glsl objects to libmesa
- add/remove new/deleted sources for various components
- adjust the libmesa/libGL builds to pull in the new glsl objects
- re-apply the BUILDSYMLINK hack for eval.c/pixel.c/pixelstore.c
- use glsl to build the slang headers on the fly


# 1.14 28-May-2010 mrg

we're now at mesa 7.7.1.

XXX: really really really need to make this in one place...


# 1.13 23-May-2010 mrg

we have Mesa 7.4.4.


# 1.12 22-May-2010 mrg

updates for changed header locations for libdrm.


# 1.11 22-May-2010 mrg

install GL/internal/sarea.h and GL/internal/dri_interface.h, like Mesa does.


Revision tags: matt-premerge-20091211
# 1.10 08-Oct-2009 snj

Move libdrm headers up one level (out of the X11 directory) to match
the rest of the world and fix the inconsistency with libdrm.pc.
Fixes PR xsrc/42126.


# 1.9 11-Jun-2009 mrg

add glapi_getproc.c.


# 1.8 11-Jun-2009 mrg

fix up the Mesa version for the gl*.pc files.


# 1.7 11-Jun-2009 mrg

build fixes for Mesa 7.4.2.


Revision tags: jym-xensuspend-nbase jym-xensuspend-base
# 1.6 14-Feb-2009 abs

Use MACHINE_ARCH rather than MACHINE where relevant. At least one file had a nice mixture of amd64 and x86_64 tests...


Revision tags: netbsd-5-0-2-RELEASE matt-nb5-mips64-premerge-20091211 matt-nb5-mips64-u2-k2-k4-k7-k8-k9 matt-nb4-mips64-k7-u2a-k9b matt-nb5-mips64-u1-k1-k5 netbsd-5-0-1-RELEASE netbsd-5-0-RELEASE netbsd-5-0-RC4 netbsd-5-0-RC3 netbsd-5-0-RC2 netbsd-5-0-RC1 haad-dm-base haad-dm-base2 haad-nbase2 netbsd-5-base matt-mips64-base2 haad-dm-base1
# 1.5 21-Sep-2008 cube

branches: 1.5.4; 1.5.6; 1.5.8; 1.5.12;
Note the proper location of the DRI modules.


# 1.4 20-Sep-2008 cube

Don't install osmesa.h from here, libOSMesa will do it.


Revision tags: wrstuden-revivesa-base-3
# 1.3 13-Sep-2008 cube

branches: 1.3.2;
Install pkgconfig files. Where applicable, remove .if 0 code that tried to
do the same thing.


Revision tags: wrstuden-revivesa-base-2
# 1.2 02-Aug-2008 rtr

* don't build glapi_x86.S for now on i386.
* when preprorcessed glapi_x86.S ends up being invalid assembler input
because of whitespace problems in concatenation macros. normally the
use of these macros as they are wouldn't be a problem except we are
receiving -traditional-cpp from share/mk and the spaces are being
passed.

XXX further discussion needs to occur in order for this to be properly
fixed


# 1.1 29-Jul-2008 mrg

branches: 1.1.1;
Initial revision


# 1.28 24-Sep-2019 maya

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.


Revision tags: netbsd-9-base phil-wifi-20190609
# 1.27 16-May-2019 christos

Fix MKCOMPATX11 build


# 1.26 18-Apr-2019 mrg

remove now dated comment.


# 1.25 11-Apr-2019 maya

the drivers we dlopen need pthread.
I'm not sure about the exact scenario causing failure, but using the
libc pthread stubs isn't sufficient.

fixes one of the glmark2 crashes (at startup with llvmpipe)


# 1.24 09-Apr-2019 maya

Expand all @@ things in pkgconfig file.
claim TLS.
pick up the list of private libs from pkgsrc mesalib
GL_LIB got renamed to GL_PKGCONF_LIB.


# 1.23 10-Mar-2019 mrg

pull across most of the new build infrastruture for mesa18 from maya's
git tree. this includes may of the changes from the changes below:


commit 52d85e74a1197aace38cc7acb705509e969120e6
Author: coypu <coypu@sdf.org>
Date: Mon Mar 4 12:25:33 2019 +0200

Make 32bit archs happier.

except i386, which now suffers from locked atomics because we
don't have clever ifunc tricks in libc.

commit ee9b4c19c58127934ed3548ad0d68934cc95ccc7
Author: coypu <coypu@sdf.org>
Date: Mon Mar 4 09:08:35 2019 +0200

Adjust includes, append rather than replace, appease clang ppc builds

commit a5341a3ad42572c78b6a2e6e5545bd323d7f2e4c
Author: coypu <coypu@sdf.org>
Date: Sun Mar 3 11:52:19 2019 +0200

Resolve i386 atomic issue and set lists.

XXX libGL in i386 is still causing issues
XXX pkgconfig file for vdpau
XXX set lists for arm32

commit 27bffc20bc15186c92cc5b8d5cc08d7299966b34
Author: coypu <coypu@sdf.org>
Date: Sat Mar 2 21:52:45 2019 +0200

make llvm sources x86 specific

hopefully not breaking non-x86 clang builds, which
have MKLLVM set.

commit f9d34922619cc8f2a224c0138a73985e50daf87f
Author: coypu <coypu@sdf.org>
Date: Sat Mar 2 21:33:31 2019 +0200

move hack to build llvm libraries soon enough.

add u_process.c to libGL specifically (dri, gallium and libGL all need
it).

Add some missing includes for pipe-loader when it moved to gallium

commit 2b1083d0d538bb5d5dd88ab2ca0ca6c331e5dd5b
Author: coypu <coypu@sdf.org>
Date: Sat Mar 2 16:47:58 2019 +0200

shuffle around:

some files move from shared driver.mk/loader.mk into gallium.
others move to shared.

add i915 files.

now i965 glxgears works (amd64).

commit 1897a90569b30b294bcbedadb3745092eca0bb33
Author: Maya Rashish <maya@NetBSD.org>
Date: Sun Feb 24 23:36:26 2019 +0200

Progress towards glxgears on i915

commit 28c9c99a236404de41ae74e88ea6d9578c088b92
Author: Maya Rashish <maya@NetBSD.org>
Date: Sun Feb 24 21:55:56 2019 +0200

rototill i965/i915 causing it to no longer startx.

Now missing sw_screen_create in the dri driver.

commit 48eb746983a5a7967fba221e7b167808af36f44a
Author: Maya Rashish <maya@NetBSD.org>
Date: Sun Feb 24 09:31:22 2019 +0200

More of vdpau. Cogs spin.

commit d9fbba8f61a43648d32f160c5fa62626788566ff
Author: Maya Rashish <maya@NetBSD.org>
Date: Sat Feb 23 22:36:37 2019 +0200

Adjust for MesaLib 18.

Build llvmpipe driver on x86 (the driver itself is x86-only).
build llvm on all x86, even on GCC builds.
galahad driver removed (upstream).
Don't build mesa 7 at all.


# 1.22 10-Mar-2019 mrg

move mesa10 build into .old scheme:

- add ${X11SRCDIR.MesaLib.old} and introduce ${X11SRCDIR.Mesa} as an
alias for either the former or the non old. this allows many of
the makefiles to simply use ${X11SRCDIR.Mesa} (but does not really
enable much sharing of makefiles, but reduces their diffs.)

- use mesa-which.mk to define ${OLD_PREFIX} to either "" or ".old",
and to know if to build 'dri7' (.old only.) ${OLD_PREFIX} is used
by other code (eg, LIBDPLIBS) to pick the right subdir.


Revision tags: netbsd-8-1-RELEASE netbsd-8-1-RC1 pgoyette-compat-merge-20190127 pgoyette-compat-20190127 pgoyette-compat-20190118 pgoyette-compat-1226 pgoyette-compat-1126 pgoyette-compat-1020 pgoyette-compat-0930 pgoyette-compat-0906 pgoyette-compat-0728 netbsd-8-0-RELEASE phil-wifi-base pgoyette-compat-0625 netbsd-8-0-RC2 pgoyette-compat-0521 pgoyette-compat-0502 pgoyette-compat-0422 netbsd-8-0-RC1 pgoyette-compat-0415 pgoyette-compat-0407 pgoyette-compat-0330 pgoyette-compat-0322 pgoyette-compat-0315 pgoyette-compat-base matt-nb8-mediatek-base perseant-stdc-iso10646-base netbsd-8-base prg-localcount2-base3 prg-localcount2-base2 prg-localcount2-base1 prg-localcount2-base pgoyette-localcount-20170426 bouyer-socketcan-base1 pgoyette-localcount-20170320 bouyer-socketcan-base pgoyette-localcount-20170107 pgoyette-localcount-20161104 localcount-20160914 pgoyette-localcount-20160806 pgoyette-localcount-20160726 pgoyette-localcount-base
# 1.21 18-Dec-2014 mrg

branches: 1.21.16;
update sets and reachover makefiles for mesa 10.3.5.


# 1.20 15-Dec-2014 mrg

delete tools/glsl, is hasn't been used for a while.
move Makefile.glsl into libGL.


Revision tags: netbsd-7-base tls-earlyentropy-base tls-maxphys-base
# 1.19 09-Jul-2014 riastradh

branches: 1.19.2;
Update reachover makefiles for MesaLib 7.11.2.

With the new GL shader compiler, glsl-compile is no longer needed as
a tool, but the shader compiler is now duplicated in several
libraries, so (XXX) external/mit/xorg/tools/glsl should be turned
into a proper library that libGL and libmesa can link against.


Revision tags: yamt-pagecache-base9 riastradh-xf86-video-intel-2-7-1-pre-2-21-15 riastradh-drm2-base3 riastradh-drm2-base2 riastradh-drm2-base1 riastradh-drm2-base agc-symver-base yamt-pagecache-base8 yamt-pagecache-base7 yamt-pagecache-base6 yamt-pagecache-base5 yamt-pagecache-base4
# 1.18 22-Mar-2012 joerg

branches: 1.18.2; 1.18.8;
Disable a bunch of additional warnings for now for the clang build.


Revision tags: netbsd-6-0-6-RELEASE netbsd-6-1-5-RELEASE netbsd-6-1-4-RELEASE netbsd-6-0-5-RELEASE netbsd-6-1-3-RELEASE netbsd-6-0-4-RELEASE netbsd-6-1-2-RELEASE netbsd-6-0-3-RELEASE netbsd-6-1-1-RELEASE netbsd-6-0-2-RELEASE netbsd-6-1-RELEASE netbsd-6-1-RC4 netbsd-6-1-RC3 netbsd-6-1-RC2 netbsd-6-1-RC1 netbsd-6-0-1-RELEASE matt-nb6-plus-nbase netbsd-6-0-RELEASE netbsd-6-0-RC2 matt-nb6-plus-base netbsd-6-0-RC1 netbsd-6-base yamt-pagecache-base3 yamt-pagecache-base2 yamt-pagecache-base
# 1.17 11-Aug-2011 joerg

branches: 1.17.2;
Various warning adjustments for clang


Revision tags: cherry-xenmp-base bouyer-quota2-nbase bouyer-quota2-base matt-mips64-premerge-20101231
# 1.16 22-Nov-2010 mrg

install dri.pc.
put the Mesa version into it's own makefile, and share it. there
are now 4 references to it.


# 1.15 19-Jul-2010 mrg

updates for Mesa 7.8.2:
- build glsl as a host tool
- add the glsl objects to libmesa
- add/remove new/deleted sources for various components
- adjust the libmesa/libGL builds to pull in the new glsl objects
- re-apply the BUILDSYMLINK hack for eval.c/pixel.c/pixelstore.c
- use glsl to build the slang headers on the fly


# 1.14 28-May-2010 mrg

we're now at mesa 7.7.1.

XXX: really really really need to make this in one place...


# 1.13 23-May-2010 mrg

we have Mesa 7.4.4.


# 1.12 22-May-2010 mrg

updates for changed header locations for libdrm.


# 1.11 22-May-2010 mrg

install GL/internal/sarea.h and GL/internal/dri_interface.h, like Mesa does.


Revision tags: matt-premerge-20091211
# 1.10 08-Oct-2009 snj

Move libdrm headers up one level (out of the X11 directory) to match
the rest of the world and fix the inconsistency with libdrm.pc.
Fixes PR xsrc/42126.


# 1.9 11-Jun-2009 mrg

add glapi_getproc.c.


# 1.8 11-Jun-2009 mrg

fix up the Mesa version for the gl*.pc files.


# 1.7 11-Jun-2009 mrg

build fixes for Mesa 7.4.2.


Revision tags: jym-xensuspend-nbase jym-xensuspend-base
# 1.6 14-Feb-2009 abs

Use MACHINE_ARCH rather than MACHINE where relevant. At least one file had a nice mixture of amd64 and x86_64 tests...


Revision tags: netbsd-5-0-2-RELEASE matt-nb5-mips64-premerge-20091211 matt-nb5-mips64-u2-k2-k4-k7-k8-k9 matt-nb4-mips64-k7-u2a-k9b matt-nb5-mips64-u1-k1-k5 netbsd-5-0-1-RELEASE netbsd-5-0-RELEASE netbsd-5-0-RC4 netbsd-5-0-RC3 netbsd-5-0-RC2 netbsd-5-0-RC1 haad-dm-base haad-dm-base2 haad-nbase2 netbsd-5-base matt-mips64-base2 haad-dm-base1
# 1.5 21-Sep-2008 cube

branches: 1.5.4; 1.5.6; 1.5.8; 1.5.12;
Note the proper location of the DRI modules.


# 1.4 20-Sep-2008 cube

Don't install osmesa.h from here, libOSMesa will do it.


Revision tags: wrstuden-revivesa-base-3
# 1.3 13-Sep-2008 cube

branches: 1.3.2;
Install pkgconfig files. Where applicable, remove .if 0 code that tried to
do the same thing.


Revision tags: wrstuden-revivesa-base-2
# 1.2 02-Aug-2008 rtr

* don't build glapi_x86.S for now on i386.
* when preprorcessed glapi_x86.S ends up being invalid assembler input
because of whitespace problems in concatenation macros. normally the
use of these macros as they are wouldn't be a problem except we are
receiving -traditional-cpp from share/mk and the spaces are being
passed.

XXX further discussion needs to occur in order for this to be properly
fixed


# 1.1 29-Jul-2008 mrg

branches: 1.1.1;
Initial revision


# 1.27 16-May-2019 christos

Fix MKCOMPATX11 build


# 1.26 18-Apr-2019 mrg

remove now dated comment.


# 1.25 11-Apr-2019 maya

the drivers we dlopen need pthread.
I'm not sure about the exact scenario causing failure, but using the
libc pthread stubs isn't sufficient.

fixes one of the glmark2 crashes (at startup with llvmpipe)


# 1.24 09-Apr-2019 maya

Expand all @@ things in pkgconfig file.
claim TLS.
pick up the list of private libs from pkgsrc mesalib
GL_LIB got renamed to GL_PKGCONF_LIB.


# 1.23 10-Mar-2019 mrg

pull across most of the new build infrastruture for mesa18 from maya's
git tree. this includes may of the changes from the changes below:


commit 52d85e74a1197aace38cc7acb705509e969120e6
Author: coypu <coypu@sdf.org>
Date: Mon Mar 4 12:25:33 2019 +0200

Make 32bit archs happier.

except i386, which now suffers from locked atomics because we
don't have clever ifunc tricks in libc.

commit ee9b4c19c58127934ed3548ad0d68934cc95ccc7
Author: coypu <coypu@sdf.org>
Date: Mon Mar 4 09:08:35 2019 +0200

Adjust includes, append rather than replace, appease clang ppc builds

commit a5341a3ad42572c78b6a2e6e5545bd323d7f2e4c
Author: coypu <coypu@sdf.org>
Date: Sun Mar 3 11:52:19 2019 +0200

Resolve i386 atomic issue and set lists.

XXX libGL in i386 is still causing issues
XXX pkgconfig file for vdpau
XXX set lists for arm32

commit 27bffc20bc15186c92cc5b8d5cc08d7299966b34
Author: coypu <coypu@sdf.org>
Date: Sat Mar 2 21:52:45 2019 +0200

make llvm sources x86 specific

hopefully not breaking non-x86 clang builds, which
have MKLLVM set.

commit f9d34922619cc8f2a224c0138a73985e50daf87f
Author: coypu <coypu@sdf.org>
Date: Sat Mar 2 21:33:31 2019 +0200

move hack to build llvm libraries soon enough.

add u_process.c to libGL specifically (dri, gallium and libGL all need
it).

Add some missing includes for pipe-loader when it moved to gallium

commit 2b1083d0d538bb5d5dd88ab2ca0ca6c331e5dd5b
Author: coypu <coypu@sdf.org>
Date: Sat Mar 2 16:47:58 2019 +0200

shuffle around:

some files move from shared driver.mk/loader.mk into gallium.
others move to shared.

add i915 files.

now i965 glxgears works (amd64).

commit 1897a90569b30b294bcbedadb3745092eca0bb33
Author: Maya Rashish <maya@NetBSD.org>
Date: Sun Feb 24 23:36:26 2019 +0200

Progress towards glxgears on i915

commit 28c9c99a236404de41ae74e88ea6d9578c088b92
Author: Maya Rashish <maya@NetBSD.org>
Date: Sun Feb 24 21:55:56 2019 +0200

rototill i965/i915 causing it to no longer startx.

Now missing sw_screen_create in the dri driver.

commit 48eb746983a5a7967fba221e7b167808af36f44a
Author: Maya Rashish <maya@NetBSD.org>
Date: Sun Feb 24 09:31:22 2019 +0200

More of vdpau. Cogs spin.

commit d9fbba8f61a43648d32f160c5fa62626788566ff
Author: Maya Rashish <maya@NetBSD.org>
Date: Sat Feb 23 22:36:37 2019 +0200

Adjust for MesaLib 18.

Build llvmpipe driver on x86 (the driver itself is x86-only).
build llvm on all x86, even on GCC builds.
galahad driver removed (upstream).
Don't build mesa 7 at all.


# 1.22 10-Mar-2019 mrg

move mesa10 build into .old scheme:

- add ${X11SRCDIR.MesaLib.old} and introduce ${X11SRCDIR.Mesa} as an
alias for either the former or the non old. this allows many of
the makefiles to simply use ${X11SRCDIR.Mesa} (but does not really
enable much sharing of makefiles, but reduces their diffs.)

- use mesa-which.mk to define ${OLD_PREFIX} to either "" or ".old",
and to know if to build 'dri7' (.old only.) ${OLD_PREFIX} is used
by other code (eg, LIBDPLIBS) to pick the right subdir.


Revision tags: netbsd-8-1-RC1 pgoyette-compat-merge-20190127 pgoyette-compat-20190127 pgoyette-compat-20190118 pgoyette-compat-1226 pgoyette-compat-1126 pgoyette-compat-1020 pgoyette-compat-0930 pgoyette-compat-0906 pgoyette-compat-0728 netbsd-8-0-RELEASE phil-wifi-base pgoyette-compat-0625 netbsd-8-0-RC2 pgoyette-compat-0521 pgoyette-compat-0502 pgoyette-compat-0422 netbsd-8-0-RC1 pgoyette-compat-0415 pgoyette-compat-0407 pgoyette-compat-0330 pgoyette-compat-0322 pgoyette-compat-0315 pgoyette-compat-base matt-nb8-mediatek-base perseant-stdc-iso10646-base netbsd-8-base prg-localcount2-base3 prg-localcount2-base2 prg-localcount2-base1 prg-localcount2-base pgoyette-localcount-20170426 bouyer-socketcan-base1 pgoyette-localcount-20170320 bouyer-socketcan-base pgoyette-localcount-20170107 pgoyette-localcount-20161104 localcount-20160914 pgoyette-localcount-20160806 pgoyette-localcount-20160726 pgoyette-localcount-base
# 1.21 18-Dec-2014 mrg

update sets and reachover makefiles for mesa 10.3.5.


# 1.20 15-Dec-2014 mrg

delete tools/glsl, is hasn't been used for a while.
move Makefile.glsl into libGL.


Revision tags: netbsd-7-base tls-earlyentropy-base tls-maxphys-base
# 1.19 09-Jul-2014 riastradh

branches: 1.19.2;
Update reachover makefiles for MesaLib 7.11.2.

With the new GL shader compiler, glsl-compile is no longer needed as
a tool, but the shader compiler is now duplicated in several
libraries, so (XXX) external/mit/xorg/tools/glsl should be turned
into a proper library that libGL and libmesa can link against.


Revision tags: yamt-pagecache-base9 riastradh-xf86-video-intel-2-7-1-pre-2-21-15 riastradh-drm2-base3 riastradh-drm2-base2 riastradh-drm2-base1 riastradh-drm2-base agc-symver-base yamt-pagecache-base8 yamt-pagecache-base7 yamt-pagecache-base6 yamt-pagecache-base5 yamt-pagecache-base4
# 1.18 22-Mar-2012 joerg

branches: 1.18.2; 1.18.8;
Disable a bunch of additional warnings for now for the clang build.


Revision tags: netbsd-6-0-6-RELEASE netbsd-6-1-5-RELEASE netbsd-6-1-4-RELEASE netbsd-6-0-5-RELEASE netbsd-6-1-3-RELEASE netbsd-6-0-4-RELEASE netbsd-6-1-2-RELEASE netbsd-6-0-3-RELEASE netbsd-6-1-1-RELEASE netbsd-6-0-2-RELEASE netbsd-6-1-RELEASE netbsd-6-1-RC4 netbsd-6-1-RC3 netbsd-6-1-RC2 netbsd-6-1-RC1 netbsd-6-0-1-RELEASE matt-nb6-plus-nbase netbsd-6-0-RELEASE netbsd-6-0-RC2 matt-nb6-plus-base netbsd-6-0-RC1 netbsd-6-base yamt-pagecache-base3 yamt-pagecache-base2 yamt-pagecache-base
# 1.17 11-Aug-2011 joerg

branches: 1.17.2;
Various warning adjustments for clang


Revision tags: cherry-xenmp-base bouyer-quota2-nbase bouyer-quota2-base matt-mips64-premerge-20101231
# 1.16 22-Nov-2010 mrg

install dri.pc.
put the Mesa version into it's own makefile, and share it. there
are now 4 references to it.


# 1.15 19-Jul-2010 mrg

updates for Mesa 7.8.2:
- build glsl as a host tool
- add the glsl objects to libmesa
- add/remove new/deleted sources for various components
- adjust the libmesa/libGL builds to pull in the new glsl objects
- re-apply the BUILDSYMLINK hack for eval.c/pixel.c/pixelstore.c
- use glsl to build the slang headers on the fly


# 1.14 28-May-2010 mrg

we're now at mesa 7.7.1.

XXX: really really really need to make this in one place...


# 1.13 23-May-2010 mrg

we have Mesa 7.4.4.


# 1.12 22-May-2010 mrg

updates for changed header locations for libdrm.


# 1.11 22-May-2010 mrg

install GL/internal/sarea.h and GL/internal/dri_interface.h, like Mesa does.


Revision tags: matt-premerge-20091211
# 1.10 08-Oct-2009 snj

Move libdrm headers up one level (out of the X11 directory) to match
the rest of the world and fix the inconsistency with libdrm.pc.
Fixes PR xsrc/42126.


# 1.9 11-Jun-2009 mrg

add glapi_getproc.c.


# 1.8 11-Jun-2009 mrg

fix up the Mesa version for the gl*.pc files.


# 1.7 11-Jun-2009 mrg

build fixes for Mesa 7.4.2.


Revision tags: jym-xensuspend-nbase jym-xensuspend-base
# 1.6 14-Feb-2009 abs

Use MACHINE_ARCH rather than MACHINE where relevant. At least one file had a nice mixture of amd64 and x86_64 tests...


Revision tags: netbsd-5-0-2-RELEASE matt-nb5-mips64-premerge-20091211 matt-nb5-mips64-u2-k2-k4-k7-k8-k9 matt-nb4-mips64-k7-u2a-k9b matt-nb5-mips64-u1-k1-k5 netbsd-5-0-1-RELEASE netbsd-5-0-RELEASE netbsd-5-0-RC4 netbsd-5-0-RC3 netbsd-5-0-RC2 netbsd-5-0-RC1 haad-dm-base haad-dm-base2 haad-nbase2 netbsd-5-base matt-mips64-base2 haad-dm-base1
# 1.5 21-Sep-2008 cube

branches: 1.5.4; 1.5.6; 1.5.8; 1.5.12;
Note the proper location of the DRI modules.


# 1.4 20-Sep-2008 cube

Don't install osmesa.h from here, libOSMesa will do it.


Revision tags: wrstuden-revivesa-base-3
# 1.3 13-Sep-2008 cube

branches: 1.3.2;
Install pkgconfig files. Where applicable, remove .if 0 code that tried to
do the same thing.


Revision tags: wrstuden-revivesa-base-2
# 1.2 02-Aug-2008 rtr

* don't build glapi_x86.S for now on i386.
* when preprorcessed glapi_x86.S ends up being invalid assembler input
because of whitespace problems in concatenation macros. normally the
use of these macros as they are wouldn't be a problem except we are
receiving -traditional-cpp from share/mk and the spaces are being
passed.

XXX further discussion needs to occur in order for this to be properly
fixed


# 1.1 29-Jul-2008 mrg

branches: 1.1.1;
Initial revision


# 1.26 18-Apr-2019 mrg

remove now dated comment.


# 1.25 11-Apr-2019 maya

the drivers we dlopen need pthread.
I'm not sure about the exact scenario causing failure, but using the
libc pthread stubs isn't sufficient.

fixes one of the glmark2 crashes (at startup with llvmpipe)


# 1.24 09-Apr-2019 maya

Expand all @@ things in pkgconfig file.
claim TLS.
pick up the list of private libs from pkgsrc mesalib
GL_LIB got renamed to GL_PKGCONF_LIB.


# 1.23 10-Mar-2019 mrg

pull across most of the new build infrastruture for mesa18 from maya's
git tree. this includes may of the changes from the changes below:


commit 52d85e74a1197aace38cc7acb705509e969120e6
Author: coypu <coypu@sdf.org>
Date: Mon Mar 4 12:25:33 2019 +0200

Make 32bit archs happier.

except i386, which now suffers from locked atomics because we
don't have clever ifunc tricks in libc.

commit ee9b4c19c58127934ed3548ad0d68934cc95ccc7
Author: coypu <coypu@sdf.org>
Date: Mon Mar 4 09:08:35 2019 +0200

Adjust includes, append rather than replace, appease clang ppc builds

commit a5341a3ad42572c78b6a2e6e5545bd323d7f2e4c
Author: coypu <coypu@sdf.org>
Date: Sun Mar 3 11:52:19 2019 +0200

Resolve i386 atomic issue and set lists.

XXX libGL in i386 is still causing issues
XXX pkgconfig file for vdpau
XXX set lists for arm32

commit 27bffc20bc15186c92cc5b8d5cc08d7299966b34
Author: coypu <coypu@sdf.org>
Date: Sat Mar 2 21:52:45 2019 +0200

make llvm sources x86 specific

hopefully not breaking non-x86 clang builds, which
have MKLLVM set.

commit f9d34922619cc8f2a224c0138a73985e50daf87f
Author: coypu <coypu@sdf.org>
Date: Sat Mar 2 21:33:31 2019 +0200

move hack to build llvm libraries soon enough.

add u_process.c to libGL specifically (dri, gallium and libGL all need
it).

Add some missing includes for pipe-loader when it moved to gallium

commit 2b1083d0d538bb5d5dd88ab2ca0ca6c331e5dd5b
Author: coypu <coypu@sdf.org>
Date: Sat Mar 2 16:47:58 2019 +0200

shuffle around:

some files move from shared driver.mk/loader.mk into gallium.
others move to shared.

add i915 files.

now i965 glxgears works (amd64).

commit 1897a90569b30b294bcbedadb3745092eca0bb33
Author: Maya Rashish <maya@NetBSD.org>
Date: Sun Feb 24 23:36:26 2019 +0200

Progress towards glxgears on i915

commit 28c9c99a236404de41ae74e88ea6d9578c088b92
Author: Maya Rashish <maya@NetBSD.org>
Date: Sun Feb 24 21:55:56 2019 +0200

rototill i965/i915 causing it to no longer startx.

Now missing sw_screen_create in the dri driver.

commit 48eb746983a5a7967fba221e7b167808af36f44a
Author: Maya Rashish <maya@NetBSD.org>
Date: Sun Feb 24 09:31:22 2019 +0200

More of vdpau. Cogs spin.

commit d9fbba8f61a43648d32f160c5fa62626788566ff
Author: Maya Rashish <maya@NetBSD.org>
Date: Sat Feb 23 22:36:37 2019 +0200

Adjust for MesaLib 18.

Build llvmpipe driver on x86 (the driver itself is x86-only).
build llvm on all x86, even on GCC builds.
galahad driver removed (upstream).
Don't build mesa 7 at all.


# 1.22 10-Mar-2019 mrg

move mesa10 build into .old scheme:

- add ${X11SRCDIR.MesaLib.old} and introduce ${X11SRCDIR.Mesa} as an
alias for either the former or the non old. this allows many of
the makefiles to simply use ${X11SRCDIR.Mesa} (but does not really
enable much sharing of makefiles, but reduces their diffs.)

- use mesa-which.mk to define ${OLD_PREFIX} to either "" or ".old",
and to know if to build 'dri7' (.old only.) ${OLD_PREFIX} is used
by other code (eg, LIBDPLIBS) to pick the right subdir.


Revision tags: pgoyette-compat-merge-20190127 pgoyette-compat-20190127 pgoyette-compat-20190118 pgoyette-compat-1226 pgoyette-compat-1126 pgoyette-compat-1020 pgoyette-compat-0930 pgoyette-compat-0906 pgoyette-compat-0728 netbsd-8-0-RELEASE phil-wifi-base pgoyette-compat-0625 netbsd-8-0-RC2 pgoyette-compat-0521 pgoyette-compat-0502 pgoyette-compat-0422 netbsd-8-0-RC1 pgoyette-compat-0415 pgoyette-compat-0407 pgoyette-compat-0330 pgoyette-compat-0322 pgoyette-compat-0315 pgoyette-compat-base matt-nb8-mediatek-base perseant-stdc-iso10646-base netbsd-8-base prg-localcount2-base3 prg-localcount2-base2 prg-localcount2-base1 prg-localcount2-base pgoyette-localcount-20170426 bouyer-socketcan-base1 pgoyette-localcount-20170320 bouyer-socketcan-base pgoyette-localcount-20170107 pgoyette-localcount-20161104 localcount-20160914 pgoyette-localcount-20160806 pgoyette-localcount-20160726 pgoyette-localcount-base
# 1.21 18-Dec-2014 mrg

update sets and reachover makefiles for mesa 10.3.5.


# 1.20 15-Dec-2014 mrg

delete tools/glsl, is hasn't been used for a while.
move Makefile.glsl into libGL.


Revision tags: netbsd-7-base tls-earlyentropy-base tls-maxphys-base
# 1.19 09-Jul-2014 riastradh

branches: 1.19.2;
Update reachover makefiles for MesaLib 7.11.2.

With the new GL shader compiler, glsl-compile is no longer needed as
a tool, but the shader compiler is now duplicated in several
libraries, so (XXX) external/mit/xorg/tools/glsl should be turned
into a proper library that libGL and libmesa can link against.


Revision tags: yamt-pagecache-base9 riastradh-xf86-video-intel-2-7-1-pre-2-21-15 riastradh-drm2-base3 riastradh-drm2-base2 riastradh-drm2-base1 riastradh-drm2-base agc-symver-base yamt-pagecache-base8 yamt-pagecache-base7 yamt-pagecache-base6 yamt-pagecache-base5 yamt-pagecache-base4
# 1.18 22-Mar-2012 joerg

branches: 1.18.2; 1.18.8;
Disable a bunch of additional warnings for now for the clang build.


Revision tags: netbsd-6-0-6-RELEASE netbsd-6-1-5-RELEASE netbsd-6-1-4-RELEASE netbsd-6-0-5-RELEASE netbsd-6-1-3-RELEASE netbsd-6-0-4-RELEASE netbsd-6-1-2-RELEASE netbsd-6-0-3-RELEASE netbsd-6-1-1-RELEASE netbsd-6-0-2-RELEASE netbsd-6-1-RELEASE netbsd-6-1-RC4 netbsd-6-1-RC3 netbsd-6-1-RC2 netbsd-6-1-RC1 netbsd-6-0-1-RELEASE matt-nb6-plus-nbase netbsd-6-0-RELEASE netbsd-6-0-RC2 matt-nb6-plus-base netbsd-6-0-RC1 netbsd-6-base yamt-pagecache-base3 yamt-pagecache-base2 yamt-pagecache-base
# 1.17 11-Aug-2011 joerg

branches: 1.17.2;
Various warning adjustments for clang


Revision tags: cherry-xenmp-base bouyer-quota2-nbase bouyer-quota2-base matt-mips64-premerge-20101231
# 1.16 22-Nov-2010 mrg

install dri.pc.
put the Mesa version into it's own makefile, and share it. there
are now 4 references to it.


# 1.15 19-Jul-2010 mrg

updates for Mesa 7.8.2:
- build glsl as a host tool
- add the glsl objects to libmesa
- add/remove new/deleted sources for various components
- adjust the libmesa/libGL builds to pull in the new glsl objects
- re-apply the BUILDSYMLINK hack for eval.c/pixel.c/pixelstore.c
- use glsl to build the slang headers on the fly


# 1.14 28-May-2010 mrg

we're now at mesa 7.7.1.

XXX: really really really need to make this in one place...


# 1.13 23-May-2010 mrg

we have Mesa 7.4.4.


# 1.12 22-May-2010 mrg

updates for changed header locations for libdrm.


# 1.11 22-May-2010 mrg

install GL/internal/sarea.h and GL/internal/dri_interface.h, like Mesa does.


Revision tags: matt-premerge-20091211
# 1.10 08-Oct-2009 snj

Move libdrm headers up one level (out of the X11 directory) to match
the rest of the world and fix the inconsistency with libdrm.pc.
Fixes PR xsrc/42126.


# 1.9 11-Jun-2009 mrg

add glapi_getproc.c.


# 1.8 11-Jun-2009 mrg

fix up the Mesa version for the gl*.pc files.


# 1.7 11-Jun-2009 mrg

build fixes for Mesa 7.4.2.


Revision tags: jym-xensuspend-nbase jym-xensuspend-base
# 1.6 14-Feb-2009 abs

Use MACHINE_ARCH rather than MACHINE where relevant. At least one file had a nice mixture of amd64 and x86_64 tests...


Revision tags: netbsd-5-0-2-RELEASE matt-nb5-mips64-premerge-20091211 matt-nb5-mips64-u2-k2-k4-k7-k8-k9 matt-nb4-mips64-k7-u2a-k9b matt-nb5-mips64-u1-k1-k5 netbsd-5-0-1-RELEASE netbsd-5-0-RELEASE netbsd-5-0-RC4 netbsd-5-0-RC3 netbsd-5-0-RC2 netbsd-5-0-RC1 haad-dm-base haad-dm-base2 haad-nbase2 netbsd-5-base matt-mips64-base2 haad-dm-base1
# 1.5 21-Sep-2008 cube

branches: 1.5.4; 1.5.6; 1.5.8; 1.5.12;
Note the proper location of the DRI modules.


# 1.4 20-Sep-2008 cube

Don't install osmesa.h from here, libOSMesa will do it.


Revision tags: wrstuden-revivesa-base-3
# 1.3 13-Sep-2008 cube

branches: 1.3.2;
Install pkgconfig files. Where applicable, remove .if 0 code that tried to
do the same thing.


Revision tags: wrstuden-revivesa-base-2
# 1.2 02-Aug-2008 rtr

* don't build glapi_x86.S for now on i386.
* when preprorcessed glapi_x86.S ends up being invalid assembler input
because of whitespace problems in concatenation macros. normally the
use of these macros as they are wouldn't be a problem except we are
receiving -traditional-cpp from share/mk and the spaces are being
passed.

XXX further discussion needs to occur in order for this to be properly
fixed


# 1.1 29-Jul-2008 mrg

branches: 1.1.1;
Initial revision