25925227 Mesa should deliver EGL and GLES libraries
authorNiveditha Rau <Niveditha.Rau@Oracle.COM>
Tue Apr 25 14:08:12 2017 -0700 (2017-04-25)
changeset 1708e360d1d26b1d
parent 1707 e213b7c834fa
child 1709 11297414509c
25925227 Mesa should deliver EGL and GLES libraries
PSARC/2017/085 Mesa should build and deliver EGL and GLES libraries in Solaris
open-src/data/ogl-select/mesa_vendor_select
open-src/data/ogl-select/nvidia_vendor_select
open-src/lib/libepoxy/Makefile
open-src/lib/libepoxy/disable-egl.patch
open-src/lib/mesa/Makefile
pkg/manifests/developer-opensolaris-X.p5m
pkg/manifests/service-opengl-ogl-select.p5m
pkg/manifests/x11-library-libepoxy.p5m
pkg/manifests/x11-library-mesa.p5m
     1.1 --- a/open-src/data/ogl-select/mesa_vendor_select	Thu Apr 13 11:05:27 2017 -0700
     1.2 +++ b/open-src/data/ogl-select/mesa_vendor_select	Tue Apr 25 14:08:12 2017 -0700
     1.3 @@ -1,6 +1,6 @@
     1.4  #!/bin/ksh93
     1.5  #
     1.6 -# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
     1.7 +# Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
     1.8  #
     1.9  # Permission is hereby granted, free of charge, to any person obtaining a
    1.10  # copy of this software and associated documentation files (the "Software"),
    1.11 @@ -88,6 +88,15 @@
    1.12  make_link ../../../../usr/lib/mesa/libGL.so.1 ${LINKDIR}/lib/libGL.so.1
    1.13  make_link ../../../../../usr/lib/mesa/${DIR64}/libGL.so.1 \
    1.14  	${LINKDIR}/lib/${DIR64}/libGL.so.1
    1.15 +make_link ../../../../usr/lib/mesa/libEGL.so.1 ${LINKDIR}/lib/libEGL.so.1
    1.16 +make_link ../../../../../usr/lib/mesa/${DIR64}/libEGL.so.1 \
    1.17 +	${LINKDIR}/lib/${DIR64}/libEGL.so.1
    1.18 +make_link ../../../../usr/lib/mesa/libGLESv1_CM.so.1 ${LINKDIR}/lib/libGLESv1_CM.so.1
    1.19 +make_link ../../../../../usr/lib/mesa/${DIR64}/libGLESv1_CM.so.1 \
    1.20 +	${LINKDIR}/lib/${DIR64}/libGLESv1_CM.so.1
    1.21 +make_link ../../../../usr/lib/mesa/libGLESv2.so.2 ${LINKDIR}/lib/libGLESv2.so.2
    1.22 +make_link ../../../../../usr/lib/mesa/${DIR64}/libGLESv2.so.2 \
    1.23 +	${LINKDIR}/lib/${DIR64}/libGLESv2.so.2
    1.24  
    1.25  # Server modules
    1.26  make_link ../../../../usr/lib/mesa/modules/extensions/libglx.so \
     2.1 --- a/open-src/data/ogl-select/nvidia_vendor_select	Thu Apr 13 11:05:27 2017 -0700
     2.2 +++ b/open-src/data/ogl-select/nvidia_vendor_select	Tue Apr 25 14:08:12 2017 -0700
     2.3 @@ -1,6 +1,6 @@
     2.4  #!/bin/ksh
     2.5  #
     2.6 -# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
     2.7 +# Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
     2.8  #
     2.9  # Permission is hereby granted, free of charge, to any person obtaining a
    2.10  # copy of this software and associated documentation files (the "Software"),
    2.11 @@ -80,6 +80,12 @@
    2.12  # User libraries
    2.13  make_file_link /usr/X11/lib/NVIDIA/libGL.so.1 $LINKDIR/lib/libGL.so.1
    2.14  make_file_link /usr/X11/lib/NVIDIA/amd64/libGL.so.1 $LINKDIR/lib/amd64/libGL.so.1
    2.15 +make_file_link /usr/X11/lib/NVIDIA/libEGL.so.1 $LINKDIR/lib/libEGL.so.1
    2.16 +make_file_link /usr/X11/lib/NVIDIA/amd64/libEGL.so.1 $LINKDIR/lib/amd64/libEGL.so.1
    2.17 +make_file_link /usr/X11/lib/NVIDIA/libGLESv1_CM.so.1 $LINKDIR/lib/libGLESv1_CM.so.1
    2.18 +make_file_link /usr/X11/lib/NVIDIA/amd64/libGLESv1_CM.so.1 $LINKDIR/lib/amd64/libGLESv1_CM.so.1
    2.19 +make_file_link /usr/X11/lib/NVIDIA/libGLESv2.so.2 $LINKDIR/lib/libGLESv2.so.2
    2.20 +make_file_link /usr/X11/lib/NVIDIA/amd64/libGLESv2.so.2 $LINKDIR/lib/amd64/libGLESv2.so.2
    2.21  make_file_link amd64 $LINKDIR/lib/64
    2.22  
    2.23  # Server libraries
     3.1 --- a/open-src/lib/libepoxy/Makefile	Thu Apr 13 11:05:27 2017 -0700
     3.2 +++ b/open-src/lib/libepoxy/Makefile	Tue Apr 25 14:08:12 2017 -0700
     3.3 @@ -2,7 +2,7 @@
     3.4  #
     3.5  # libepoxy - library for handling OpenGL function pointers
     3.6  #
     3.7 -# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
     3.8 +# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
     3.9  #
    3.10  # Permission is hereby granted, free of charge, to any person obtaining a
    3.11  # copy of this software and associated documentation files (the "Software"),
    3.12 @@ -57,7 +57,7 @@
    3.13  SOURCE_TARBALL_NAME_SET=yes
    3.14  
    3.15  # Patches to apply to source after unpacking, in order
    3.16 -SOURCE_PATCHES = disable-egl.patch
    3.17 +SOURCE_PATCHES = 
    3.18  
    3.19  # Need to build with gcc
    3.20  MODULE_COMPILER=gcc
     4.1 --- a/open-src/lib/libepoxy/disable-egl.patch	Thu Apr 13 11:05:27 2017 -0700
     4.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.3 @@ -1,29 +0,0 @@
     4.4 ---- configure.ac	Fri Jul 10 11:23:57 2015
     4.5 -+++ configure.ac	Fri Jul 10 11:31:10 2015
     4.6 -@@ -84,6 +84,12 @@
     4.7 -         has_znow=no
     4.8 -         EPOXY_LINK_LIBS=""
     4.9 -         ;;
    4.10 -+    solaris*)
    4.11 -+        build_egl=no
    4.12 -+        build_glx=yes
    4.13 -+        build_wgl=no
    4.14 -+        EPOXY_LINK_LIBS=""
    4.15 -+        ;;
    4.16 -     *)
    4.17 -         build_egl=yes
    4.18 -         build_glx=yes
    4.19 ---- src/dispatch_common.h	Fri Jul 10 11:57:22 2015
    4.20 -+++ src/dispatch_common.h	Fri Jul 10 11:58:48 2015
    4.21 -@@ -33,6 +33,11 @@
    4.22 - #define PLATFORM_HAS_GLX 1
    4.23 - #define PLATFORM_HAS_WGL 0
    4.24 - #define EPOXY_IMPORTEXPORT
    4.25 -+#elif defined(__sun) && defined(__SVR4)
    4.26 -+#define PLATFORM_HAS_EGL 0
    4.27 -+#define PLATFORM_HAS_GLX 1
    4.28 -+#define PLATFORM_HAS_WGL 0
    4.29 -+#define EPOXY_IMPORTEXPORT
    4.30 - #else
    4.31 - #define PLATFORM_HAS_EGL 1
    4.32 - #define PLATFORM_HAS_GLX 1
     5.1 --- a/open-src/lib/mesa/Makefile	Thu Apr 13 11:05:27 2017 -0700
     5.2 +++ b/open-src/lib/mesa/Makefile	Tue Apr 25 14:08:12 2017 -0700
     5.3 @@ -46,6 +46,8 @@
     5.4  MODULE_ARC_CASES += PSARC/2015/251
     5.5  # PSARC/2016/560 Mesa 12
     5.6  MODULE_ARC_CASES += PSARC/2016/560
     5.7 +# PSARC/2017/085 Mesa EGL/GLES
     5.8 +MODULE_ARC_CASES += PSARC/2017/085
     5.9  
    5.10  # Version number (used in path names)
    5.11  MODULE_VERSION=12.0.3
    5.12 @@ -90,9 +92,8 @@
    5.13  MODULE_CONFIG_OPTS_32 = --disable-gallium-llvm
    5.14  MODULE_CONFIG_OPTS_64 =  --enable-gallium-llvm --disable-llvm-shared-libs
    5.15  
    5.16 -MODULE_CONFIG_OPTS = --disable-egl --enable-shared --with-dri-drivers='$(DRI_DRIVER_LIST)'
    5.17 +MODULE_CONFIG_OPTS = --enable-shared --with-dri-drivers='$(DRI_DRIVER_LIST)'
    5.18  MODULE_CONFIG_OPTS += --with-gallium-drivers=swrast 
    5.19 -MODULE_CONFIG_OPTS += --disable-gles1 --disable-gles2 
    5.20  MODULE_CONFIG_OPTS +=  --with-dri-driverdir='$(X11_SERVERMODS_DIR)/dri$(ARCHLIBSUBDIR)' 
    5.21  MODULE_CONFIG_OPTS += $(MODULE_CONFIG_OPTS_$(BUILD_TYPE))
    5.22  
    5.23 @@ -129,6 +130,10 @@
    5.24  
    5.25  # Move installed files to mesa subdirs and make links back
    5.26  LIBRARIES_TO_LINK = libGL.so.1.2.0 libglapi.so.0.0.0
    5.27 +
    5.28 +# Creating these separately here so that we avoid creating /usr/X11/*
    5.29 +# links for these since they are newly delivered.
    5.30 +LIBRARIES_TO_LINK_NEW += libEGL.so.1.0.0 libGLESv1_CM.so.1.1.0 libGLESv2.so.2.0.0
    5.31  MESA_LIBDIR = $(PROTODIR)/usr/lib/mesa$(ARCHLIBSUBDIR)
    5.32  
    5.33  HEADERS_TO_MOVE = gl.h gl_mangle.h glext.h \
    5.34 @@ -164,10 +169,16 @@
    5.35  	ln -sf $(SUBDIR64) $(PROTODIR)/usr/lib/mesa/64
    5.36  	-rm -f $(LIBRARIES_TO_LINK:%=$(PROTODIR)/usr/lib/mesa/%) \
    5.37  		$(LIBRARIES_TO_LINK:%=$(PROTODIR)/usr/lib/mesa/$(SUBDIR64)/%)
    5.38 +	-rm -f $(LIBRARIES_TO_LINK_NEW:%=$(PROTODIR)/usr/lib/mesa/%) \
    5.39 +		$(LIBRARIES_TO_LINK_NEW:%=$(PROTODIR)/usr/lib/mesa/$(SUBDIR64)/%)
    5.40  	mv $(LIBRARIES_TO_LINK:%=$(PROTODIR)/usr/lib/%) \
    5.41  		$(PROTODIR)/usr/lib/mesa/
    5.42  	mv $(LIBRARIES_TO_LINK:%=$(PROTODIR)/usr/lib/$(SUBDIR64)/%) \
    5.43  		$(PROTODIR)/usr/lib/mesa/$(SUBDIR64)/
    5.44 +	mv $(LIBRARIES_TO_LINK_NEW:%=$(PROTODIR)/usr/lib/%) \
    5.45 +		$(PROTODIR)/usr/lib/mesa/
    5.46 +	mv $(LIBRARIES_TO_LINK_NEW:%=$(PROTODIR)/usr/lib/$(SUBDIR64)/%) \
    5.47 +		$(PROTODIR)/usr/lib/mesa/$(SUBDIR64)/
    5.48  	-rm -f $(PROTODIR)/usr/lib/mesa/libGL.so.1 
    5.49  	-rm -f $(PROTODIR)/usr/lib/mesa/libGL.so 
    5.50  	-rm -f $(PROTODIR)/usr/lib/GL/libGL.so.1
    5.51 @@ -180,10 +191,22 @@
    5.52  	ln -sf libGL.so.1 $(PROTODIR)/usr/lib/mesa/libGL.so
    5.53  	ln -sf libglapi.so.0 $(PROTODIR)/usr/lib/mesa/libglapi.so
    5.54  	ln -sf libglapi.so.0.0.0 $(PROTODIR)/usr/lib/mesa/libglapi.so.0
    5.55 +	ln -sf libEGL.so.1 $(PROTODIR)/usr/lib/mesa/libEGL.so
    5.56 +	ln -sf libEGL.so.1.0.0 $(PROTODIR)/usr/lib/mesa/libEGL.so.1
    5.57 +	ln -sf libGLESv1_CM.so.1 $(PROTODIR)/usr/lib/mesa/libGLESv1_CM.so
    5.58 +	ln -sf libGLESv1_CM.so.1.1.0 $(PROTODIR)/usr/lib/mesa/libGLESv1_CM.so.1
    5.59 +	ln -sf libGLESv2.so.2 $(PROTODIR)/usr/lib/mesa/libGLESv2.so
    5.60 +	ln -sf libGLESv2.so.2.0.0 $(PROTODIR)/usr/lib/mesa/libGLESv2.so.2
    5.61  	ln -sf libGL.so.1.2.0 $(PROTODIR)/usr/lib/mesa/$(SUBDIR64)/libGL.so.1
    5.62  	ln -sf libGL.so.1 $(PROTODIR)/usr/lib/mesa/$(SUBDIR64)/libGL.so
    5.63  	ln -sf libglapi.so.0.0.0 $(PROTODIR)/usr/lib/mesa/$(SUBDIR64)/libglapi.so.0
    5.64  	ln -sf libglapi.so.0 $(PROTODIR)/usr/lib/mesa/$(SUBDIR64)/libglapi.so
    5.65 +	ln -sf libEGL.so.1.0.0 $(PROTODIR)/usr/lib/mesa/$(SUBDIR64)/libEGL.so.1
    5.66 +	ln -sf libEGL.so.1 $(PROTODIR)/usr/lib/mesa/$(SUBDIR64)/libEGL.so
    5.67 +	ln -sf libGLESv1_CM.so.1.1.0 $(PROTODIR)/usr/lib/mesa/$(SUBDIR64)/libGLESv1_CM.so.1
    5.68 +	ln -sf libGLESv1_CM.so.1 $(PROTODIR)/usr/lib/mesa/$(SUBDIR64)/libGLESv1_CM.so
    5.69 +	ln -sf libGLESv2.so.2.0.0 $(PROTODIR)/usr/lib/mesa/$(SUBDIR64)/libGLESv2.so.2
    5.70 +	ln -sf libGLESv2.so.2 $(PROTODIR)/usr/lib/mesa/$(SUBDIR64)/libGLESv2.so
    5.71  	rm -f $(PROTODIR)/usr/lib/*libGL.*
    5.72  	rm -f $(PROTODIR)/usr/lib/$(SUBDIR64)/*libGL.*
    5.73  	rm -f $(PROTODIR)/usr/lib/xorg/modules/dri/*.la
    5.74 @@ -193,23 +216,51 @@
    5.75  	ln -sf libGL.so.1 $(PROTODIR)/usr/lib/GL/libGL.so
    5.76  	ln -sf libglapi.so.0.0.0 $(PROTODIR)/usr/lib/GL/libglapi.so.0
    5.77  	ln -sf libglapi.so.0 $(PROTODIR)/usr/lib/GL/libglapi.so
    5.78 +	(cd $(PROTODIR)/usr/lib/GL; ln -sf $(LIBRARIES_TO_LINK_NEW:%=../mesa/%) .)
    5.79 +	ln -sf libEGL.so.1.0.0 $(PROTODIR)/usr/lib/GL/libEGL.so.1
    5.80 +	ln -sf libEGL.so.1 $(PROTODIR)/usr/lib/GL/libEGL.so
    5.81 +	ln -sf libGLESv1_CM.so.1.1.0 $(PROTODIR)/usr/lib/GL/libGLESv1_CM.so.1
    5.82 +	ln -sf libGLESv1_CM.so.1 $(PROTODIR)/usr/lib/GL/libGLESv1_CM.so
    5.83 +	ln -sf libGLESv2.so.2.0.0 $(PROTODIR)/usr/lib/GL/libGLESv2.so.2
    5.84 +	ln -sf libGLESv2.so.2 $(PROTODIR)/usr/lib/GL/libGLESv2.so
    5.85  	(cd $(PROTODIR)/usr/lib/GL/$(SUBDIR64); ln -sf $(LIBRARIES_TO_LINK:%=../../mesa/$(SUBDIR64)/%) .)
    5.86  	rm -f $(PROTODIR)/usr/lib/GL/$(SUBDIR64)/libGL.so.1.2.0
    5.87  	ln -sf libGL.so.1 $(PROTODIR)/usr/lib/GL/$(SUBDIR64)/libGL.so
    5.88  	ln -sf libglapi.so.0.0.0 $(PROTODIR)/usr/lib/GL/$(SUBDIR64)/libglapi.so.0
    5.89  	ln -sf libglapi.so.0 $(PROTODIR)/usr/lib/GL/$(SUBDIR64)/libglapi.so
    5.90 +	(cd $(PROTODIR)/usr/lib/GL/$(SUBDIR64); ln -sf $(LIBRARIES_TO_LINK_NEW:%=../../mesa/$(SUBDIR64)/%) .)
    5.91 +	ln -sf libEGL.so.1.0.0 $(PROTODIR)/usr/lib/GL/$(SUBDIR64)/libEGL.so.1
    5.92 +	ln -sf libEGL.so.1 $(PROTODIR)/usr/lib/GL/$(SUBDIR64)/libEGL.so
    5.93 +	ln -sf libGLESv2.so.2.0.0 $(PROTODIR)/usr/lib/GL/$(SUBDIR64)/libGLESv2.so.2
    5.94 +	ln -sf libGLESv2.so.2 $(PROTODIR)/usr/lib/GL/$(SUBDIR64)/libGLESv2.so
    5.95 +	ln -sf libGLESv1_CM.so.1.1.0 $(PROTODIR)/usr/lib/GL/$(SUBDIR64)/libGLESv1_CM.so.1
    5.96 +	ln -sf libGLESv1_CM.so.1 $(PROTODIR)/usr/lib/GL/$(SUBDIR64)/libGLESv1_CM.so
    5.97  	(cd $(PROTODIR)/usr/lib; ln -sf $(LIBRARIES_TO_LINK:%=GL/%) .)
    5.98  	rm -f $(PROTODIR)/usr/lib/libGL.so.1.2.0
    5.99  	ln -sf GL/libGL.so.1 $(PROTODIR)/usr/lib/libGL.so.1
   5.100  	ln -sf libGL.so.1 $(PROTODIR)/usr/lib/libGL.so
   5.101  	ln -sf libglapi.so.0.0.0 $(PROTODIR)/usr/lib/libglapi.so.0
   5.102  	ln -sf libglapi.so.0 $(PROTODIR)/usr/lib/libglapi.so
   5.103 +	(cd $(PROTODIR)/usr/lib; ln -sf $(LIBRARIES_TO_LINK_NEW:%=GL/%) .)
   5.104 +	ln -sf libEGL.so.1.0.0 $(PROTODIR)/usr/lib/libEGL.so.1
   5.105 +	ln -sf libEGL.so.1 $(PROTODIR)/usr/lib/libEGL.so
   5.106 +	ln -sf libGLESv2.so.2.0.0 $(PROTODIR)/usr/lib/libGLESv2.so.2
   5.107 +	ln -sf libGLESv2.so.2 $(PROTODIR)/usr/lib/libGLESv2.so
   5.108 +	ln -sf libGLESv1_CM.so.1.1.0 $(PROTODIR)/usr/lib/libGLESv1_CM.so.1
   5.109 +	ln -sf libGLESv1_CM.so.1 $(PROTODIR)/usr/lib/libGLESv1_CM.so
   5.110  	(cd $(PROTODIR)/usr/lib/$(SUBDIR64); ln -sf $(LIBRARIES_TO_LINK:%=../GL/$(SUBDIR64)/%) .)
   5.111  	rm -f $(PROTODIR)/usr/lib/$(SUBDIR64)/libGL.so.1.2.0
   5.112  	ln -sf ../GL/$(SUBDIR64)/libGL.so.1 $(PROTODIR)/usr/lib/$(SUBDIR64)/libGL.so.1
   5.113  	ln -sf libGL.so.1 $(PROTODIR)/usr/lib/$(SUBDIR64)/libGL.so
   5.114  	ln -sf libglapi.so.0.0.0 $(PROTODIR)/usr/lib/$(SUBDIR64)/libglapi.so.0
   5.115  	ln -sf libglapi.so.0 $(PROTODIR)/usr/lib/$(SUBDIR64)/libglapi.so
   5.116 +	(cd $(PROTODIR)/usr/lib/$(SUBDIR64); ln -sf $(LIBRARIES_TO_LINK_NEW:%=../GL/$(SUBDIR64)/%) .)
   5.117 +	ln -sf libEGL.so.1.0.0 $(PROTODIR)/usr/lib/$(SUBDIR64)/libEGL.so.1
   5.118 +	ln -sf libEGL.so.1 $(PROTODIR)/usr/lib/$(SUBDIR64)/libEGL.so
   5.119 +	ln -sf libGLESv2.so.2.0.0 $(PROTODIR)/usr/lib/$(SUBDIR64)/libGLESv2.so.2
   5.120 +	ln -sf libGLESv2.so.2 $(PROTODIR)/usr/lib/$(SUBDIR64)/libGLESv2.so
   5.121 +	ln -sf libGLESv1_CM.so.1.1.0 $(PROTODIR)/usr/lib/$(SUBDIR64)/libGLESv1_CM.so.1
   5.122 +	ln -sf libGLESv1_CM.so.1 $(PROTODIR)/usr/lib/$(SUBDIR64)/libGLESv1_CM.so
   5.123  	ln -sf ../../../system/volatile/opengl/lib/libGL.so.1 \
   5.124  		$(PROTODIR)/usr/lib/GL/libGL.so.1
   5.125  	ln -sf ../../../../system/volatile/opengl/lib/$(SUBDIR64)/libGL.so.1 \
     6.1 --- a/pkg/manifests/developer-opensolaris-X.p5m	Thu Apr 13 11:05:27 2017 -0700
     6.2 +++ b/pkg/manifests/developer-opensolaris-X.p5m	Tue Apr 25 14:08:12 2017 -0700
     6.3 @@ -1,4 +1,4 @@
     6.4 -# Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
     6.5 +# Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
     6.6  #
     6.7  # Permission is hereby granted, free of charge, to any person obtaining a
     6.8  # copy of this software and associated documentation files (the "Software"),
     6.9 @@ -107,6 +107,9 @@
    6.10  depend type=require fmri=pkg:/developer/llvm/llvm \
    6.11      org.opensolaris.pkgdepend.resolve=true
    6.12  
    6.13 +# Need llvm-build to build mesa
    6.14 +depend type=require fmri=pkg:/developer/llvm/llvm-build
    6.15 +
    6.16  # xcb, xcb-util, xcb-util-wm need GNU M4 to build
    6.17  # (also required by any module running autoconf/autoreconf)
    6.18  depend type=require fmri=pkg:/developer/macro/gnu-m4
     7.1 --- a/pkg/manifests/service-opengl-ogl-select.p5m	Thu Apr 13 11:05:27 2017 -0700
     7.2 +++ b/pkg/manifests/service-opengl-ogl-select.p5m	Tue Apr 25 14:08:12 2017 -0700
     7.3 @@ -1,4 +1,4 @@
     7.4 -# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
     7.5 +# Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
     7.6  #
     7.7  # Permission is hereby granted, free of charge, to any person obtaining a
     7.8  # copy of this software and associated documentation files (the "Software"),
     7.9 @@ -56,11 +56,23 @@
    7.10      target=../../../../usr/include/mesa/glxext.h
    7.11  dir  path=system/volatile/opengl/lib
    7.12  dir  path=system/volatile/opengl/lib/$(ARCH64)
    7.13 +link path=system/volatile/opengl/lib/$(ARCH64)/libEGL.so.1 \
    7.14 +    target=../../../../../usr/lib/mesa/$(ARCH64)/libEGL.so.1
    7.15  link path=system/volatile/opengl/lib/$(ARCH64)/libGL.so.1 \
    7.16      target=../../../../../usr/lib/mesa/$(ARCH64)/libGL.so.1
    7.17 +link path=system/volatile/opengl/lib/$(ARCH64)/libGLESv1_CM.so.1 \
    7.18 +    target=../../../../../usr/lib/mesa/$(ARCH64)/libGLESv1_CM.so.1
    7.19 +link path=system/volatile/opengl/lib/$(ARCH64)/libGLESv2.so.2 \
    7.20 +    target=../../../../../usr/lib/mesa/$(ARCH64)/libGLESv2.so.2
    7.21  link path=system/volatile/opengl/lib/64 target=$(ARCH64)
    7.22 +link path=system/volatile/opengl/lib/libEGL.so.1 \
    7.23 +    target=../../../../usr/lib/mesa/libEGL.so.1
    7.24  link path=system/volatile/opengl/lib/libGL.so.1 \
    7.25      target=../../../../usr/lib/mesa/libGL.so.1
    7.26 +link path=system/volatile/opengl/lib/libGLESv1_CM.so.1 \
    7.27 +    target=../../../../usr/lib/mesa/libGLESv1_CM.so.1
    7.28 +link path=system/volatile/opengl/lib/libGLESv2.so.2 \
    7.29 +    target=../../../../usr/lib/mesa/libGLESv2.so.2
    7.30  dir  path=system/volatile/opengl/server
    7.31  link path=system/volatile/opengl/server/libglx.so \
    7.32      target=../../../../usr/lib/mesa/modules/extensions/libglx.so
     8.1 --- a/pkg/manifests/x11-library-libepoxy.p5m	Thu Apr 13 11:05:27 2017 -0700
     8.2 +++ b/pkg/manifests/x11-library-libepoxy.p5m	Tue Apr 25 14:08:12 2017 -0700
     8.3 @@ -1,4 +1,4 @@
     8.4 -# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
     8.5 +# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
     8.6  #
     8.7  # Permission is hereby granted, free of charge, to any person obtaining a
     8.8  # copy of this software and associated documentation files (the "Software"),
     8.9 @@ -26,6 +26,8 @@
    8.10      value="Epoxy is a library for handling OpenGL function pointer management"
    8.11  #
    8.12  dir  path=usr/include/epoxy
    8.13 +file path=usr/include/epoxy/egl.h
    8.14 +file path=usr/include/epoxy/egl_generated.h
    8.15  file path=usr/include/epoxy/gl.h
    8.16  file path=usr/include/epoxy/gl_generated.h
    8.17  file path=usr/include/epoxy/glx.h
     9.1 --- a/pkg/manifests/x11-library-mesa.p5m	Thu Apr 13 11:05:27 2017 -0700
     9.2 +++ b/pkg/manifests/x11-library-mesa.p5m	Tue Apr 25 14:08:12 2017 -0700
     9.3 @@ -1,4 +1,4 @@
     9.4 -# Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
     9.5 +# Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
     9.6  #
     9.7  # Permission is hereby granted, free of charge, to any person obtaining a
     9.8  # copy of this software and associated documentation files (the "Software"),
     9.9 @@ -38,6 +38,12 @@
    9.10  link path=usr/X11/lib/libglapi.so.0 target=libglapi.so.0.0.0
    9.11  link path=usr/X11/lib/libglapi.so.0.0.0 target=GL/libglapi.so.0.0.0
    9.12  link path=usr/X11/lib/mesa target=../../lib/mesa
    9.13 +dir  path=usr/include/EGL
    9.14 +file path=usr/include/EGL/egl.h
    9.15 +file path=usr/include/EGL/eglext.h
    9.16 +file path=usr/include/EGL/eglextchromium.h
    9.17 +file path=usr/include/EGL/eglmesaext.h
    9.18 +file path=usr/include/EGL/eglplatform.h
    9.19  dir  path=usr/include/GL
    9.20  link path=usr/include/GL/glu.h target=../mesa/glu.h
    9.21  dir  path=usr/include/GL/internal
    9.22 @@ -45,6 +51,22 @@
    9.23      target=../../mesa/internal/dri_interface.h
    9.24  file path=usr/include/GL/mesa_glinterop.h
    9.25  link path=usr/include/GL/osmesa.h target=../mesa/osmesa.h
    9.26 +dir  path=usr/include/GLES
    9.27 +file path=usr/include/GLES/egl.h
    9.28 +file path=usr/include/GLES/gl.h
    9.29 +file path=usr/include/GLES/glext.h
    9.30 +file path=usr/include/GLES/glplatform.h
    9.31 +dir  path=usr/include/GLES2
    9.32 +file path=usr/include/GLES2/gl2.h
    9.33 +file path=usr/include/GLES2/gl2ext.h
    9.34 +file path=usr/include/GLES2/gl2platform.h
    9.35 +dir  path=usr/include/GLES3
    9.36 +file path=usr/include/GLES3/gl3.h
    9.37 +file path=usr/include/GLES3/gl31.h
    9.38 +file path=usr/include/GLES3/gl3ext.h
    9.39 +file path=usr/include/GLES3/gl3platform.h
    9.40 +dir  path=usr/include/KHR
    9.41 +file path=usr/include/KHR/khrplatform.h
    9.42  dir  path=usr/include/mesa
    9.43  file path=usr/include/mesa/gl.h
    9.44  file path=usr/include/mesa/gl_mangle.h
    9.45 @@ -58,8 +80,20 @@
    9.46  file path=usr/include/mesa/internal/dri_interface.h
    9.47  file path=usr/include/mesa/osmesa.h
    9.48  file path=usr/include/mesa/wglext.h
    9.49 +link path=usr/lib/$(ARCH64)/libEGL.so target=libEGL.so.1
    9.50 +link path=usr/lib/$(ARCH64)/libEGL.so.1 target=libEGL.so.1.0.0
    9.51 +link path=usr/lib/$(ARCH64)/libEGL.so.1.0.0 \
    9.52 +    target=../GL/$(ARCH64)/libEGL.so.1.0.0
    9.53  link path=usr/lib/$(ARCH64)/libGL.so target=libGL.so.1
    9.54  link path=usr/lib/$(ARCH64)/libGL.so.1 target=../GL/$(ARCH64)/libGL.so.1
    9.55 +link path=usr/lib/$(ARCH64)/libGLESv1_CM.so target=libGLESv1_CM.so.1
    9.56 +link path=usr/lib/$(ARCH64)/libGLESv1_CM.so.1 target=libGLESv1_CM.so.1.1.0
    9.57 +link path=usr/lib/$(ARCH64)/libGLESv1_CM.so.1.1.0 \
    9.58 +    target=../GL/$(ARCH64)/libGLESv1_CM.so.1.1.0
    9.59 +link path=usr/lib/$(ARCH64)/libGLESv2.so target=libGLESv2.so.2
    9.60 +link path=usr/lib/$(ARCH64)/libGLESv2.so.2 target=libGLESv2.so.2.0.0
    9.61 +link path=usr/lib/$(ARCH64)/libGLESv2.so.2.0.0 \
    9.62 +    target=../GL/$(ARCH64)/libGLESv2.so.2.0.0
    9.63  link path=usr/lib/$(ARCH64)/libGLU.so target=libGLU.so.1
    9.64  link path=usr/lib/$(ARCH64)/libGLU.so.1 target=../GL/$(ARCH64)/libGLU.so.1
    9.65  link path=usr/lib/$(ARCH64)/libglapi.so target=libglapi.so.0
    9.66 @@ -67,10 +101,25 @@
    9.67  link path=usr/lib/$(ARCH64)/libglapi.so.0.0.0 \
    9.68      target=../GL/$(ARCH64)/libglapi.so.0.0.0
    9.69  file path=usr/lib/$(ARCH64)/pkgconfig/dri.pc
    9.70 +file path=usr/lib/$(ARCH64)/pkgconfig/egl.pc
    9.71  file path=usr/lib/$(ARCH64)/pkgconfig/gl.pc
    9.72 +file path=usr/lib/$(ARCH64)/pkgconfig/glesv1_cm.pc
    9.73 +file path=usr/lib/$(ARCH64)/pkgconfig/glesv2.pc
    9.74  file path=usr/lib/$(ARCH64)/pkgconfig/glu.pc
    9.75  dir  path=usr/lib/GL
    9.76  dir  path=usr/lib/GL/$(ARCH64)
    9.77 +link path=usr/lib/GL/$(ARCH64)/libEGL.so target=libEGL.so.1
    9.78 +link path=usr/lib/GL/$(ARCH64)/libEGL.so.1 target=libEGL.so.1.0.0
    9.79 +link path=usr/lib/GL/$(ARCH64)/libEGL.so.1.0.0 \
    9.80 +    target=../../mesa/$(ARCH64)/libEGL.so.1.0.0
    9.81 +link path=usr/lib/GL/$(ARCH64)/libGLESv1_CM.so target=libGLESv1_CM.so.1
    9.82 +link path=usr/lib/GL/$(ARCH64)/libGLESv1_CM.so.1 target=libGLESv1_CM.so.1.1.0
    9.83 +link path=usr/lib/GL/$(ARCH64)/libGLESv1_CM.so.1.1.0 \
    9.84 +    target=../../mesa/$(ARCH64)/libGLESv1_CM.so.1.1.0
    9.85 +link path=usr/lib/GL/$(ARCH64)/libGLESv2.so target=libGLESv2.so.2
    9.86 +link path=usr/lib/GL/$(ARCH64)/libGLESv2.so.2 target=libGLESv2.so.2.0.0
    9.87 +link path=usr/lib/GL/$(ARCH64)/libGLESv2.so.2.0.0 \
    9.88 +    target=../../mesa/$(ARCH64)/libGLESv2.so.2.0.0
    9.89  link path=usr/lib/GL/$(ARCH64)/libGLU.so target=libGLU.so.1
    9.90  link path=usr/lib/GL/$(ARCH64)/libGLU.so.1 \
    9.91      target=../../mesa/$(ARCH64)/libGLU.so.1
    9.92 @@ -78,13 +127,31 @@
    9.93  link path=usr/lib/GL/$(ARCH64)/libglapi.so.0 target=libglapi.so.0.0.0
    9.94  link path=usr/lib/GL/$(ARCH64)/libglapi.so.0.0.0 \
    9.95      target=../../mesa/$(ARCH64)/libglapi.so.0.0.0
    9.96 +link path=usr/lib/GL/libEGL.so target=libEGL.so.1
    9.97 +link path=usr/lib/GL/libEGL.so.1 target=libEGL.so.1.0.0
    9.98 +link path=usr/lib/GL/libEGL.so.1.0.0 target=../mesa/libEGL.so.1.0.0
    9.99 +link path=usr/lib/GL/libGLESv1_CM.so target=libGLESv1_CM.so.1
   9.100 +link path=usr/lib/GL/libGLESv1_CM.so.1 target=libGLESv1_CM.so.1.1.0
   9.101 +link path=usr/lib/GL/libGLESv1_CM.so.1.1.0 target=../mesa/libGLESv1_CM.so.1.1.0
   9.102 +link path=usr/lib/GL/libGLESv2.so target=libGLESv2.so.2
   9.103 +link path=usr/lib/GL/libGLESv2.so.2 target=libGLESv2.so.2.0.0
   9.104 +link path=usr/lib/GL/libGLESv2.so.2.0.0 target=../mesa/libGLESv2.so.2.0.0
   9.105  link path=usr/lib/GL/libGLU.so target=libGLU.so.1
   9.106  link path=usr/lib/GL/libGLU.so.1 target=../mesa/libGLU.so.1
   9.107  link path=usr/lib/GL/libglapi.so target=libglapi.so.0
   9.108  link path=usr/lib/GL/libglapi.so.0 target=libglapi.so.0.0.0
   9.109  link path=usr/lib/GL/libglapi.so.0.0.0 target=../mesa/libglapi.so.0.0.0
   9.110 +link path=usr/lib/libEGL.so target=libEGL.so.1
   9.111 +link path=usr/lib/libEGL.so.1 target=libEGL.so.1.0.0
   9.112 +link path=usr/lib/libEGL.so.1.0.0 target=GL/libEGL.so.1.0.0
   9.113  link path=usr/lib/libGL.so target=libGL.so.1
   9.114  link path=usr/lib/libGL.so.1 target=GL/libGL.so.1
   9.115 +link path=usr/lib/libGLESv1_CM.so target=libGLESv1_CM.so.1
   9.116 +link path=usr/lib/libGLESv1_CM.so.1 target=libGLESv1_CM.so.1.1.0
   9.117 +link path=usr/lib/libGLESv1_CM.so.1.1.0 target=GL/libGLESv1_CM.so.1.1.0
   9.118 +link path=usr/lib/libGLESv2.so target=libGLESv2.so.2
   9.119 +link path=usr/lib/libGLESv2.so.2 target=libGLESv2.so.2.0.0
   9.120 +link path=usr/lib/libGLESv2.so.2.0.0 target=GL/libGLESv2.so.2.0.0
   9.121  link path=usr/lib/libGLU.so target=libGLU.so.1
   9.122  link path=usr/lib/libGLU.so.1 target=GL/libGLU.so.1
   9.123  link path=usr/lib/libglapi.so target=libglapi.so.0
   9.124 @@ -92,18 +159,36 @@
   9.125  link path=usr/lib/libglapi.so.0.0.0 target=GL/libglapi.so.0.0.0
   9.126  dir  path=usr/lib/mesa
   9.127  dir  path=usr/lib/mesa/$(ARCH64)
   9.128 +link path=usr/lib/mesa/$(ARCH64)/libEGL.so target=libEGL.so.1
   9.129 +link path=usr/lib/mesa/$(ARCH64)/libEGL.so.1 target=libEGL.so.1.0.0
   9.130 +file path=usr/lib/mesa/$(ARCH64)/libEGL.so.1.0.0
   9.131  link path=usr/lib/mesa/$(ARCH64)/libGL.so target=libGL.so.1
   9.132  link path=usr/lib/mesa/$(ARCH64)/libGL.so.1 target=libGL.so.1.2.0
   9.133  file path=usr/lib/mesa/$(ARCH64)/libGL.so.1.2.0
   9.134 +link path=usr/lib/mesa/$(ARCH64)/libGLESv1_CM.so target=libGLESv1_CM.so.1
   9.135 +link path=usr/lib/mesa/$(ARCH64)/libGLESv1_CM.so.1 target=libGLESv1_CM.so.1.1.0
   9.136 +file path=usr/lib/mesa/$(ARCH64)/libGLESv1_CM.so.1.1.0
   9.137 +link path=usr/lib/mesa/$(ARCH64)/libGLESv2.so target=libGLESv2.so.2
   9.138 +link path=usr/lib/mesa/$(ARCH64)/libGLESv2.so.2 target=libGLESv2.so.2.0.0
   9.139 +file path=usr/lib/mesa/$(ARCH64)/libGLESv2.so.2.0.0
   9.140  link path=usr/lib/mesa/$(ARCH64)/libGLU.so target=libGLU.so.1
   9.141  file path=usr/lib/mesa/$(ARCH64)/libGLU.so.1
   9.142  link path=usr/lib/mesa/$(ARCH64)/libglapi.so target=libglapi.so.0
   9.143  link path=usr/lib/mesa/$(ARCH64)/libglapi.so.0 target=libglapi.so.0.0.0
   9.144  file path=usr/lib/mesa/$(ARCH64)/libglapi.so.0.0.0
   9.145  link path=usr/lib/mesa/64 target=$(ARCH64)
   9.146 +link path=usr/lib/mesa/libEGL.so target=libEGL.so.1
   9.147 +link path=usr/lib/mesa/libEGL.so.1 target=libEGL.so.1.0.0
   9.148 +file path=usr/lib/mesa/libEGL.so.1.0.0
   9.149  link path=usr/lib/mesa/libGL.so target=libGL.so.1
   9.150  link path=usr/lib/mesa/libGL.so.1 target=libGL.so.1.2.0
   9.151  file path=usr/lib/mesa/libGL.so.1.2.0
   9.152 +link path=usr/lib/mesa/libGLESv1_CM.so target=libGLESv1_CM.so.1
   9.153 +link path=usr/lib/mesa/libGLESv1_CM.so.1 target=libGLESv1_CM.so.1.1.0
   9.154 +file path=usr/lib/mesa/libGLESv1_CM.so.1.1.0
   9.155 +link path=usr/lib/mesa/libGLESv2.so target=libGLESv2.so.2
   9.156 +link path=usr/lib/mesa/libGLESv2.so.2 target=libGLESv2.so.2.0.0
   9.157 +file path=usr/lib/mesa/libGLESv2.so.2.0.0
   9.158  link path=usr/lib/mesa/libGLU.so target=libGLU.so.1
   9.159  file path=usr/lib/mesa/libGLU.so.1
   9.160  link path=usr/lib/mesa/libglapi.so target=libglapi.so.0
   9.161 @@ -113,7 +198,10 @@
   9.162  dir  path=usr/lib/mesa/modules/extensions
   9.163  file path=usr/lib/mesa/modules/extensions/libglx.so
   9.164  file path=usr/lib/pkgconfig/dri.pc
   9.165 +file path=usr/lib/pkgconfig/egl.pc
   9.166  file path=usr/lib/pkgconfig/gl.pc
   9.167 +file path=usr/lib/pkgconfig/glesv1_cm.pc
   9.168 +file path=usr/lib/pkgconfig/glesv2.pc
   9.169  file path=usr/lib/pkgconfig/glu.pc
   9.170  dir  path=usr/lib/xorg/modules/dri/$(ARCH64)
   9.171  file path=usr/lib/xorg/modules/dri/$(ARCH64)/swrast_dri.so