Merge Mesa 13.0.2

1 files changed, 49 insertions, 21 deletions

diff --git a/lib/mesa/src/gbm/Makefile.in b/lib/mesa/src/gbm/Makefile.in
index ea8e08c92..4f0ba035e 100644
--- a/lib/mesa/src/gbm/Makefile.in
+++ b/lib/mesa/src/gbm/Makefile.in
@@ -56,22 +56,23 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
-@HAVE_EGL_PLATFORM_WAYLAND_TRUE@am__append_1 = $(WAYLAND_CFLAGS)
-@HAVE_EGL_PLATFORM_WAYLAND_TRUE@am__append_2 = $(top_builddir)/src/egl/wayland/wayland-drm/libwayland-drm.la $(WAYLAND_LIBS)
+DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in $(srcdir)/Makefile.sources \
+	$(top_srcdir)/bin/depcomp $(top_srcdir)/install-lib-links.mk
+@HAVE_PLATFORM_WAYLAND_TRUE@am__append_1 = $(WAYLAND_CFLAGS)
+@HAVE_PLATFORM_WAYLAND_TRUE@am__append_2 = $(top_builddir)/src/egl/wayland/wayland-drm/libwayland-drm.la $(WAYLAND_LIBS)
 @HAVE_DRI2_TRUE@am__append_3 = \
-@HAVE_DRI2_TRUE@	backends/dri/gbm_dri.c \
-@HAVE_DRI2_TRUE@	backends/dri/gbm_driint.h
+@HAVE_DRI2_TRUE@	$(gbm_dri_FILES)
 
 @HAVE_DRI2_TRUE@am__append_4 = \
 @HAVE_DRI2_TRUE@	-DDEFAULT_DRIVER_DIR='"$(DRI_DRIVER_SEARCH_DIR)"' \
-@HAVE_DRI2_TRUE@	$(LIBDRM_CFLAGS)
+@HAVE_DRI2_TRUE@	$(LIBDRM_CFLAGS) \
+@HAVE_DRI2_TRUE@	$(PTHREADSTUBS_CFLAGS)
 
 @HAVE_DRI2_TRUE@am__append_5 = \
-@HAVE_DRI2_TRUE@	$(LIBDRM_LIBS)
+@HAVE_DRI2_TRUE@	$(LIBDRM_LIBS) \
+@HAVE_DRI2_TRUE@	$(PTHREADSTUBS_LIBS)
 
-DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(top_srcdir)/bin/depcomp \
-	$(top_srcdir)/install-lib-links.mk
 subdir = src/gbm
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_gnu_make.m4 \
@@ -120,9 +121,10 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" \
 	"$(DESTDIR)$(includedir)"
 LTLIBRARIES = $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
-@HAVE_EGL_PLATFORM_WAYLAND_TRUE@am__DEPENDENCIES_2 = $(top_builddir)/src/egl/wayland/wayland-drm/libwayland-drm.la \
-@HAVE_EGL_PLATFORM_WAYLAND_TRUE@	$(am__DEPENDENCIES_1)
-@HAVE_DRI2_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1)
+@HAVE_PLATFORM_WAYLAND_TRUE@am__DEPENDENCIES_2 = $(top_builddir)/src/egl/wayland/wayland-drm/libwayland-drm.la \
+@HAVE_PLATFORM_WAYLAND_TRUE@	$(am__DEPENDENCIES_1)
+@HAVE_DRI2_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1) \
+@HAVE_DRI2_TRUE@	$(am__DEPENDENCIES_1)
 libgbm_la_DEPENDENCIES = $(top_builddir)/src/loader/libloader.la \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
 	$(am__DEPENDENCIES_3)
@@ -130,8 +132,10 @@ am__libgbm_la_SOURCES_DIST = main/backend.c main/backend.h \
 	main/common_drm.h main/gbm.c main/gbm.h main/gbmint.h \
 	backends/dri/gbm_dri.c backends/dri/gbm_driint.h
 am__dirstamp = $(am__leading_dot)dirstamp
-@HAVE_DRI2_TRUE@am__objects_1 = backends/dri/gbm_dri.lo
-am_libgbm_la_OBJECTS = main/backend.lo main/gbm.lo $(am__objects_1)
+am__objects_1 = main/backend.lo main/gbm.lo
+am__objects_2 = backends/dri/gbm_dri.lo
+@HAVE_DRI2_TRUE@am__objects_3 = $(am__objects_2)
+am_libgbm_la_OBJECTS = $(am__objects_1) $(am__objects_3)
 libgbm_la_OBJECTS = $(am_libgbm_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -258,6 +262,8 @@ GLESv2_LIB_DEPS = @GLESv2_LIB_DEPS@
 GLESv2_PC_LIB_PRIV = @GLESv2_PC_LIB_PRIV@
 GLPROTO_CFLAGS = @GLPROTO_CFLAGS@
 GLPROTO_LIBS = @GLPROTO_LIBS@
+GLVND_CFLAGS = @GLVND_CFLAGS@
+GLVND_LIBS = @GLVND_LIBS@
 GLX_TLS = @GLX_TLS@
 GL_LIB = @GL_LIB@
 GL_LIB_DEPS = @GL_LIB_DEPS@
@@ -289,11 +295,10 @@ LIBELF_CFLAGS = @LIBELF_CFLAGS@
 LIBELF_LIBS = @LIBELF_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LIBSENSORS_LDFLAGS = @LIBSENSORS_LDFLAGS@
 LIBSHA1_CFLAGS = @LIBSHA1_CFLAGS@
 LIBSHA1_LIBS = @LIBSHA1_LIBS@
 LIBTOOL = @LIBTOOL@
-LIBUDEV_CFLAGS = @LIBUDEV_CFLAGS@
-LIBUDEV_LIBS = @LIBUDEV_LIBS@
 LIB_DIR = @LIB_DIR@
 LIB_EXT = @LIB_EXT@
 LIPO = @LIPO@
@@ -356,6 +361,8 @@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 POSIX_SHELL = @POSIX_SHELL@
 PRESENTPROTO_CFLAGS = @PRESENTPROTO_CFLAGS@
 PRESENTPROTO_LIBS = @PRESENTPROTO_LIBS@
+PTHREADSTUBS_CFLAGS = @PTHREADSTUBS_CFLAGS@
+PTHREADSTUBS_LIBS = @PTHREADSTUBS_LIBS@
 PTHREAD_CC = @PTHREAD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
 PTHREAD_LIBS = @PTHREAD_LIBS@
@@ -376,11 +383,19 @@ SIMPENROSE_CFLAGS = @SIMPENROSE_CFLAGS@
 SIMPENROSE_LIBS = @SIMPENROSE_LIBS@
 SSE41_CFLAGS = @SSE41_CFLAGS@
 STRIP = @STRIP@
+SWR_AVX2_CXXFLAGS = @SWR_AVX2_CXXFLAGS@
+SWR_AVX_CXXFLAGS = @SWR_AVX_CXXFLAGS@
+SWR_CXX11_CXXFLAGS = @SWR_CXX11_CXXFLAGS@
+TIMESTAMP_CMD = @TIMESTAMP_CMD@
+VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
+VALGRIND_LIBS = @VALGRIND_LIBS@
 VA_CFLAGS = @VA_CFLAGS@
 VA_LIBS = @VA_LIBS@
 VA_LIB_INSTALL_DIR = @VA_LIB_INSTALL_DIR@
 VA_MAJOR = @VA_MAJOR@
 VA_MINOR = @VA_MINOR@
+VC4_CFLAGS = @VC4_CFLAGS@
+VC4_LIBS = @VC4_LIBS@
 VDPAU_CFLAGS = @VDPAU_CFLAGS@
 VDPAU_LIBS = @VDPAU_LIBS@
 VDPAU_LIB_INSTALL_DIR = @VDPAU_LIB_INSTALL_DIR@
@@ -392,6 +407,7 @@ VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@
 VISIBILITY_CXXFLAGS = @VISIBILITY_CXXFLAGS@
 VL_CFLAGS = @VL_CFLAGS@
 VL_LIBS = @VL_LIBS@
+VULKAN_ICD_INSTALL_DIR = @VULKAN_ICD_INSTALL_DIR@
 WAYLAND_CFLAGS = @WAYLAND_CFLAGS@
 WAYLAND_LIBS = @WAYLAND_LIBS@
 WAYLAND_SCANNER = @WAYLAND_SCANNER@
@@ -415,6 +431,7 @@ XVMC_LIBS = @XVMC_LIBS@
 XVMC_LIB_INSTALL_DIR = @XVMC_LIB_INSTALL_DIR@
 XVMC_MAJOR = @XVMC_MAJOR@
 XVMC_MINOR = @XVMC_MINOR@
+XXD = @XXD@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
 abs_builddir = @abs_builddir@
@@ -477,6 +494,18 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+gbm_core_FILES = \
+	main/backend.c \
+	main/backend.h \
+	main/common_drm.h \
+	main/gbm.c \
+	main/gbm.h \
+	main/gbmint.h
+
+gbm_dri_FILES = \
+	backends/dri/gbm_dri.c \
+	backends/dri/gbm_driint.h
+
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = main/gbm.pc
 AM_CFLAGS = -D_OS_UNIX=1 -DMODULEDIR='"$(libdir)/gbm"' \
@@ -485,8 +514,7 @@ AM_CFLAGS = -D_OS_UNIX=1 -DMODULEDIR='"$(libdir)/gbm"' \
 	$(VISIBILITY_CFLAGS) $(am__append_1) $(am__append_4)
 lib_LTLIBRARIES = libgbm.la
 include_HEADERS = main/gbm.h
-libgbm_la_SOURCES = main/backend.c main/backend.h main/common_drm.h \
-	main/gbm.c main/gbm.h main/gbmint.h $(am__append_3)
+libgbm_la_SOURCES = $(gbm_core_FILES) $(am__append_3)
 libgbm_la_LDFLAGS = \
 	-no-undefined \
 	-version-info 1:0 \
@@ -495,14 +523,14 @@ libgbm_la_LDFLAGS = \
 
 libgbm_la_LIBADD = $(top_builddir)/src/loader/libloader.la \
 	$(DLOPEN_LIBS) $(am__append_2) $(am__append_5)
-@HAVE_EGL_PLATFORM_WAYLAND_TRUE@AM_CPPFLAGS = -DHAVE_WAYLAND_PLATFORM
+@HAVE_PLATFORM_WAYLAND_TRUE@AM_CPPFLAGS = -DHAVE_WAYLAND_PLATFORM
 TESTS = gbm-symbols-check
 EXTRA_DIST = gbm-symbols-check
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/install-lib-links.mk $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/Makefile.sources $(top_srcdir)/install-lib-links.mk $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -523,7 +551,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
-$(top_srcdir)/install-lib-links.mk:
+$(srcdir)/Makefile.sources $(top_srcdir)/install-lib-links.mk:
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh