--- a/exception_lists/check_rtime Tue Oct 04 15:26:36 2016 -0700
+++ b/exception_lists/check_rtime Thu Oct 06 16:22:15 2016 -0700
@@ -43,6 +43,7 @@
# to do such aliasing in C. C++ is different: The compiler generates aliases
# for implementation reasons, and the mangled names used to encode argument
# and return value types are difficult to handle well in mapfiles.
+NOSYMSORT usr/lib/synergy/plugins/libns.so
NOSYMSORT usr/bin/synergyc
NOSYMSORT usr/bin/synergys
NOSYMSORT usr/bin/Xvnc
@@ -58,7 +59,7 @@
NOSYMSORT usr/lib/xorg/modules/MACH(dri)/r200_dri\.so
NOSYMSORT usr/lib/xorg/modules/MACH(dri)/radeon_dri\.so
NOSYMSORT usr/lib/xorg/modules/MACH(dri)/swrast_dri\.so
-
+NOSYMSORT usr/lib/xorg/modules/MACH(dri)/kms_swrast_dri\.so
# Loadable modules without dependencies on other modules may have no direct
# bindings
NODIRECT ^usr/lib/mesa/modules/.*$
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/lib/mesa/0001-Can-t-use-restrict-in-C.patch Thu Oct 06 16:22:15 2016 -0700
@@ -0,0 +1,26 @@
+From 817c3f71030ca9b4f88946ecf929bfaeaaad5ed1 Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <[email protected]>
+Date: Sat, 10 Sep 2016 09:46:02 -0700
+Subject: [PATCH:mesa] Can't use restrict in C++
+
+Signed-off-by: Alan Coopersmith <[email protected]>
+---
+ include/c99_compat.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git unpacked-src/include/c99_compat.h unpacked-src/include/c99_compat.h
+index 24e96e0..1e9e12b 100644
+--- include/c99_compat.h
++++ include/c99_compat.h
+@@ -96,7 +96,7 @@
+ * - http://cellperformance.beyond3d.com/articles/2006/05/demystifying-the-restrict-keyword.html
+ */
+ #ifndef restrict
+-# if (__STDC_VERSION__ >= 199901L)
++# if (__STDC_VERSION__ >= 199901L) && !defined(__cplusplus)
+ /* C99 */
+ # elif defined(__GNUC__)
+ # define restrict __restrict__
+--
+2.7.4
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/lib/mesa/0002-libglapi.patch Thu Oct 06 16:22:15 2016 -0700
@@ -0,0 +1,11 @@
+--- src/gallium/targets/dri/Makefile.am 2016-10-04 16:23:17.782716013 -0700
++++ src/gallium/targets/dri/Makefile.am 2016-10-04 16:23:32.446643025 -0700
+@@ -6,6 +6,8 @@
+ endif
+ endif
+
++SHARED_GLAPI_LIB = $(top_builddir)/src/mapi/shared-glapi/libglapi.la
++
+ AM_CFLAGS = \
+ -I$(top_srcdir)/src/mapi \
+ -I$(top_srcdir)/src/mesa \
--- a/open-src/lib/mesa/Makefile Tue Oct 04 15:26:36 2016 -0700
+++ b/open-src/lib/mesa/Makefile Thu Oct 06 16:22:15 2016 -0700
@@ -1,4 +1,4 @@
-###############################################################################
+###############################################################################
#
# Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
#
@@ -35,7 +35,7 @@
MODULE_LICENSE_SET = yes
MODULE_LICENSE_PREPEND = $(GPL_CHOICE_FILE)
MODULE_DESC = the Mesa 3-D Graphics Libraries
-ORACLE_TPNO = 22939
+ORACLE_TPNO = 31745
# ARC cases that covered this module
# LSARC/2005/109 MESA, Open Source OpenGL clone
@@ -44,17 +44,19 @@
MODULE_ARC_CASES += PSARC/2013/264
# PSARC/2015/251 Xorg server 1.17
MODULE_ARC_CASES += PSARC/2015/251
+# PSARC/2016/560 Mesa 12
+MODULE_ARC_CASES += PSARC/2016/560
# Version number (used in path names)
-MODULE_VERSION=10.4.7
+MODULE_VERSION=12.0.3
# Checksums for upstream tarball
-TARBALL_MD5 = 92c8a9bf5c43e7b082c3f5007c77297e
-TARBALL_SHA1 = a7c6dac86f4a4410a82267c3672d6b0d5f45ed48
-TARBALL_SHA256 = 2c351c98671f9a7ab3fd9c601bb7a255801b1580f5dd0992639f99152801b0d2
+TARBALL_MD5 = 60c5f9897ddc38b46f8144c7366e84ad
+TARBALL_SHA1 = 3661e2f6b3ff71b7498fa787848959059517e92a
+TARBALL_SHA256 = 79abcfab3de30dbd416d1582a3cf6b1be308466231488775f1b7bb43be353602
# Source tarball
-SOURCE_TARBALL_NAME=MesaLib-$(MODULE_VERSION).tar.bz2
+SOURCE_TARBALL_NAME=mesa-$(MODULE_VERSION).tar.gz
SOURCE_TARBALL_NAME_SET=yes
# Download site for source
@@ -68,9 +70,7 @@
SOURCE_DIRNAME_SET=yes
# Patches to apply to source after unpacking, in order
-SOURCE_PATCHES= \
- solaris-port.patch \
-
+SOURCE_PATCHES += 0001-Can-t-use-restrict-in-C.patch 0002-libglapi.patch
CLONE_SRC = yes
# Regenerate configure after patching configure.ac in mesa9-port.patch
@@ -83,17 +83,26 @@
DRI_DRIVER_LIST_i386=i915 i965 radeon r200
DRI_DRIVER_LIST= $(DRI_DRIVER_LIST_$(MACH)) swrast
+MODULE_CXXFLAGS += -std=c++11 -D_GLIBCXX_USE_CXX11_ABI=0
+
# Command line options to GNU autoconf configure script
-MODULE_CONFIG_OPTS = --with-driver=dri --disable-egl --disable-gallium \
- --with-dri-driverdir='$(X11_SERVERMODS_DIR)/dri$(ARCHLIBSUBDIR)' \
- --with-dri-drivers='$(DRI_DRIVER_LIST)' \
- --with-gallium-drivers= --disable-gallium-llvm
+
+MODULE_CONFIG_OPTS_32 = --disable-gallium-llvm
+MODULE_CONFIG_OPTS_64 = --enable-gallium-llvm --disable-llvm-shared-libs
+
+MODULE_CONFIG_OPTS = --disable-egl --enable-shared --with-dri-drivers='$(DRI_DRIVER_LIST)'
+MODULE_CONFIG_OPTS += --with-gallium-drivers=swrast
+MODULE_CONFIG_OPTS += --disable-gles1 --disable-gles2
+MODULE_CONFIG_OPTS += --with-dri-driverdir='$(X11_SERVERMODS_DIR)/dri$(ARCHLIBSUBDIR)'
+MODULE_CONFIG_OPTS += $(MODULE_CONFIG_OPTS_$(BUILD_TYPE))
# Build mesa with this define (Bug 15706016)
MODULE_CFLAGS = -D__EXTENSIONS__
+MODULE_CPPFLAGS = -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS
# Add proto area to path to find makedepend
-MODULE_BUILD_ENV = PATH="$(PROTODIR)/$(X11_BIN_DIR):$(PATH)"
+MODULE_BUILD_ENV = PATH="$(PROTODIR)/$(X11_BIN_DIR):/usr/gnu/bin:$(PATH)"
+MODULE_BUILD_ENV += LLVM_CONFIG=$(PWD)/llvm-config
MODULE_CONFIG_ENV += $(MODULE_BUILD_ENV)
# Need to use GNU Make to build
@@ -104,11 +113,13 @@
# Need to build with gcc
MODULE_COMPILER=gcc
MODULE_COMPILER_SET=yes
-
-MODULE_LD_OPTIONS += -M $(PWD)/mapfile.externs
+USE_PARFAIT=no
-# Merge in additional sources from sun-src directory
-ADDITIONAL_SOURCE_DIR=sun-src
+MODULE_LD_OPTIONS += -M $(PWD)/mapfile.externs
+MODULE_LD_SHARED_OPTIONS_64 = -z nodefs $(ZDISCARD_UNUSED_DEP) -lLLVM -lssp
+MODULE_LD_SHARED_OPTIONS = $(MODULE_LD_SHARED_OPTIONS_$(BUILD_TYPE))
+
+MODULE_LDFLAGS += -Wl,-z,rescan-now
# pkg-config files that need to have -R added
FIX_PC_FILES=src/*/*.pc.in src/mesa/drivers/dri/dri.pc.in
@@ -122,7 +133,8 @@
HEADERS_TO_MOVE = gl.h gl_mangle.h glext.h \
glx.h glx_mangle.h glxext.h \
- osmesa.h wglext.h wmesa.h
+ osmesa.h wglext.h
+
HEADERS_TO_DIRECT_LINK = osmesa.h
HEADERS_TO_RUNTIME_LINK = gl.h glext.h glx.h glxext.h
@@ -138,18 +150,18 @@
$(PROTODIR)/usr/include/mesa
mv $(PROTODIR)/usr/include/GL/internal/dri_interface.h \
$(PROTODIR)/usr/include/mesa/internal
- ln -s ../../mesa/internal/dri_interface.h \
+ ln -sf ../../mesa/internal/dri_interface.h \
$(PROTODIR)/usr/include/GL/internal/
-rm -f $(HEADERS_TO_DIRECT_LINK:%=$(PROTODIR)/usr/include/GL/%) \
$(HEADERS_TO_RUNTIME_LINK:%=$(PROTODIR)/usr/include/GL/%)
- ln -s $(HEADERS_TO_DIRECT_LINK:%=../mesa/%) \
+ ln -sf $(HEADERS_TO_DIRECT_LINK:%=../mesa/%) \
$(HEADERS_TO_RUNTIME_LINK:%=../../../system/volatile/opengl/include/%) \
$(PROTODIR)/usr/include/GL
mkdir -p $(PROTODIR)/usr/lib/GL/$(SUBDIR64) \
$(PROTODIR)/usr/lib/mesa/$(SUBDIR64)
-rm -f $(PROTODIR)/usr/lib/GL/64 $(PROTODIR)/usr/lib/mesa/64
- ln -s $(SUBDIR64) $(PROTODIR)/usr/lib/GL/64
- ln -s $(SUBDIR64) $(PROTODIR)/usr/lib/mesa/64
+ ln -sf $(SUBDIR64) $(PROTODIR)/usr/lib/GL/64
+ ln -sf $(SUBDIR64) $(PROTODIR)/usr/lib/mesa/64
-rm -f $(LIBRARIES_TO_LINK:%=$(PROTODIR)/usr/lib/mesa/%) \
$(LIBRARIES_TO_LINK:%=$(PROTODIR)/usr/lib/mesa/$(SUBDIR64)/%)
mv $(LIBRARIES_TO_LINK:%=$(PROTODIR)/usr/lib/%) \
@@ -158,74 +170,69 @@
$(PROTODIR)/usr/lib/mesa/$(SUBDIR64)/
-rm -f $(PROTODIR)/usr/lib/mesa/libGL.so.1
-rm -f $(PROTODIR)/usr/lib/mesa/libGL.so
- -rm -f $(PROTODIR)/usr/lib/mesa/libGLU.so.1
-rm -f $(PROTODIR)/usr/lib/GL/libGL.so.1
- -rm -f $(PROTODIR)/usr/lib/GL/libGLU.so.1
-rm -f $(PROTODIR)/usr/lib/GL/libGL.so
-rm -f $(PROTODIR)/usr/lib/mesa/$(SUBDIR64)/libGL.so.1
- -rm -f $(PROTODIR)/usr/lib/mesa/$(SUBDIR64)/libGLU.so.1
+ -rm -f $(PROTODIR)/usr/lib/mesa/$(SUBDIR64)/libGL.so
-rm -f $(PROTODIR)/usr/lib/GL/$(SUBDIR64)/libGL.so.1
-rm -f $(PROTODIR)/usr/lib/GL/$(SUBDIR64)/libGL.so
- -rm -f $(PROTODIR)/usr/lib/GL/$(SUBDIR64)/libGLU.so.1
- ln -s libGL.so.1.2.0 $(PROTODIR)/usr/lib/mesa/libGL.so.1
- ln -s libGL.so.1 $(PROTODIR)/usr/lib/mesa/libGL.so
- ln -s libglapi.so.0.0.0 $(PROTODIR)/usr/lib/mesa/libglapi.so.0
- ln -s libglapi.so.0 $(PROTODIR)/usr/lib/mesa/libglapi.so
- ln -s libGL.so.1.2.0 $(PROTODIR)/usr/lib/mesa/$(SUBDIR64)/libGL.so.1
- ln -s libGL.so.1 $(PROTODIR)/usr/lib/mesa/$(SUBDIR64)/libGL.so
- ln -s libglapi.so.0.0.0 $(PROTODIR)/usr/lib/mesa/$(SUBDIR64)/libglapi.so.0
- ln -s libglapi.so.0 $(PROTODIR)/usr/lib/mesa/$(SUBDIR64)/libglapi.so
- rm -f $(PROTODIR)/usr/lib/*libglapi*
+ ln -sf libGL.so.1.2.0 $(PROTODIR)/usr/lib/mesa/libGL.so.1
+ ln -sf libGL.so.1 $(PROTODIR)/usr/lib/mesa/libGL.so
+ ln -sf libglapi.so.0 $(PROTODIR)/usr/lib/mesa/libglapi.so
+ ln -sf libglapi.so.0.0.0 $(PROTODIR)/usr/lib/mesa/libglapi.so.0
+ ln -sf libGL.so.1.2.0 $(PROTODIR)/usr/lib/mesa/$(SUBDIR64)/libGL.so.1
+ ln -sf libGL.so.1 $(PROTODIR)/usr/lib/mesa/$(SUBDIR64)/libGL.so
+ ln -sf libglapi.so.0.0.0 $(PROTODIR)/usr/lib/mesa/$(SUBDIR64)/libglapi.so.0
+ ln -sf libglapi.so.0 $(PROTODIR)/usr/lib/mesa/$(SUBDIR64)/libglapi.so
rm -f $(PROTODIR)/usr/lib/*libGL.*
- rm -f $(PROTODIR)/usr/lib/$(SUBDIR64)/*libglapi*
rm -f $(PROTODIR)/usr/lib/$(SUBDIR64)/*libGL.*
rm -f $(PROTODIR)/usr/lib/xorg/modules/dri/*.la
rm -f $(PROTODIR)/usr/lib/xorg/modules/dri/$(SUBDIR64)/*.la
- (cd $(PROTODIR)/usr/lib/GL; ln -s $(LIBRARIES_TO_LINK:%=../mesa/%) .)
+ (cd $(PROTODIR)/usr/lib/GL; ln -sf $(LIBRARIES_TO_LINK:%=../mesa/%) .)
rm -f $(PROTODIR)/usr/lib/GL/libGL.so.1.2.0
- ln -s libGL.so.1 $(PROTODIR)/usr/lib/GL/libGL.so
- ln -s libglapi.so.0.0.0 $(PROTODIR)/usr/lib/GL/libglapi.so.0
- ln -s libglapi.so.0 $(PROTODIR)/usr/lib/GL/libglapi.so
- (cd $(PROTODIR)/usr/lib/GL/$(SUBDIR64); ln -s $(LIBRARIES_TO_LINK:%=../../mesa/$(SUBDIR64)/%) .)
+ ln -sf libGL.so.1 $(PROTODIR)/usr/lib/GL/libGL.so
+ ln -sf libglapi.so.0.0.0 $(PROTODIR)/usr/lib/GL/libglapi.so.0
+ ln -sf libglapi.so.0 $(PROTODIR)/usr/lib/GL/libglapi.so
+ (cd $(PROTODIR)/usr/lib/GL/$(SUBDIR64); ln -sf $(LIBRARIES_TO_LINK:%=../../mesa/$(SUBDIR64)/%) .)
rm -f $(PROTODIR)/usr/lib/GL/$(SUBDIR64)/libGL.so.1.2.0
- ln -s libGL.so.1 $(PROTODIR)/usr/lib/GL/$(SUBDIR64)/libGL.so
- ln -s libglapi.so.0.0.0 $(PROTODIR)/usr/lib/GL/$(SUBDIR64)/libglapi.so.0
- ln -s libglapi.so.0 $(PROTODIR)/usr/lib/GL/$(SUBDIR64)/libglapi.so
- (cd $(PROTODIR)/usr/lib; ln -s $(LIBRARIES_TO_LINK:%=GL/%) .)
+ ln -sf libGL.so.1 $(PROTODIR)/usr/lib/GL/$(SUBDIR64)/libGL.so
+ ln -sf libglapi.so.0.0.0 $(PROTODIR)/usr/lib/GL/$(SUBDIR64)/libglapi.so.0
+ ln -sf libglapi.so.0 $(PROTODIR)/usr/lib/GL/$(SUBDIR64)/libglapi.so
+ (cd $(PROTODIR)/usr/lib; ln -sf $(LIBRARIES_TO_LINK:%=GL/%) .)
rm -f $(PROTODIR)/usr/lib/libGL.so.1.2.0
- ln -s GL/libGL.so.1 $(PROTODIR)/usr/lib/libGL.so.1
- ln -s libGL.so.1 $(PROTODIR)/usr/lib/libGL.so
- ln -s libglapi.so.0.0.0 $(PROTODIR)/usr/lib/libglapi.so.0
- ln -s libglapi.so.0 $(PROTODIR)/usr/lib/libglapi.so
- (cd $(PROTODIR)/usr/lib/$(SUBDIR64); ln -s $(LIBRARIES_TO_LINK:%=../GL/$(SUBDIR64)/%) .)
+ ln -sf GL/libGL.so.1 $(PROTODIR)/usr/lib/libGL.so.1
+ ln -sf libGL.so.1 $(PROTODIR)/usr/lib/libGL.so
+ ln -sf libglapi.so.0.0.0 $(PROTODIR)/usr/lib/libglapi.so.0
+ ln -sf libglapi.so.0 $(PROTODIR)/usr/lib/libglapi.so
+ (cd $(PROTODIR)/usr/lib/$(SUBDIR64); ln -sf $(LIBRARIES_TO_LINK:%=../GL/$(SUBDIR64)/%) .)
rm -f $(PROTODIR)/usr/lib/$(SUBDIR64)/libGL.so.1.2.0
- ln -s ../GL/$(SUBDIR64)/libGL.so.1 $(PROTODIR)/usr/lib/$(SUBDIR64)/libGL.so.1
- ln -s libGL.so.1 $(PROTODIR)/usr/lib/$(SUBDIR64)/libGL.so
- ln -s libglapi.so.0.0.0 $(PROTODIR)/usr/lib/$(SUBDIR64)/libglapi.so.0
- ln -s libglapi.so.0 $(PROTODIR)/usr/lib/$(SUBDIR64)/libglapi.so
- ln -s ../../../system/volatile/opengl/lib/libGL.so.1 \
+ ln -sf ../GL/$(SUBDIR64)/libGL.so.1 $(PROTODIR)/usr/lib/$(SUBDIR64)/libGL.so.1
+ ln -sf libGL.so.1 $(PROTODIR)/usr/lib/$(SUBDIR64)/libGL.so
+ ln -sf libglapi.so.0.0.0 $(PROTODIR)/usr/lib/$(SUBDIR64)/libglapi.so.0
+ ln -sf libglapi.so.0 $(PROTODIR)/usr/lib/$(SUBDIR64)/libglapi.so
+ ln -sf ../../../system/volatile/opengl/lib/libGL.so.1 \
$(PROTODIR)/usr/lib/GL/libGL.so.1
- ln -s ../../../../system/volatile/opengl/lib/$(SUBDIR64)/libGL.so.1 \
+ ln -sf ../../../../system/volatile/opengl/lib/$(SUBDIR64)/libGL.so.1 \
$(PROTODIR)/usr/lib/GL/$(SUBDIR64)/libGL.so.1
mkdir -p $(PROTODIR)/usr/X11/lib/$(SUBDIR64) \
$(PROTODIR)/usr/X11/include
-rm -f $(PROTODIR)/usr/X11/lib/GL $(PROTODIR)/usr/X11/lib/mesa
- ln -s ../../lib/GL $(PROTODIR)/usr/X11/lib/GL
- ln -s ../../lib/mesa $(PROTODIR)/usr/X11/lib/mesa
+ ln -sf ../../lib/GL $(PROTODIR)/usr/X11/lib/GL
+ ln -sf ../../lib/mesa $(PROTODIR)/usr/X11/lib/mesa
-rm -f $(PROTODIR)/usr/X11/lib/64
- ln -s $(SUBDIR64) $(PROTODIR)/usr/X11/lib/64
- (cd $(PROTODIR)/usr/X11/lib; ln -s $(LIBRARIES_TO_LINK:%=GL/%) .)
+ ln -sf $(SUBDIR64) $(PROTODIR)/usr/X11/lib/64
+ (cd $(PROTODIR)/usr/X11/lib; ln -sf $(LIBRARIES_TO_LINK:%=GL/%) .)
rm -f $(PROTODIR)/usr/X11/lib/libGL.so.1.2.0
- ln -s ../../lib/GL/libGL.so.1 $(PROTODIR)/usr/X11/lib/libGL.so.1
- ln -s libGL.so.1 $(PROTODIR)/usr/X11/lib/libGL.so
- ln -s libglapi.so.0.0.0 $(PROTODIR)/usr/X11/lib/libglapi.so.0
- ln -s libglapi.so.0 $(PROTODIR)/usr/X11/lib/libglapi.so
- (cd $(PROTODIR)/usr/X11/lib/$(SUBDIR64); ln -s $(LIBRARIES_TO_LINK:%=../GL/$(SUBDIR64)/%) .)
+ ln -sf ../../lib/GL/libGL.so.1 $(PROTODIR)/usr/X11/lib/libGL.so.1
+ ln -sf libGL.so.1 $(PROTODIR)/usr/X11/lib/libGL.so
+ ln -sf libglapi.so.0.0.0 $(PROTODIR)/usr/X11/lib/libglapi.so.0
+ ln -sf libglapi.so.0 $(PROTODIR)/usr/X11/lib/libglapi.so
+ (cd $(PROTODIR)/usr/X11/lib/$(SUBDIR64); ln -sf $(LIBRARIES_TO_LINK:%=../GL/$(SUBDIR64)/%) .)
rm -f $(PROTODIR)/usr/X11/lib/$(SUBDIR64)/libGL.so.1.2.0
- ln -s ../../../lib/GL/$(SUBDIR64)/libGL.so.1 $(PROTODIR)/usr/X11/lib/$(SUBDIR64)/libGL.so.1
- ln -s libGL.so.1 $(PROTODIR)/usr/X11/lib/$(SUBDIR64)/libGL.so
- ln -s libglapi.so.0.0.0 $(PROTODIR)/usr/X11/lib/$(SUBDIR64)/libglapi.so.0
- ln -s libglapi.so.0 $(PROTODIR)/usr/X11/lib/$(SUBDIR64)/libglapi.so
+ ln -sf ../../../lib/GL/$(SUBDIR64)/libGL.so.1 $(PROTODIR)/usr/X11/lib/$(SUBDIR64)/libGL.so.1
+ ln -sf libGL.so.1 $(PROTODIR)/usr/X11/lib/$(SUBDIR64)/libGL.so
+ ln -sf libglapi.so.0.0.0 $(PROTODIR)/usr/X11/lib/$(SUBDIR64)/libglapi.so.0
+ ln -sf libglapi.so.0 $(PROTODIR)/usr/X11/lib/$(SUBDIR64)/libglapi.so
-rm -f $(PROTODIR)/usr/X11/include/GL $(PROTODIR)/usr/X11/include/mesa
- ln -s ../../include/GL ../../include/mesa $(PROTODIR)/usr/X11/include/
+ ln -sf ../../include/GL ../../include/mesa $(PROTODIR)/usr/X11/include/
$(TOP)/open-src/data/ogl-select/mesa_vendor_select root="$(PROTODIR)"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/lib/mesa/llvm-config Thu Oct 06 16:22:15 2016 -0700
@@ -0,0 +1,13 @@
+#! /usr/bin/expect --
+
+log_user 0
+set pid [eval spawn -noecho /usr/bin/llvm-config [lrange $argv 0 end]]
+expect {
+ "*\r" {
+ set buf $expect_out(buffer)
+ }
+}
+wait $pid
+foreach line [split $buf "\n"] {
+ puts [string trim $line]
+}
--- a/open-src/lib/mesa/solaris-port.patch Tue Oct 04 15:26:36 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,249 +0,0 @@
---- src/mesa/drivers/dri/i915/intel_context.h Fri Oct 24 13:15:00 2014
-+++ src/mesa/drivers/dri/i915/intel_context.h Fri Oct 24 13:16:08 2014
-@@ -285,9 +285,13 @@
- driOptionCache optionCache;
- };
-
-+#if defined(__sun)
-+#include <stdlib.h>
-+#define __progname getexecname()
-+#else
- extern char *__progname;
-+#endif
-
--
- #define SUBPIXEL_X 0.125
- #define SUBPIXEL_Y 0.125
-
-@@ -302,7 +306,7 @@
- * than COPY_DWORDS would:
- * XXX Put this in src/mesa/main/imports.h ???
- */
--#if defined(i386) || defined(__i386__)
-+#if (defined(i386) || defined(__i386__)) && !(defined(__SOLARIS__) || defined(sun))
- static INLINE void * __memcpy(void * to, const void * from, size_t n)
- {
- int d0, d1, d2;
---- src/mesa/drivers/dri/common/dri_util.h Fri Oct 24 13:16:38 2014
-+++ src/mesa/drivers/dri/common/dri_util.h Fri Oct 24 13:17:23 2014
-@@ -59,6 +59,10 @@
- #include "xmlconfig.h"
- #include <stdbool.h>
-
-+#define u_int64_t uint64_t
-+#define u_int32_t uint32_t
-+#define u_int8_t uint8_t
-+
- /**
- * Extensions.
- */
---- src/mesa/drivers/dri/common/mmio.h Fri Oct 24 13:18:01 2014
-+++ src/mesa/drivers/dri/common/mmio.h Fri Oct 24 13:19:02 2014
-@@ -34,6 +34,7 @@
- #define MMIO_H
-
- #include "main/glheader.h"
-+#include "dri_util.h"
-
- #if defined( __powerpc__ )
-
---- src/mesa/drivers/dri/i915/intel_tris.c Fri Oct 24 13:21:20 2014
-+++ src/mesa/drivers/dri/i915/intel_tris.c Fri Oct 24 13:21:38 2014
-@@ -343,7 +343,7 @@
- * Emit primitives as inline vertices *
- ***********************************************************************/
-
--#ifdef __i386__
-+#if (defined(i386) || defined(__i386__)) && !(defined(__SOLARIS__) || defined(sun))
- #define COPY_DWORDS( j, vb, vertsize, v ) \
- do { \
- int __tmp; \
---- src/mesa/drivers/dri/i915/intel_batchbuffer.c Fri Oct 24 13:22:38 2014
-+++ src/mesa/drivers/dri/i915/intel_batchbuffer.c Fri Oct 24 13:22:49 2014
-@@ -56,7 +56,7 @@
- intel->batch.bo = drm_intel_bo_alloc(intel->bufmgr, "batchbuffer",
- intel->maxBatchSize, 4096);
-
-- intel->batch.reserved_space = BATCH_RESERVED;
-+ intel->batch.reserved_space = 4096;
- intel->batch.used = 0;
- }
-
---- configure.ac Fri Oct 24 13:24:33 2014
-+++ configure.ac Fri Oct 24 13:26:10 2014
-@@ -149,7 +149,7 @@
- _SAVE_CPPFLAGS="$CPPFLAGS"
-
- dnl Compiler macros
--DEFINES="-DUSE_EXTERNAL_DXTN_LIB=1"
-+DEFINES="-DUSE_EXTERNAL_DXTN_LIB=0"
- AC_SUBST([DEFINES])
- case "$host_os" in
- linux*|*-gnu*|gnu*)
---- src/mesa/drivers/dri/common/dri_util.h Tue Nov 4 09:09:50 2014
-+++ src/mesa/drivers/dri/common/dri_util.h Tue Nov 4 09:10:58 2014
-@@ -54,7 +54,7 @@
- #define _DRI_UTIL_H_
-
- #include <GL/gl.h>
--#include <GL/internal/dri_interface.h>
-+#include "../../../../../include/GL/internal/dri_interface.h"
- #include "main/mtypes.h"
- #include "xmlconfig.h"
- #include <stdbool.h>
---- src/mesa/drivers/dri/i915/intel_mipmap_tree.c Tue Nov 4 09:14:35 2014
-+++ src/mesa/drivers/dri/i915/intel_mipmap_tree.c Tue Nov 4 09:16:46 2014
-@@ -25,8 +25,8 @@
- *
- **************************************************************************/
-
--#include <GL/gl.h>
--#include <GL/internal/dri_interface.h>
-+#include "../../../../../include/GL/gl.h"
-+#include "../../../../../include/GL/internal/dri_interface.h"
-
- #include "intel_batchbuffer.h"
- #include "intel_chipset.h"
---- src/mesa/drivers/dri/i915/intel_mipmap_tree.h Tue Nov 4 09:14:42 2014
-+++ src/mesa/drivers/dri/i915/intel_mipmap_tree.h Tue Nov 4 09:15:04 2014
-@@ -32,7 +32,7 @@
-
- #include "intel_screen.h"
- #include "intel_regions.h"
--#include "GL/internal/dri_interface.h"
-+#include "../../../../../include/GL/internal/dri_interface.h"
-
- #ifdef __cplusplus
- extern "C" {
---- src/mesa/drivers/dri/common/utils.h Tue Nov 4 12:34:00 2014
-+++ src/mesa/drivers/dri/common/utils.h Tue Nov 4 12:34:19 2014
-@@ -29,7 +29,7 @@
- #define DRI_DEBUG_H
-
- #include <GL/gl.h>
--#include <GL/internal/dri_interface.h>
-+#include "../../../../../include/GL/internal/dri_interface.h"
- #include "main/context.h"
-
- struct dri_debug_control {
---- src/mesa/swrast/s_span.h Tue Nov 4 13:20:40 2014
-+++ src/mesa/swrast/s_span.h Tue Nov 4 13:20:57 2014
-@@ -38,7 +38,7 @@
- struct gl_context;
- struct gl_renderbuffer;
-
--
-+typedef GLint GLfixed;
- /**
- * \defgroup SpanFlags
- * Special bitflags to describe span data.
---- src/mesa/main/glheader.h Tue Nov 4 13:25:36 2014
-+++ src/mesa/main/glheader.h Tue Nov 4 13:26:24 2014
-@@ -35,7 +35,7 @@
-
- #define GL_GLEXT_PROTOTYPES
- #include "GL/gl.h"
--#include "GL/glext.h"
-+#include "../../../include/GL/glext.h"
-
-
- #ifdef __cplusplus
---- src/mesa/drivers/dri/i965/intel_mipmap_tree.h Tue Nov 4 13:48:12 2014
-+++ src/mesa/drivers/dri/i965/intel_mipmap_tree.h Tue Nov 4 13:48:39 2014
-@@ -51,7 +51,7 @@
- #include "main/mtypes.h"
- #include "intel_bufmgr.h"
- #include "intel_resolve_map.h"
--#include <GL/internal/dri_interface.h>
-+#include "../../../../../include/GL/internal/dri_interface.h"
-
- #ifdef __cplusplus
- extern "C" {
---- src/mesa/drivers/dri/i965/intel_mipmap_tree.c Tue Nov 4 13:48:07 2014
-+++ src/mesa/drivers/dri/i965/intel_mipmap_tree.c Tue Nov 4 13:49:49 2014
-@@ -26,7 +26,7 @@
- **************************************************************************/
-
- #include <GL/gl.h>
--#include <GL/internal/dri_interface.h>
-+#include "../../../../../include/GL/internal/dri_interface.h"
-
- #include "intel_batchbuffer.h"
- #include "intel_chipset.h"
---- src/mesa/drivers/dri/i965/intel_image.h Tue Nov 4 13:48:01 2014
-+++ src/mesa/drivers/dri/i965/intel_image.h Tue Nov 4 13:50:33 2014
-@@ -43,7 +43,7 @@
-
- #include "main/mtypes.h"
- #include "intel_bufmgr.h"
--#include <GL/internal/dri_interface.h>
-+#include "../../../../../include/GL/internal/dri_interface.h"
-
- #ifdef __cplusplus
- extern "C" {
---- src/mesa/program/program.h Tue Nov 4 14:09:53 2014
-+++ src/mesa/program/program.h Tue Nov 4 14:10:42 2014
-@@ -43,7 +43,9 @@
- #include "main/compiler.h"
- #include "main/mtypes.h"
-
-+#define GL_COMPUTE_PROGRAM_NV 0x90FB
-
-+
- #ifdef __cplusplus
- extern "C" {
- #endif
---- src/glx/dri_common.h Wed Nov 5 10:21:35 2014
-+++ src/glx/dri_common.h Wed Nov 5 10:22:06 2014
-@@ -36,7 +36,7 @@
- #ifndef _DRI_COMMON_H
- #define _DRI_COMMON_H
-
--#include <GL/internal/dri_interface.h>
-+#include "../../include/GL/internal/dri_interface.h"
- #include <stdbool.h>
- #include "loader.h"
-
---- src/glx/indirect_vertex_array.h Thu Dec 6 09:40:13 2012
-+++ src/glx/indirect_vertex_array.h Wed Nov 5 10:51:08 2014
-@@ -26,6 +26,8 @@
- #ifndef INDIRECT_VERTEX_ARRAY_H
- #define INDIRECT_VERTEX_ARRAY_H
-
-+#include <GL/glext.h>
-+
- extern const GLuint __glXTypeSize_table[16];
-
- #define __glXTypeSize(e) ((((e) & ~0x0f) != 0x1400) \
---- src/glx/glx_pbuffer.c Wed Nov 5 12:02:49 2014
-+++ src/glx/glx_pbuffer.c Wed Nov 5 12:19:52 2014
-@@ -35,6 +35,7 @@
- #include <X11/extensions/Xext.h>
- #include <assert.h>
- #include <string.h>
-+#include "../../include/GL/glxext.h"
- #include "glxextensions.h"
-
- #ifdef GLX_USE_APPLEGL
-@@ -44,6 +45,8 @@
-
- #include "glx_error.h"
-
-+#define GLX_BACK_BUFFER_AGE_EXT 0x20F4
-+
- #define WARN_ONCE_GLX_1_3(a, b) { \
- static int warned=1; \
- if(warned) { \
---- src/glx/glxclient.h Wed Nov 5 14:38:02 2014
-+++ src/glx/glxclient.h Wed Nov 5 15:10:10 2014
-@@ -42,8 +42,8 @@
- #include <X11/Xfuncproto.h>
- #include <X11/extensions/extutil.h>
- #define GLX_GLXEXT_PROTOTYPES
--#include <GL/glx.h>
--#include <GL/glxext.h>
-+#include "../../include/GL/glx.h"
-+#include "../../include/GL/glxext.h"
- #include <string.h>
- #include <stdlib.h>
- #include <stdio.h>
--- a/open-src/lib/mesa/sun-src/src/glx/mapfile.scope Tue Oct 04 15:26:36 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,670 +0,0 @@
-# Needed to truly hide symbols gcc treats as HIDDEN/INTERNAL but doesn't mark
-# as hidden in the ELF files properly.
-
-{
- local:
-
-# indirect.h / indirect.c
- __glXReadReply;
- __glXReadPixelReply;
- __glXSetupSingleRequest;
- __glXSetupVendorRequest;
- __indirect_glNewList;
- __indirect_glEndList;
- __indirect_glCallList;
- __indirect_glCallLists;
- __indirect_glDeleteLists;
- __indirect_glGenLists;
- __indirect_glListBase;
- __indirect_glBegin;
- __indirect_glBitmap;
- __indirect_glColor3b;
- __indirect_glColor3bv;
- __indirect_glColor3d;
- __indirect_glColor3dv;
- __indirect_glColor3f;
- __indirect_glColor3fv;
- __indirect_glColor3i;
- __indirect_glColor3iv;
- __indirect_glColor3s;
- __indirect_glColor3sv;
- __indirect_glColor3ub;
- __indirect_glColor3ubv;
- __indirect_glColor3ui;
- __indirect_glColor3uiv;
- __indirect_glColor3us;
- __indirect_glColor3usv;
- __indirect_glColor4b;
- __indirect_glColor4bv;
- __indirect_glColor4d;
- __indirect_glColor4dv;
- __indirect_glColor4f;
- __indirect_glColor4fv;
- __indirect_glColor4i;
- __indirect_glColor4iv;
- __indirect_glColor4s;
- __indirect_glColor4sv;
- __indirect_glColor4ub;
- __indirect_glColor4ubv;
- __indirect_glColor4ui;
- __indirect_glColor4uiv;
- __indirect_glColor4us;
- __indirect_glColor4usv;
- __indirect_glEdgeFlag;
- __indirect_glEdgeFlagv;
- __indirect_glEnd;
- __indirect_glIndexd;
- __indirect_glIndexdv;
- __indirect_glIndexf;
- __indirect_glIndexfv;
- __indirect_glIndexi;
- __indirect_glIndexiv;
- __indirect_glIndexs;
- __indirect_glIndexsv;
- __indirect_glNormal3b;
- __indirect_glNormal3bv;
- __indirect_glNormal3d;
- __indirect_glNormal3dv;
- __indirect_glNormal3f;
- __indirect_glNormal3fv;
- __indirect_glNormal3i;
- __indirect_glNormal3iv;
- __indirect_glNormal3s;
- __indirect_glNormal3sv;
- __indirect_glRasterPos2d;
- __indirect_glRasterPos2dv;
- __indirect_glRasterPos2f;
- __indirect_glRasterPos2fv;
- __indirect_glRasterPos2i;
- __indirect_glRasterPos2iv;
- __indirect_glRasterPos2s;
- __indirect_glRasterPos2sv;
- __indirect_glRasterPos3d;
- __indirect_glRasterPos3dv;
- __indirect_glRasterPos3f;
- __indirect_glRasterPos3fv;
- __indirect_glRasterPos3i;
- __indirect_glRasterPos3iv;
- __indirect_glRasterPos3s;
- __indirect_glRasterPos3sv;
- __indirect_glRasterPos4d;
- __indirect_glRasterPos4dv;
- __indirect_glRasterPos4f;
- __indirect_glRasterPos4fv;
- __indirect_glRasterPos4i;
- __indirect_glRasterPos4iv;
- __indirect_glRasterPos4s;
- __indirect_glRasterPos4sv;
- __indirect_glRectd;
- __indirect_glRectdv;
- __indirect_glRectf;
- __indirect_glRectfv;
- __indirect_glRecti;
- __indirect_glRectiv;
- __indirect_glRects;
- __indirect_glRectsv;
- __indirect_glTexCoord1d;
- __indirect_glTexCoord1dv;
- __indirect_glTexCoord1f;
- __indirect_glTexCoord1fv;
- __indirect_glTexCoord1i;
- __indirect_glTexCoord1iv;
- __indirect_glTexCoord1s;
- __indirect_glTexCoord1sv;
- __indirect_glTexCoord2d;
- __indirect_glTexCoord2dv;
- __indirect_glTexCoord2f;
- __indirect_glTexCoord2fv;
- __indirect_glTexCoord2i;
- __indirect_glTexCoord2iv;
- __indirect_glTexCoord2s;
- __indirect_glTexCoord2sv;
- __indirect_glTexCoord3d;
- __indirect_glTexCoord3dv;
- __indirect_glTexCoord3f;
- __indirect_glTexCoord3fv;
- __indirect_glTexCoord3i;
- __indirect_glTexCoord3iv;
- __indirect_glTexCoord3s;
- __indirect_glTexCoord3sv;
- __indirect_glTexCoord4d;
- __indirect_glTexCoord4dv;
- __indirect_glTexCoord4f;
- __indirect_glTexCoord4fv;
- __indirect_glTexCoord4i;
- __indirect_glTexCoord4iv;
- __indirect_glTexCoord4s;
- __indirect_glTexCoord4sv;
- __indirect_glVertex2d;
- __indirect_glVertex2dv;
- __indirect_glVertex2f;
- __indirect_glVertex2fv;
- __indirect_glVertex2i;
- __indirect_glVertex2iv;
- __indirect_glVertex2s;
- __indirect_glVertex2sv;
- __indirect_glVertex3d;
- __indirect_glVertex3dv;
- __indirect_glVertex3f;
- __indirect_glVertex3fv;
- __indirect_glVertex3i;
- __indirect_glVertex3iv;
- __indirect_glVertex3s;
- __indirect_glVertex3sv;
- __indirect_glVertex4d;
- __indirect_glVertex4dv;
- __indirect_glVertex4f;
- __indirect_glVertex4fv;
- __indirect_glVertex4i;
- __indirect_glVertex4iv;
- __indirect_glVertex4s;
- __indirect_glVertex4sv;
- __indirect_glClipPlane;
- __indirect_glColorMaterial;
- __indirect_glCullFace;
- __indirect_glFogf;
- __indirect_glFogfv;
- __indirect_glFogi;
- __indirect_glFogiv;
- __indirect_glFrontFace;
- __indirect_glHint;
- __indirect_glLightf;
- __indirect_glLightfv;
- __indirect_glLighti;
- __indirect_glLightiv;
- __indirect_glLightModelf;
- __indirect_glLightModelfv;
- __indirect_glLightModeli;
- __indirect_glLightModeliv;
- __indirect_glLineStipple;
- __indirect_glLineWidth;
- __indirect_glMaterialf;
- __indirect_glMaterialfv;
- __indirect_glMateriali;
- __indirect_glMaterialiv;
- __indirect_glPointSize;
- __indirect_glPolygonMode;
- __indirect_glPolygonStipple;
- __indirect_glScissor;
- __indirect_glShadeModel;
- __indirect_glTexParameterf;
- __indirect_glTexParameterfv;
- __indirect_glTexParameteri;
- __indirect_glTexParameteriv;
- __indirect_glTexImage1D;
- __indirect_glTexImage2D;
- __indirect_glTexEnvf;
- __indirect_glTexEnvfv;
- __indirect_glTexEnvi;
- __indirect_glTexEnviv;
- __indirect_glTexGend;
- __indirect_glTexGendv;
- __indirect_glTexGenf;
- __indirect_glTexGenfv;
- __indirect_glTexGeni;
- __indirect_glTexGeniv;
- __indirect_glFeedbackBuffer;
- __indirect_glSelectBuffer;
- __indirect_glRenderMode;
- __indirect_glInitNames;
- __indirect_glLoadName;
- __indirect_glPassThrough;
- __indirect_glPopName;
- __indirect_glPushName;
- __indirect_glDrawBuffer;
- __indirect_glClear;
- __indirect_glClearAccum;
- __indirect_glClearIndex;
- __indirect_glClearColor;
- __indirect_glClearStencil;
- __indirect_glClearDepth;
- __indirect_glStencilMask;
- __indirect_glColorMask;
- __indirect_glDepthMask;
- __indirect_glIndexMask;
- __indirect_glAccum;
- __indirect_glDisable;
- __indirect_glEnable;
- __indirect_glFinish;
- __indirect_glFlush;
- __indirect_glPopAttrib;
- __indirect_glPushAttrib;
- __indirect_glMap1d;
- __indirect_glMap1f;
- __indirect_glMap2d;
- __indirect_glMap2f;
- __indirect_glMapGrid1d;
- __indirect_glMapGrid1f;
- __indirect_glMapGrid2d;
- __indirect_glMapGrid2f;
- __indirect_glEvalCoord1d;
- __indirect_glEvalCoord1dv;
- __indirect_glEvalCoord1f;
- __indirect_glEvalCoord1fv;
- __indirect_glEvalCoord2d;
- __indirect_glEvalCoord2dv;
- __indirect_glEvalCoord2f;
- __indirect_glEvalCoord2fv;
- __indirect_glEvalMesh1;
- __indirect_glEvalPoint1;
- __indirect_glEvalMesh2;
- __indirect_glEvalPoint2;
- __indirect_glAlphaFunc;
- __indirect_glBlendFunc;
- __indirect_glLogicOp;
- __indirect_glStencilFunc;
- __indirect_glStencilOp;
- __indirect_glDepthFunc;
- __indirect_glPixelZoom;
- __indirect_glPixelTransferf;
- __indirect_glPixelTransferi;
- __indirect_glPixelStoref;
- __indirect_glPixelStorei;
- __indirect_glPixelMapfv;
- __indirect_glPixelMapuiv;
- __indirect_glPixelMapusv;
- __indirect_glReadBuffer;
- __indirect_glCopyPixels;
- __indirect_glReadPixels;
- __indirect_glDrawPixels;
- __indirect_glGetBooleanv;
- __indirect_glGetClipPlane;
- __indirect_glGetDoublev;
- __indirect_glGetError;
- __indirect_glGetFloatv;
- __indirect_glGetIntegerv;
- __indirect_glGetLightfv;
- __indirect_glGetLightiv;
- __indirect_glGetMapdv;
- __indirect_glGetMapfv;
- __indirect_glGetMapiv;
- __indirect_glGetMaterialfv;
- __indirect_glGetMaterialiv;
- __indirect_glGetPixelMapfv;
- __indirect_glGetPixelMapuiv;
- __indirect_glGetPixelMapusv;
- __indirect_glGetPolygonStipple;
- __indirect_glGetString;
- __indirect_glGetTexEnvfv;
- __indirect_glGetTexEnviv;
- __indirect_glGetTexGendv;
- __indirect_glGetTexGenfv;
- __indirect_glGetTexGeniv;
- __indirect_glGetTexImage;
- __indirect_glGetTexParameterfv;
- __indirect_glGetTexParameteriv;
- __indirect_glGetTexLevelParameterfv;
- __indirect_glGetTexLevelParameteriv;
- __indirect_glIsEnabled;
- __indirect_glIsList;
- __indirect_glDepthRange;
- __indirect_glFrustum;
- __indirect_glLoadIdentity;
- __indirect_glLoadMatrixf;
- __indirect_glLoadMatrixd;
- __indirect_glMatrixMode;
- __indirect_glMultMatrixf;
- __indirect_glMultMatrixd;
- __indirect_glOrtho;
- __indirect_glPopMatrix;
- __indirect_glPushMatrix;
- __indirect_glRotated;
- __indirect_glRotatef;
- __indirect_glScaled;
- __indirect_glScalef;
- __indirect_glTranslated;
- __indirect_glTranslatef;
- __indirect_glViewport;
- __indirect_glArrayElement;
- __indirect_glBindTexture;
- __indirect_glColorPointer;
- __indirect_glDisableClientState;
- __indirect_glDrawArrays;
- __indirect_glDrawElements;
- __indirect_glEdgeFlagPointer;
- __indirect_glEnableClientState;
- __indirect_glIndexPointer;
- __indirect_glIndexub;
- __indirect_glIndexubv;
- __indirect_glInterleavedArrays;
- __indirect_glNormalPointer;
- __indirect_glPolygonOffset;
- __indirect_glTexCoordPointer;
- __indirect_glVertexPointer;
- __indirect_glAreTexturesResident;
- __indirect_glCopyTexImage1D;
- __indirect_glCopyTexImage2D;
- __indirect_glCopyTexSubImage1D;
- __indirect_glCopyTexSubImage2D;
- __indirect_glDeleteTextures;
- __indirect_glGenTextures;
- __indirect_glGetPointerv;
- __indirect_glIsTexture;
- __indirect_glPrioritizeTextures;
- __indirect_glTexSubImage1D;
- __indirect_glTexSubImage2D;
- __indirect_glPopClientAttrib;
- __indirect_glPushClientAttrib;
- __indirect_glBlendColor;
- __indirect_glBlendEquation;
- __indirect_glDrawRangeElements;
- __indirect_glColorTable;
- __indirect_glColorTableParameterfv;
- __indirect_glColorTableParameteriv;
- __indirect_glCopyColorTable;
- __indirect_glGetColorTable;
- __indirect_glGetColorTableParameterfv;
- __indirect_glGetColorTableParameteriv;
- __indirect_glColorSubTable;
- __indirect_glCopyColorSubTable;
- __indirect_glConvolutionFilter1D;
- __indirect_glConvolutionFilter2D;
- __indirect_glConvolutionParameterf;
- __indirect_glConvolutionParameterfv;
- __indirect_glConvolutionParameteri;
- __indirect_glConvolutionParameteriv;
- __indirect_glCopyConvolutionFilter1D;
- __indirect_glCopyConvolutionFilter2D;
- __indirect_glGetConvolutionFilter;
- __indirect_glGetConvolutionParameterfv;
- __indirect_glGetConvolutionParameteriv;
- __indirect_glGetSeparableFilter;
- __indirect_glSeparableFilter2D;
- __indirect_glGetHistogram;
- __indirect_glGetHistogramParameterfv;
- __indirect_glGetHistogramParameteriv;
- __indirect_glGetMinmax;
- __indirect_glGetMinmaxParameterfv;
- __indirect_glGetMinmaxParameteriv;
- __indirect_glHistogram;
- __indirect_glMinmax;
- __indirect_glResetHistogram;
- __indirect_glResetMinmax;
- __indirect_glTexImage3D;
- __indirect_glTexSubImage3D;
- __indirect_glCopyTexSubImage3D;
- __indirect_glActiveTextureARB;
- __indirect_glClientActiveTextureARB;
- __indirect_glMultiTexCoord1dARB;
- __indirect_glMultiTexCoord1dvARB;
- __indirect_glMultiTexCoord1fARB;
- __indirect_glMultiTexCoord1fvARB;
- __indirect_glMultiTexCoord1iARB;
- __indirect_glMultiTexCoord1ivARB;
- __indirect_glMultiTexCoord1sARB;
- __indirect_glMultiTexCoord1svARB;
- __indirect_glMultiTexCoord2dARB;
- __indirect_glMultiTexCoord2dvARB;
- __indirect_glMultiTexCoord2fARB;
- __indirect_glMultiTexCoord2fvARB;
- __indirect_glMultiTexCoord2iARB;
- __indirect_glMultiTexCoord2ivARB;
- __indirect_glMultiTexCoord2sARB;
- __indirect_glMultiTexCoord2svARB;
- __indirect_glMultiTexCoord3dARB;
- __indirect_glMultiTexCoord3dvARB;
- __indirect_glMultiTexCoord3fARB;
- __indirect_glMultiTexCoord3fvARB;
- __indirect_glMultiTexCoord3iARB;
- __indirect_glMultiTexCoord3ivARB;
- __indirect_glMultiTexCoord3sARB;
- __indirect_glMultiTexCoord3svARB;
- __indirect_glMultiTexCoord4dARB;
- __indirect_glMultiTexCoord4dvARB;
- __indirect_glMultiTexCoord4fARB;
- __indirect_glMultiTexCoord4fvARB;
- __indirect_glMultiTexCoord4iARB;
- __indirect_glMultiTexCoord4ivARB;
- __indirect_glMultiTexCoord4sARB;
- __indirect_glMultiTexCoord4svARB;
- __indirect_glLoadTransposeMatrixdARB;
- __indirect_glLoadTransposeMatrixfARB;
- __indirect_glMultTransposeMatrixdARB;
- __indirect_glMultTransposeMatrixfARB;
- __indirect_glSampleCoverageARB;
- __indirect_glCompressedTexImage1DARB;
- __indirect_glCompressedTexImage2DARB;
- __indirect_glCompressedTexImage3DARB;
- __indirect_glCompressedTexSubImage1DARB;
- __indirect_glCompressedTexSubImage2DARB;
- __indirect_glCompressedTexSubImage3DARB;
- __indirect_glGetCompressedTexImageARB;
- __indirect_glDisableVertexAttribArrayARB;
- __indirect_glEnableVertexAttribArrayARB;
- __indirect_glGetProgramEnvParameterdvARB;
- __indirect_glGetProgramEnvParameterfvARB;
- __indirect_glGetProgramLocalParameterdvARB;
- __indirect_glGetProgramLocalParameterfvARB;
- __indirect_glGetProgramStringARB;
- __indirect_glGetProgramivARB;
- __indirect_glGetVertexAttribdvARB;
- __indirect_glGetVertexAttribfvARB;
- __indirect_glGetVertexAttribivARB;
- __indirect_glProgramEnvParameter4dARB;
- __indirect_glProgramEnvParameter4dvARB;
- __indirect_glProgramEnvParameter4fARB;
- __indirect_glProgramEnvParameter4fvARB;
- __indirect_glProgramLocalParameter4dARB;
- __indirect_glProgramLocalParameter4dvARB;
- __indirect_glProgramLocalParameter4fARB;
- __indirect_glProgramLocalParameter4fvARB;
- __indirect_glProgramStringARB;
- __indirect_glVertexAttrib1dARB;
- __indirect_glVertexAttrib1dvARB;
- __indirect_glVertexAttrib1fARB;
- __indirect_glVertexAttrib1fvARB;
- __indirect_glVertexAttrib1sARB;
- __indirect_glVertexAttrib1svARB;
- __indirect_glVertexAttrib2dARB;
- __indirect_glVertexAttrib2dvARB;
- __indirect_glVertexAttrib2fARB;
- __indirect_glVertexAttrib2fvARB;
- __indirect_glVertexAttrib2sARB;
- __indirect_glVertexAttrib2svARB;
- __indirect_glVertexAttrib3dARB;
- __indirect_glVertexAttrib3dvARB;
- __indirect_glVertexAttrib3fARB;
- __indirect_glVertexAttrib3fvARB;
- __indirect_glVertexAttrib3sARB;
- __indirect_glVertexAttrib3svARB;
- __indirect_glVertexAttrib4NbvARB;
- __indirect_glVertexAttrib4NivARB;
- __indirect_glVertexAttrib4NsvARB;
- __indirect_glVertexAttrib4NubARB;
- __indirect_glVertexAttrib4NubvARB;
- __indirect_glVertexAttrib4NuivARB;
- __indirect_glVertexAttrib4NusvARB;
- __indirect_glVertexAttrib4bvARB;
- __indirect_glVertexAttrib4dARB;
- __indirect_glVertexAttrib4dvARB;
- __indirect_glVertexAttrib4fARB;
- __indirect_glVertexAttrib4fvARB;
- __indirect_glVertexAttrib4ivARB;
- __indirect_glVertexAttrib4sARB;
- __indirect_glVertexAttrib4svARB;
- __indirect_glVertexAttrib4ubvARB;
- __indirect_glVertexAttrib4uivARB;
- __indirect_glVertexAttrib4usvARB;
- __indirect_glVertexAttribPointerARB;
- __indirect_glBeginQueryARB;
- __indirect_glDeleteQueriesARB;
- __indirect_glEndQueryARB;
- __indirect_glGenQueriesARB;
- __indirect_glGetQueryObjectivARB;
- __indirect_glGetQueryObjectuivARB;
- __indirect_glGetQueryivARB;
- __indirect_glIsQueryARB;
- __indirect_glDrawBuffersARB;
- __indirect_glSampleMaskSGIS;
- __indirect_glSamplePatternSGIS;
- __indirect_glColorPointerEXT;
- __indirect_glEdgeFlagPointerEXT;
- __indirect_glIndexPointerEXT;
- __indirect_glNormalPointerEXT;
- __indirect_glTexCoordPointerEXT;
- __indirect_glVertexPointerEXT;
- __indirect_glPointParameterfEXT;
- __indirect_glPointParameterfvEXT;
- __indirect_glSecondaryColor3bEXT;
- __indirect_glSecondaryColor3bvEXT;
- __indirect_glSecondaryColor3dEXT;
- __indirect_glSecondaryColor3dvEXT;
- __indirect_glSecondaryColor3fEXT;
- __indirect_glSecondaryColor3fvEXT;
- __indirect_glSecondaryColor3iEXT;
- __indirect_glSecondaryColor3ivEXT;
- __indirect_glSecondaryColor3sEXT;
- __indirect_glSecondaryColor3svEXT;
- __indirect_glSecondaryColor3ubEXT;
- __indirect_glSecondaryColor3ubvEXT;
- __indirect_glSecondaryColor3uiEXT;
- __indirect_glSecondaryColor3uivEXT;
- __indirect_glSecondaryColor3usEXT;
- __indirect_glSecondaryColor3usvEXT;
- __indirect_glSecondaryColorPointerEXT;
- __indirect_glMultiDrawArraysEXT;
- __indirect_glMultiDrawElementsEXT;
- __indirect_glFogCoordPointerEXT;
- __indirect_glFogCoorddEXT;
- __indirect_glFogCoorddvEXT;
- __indirect_glFogCoordfEXT;
- __indirect_glFogCoordfvEXT;
- __indirect_glBlendFuncSeparateEXT;
- __indirect_glWindowPos2dMESA;
- __indirect_glWindowPos2dvMESA;
- __indirect_glWindowPos2fMESA;
- __indirect_glWindowPos2fvMESA;
- __indirect_glWindowPos2iMESA;
- __indirect_glWindowPos2ivMESA;
- __indirect_glWindowPos2sMESA;
- __indirect_glWindowPos2svMESA;
- __indirect_glWindowPos3dMESA;
- __indirect_glWindowPos3dvMESA;
- __indirect_glWindowPos3fMESA;
- __indirect_glWindowPos3fvMESA;
- __indirect_glWindowPos3iMESA;
- __indirect_glWindowPos3ivMESA;
- __indirect_glWindowPos3sMESA;
- __indirect_glWindowPos3svMESA;
- __indirect_glAreProgramsResidentNV;
- __indirect_glBindProgramNV;
- __indirect_glDeleteProgramsNV;
- __indirect_glExecuteProgramNV;
- __indirect_glGenProgramsNV;
- __indirect_glGetProgramParameterdvNV;
- __indirect_glGetProgramParameterfvNV;
- __indirect_glGetProgramStringNV;
- __indirect_glGetProgramivNV;
- __indirect_glGetTrackMatrixivNV;
- __indirect_glGetVertexAttribPointervNV;
- __indirect_glGetVertexAttribdvNV;
- __indirect_glGetVertexAttribfvNV;
- __indirect_glGetVertexAttribivNV;
- __indirect_glIsProgramNV;
- __indirect_glLoadProgramNV;
- __indirect_glProgramParameters4dvNV;
- __indirect_glProgramParameters4fvNV;
- __indirect_glRequestResidentProgramsNV;
- __indirect_glTrackMatrixNV;
- __indirect_glVertexAttrib1dNV;
- __indirect_glVertexAttrib1dvNV;
- __indirect_glVertexAttrib1fNV;
- __indirect_glVertexAttrib1fvNV;
- __indirect_glVertexAttrib1sNV;
- __indirect_glVertexAttrib1svNV;
- __indirect_glVertexAttrib2dNV;
- __indirect_glVertexAttrib2dvNV;
- __indirect_glVertexAttrib2fNV;
- __indirect_glVertexAttrib2fvNV;
- __indirect_glVertexAttrib2sNV;
- __indirect_glVertexAttrib2svNV;
- __indirect_glVertexAttrib3dNV;
- __indirect_glVertexAttrib3dvNV;
- __indirect_glVertexAttrib3fNV;
- __indirect_glVertexAttrib3fvNV;
- __indirect_glVertexAttrib3sNV;
- __indirect_glVertexAttrib3svNV;
- __indirect_glVertexAttrib4dNV;
- __indirect_glVertexAttrib4dvNV;
- __indirect_glVertexAttrib4fNV;
- __indirect_glVertexAttrib4fvNV;
- __indirect_glVertexAttrib4sNV;
- __indirect_glVertexAttrib4svNV;
- __indirect_glVertexAttrib4ubNV;
- __indirect_glVertexAttrib4ubvNV;
- __indirect_glVertexAttribPointerNV;
- __indirect_glVertexAttribs1dvNV;
- __indirect_glVertexAttribs1fvNV;
- __indirect_glVertexAttribs1svNV;
- __indirect_glVertexAttribs2dvNV;
- __indirect_glVertexAttribs2fvNV;
- __indirect_glVertexAttribs2svNV;
- __indirect_glVertexAttribs3dvNV;
- __indirect_glVertexAttribs3fvNV;
- __indirect_glVertexAttribs3svNV;
- __indirect_glVertexAttribs4dvNV;
- __indirect_glVertexAttribs4fvNV;
- __indirect_glVertexAttribs4svNV;
- __indirect_glVertexAttribs4ubvNV;
- __indirect_glPointParameteriNV;
- __indirect_glPointParameterivNV;
- __indirect_glActiveStencilFaceEXT;
- __indirect_glGetProgramNamedParameterdvNV;
- __indirect_glGetProgramNamedParameterfvNV;
- __indirect_glProgramNamedParameter4dNV;
- __indirect_glProgramNamedParameter4dvNV;
- __indirect_glProgramNamedParameter4fNV;
- __indirect_glProgramNamedParameter4fvNV;
- __indirect_glBlendEquationSeparateEXT;
- __indirect_glBindFramebufferEXT;
- __indirect_glBindRenderbufferEXT;
- __indirect_glCheckFramebufferStatusEXT;
- __indirect_glDeleteFramebuffersEXT;
- __indirect_glDeleteRenderbuffersEXT;
- __indirect_glFramebufferRenderbufferEXT;
- __indirect_glFramebufferTexture1DEXT;
- __indirect_glFramebufferTexture2DEXT;
- __indirect_glFramebufferTexture3DEXT;
- __indirect_glGenFramebuffersEXT;
- __indirect_glGenRenderbuffersEXT;
- __indirect_glGenerateMipmapEXT;
- __indirect_glGetFramebufferAttachmentParameterivEXT;
- __indirect_glGetRenderbufferParameterivEXT;
- __indirect_glIsFramebufferEXT;
- __indirect_glIsRenderbufferEXT;
- __indirect_glRenderbufferStorageEXT;
- __indirect_glRenderbufferStorageMultisample;
- __indirect_glBlitFramebufferEXT;
- __indirect_glFramebufferTextureLayerEXT;
-
-
-# indirect_size.h / indirect_size.c
- __glCallLists_size;
- __glFogfv_size;
- __glFogiv_size;
- __glLightfv_size;
- __glLightiv_size;
- __glLightModelfv_size;
- __glLightModeliv_size;
- __glMaterialfv_size;
- __glMaterialiv_size;
- __glTexParameterfv_size;
- __glTexParameteriv_size;
- __glTexEnvfv_size;
- __glTexEnviv_size;
- __glTexGendv_size;
- __glTexGenfv_size;
- __glTexGeniv_size;
- __glMap1d_size;
- __glMap1f_size;
- __glMap2d_size;
- __glMap2f_size;
- __glColorTableParameterfv_size;
- __glColorTableParameteriv_size;
- __glConvolutionParameterfv_size;
- __glConvolutionParameteriv_size;
- __glPointParameterfvEXT_size;
- __glPointParameterivNV_size;
- __indirect_glClampColorARB;
-
-};
--- a/open-src/lib/mesa/sun-src/src/mesa/drivers/dri/mapfile.externs Tue Oct 04 15:26:36 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-# Functions which are allowed to be unresolved when building dri modules
-
-{
- global:
- _glapi_Context = DATA extern;
- _glapi_Dispatch = DATA extern;
- _glapi_add_dispatch = FUNCTION extern;
- _glapi_get_dispatch = FUNCTION extern;
- _glapi_get_dispatch_table_size = FUNCTION extern;
- _glapi_set_dispatch = FUNCTION extern;
- _glapi_get_context = FUNCTION extern;
- _glapi_set_context = FUNCTION extern;
- _glapi_set_warning_func = FUNCTION extern;
- _glapi_noop_enable_warnings = FUNCTION extern;
- _glapi_check_multithread = FUNCTION extern;
- _glthread_GetID = FUNCTION extern;
- sl_pp_context_add_extension = FUNCTION extern;
- sl_pp_context_create = FUNCTION extern;
- sl_pp_context_error_message = FUNCTION extern;
- sl_pp_context_destroy = FUNCTION extern;
- sl_pp_version = FUNCTION extern;
- sl_cl_compile = FUNCTION extern;
-
- radeon_gem_get_kernel_name = FUNCTION extern;
-
- _mesa_bitcount = FUNCTION extern;
-};
--- a/open-src/xserver/xvnc/Makefile Tue Oct 04 15:26:36 2016 -0700
+++ b/open-src/xserver/xvnc/Makefile Thu Oct 06 16:22:15 2016 -0700
@@ -126,7 +126,8 @@
-o '{Interface Stability, Path: Committed, Options: Volatile}'
# Compiler to use
-MODULE_COMPILER=suncc
+
+MODULE_COMPILER=gcc
MODULE_COMPILER_SET=yes
# Make command to use
--- a/pkg/manifests/developer-opensolaris-X.p5m Tue Oct 04 15:26:36 2016 -0700
+++ b/pkg/manifests/developer-opensolaris-X.p5m Thu Oct 06 16:22:15 2016 -0700
@@ -103,6 +103,9 @@
# Various modules need flex to generate lexers
depend type=require fmri=pkg:/developer/lexer/flex
+# we are adding llvm (pipe) to mesa for 3d support on gnome3
+depend type=require fmri=pkg:/developer/llvm/llvm org.opensolaris.pkgdepend.resolve=true
+
# xcb, xcb-util, xcb-util-wm need GNU M4 to build
# (also required by any module running autoconf/autoreconf)
depend type=require fmri=pkg:/developer/macro/gnu-m4
--- a/pkg/manifests/x11-library-mesa.p5m Tue Oct 04 15:26:36 2016 -0700
+++ b/pkg/manifests/x11-library-mesa.p5m Thu Oct 06 16:22:15 2016 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
@@ -43,6 +43,7 @@
dir path=usr/include/GL/internal
link path=usr/include/GL/internal/dri_interface.h \
target=../../mesa/internal/dri_interface.h
+file path=usr/include/GL/mesa_glinterop.h
link path=usr/include/GL/osmesa.h target=../mesa/osmesa.h
dir path=usr/include/mesa
file path=usr/include/mesa/gl.h
@@ -57,7 +58,6 @@
file path=usr/include/mesa/internal/dri_interface.h
file path=usr/include/mesa/osmesa.h
file path=usr/include/mesa/wglext.h
-file path=usr/include/mesa/wmesa.h
link path=usr/lib/$(ARCH64)/libGL.so target=libGL.so.1
link path=usr/lib/$(ARCH64)/libGL.so.1 target=../GL/$(ARCH64)/libGL.so.1
link path=usr/lib/$(ARCH64)/libGLU.so target=libGLU.so.1