Skip to content

Commit 8927aa1

Browse files
author
bors-servo
authored
Auto merge of #24 - emilio:osmesaup, r=jdm
Update mesa (again).
2 parents 100789c + 67c06e1 commit 8927aa1

171 files changed

Lines changed: 10486 additions & 8550 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎build.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ fn main() {
3838
.arg("--disable-gles1")
3939
.arg("--disable-gles2")
4040
.arg("--disable-glx")
41-
.arg("--disable-llvm-shared-libs")
4241
.arg("--with-platforms=")
4342
.arg("--enable-gallium-osmesa")
4443
.arg("--with-gallium-drivers=swrast"));

‎mesa-src/Makefile.am‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,9 @@ EXTRA_DIST = \
5656
doxygen \
5757
bin/git_sha1_gen.py \
5858
scons \
59-
SConstruct
59+
SConstruct \
60+
build-support/conftest.dyn \
61+
build-support/conftest.map
6062

6163
noinst_HEADERS = \
6264
include/c99_alloca.h \

‎mesa-src/Makefile.in‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# Makefile.in generated by automake 1.15.1 from Makefile.am.
1+
# Makefile.in generated by automake 1.15 from Makefile.am.
22
# @configure_input@
33

4-
# Copyright (C) 1994-2017 Free Software Foundation, Inc.
4+
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
55

66
# This Makefile.in is free software; the Free Software Foundation
77
# gives unlimited permission to copy and/or distribute it,
@@ -575,7 +575,9 @@ EXTRA_DIST = \
575575
doxygen \
576576
bin/git_sha1_gen.py \
577577
scons \
578-
SConstruct
578+
SConstruct \
579+
build-support/conftest.dyn \
580+
build-support/conftest.map
579581

580582
noinst_HEADERS = \
581583
include/c99_alloca.h \

‎mesa-src/aclocal.m4‎

Lines changed: 99 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
1+
# generated automatically by aclocal 1.15 -*- Autoconf -*-
22

3-
# Copyright (C) 1996-2017 Free Software Foundation, Inc.
3+
# Copyright (C) 1996-2014 Free Software Foundation, Inc.
44

55
# This file is free software; the Free Software Foundation
66
# gives unlimited permission to copy and/or distribute it,
@@ -21,7 +21,7 @@ If you have problems, you may need to regenerate the build system entirely.
2121
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
2222

2323
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
24-
# serial 12 (pkg-config-0.29.2)
24+
# serial 11 (pkg-config-0.29.1)
2525

2626
dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
2727
dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
@@ -63,7 +63,7 @@ dnl
6363
dnl See the "Since" comment for each macro you use to see what version
6464
dnl of the macros you require.
6565
m4_defun([PKG_PREREQ],
66-
[m4_define([PKG_MACROS_VERSION], [0.29.2])
66+
[m4_define([PKG_MACROS_VERSION], [0.29.1])
6767
m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
6868
[m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
6969
])dnl PKG_PREREQ
@@ -164,7 +164,7 @@ AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
164164
AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
165165
166166
pkg_failed=no
167-
AC_MSG_CHECKING([for $2])
167+
AC_MSG_CHECKING([for $1])
168168
169169
_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
170170
_PKG_CONFIG([$1][_LIBS], [libs], [$2])
@@ -174,11 +174,11 @@ and $1[]_LIBS to avoid the need to call pkg-config.
174174
See the pkg-config man page for more details.])
175175
176176
if test $pkg_failed = yes; then
177-
AC_MSG_RESULT([no])
177+
AC_MSG_RESULT([no])
178178
_PKG_SHORT_ERRORS_SUPPORTED
179179
if test $_pkg_short_errors_supported = yes; then
180180
$1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
181-
else
181+
else
182182
$1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
183183
fi
184184
# Put the nasty error message in config.log where it belongs
@@ -195,7 +195,7 @@ installed software in a non-standard prefix.
195195
_PKG_TEXT])[]dnl
196196
])
197197
elif test $pkg_failed = untried; then
198-
AC_MSG_RESULT([no])
198+
AC_MSG_RESULT([no])
199199
m4_default([$4], [AC_MSG_FAILURE(
200200
[The pkg-config script could not be found or is too old. Make sure it
201201
is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -296,7 +296,75 @@ AS_VAR_COPY([$1], [pkg_cv_][$1])
296296
AS_VAR_IF([$1], [""], [$5], [$4])dnl
297297
])dnl PKG_CHECK_VAR
298298

299-
# Copyright (C) 2002-2017 Free Software Foundation, Inc.
299+
dnl PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES,
300+
dnl [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND],
301+
dnl [DESCRIPTION], [DEFAULT])
302+
dnl ------------------------------------------
303+
dnl
304+
dnl Prepare a "--with-" configure option using the lowercase
305+
dnl [VARIABLE-PREFIX] name, merging the behaviour of AC_ARG_WITH and
306+
dnl PKG_CHECK_MODULES in a single macro.
307+
AC_DEFUN([PKG_WITH_MODULES],
308+
[
309+
m4_pushdef([with_arg], m4_tolower([$1]))
310+
311+
m4_pushdef([description],
312+
[m4_default([$5], [build with ]with_arg[ support])])
313+
314+
m4_pushdef([def_arg], [m4_default([$6], [auto])])
315+
m4_pushdef([def_action_if_found], [AS_TR_SH([with_]with_arg)=yes])
316+
m4_pushdef([def_action_if_not_found], [AS_TR_SH([with_]with_arg)=no])
317+
318+
m4_case(def_arg,
319+
[yes],[m4_pushdef([with_without], [--without-]with_arg)],
320+
[m4_pushdef([with_without],[--with-]with_arg)])
321+
322+
AC_ARG_WITH(with_arg,
323+
AS_HELP_STRING(with_without, description[ @<:@default=]def_arg[@:>@]),,
324+
[AS_TR_SH([with_]with_arg)=def_arg])
325+
326+
AS_CASE([$AS_TR_SH([with_]with_arg)],
327+
[yes],[PKG_CHECK_MODULES([$1],[$2],$3,$4)],
328+
[auto],[PKG_CHECK_MODULES([$1],[$2],
329+
[m4_n([def_action_if_found]) $3],
330+
[m4_n([def_action_if_not_found]) $4])])
331+
332+
m4_popdef([with_arg])
333+
m4_popdef([description])
334+
m4_popdef([def_arg])
335+
336+
])dnl PKG_WITH_MODULES
337+
338+
dnl PKG_HAVE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
339+
dnl [DESCRIPTION], [DEFAULT])
340+
dnl -----------------------------------------------
341+
dnl
342+
dnl Convenience macro to trigger AM_CONDITIONAL after PKG_WITH_MODULES
343+
dnl check._[VARIABLE-PREFIX] is exported as make variable.
344+
AC_DEFUN([PKG_HAVE_WITH_MODULES],
345+
[
346+
PKG_WITH_MODULES([$1],[$2],,,[$3],[$4])
347+
348+
AM_CONDITIONAL([HAVE_][$1],
349+
[test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"])
350+
])dnl PKG_HAVE_WITH_MODULES
351+
352+
dnl PKG_HAVE_DEFINE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
353+
dnl [DESCRIPTION], [DEFAULT])
354+
dnl ------------------------------------------------------
355+
dnl
356+
dnl Convenience macro to run AM_CONDITIONAL and AC_DEFINE after
357+
dnl PKG_WITH_MODULES check. HAVE_[VARIABLE-PREFIX] is exported as make
358+
dnl and preprocessor variable.
359+
AC_DEFUN([PKG_HAVE_DEFINE_WITH_MODULES],
360+
[
361+
PKG_HAVE_WITH_MODULES([$1],[$2],[$3],[$4])
362+
363+
AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"],
364+
[AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])])
365+
])dnl PKG_HAVE_DEFINE_WITH_MODULES
366+
367+
# Copyright (C) 2002-2014 Free Software Foundation, Inc.
300368
#
301369
# This file is free software; the Free Software Foundation
302370
# gives unlimited permission to copy and/or distribute it,
@@ -311,7 +379,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
311379
[am__api_version='1.15'
312380
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
313381
dnl require some minimum version. Point them to the right macro.
314-
m4_if([$1], [1.15.1], [],
382+
m4_if([$1], [1.15], [],
315383
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
316384
])
317385

@@ -327,12 +395,12 @@ m4_define([_AM_AUTOCONF_VERSION], [])
327395
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
328396
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
329397
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
330-
[AM_AUTOMAKE_VERSION([1.15.1])dnl
398+
[AM_AUTOMAKE_VERSION([1.15])dnl
331399
m4_ifndef([AC_AUTOCONF_VERSION],
332400
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
333401
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
334402

335-
# Copyright (C) 2011-2017 Free Software Foundation, Inc.
403+
# Copyright (C) 2011-2014 Free Software Foundation, Inc.
336404
#
337405
# This file is free software; the Free Software Foundation
338406
# gives unlimited permission to copy and/or distribute it,
@@ -394,7 +462,7 @@ AC_SUBST([AR])dnl
394462

395463
# Figure out how to run the assembler. -*- Autoconf -*-
396464

397-
# Copyright (C) 2001-2017 Free Software Foundation, Inc.
465+
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
398466
#
399467
# This file is free software; the Free Software Foundation
400468
# gives unlimited permission to copy and/or distribute it,
@@ -414,7 +482,7 @@ _AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES([CCAS])])dnl
414482

415483
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
416484

417-
# Copyright (C) 2001-2017 Free Software Foundation, Inc.
485+
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
418486
#
419487
# This file is free software; the Free Software Foundation
420488
# gives unlimited permission to copy and/or distribute it,
@@ -466,7 +534,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd`
466534

467535
# AM_CONDITIONAL -*- Autoconf -*-
468536

469-
# Copyright (C) 1997-2017 Free Software Foundation, Inc.
537+
# Copyright (C) 1997-2014 Free Software Foundation, Inc.
470538
#
471539
# This file is free software; the Free Software Foundation
472540
# gives unlimited permission to copy and/or distribute it,
@@ -497,7 +565,7 @@ AC_CONFIG_COMMANDS_PRE(
497565
Usually this means the macro was only invoked conditionally.]])
498566
fi])])
499567

500-
# Copyright (C) 1999-2017 Free Software Foundation, Inc.
568+
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
501569
#
502570
# This file is free software; the Free Software Foundation
503571
# gives unlimited permission to copy and/or distribute it,
@@ -688,7 +756,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
688756

689757
# Generate code to set up dependency tracking. -*- Autoconf -*-
690758

691-
# Copyright (C) 1999-2017 Free Software Foundation, Inc.
759+
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
692760
#
693761
# This file is free software; the Free Software Foundation
694762
# gives unlimited permission to copy and/or distribute it,
@@ -764,7 +832,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
764832

765833
# Do all the work for Automake. -*- Autoconf -*-
766834

767-
# Copyright (C) 1996-2017 Free Software Foundation, Inc.
835+
# Copyright (C) 1996-2014 Free Software Foundation, Inc.
768836
#
769837
# This file is free software; the Free Software Foundation
770838
# gives unlimited permission to copy and/or distribute it,
@@ -961,7 +1029,7 @@ for _am_header in $config_headers :; do
9611029
done
9621030
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
9631031

964-
# Copyright (C) 2001-2017 Free Software Foundation, Inc.
1032+
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
9651033
#
9661034
# This file is free software; the Free Software Foundation
9671035
# gives unlimited permission to copy and/or distribute it,
@@ -982,7 +1050,7 @@ if test x"${install_sh+set}" != xset; then
9821050
fi
9831051
AC_SUBST([install_sh])])
9841052

985-
# Copyright (C) 2003-2017 Free Software Foundation, Inc.
1053+
# Copyright (C) 2003-2014 Free Software Foundation, Inc.
9861054
#
9871055
# This file is free software; the Free Software Foundation
9881056
# gives unlimited permission to copy and/or distribute it,
@@ -1001,7 +1069,7 @@ fi
10011069
rmdir .tst 2>/dev/null
10021070
AC_SUBST([am__leading_dot])])
10031071

1004-
# Copyright (C) 1998-2017 Free Software Foundation, Inc.
1072+
# Copyright (C) 1998-2014 Free Software Foundation, Inc.
10051073
#
10061074
# This file is free software; the Free Software Foundation
10071075
# gives unlimited permission to copy and/or distribute it,
@@ -1021,7 +1089,7 @@ fi])
10211089

10221090
# Check to see how 'make' treats includes. -*- Autoconf -*-
10231091

1024-
# Copyright (C) 2001-2017 Free Software Foundation, Inc.
1092+
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
10251093
#
10261094
# This file is free software; the Free Software Foundation
10271095
# gives unlimited permission to copy and/or distribute it,
@@ -1071,7 +1139,7 @@ rm -f confinc confmf
10711139

10721140
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
10731141

1074-
# Copyright (C) 1997-2017 Free Software Foundation, Inc.
1142+
# Copyright (C) 1997-2014 Free Software Foundation, Inc.
10751143
#
10761144
# This file is free software; the Free Software Foundation
10771145
# gives unlimited permission to copy and/or distribute it,
@@ -1110,7 +1178,7 @@ fi
11101178

11111179
# Helper functions for option handling. -*- Autoconf -*-
11121180

1113-
# Copyright (C) 2001-2017 Free Software Foundation, Inc.
1181+
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
11141182
#
11151183
# This file is free software; the Free Software Foundation
11161184
# gives unlimited permission to copy and/or distribute it,
@@ -1139,7 +1207,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
11391207
AC_DEFUN([_AM_IF_OPTION],
11401208
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
11411209

1142-
# Copyright (C) 1999-2017 Free Software Foundation, Inc.
1210+
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
11431211
#
11441212
# This file is free software; the Free Software Foundation
11451213
# gives unlimited permission to copy and/or distribute it,
@@ -1186,7 +1254,7 @@ AC_LANG_POP([C])])
11861254
# For backward compatibility.
11871255
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
11881256

1189-
# Copyright (C) 2001-2017 Free Software Foundation, Inc.
1257+
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
11901258
#
11911259
# This file is free software; the Free Software Foundation
11921260
# gives unlimited permission to copy and/or distribute it,
@@ -1205,7 +1273,7 @@ AC_DEFUN([AM_RUN_LOG],
12051273

12061274
# Check to make sure that the build environment is sane. -*- Autoconf -*-
12071275

1208-
# Copyright (C) 1996-2017 Free Software Foundation, Inc.
1276+
# Copyright (C) 1996-2014 Free Software Foundation, Inc.
12091277
#
12101278
# This file is free software; the Free Software Foundation
12111279
# gives unlimited permission to copy and/or distribute it,
@@ -1286,7 +1354,7 @@ AC_CONFIG_COMMANDS_PRE(
12861354
rm -f conftest.file
12871355
])
12881356

1289-
# Copyright (C) 2009-2017 Free Software Foundation, Inc.
1357+
# Copyright (C) 2009-2014 Free Software Foundation, Inc.
12901358
#
12911359
# This file is free software; the Free Software Foundation
12921360
# gives unlimited permission to copy and/or distribute it,
@@ -1346,7 +1414,7 @@ AC_SUBST([AM_BACKSLASH])dnl
13461414
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
13471415
])
13481416

1349-
# Copyright (C) 2001-2017 Free Software Foundation, Inc.
1417+
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
13501418
#
13511419
# This file is free software; the Free Software Foundation
13521420
# gives unlimited permission to copy and/or distribute it,
@@ -1374,7 +1442,7 @@ fi
13741442
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
13751443
AC_SUBST([INSTALL_STRIP_PROGRAM])])
13761444

1377-
# Copyright (C) 2006-2017 Free Software Foundation, Inc.
1445+
# Copyright (C) 2006-2014 Free Software Foundation, Inc.
13781446
#
13791447
# This file is free software; the Free Software Foundation
13801448
# gives unlimited permission to copy and/or distribute it,
@@ -1393,7 +1461,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
13931461

13941462
# Check how to create a tarball. -*- Autoconf -*-
13951463

1396-
# Copyright (C) 2004-2017 Free Software Foundation, Inc.
1464+
# Copyright (C) 2004-2014 Free Software Foundation, Inc.
13971465
#
13981466
# This file is free software; the Free Software Foundation
13991467
# gives unlimited permission to copy and/or distribute it,

‎mesa-src/bin/ar-lib‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
me=ar-lib
55
scriptversion=2012-03-01.08; # UTC
66

7-
# Copyright (C) 2010-2017 Free Software Foundation, Inc.
7+
# Copyright (C) 2010-2014 Free Software Foundation, Inc.
88
# Written by Peter Rosin <peda@lysator.liu.se>.
99
#
1010
# This program is free software; you can redistribute it and/or modify

0 commit comments

Comments
 (0)