Mercurial Mercurial > upstream > oracle > x-cons > x-s12-clone / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
25925227 Mesa should deliver EGL and GLES libraries
authorNiveditha Rau <Niveditha.Rau@Oracle.COM>
Tue, 25 Apr 2017 14:08:12 -0700
changeset 1708 e360d1d26b1d
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 file | annotate | diff | comparison | revisions
open-src/data/ogl-select/nvidia_vendor_select file | annotate | diff | comparison | revisions
open-src/lib/libepoxy/Makefile file | annotate | diff | comparison | revisions
open-src/lib/libepoxy/disable-egl.patch file | annotate | diff | comparison | revisions
open-src/lib/mesa/Makefile file | annotate | diff | comparison | revisions
pkg/manifests/developer-opensolaris-X.p5m file | annotate | diff | comparison | revisions
pkg/manifests/service-opengl-ogl-select.p5m file | annotate | diff | comparison | revisions
pkg/manifests/x11-library-libepoxy.p5m file | annotate | diff | comparison | revisions
pkg/manifests/x11-library-mesa.p5m file | annotate | diff | comparison | revisions 
--- a/open-src/data/ogl-select/mesa_vendor_select	Thu Apr 13 11:05:27 2017 -0700
+++ b/open-src/data/ogl-select/mesa_vendor_select	Tue Apr 25 14:08:12 2017 -0700
@@ -1,6 +1,6 @@
 #!/bin/ksh93
 #
-# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2017, 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"),
@@ -88,6 +88,15 @@
 make_link ../../../../usr/lib/mesa/libGL.so.1 ${LINKDIR}/lib/libGL.so.1
 make_link ../../../../../usr/lib/mesa/${DIR64}/libGL.so.1 \
 	${LINKDIR}/lib/${DIR64}/libGL.so.1
+make_link ../../../../usr/lib/mesa/libEGL.so.1 ${LINKDIR}/lib/libEGL.so.1
+make_link ../../../../../usr/lib/mesa/${DIR64}/libEGL.so.1 \
+	${LINKDIR}/lib/${DIR64}/libEGL.so.1
+make_link ../../../../usr/lib/mesa/libGLESv1_CM.so.1 ${LINKDIR}/lib/libGLESv1_CM.so.1
+make_link ../../../../../usr/lib/mesa/${DIR64}/libGLESv1_CM.so.1 \
+	${LINKDIR}/lib/${DIR64}/libGLESv1_CM.so.1
+make_link ../../../../usr/lib/mesa/libGLESv2.so.2 ${LINKDIR}/lib/libGLESv2.so.2
+make_link ../../../../../usr/lib/mesa/${DIR64}/libGLESv2.so.2 \
+	${LINKDIR}/lib/${DIR64}/libGLESv2.so.2
 
 # Server modules
 make_link ../../../../usr/lib/mesa/modules/extensions/libglx.so \
--- a/open-src/data/ogl-select/nvidia_vendor_select	Thu Apr 13 11:05:27 2017 -0700
+++ b/open-src/data/ogl-select/nvidia_vendor_select	Tue Apr 25 14:08:12 2017 -0700
@@ -1,6 +1,6 @@
 #!/bin/ksh
 #
-# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2017, 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"),
@@ -80,6 +80,12 @@
 # User libraries
 make_file_link /usr/X11/lib/NVIDIA/libGL.so.1 $LINKDIR/lib/libGL.so.1
 make_file_link /usr/X11/lib/NVIDIA/amd64/libGL.so.1 $LINKDIR/lib/amd64/libGL.so.1
+make_file_link /usr/X11/lib/NVIDIA/libEGL.so.1 $LINKDIR/lib/libEGL.so.1
+make_file_link /usr/X11/lib/NVIDIA/amd64/libEGL.so.1 $LINKDIR/lib/amd64/libEGL.so.1
+make_file_link /usr/X11/lib/NVIDIA/libGLESv1_CM.so.1 $LINKDIR/lib/libGLESv1_CM.so.1
+make_file_link /usr/X11/lib/NVIDIA/amd64/libGLESv1_CM.so.1 $LINKDIR/lib/amd64/libGLESv1_CM.so.1
+make_file_link /usr/X11/lib/NVIDIA/libGLESv2.so.2 $LINKDIR/lib/libGLESv2.so.2
+make_file_link /usr/X11/lib/NVIDIA/amd64/libGLESv2.so.2 $LINKDIR/lib/amd64/libGLESv2.so.2
 make_file_link amd64 $LINKDIR/lib/64
 
 # Server libraries
--- a/open-src/lib/libepoxy/Makefile	Thu Apr 13 11:05:27 2017 -0700
+++ b/open-src/lib/libepoxy/Makefile	Tue Apr 25 14:08:12 2017 -0700
@@ -2,7 +2,7 @@
 #
 # libepoxy - library for handling OpenGL function pointers
 #
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2017, 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"),
@@ -57,7 +57,7 @@
 SOURCE_TARBALL_NAME_SET=yes
 
 # Patches to apply to source after unpacking, in order
-SOURCE_PATCHES = disable-egl.patch
+SOURCE_PATCHES = 
 
 # Need to build with gcc
 MODULE_COMPILER=gcc
--- a/open-src/lib/libepoxy/disable-egl.patch	Thu Apr 13 11:05:27 2017 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
---- configure.ac	Fri Jul 10 11:23:57 2015
-+++ configure.ac	Fri Jul 10 11:31:10 2015
-@@ -84,6 +84,12 @@
-         has_znow=no
-         EPOXY_LINK_LIBS=""
-         ;;
-+    solaris*)
-+        build_egl=no
-+        build_glx=yes
-+        build_wgl=no
-+        EPOXY_LINK_LIBS=""
-+        ;;
-     *)
-         build_egl=yes
-         build_glx=yes
---- src/dispatch_common.h	Fri Jul 10 11:57:22 2015
-+++ src/dispatch_common.h	Fri Jul 10 11:58:48 2015
-@@ -33,6 +33,11 @@
- #define PLATFORM_HAS_GLX 1
- #define PLATFORM_HAS_WGL 0
- #define EPOXY_IMPORTEXPORT
-+#elif defined(__sun) && defined(__SVR4)
-+#define PLATFORM_HAS_EGL 0
-+#define PLATFORM_HAS_GLX 1
-+#define PLATFORM_HAS_WGL 0
-+#define EPOXY_IMPORTEXPORT
- #else
- #define PLATFORM_HAS_EGL 1
- #define PLATFORM_HAS_GLX 1
--- a/open-src/lib/mesa/Makefile	Thu Apr 13 11:05:27 2017 -0700
+++ b/open-src/lib/mesa/Makefile	Tue Apr 25 14:08:12 2017 -0700
@@ -46,6 +46,8 @@
 MODULE_ARC_CASES += PSARC/2015/251
 # PSARC/2016/560 Mesa 12
 MODULE_ARC_CASES += PSARC/2016/560
+# PSARC/2017/085 Mesa EGL/GLES
+MODULE_ARC_CASES += PSARC/2017/085
 
 # Version number (used in path names)
 MODULE_VERSION=12.0.3
@@ -90,9 +92,8 @@
 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 = --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))
 
@@ -129,6 +130,10 @@
 
 # Move installed files to mesa subdirs and make links back
 LIBRARIES_TO_LINK = libGL.so.1.2.0 libglapi.so.0.0.0
+
+# Creating these separately here so that we avoid creating /usr/X11/*
+# links for these since they are newly delivered.
+LIBRARIES_TO_LINK_NEW += libEGL.so.1.0.0 libGLESv1_CM.so.1.1.0 libGLESv2.so.2.0.0
 MESA_LIBDIR = $(PROTODIR)/usr/lib/mesa$(ARCHLIBSUBDIR)
 
 HEADERS_TO_MOVE = gl.h gl_mangle.h glext.h \
@@ -164,10 +169,16 @@
 	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)/%)
+	-rm -f $(LIBRARIES_TO_LINK_NEW:%=$(PROTODIR)/usr/lib/mesa/%) \
+		$(LIBRARIES_TO_LINK_NEW:%=$(PROTODIR)/usr/lib/mesa/$(SUBDIR64)/%)
 	mv $(LIBRARIES_TO_LINK:%=$(PROTODIR)/usr/lib/%) \
 		$(PROTODIR)/usr/lib/mesa/
 	mv $(LIBRARIES_TO_LINK:%=$(PROTODIR)/usr/lib/$(SUBDIR64)/%) \
 		$(PROTODIR)/usr/lib/mesa/$(SUBDIR64)/
+	mv $(LIBRARIES_TO_LINK_NEW:%=$(PROTODIR)/usr/lib/%) \
+		$(PROTODIR)/usr/lib/mesa/
+	mv $(LIBRARIES_TO_LINK_NEW:%=$(PROTODIR)/usr/lib/$(SUBDIR64)/%) \
+		$(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/GL/libGL.so.1
@@ -180,10 +191,22 @@
 	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 libEGL.so.1 $(PROTODIR)/usr/lib/mesa/libEGL.so
+	ln -sf libEGL.so.1.0.0 $(PROTODIR)/usr/lib/mesa/libEGL.so.1
+	ln -sf libGLESv1_CM.so.1 $(PROTODIR)/usr/lib/mesa/libGLESv1_CM.so
+	ln -sf libGLESv1_CM.so.1.1.0 $(PROTODIR)/usr/lib/mesa/libGLESv1_CM.so.1
+	ln -sf libGLESv2.so.2 $(PROTODIR)/usr/lib/mesa/libGLESv2.so
+	ln -sf libGLESv2.so.2.0.0 $(PROTODIR)/usr/lib/mesa/libGLESv2.so.2
 	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
+	ln -sf libEGL.so.1.0.0 $(PROTODIR)/usr/lib/mesa/$(SUBDIR64)/libEGL.so.1
+	ln -sf libEGL.so.1 $(PROTODIR)/usr/lib/mesa/$(SUBDIR64)/libEGL.so
+	ln -sf libGLESv1_CM.so.1.1.0 $(PROTODIR)/usr/lib/mesa/$(SUBDIR64)/libGLESv1_CM.so.1
+	ln -sf libGLESv1_CM.so.1 $(PROTODIR)/usr/lib/mesa/$(SUBDIR64)/libGLESv1_CM.so
+	ln -sf libGLESv2.so.2.0.0 $(PROTODIR)/usr/lib/mesa/$(SUBDIR64)/libGLESv2.so.2
+	ln -sf libGLESv2.so.2 $(PROTODIR)/usr/lib/mesa/$(SUBDIR64)/libGLESv2.so
 	rm -f $(PROTODIR)/usr/lib/*libGL.*
 	rm -f $(PROTODIR)/usr/lib/$(SUBDIR64)/*libGL.*
 	rm -f $(PROTODIR)/usr/lib/xorg/modules/dri/*.la
@@ -193,23 +216,51 @@
 	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; ln -sf $(LIBRARIES_TO_LINK_NEW:%=../mesa/%) .)
+	ln -sf libEGL.so.1.0.0 $(PROTODIR)/usr/lib/GL/libEGL.so.1
+	ln -sf libEGL.so.1 $(PROTODIR)/usr/lib/GL/libEGL.so
+	ln -sf libGLESv1_CM.so.1.1.0 $(PROTODIR)/usr/lib/GL/libGLESv1_CM.so.1
+	ln -sf libGLESv1_CM.so.1 $(PROTODIR)/usr/lib/GL/libGLESv1_CM.so
+	ln -sf libGLESv2.so.2.0.0 $(PROTODIR)/usr/lib/GL/libGLESv2.so.2
+	ln -sf libGLESv2.so.2 $(PROTODIR)/usr/lib/GL/libGLESv2.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 -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/GL/$(SUBDIR64); ln -sf $(LIBRARIES_TO_LINK_NEW:%=../../mesa/$(SUBDIR64)/%) .)
+	ln -sf libEGL.so.1.0.0 $(PROTODIR)/usr/lib/GL/$(SUBDIR64)/libEGL.so.1
+	ln -sf libEGL.so.1 $(PROTODIR)/usr/lib/GL/$(SUBDIR64)/libEGL.so
+	ln -sf libGLESv2.so.2.0.0 $(PROTODIR)/usr/lib/GL/$(SUBDIR64)/libGLESv2.so.2
+	ln -sf libGLESv2.so.2 $(PROTODIR)/usr/lib/GL/$(SUBDIR64)/libGLESv2.so
+	ln -sf libGLESv1_CM.so.1.1.0 $(PROTODIR)/usr/lib/GL/$(SUBDIR64)/libGLESv1_CM.so.1
+	ln -sf libGLESv1_CM.so.1 $(PROTODIR)/usr/lib/GL/$(SUBDIR64)/libGLESv1_CM.so
 	(cd $(PROTODIR)/usr/lib; ln -sf $(LIBRARIES_TO_LINK:%=GL/%) .)
 	rm -f $(PROTODIR)/usr/lib/libGL.so.1.2.0
 	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; ln -sf $(LIBRARIES_TO_LINK_NEW:%=GL/%) .)
+	ln -sf libEGL.so.1.0.0 $(PROTODIR)/usr/lib/libEGL.so.1
+	ln -sf libEGL.so.1 $(PROTODIR)/usr/lib/libEGL.so
+	ln -sf libGLESv2.so.2.0.0 $(PROTODIR)/usr/lib/libGLESv2.so.2
+	ln -sf libGLESv2.so.2 $(PROTODIR)/usr/lib/libGLESv2.so
+	ln -sf libGLESv1_CM.so.1.1.0 $(PROTODIR)/usr/lib/libGLESv1_CM.so.1
+	ln -sf libGLESv1_CM.so.1 $(PROTODIR)/usr/lib/libGLESv1_CM.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 -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
+	(cd $(PROTODIR)/usr/lib/$(SUBDIR64); ln -sf $(LIBRARIES_TO_LINK_NEW:%=../GL/$(SUBDIR64)/%) .)
+	ln -sf libEGL.so.1.0.0 $(PROTODIR)/usr/lib/$(SUBDIR64)/libEGL.so.1
+	ln -sf libEGL.so.1 $(PROTODIR)/usr/lib/$(SUBDIR64)/libEGL.so
+	ln -sf libGLESv2.so.2.0.0 $(PROTODIR)/usr/lib/$(SUBDIR64)/libGLESv2.so.2
+	ln -sf libGLESv2.so.2 $(PROTODIR)/usr/lib/$(SUBDIR64)/libGLESv2.so
+	ln -sf libGLESv1_CM.so.1.1.0 $(PROTODIR)/usr/lib/$(SUBDIR64)/libGLESv1_CM.so.1
+	ln -sf libGLESv1_CM.so.1 $(PROTODIR)/usr/lib/$(SUBDIR64)/libGLESv1_CM.so
 	ln -sf ../../../system/volatile/opengl/lib/libGL.so.1 \
 		$(PROTODIR)/usr/lib/GL/libGL.so.1
 	ln -sf ../../../../system/volatile/opengl/lib/$(SUBDIR64)/libGL.so.1 \
--- a/pkg/manifests/developer-opensolaris-X.p5m	Thu Apr 13 11:05:27 2017 -0700
+++ b/pkg/manifests/developer-opensolaris-X.p5m	Tue Apr 25 14:08:12 2017 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2017, 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"),
@@ -107,6 +107,9 @@
 depend type=require fmri=pkg:/developer/llvm/llvm \
     org.opensolaris.pkgdepend.resolve=true
 
+# Need llvm-build to build mesa
+depend type=require fmri=pkg:/developer/llvm/llvm-build
+
 # 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/service-opengl-ogl-select.p5m	Thu Apr 13 11:05:27 2017 -0700
+++ b/pkg/manifests/service-opengl-ogl-select.p5m	Tue Apr 25 14:08:12 2017 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2017, 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"),
@@ -56,11 +56,23 @@
     target=../../../../usr/include/mesa/glxext.h
 dir  path=system/volatile/opengl/lib
 dir  path=system/volatile/opengl/lib/$(ARCH64)
+link path=system/volatile/opengl/lib/$(ARCH64)/libEGL.so.1 \
+    target=../../../../../usr/lib/mesa/$(ARCH64)/libEGL.so.1
 link path=system/volatile/opengl/lib/$(ARCH64)/libGL.so.1 \
     target=../../../../../usr/lib/mesa/$(ARCH64)/libGL.so.1
+link path=system/volatile/opengl/lib/$(ARCH64)/libGLESv1_CM.so.1 \
+    target=../../../../../usr/lib/mesa/$(ARCH64)/libGLESv1_CM.so.1
+link path=system/volatile/opengl/lib/$(ARCH64)/libGLESv2.so.2 \
+    target=../../../../../usr/lib/mesa/$(ARCH64)/libGLESv2.so.2
 link path=system/volatile/opengl/lib/64 target=$(ARCH64)
+link path=system/volatile/opengl/lib/libEGL.so.1 \
+    target=../../../../usr/lib/mesa/libEGL.so.1
 link path=system/volatile/opengl/lib/libGL.so.1 \
     target=../../../../usr/lib/mesa/libGL.so.1
+link path=system/volatile/opengl/lib/libGLESv1_CM.so.1 \
+    target=../../../../usr/lib/mesa/libGLESv1_CM.so.1
+link path=system/volatile/opengl/lib/libGLESv2.so.2 \
+    target=../../../../usr/lib/mesa/libGLESv2.so.2
 dir  path=system/volatile/opengl/server
 link path=system/volatile/opengl/server/libglx.so \
     target=../../../../usr/lib/mesa/modules/extensions/libglx.so
--- a/pkg/manifests/x11-library-libepoxy.p5m	Thu Apr 13 11:05:27 2017 -0700
+++ b/pkg/manifests/x11-library-libepoxy.p5m	Tue Apr 25 14:08:12 2017 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2017, 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"),
@@ -26,6 +26,8 @@
     value="Epoxy is a library for handling OpenGL function pointer management"
 #
 dir  path=usr/include/epoxy
+file path=usr/include/epoxy/egl.h
+file path=usr/include/epoxy/egl_generated.h
 file path=usr/include/epoxy/gl.h
 file path=usr/include/epoxy/gl_generated.h
 file path=usr/include/epoxy/glx.h
--- a/pkg/manifests/x11-library-mesa.p5m	Thu Apr 13 11:05:27 2017 -0700
+++ b/pkg/manifests/x11-library-mesa.p5m	Tue Apr 25 14:08:12 2017 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2017, 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"),
@@ -38,6 +38,12 @@
 link path=usr/X11/lib/libglapi.so.0 target=libglapi.so.0.0.0
 link path=usr/X11/lib/libglapi.so.0.0.0 target=GL/libglapi.so.0.0.0
 link path=usr/X11/lib/mesa target=../../lib/mesa
+dir  path=usr/include/EGL
+file path=usr/include/EGL/egl.h
+file path=usr/include/EGL/eglext.h
+file path=usr/include/EGL/eglextchromium.h
+file path=usr/include/EGL/eglmesaext.h
+file path=usr/include/EGL/eglplatform.h
 dir  path=usr/include/GL
 link path=usr/include/GL/glu.h target=../mesa/glu.h
 dir  path=usr/include/GL/internal
@@ -45,6 +51,22 @@
     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/GLES
+file path=usr/include/GLES/egl.h
+file path=usr/include/GLES/gl.h
+file path=usr/include/GLES/glext.h
+file path=usr/include/GLES/glplatform.h
+dir  path=usr/include/GLES2
+file path=usr/include/GLES2/gl2.h
+file path=usr/include/GLES2/gl2ext.h
+file path=usr/include/GLES2/gl2platform.h
+dir  path=usr/include/GLES3
+file path=usr/include/GLES3/gl3.h
+file path=usr/include/GLES3/gl31.h
+file path=usr/include/GLES3/gl3ext.h
+file path=usr/include/GLES3/gl3platform.h
+dir  path=usr/include/KHR
+file path=usr/include/KHR/khrplatform.h
 dir  path=usr/include/mesa
 file path=usr/include/mesa/gl.h
 file path=usr/include/mesa/gl_mangle.h
@@ -58,8 +80,20 @@
 file path=usr/include/mesa/internal/dri_interface.h
 file path=usr/include/mesa/osmesa.h
 file path=usr/include/mesa/wglext.h
+link path=usr/lib/$(ARCH64)/libEGL.so target=libEGL.so.1
+link path=usr/lib/$(ARCH64)/libEGL.so.1 target=libEGL.so.1.0.0
+link path=usr/lib/$(ARCH64)/libEGL.so.1.0.0 \
+    target=../GL/$(ARCH64)/libEGL.so.1.0.0
 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)/libGLESv1_CM.so target=libGLESv1_CM.so.1
+link path=usr/lib/$(ARCH64)/libGLESv1_CM.so.1 target=libGLESv1_CM.so.1.1.0
+link path=usr/lib/$(ARCH64)/libGLESv1_CM.so.1.1.0 \
+    target=../GL/$(ARCH64)/libGLESv1_CM.so.1.1.0
+link path=usr/lib/$(ARCH64)/libGLESv2.so target=libGLESv2.so.2
+link path=usr/lib/$(ARCH64)/libGLESv2.so.2 target=libGLESv2.so.2.0.0
+link path=usr/lib/$(ARCH64)/libGLESv2.so.2.0.0 \
+    target=../GL/$(ARCH64)/libGLESv2.so.2.0.0
 link path=usr/lib/$(ARCH64)/libGLU.so target=libGLU.so.1
 link path=usr/lib/$(ARCH64)/libGLU.so.1 target=../GL/$(ARCH64)/libGLU.so.1
 link path=usr/lib/$(ARCH64)/libglapi.so target=libglapi.so.0
@@ -67,10 +101,25 @@
 link path=usr/lib/$(ARCH64)/libglapi.so.0.0.0 \
     target=../GL/$(ARCH64)/libglapi.so.0.0.0
 file path=usr/lib/$(ARCH64)/pkgconfig/dri.pc
+file path=usr/lib/$(ARCH64)/pkgconfig/egl.pc
 file path=usr/lib/$(ARCH64)/pkgconfig/gl.pc
+file path=usr/lib/$(ARCH64)/pkgconfig/glesv1_cm.pc
+file path=usr/lib/$(ARCH64)/pkgconfig/glesv2.pc
 file path=usr/lib/$(ARCH64)/pkgconfig/glu.pc
 dir  path=usr/lib/GL
 dir  path=usr/lib/GL/$(ARCH64)
+link path=usr/lib/GL/$(ARCH64)/libEGL.so target=libEGL.so.1
+link path=usr/lib/GL/$(ARCH64)/libEGL.so.1 target=libEGL.so.1.0.0
+link path=usr/lib/GL/$(ARCH64)/libEGL.so.1.0.0 \
+    target=../../mesa/$(ARCH64)/libEGL.so.1.0.0
+link path=usr/lib/GL/$(ARCH64)/libGLESv1_CM.so target=libGLESv1_CM.so.1
+link path=usr/lib/GL/$(ARCH64)/libGLESv1_CM.so.1 target=libGLESv1_CM.so.1.1.0
+link path=usr/lib/GL/$(ARCH64)/libGLESv1_CM.so.1.1.0 \
+    target=../../mesa/$(ARCH64)/libGLESv1_CM.so.1.1.0
+link path=usr/lib/GL/$(ARCH64)/libGLESv2.so target=libGLESv2.so.2
+link path=usr/lib/GL/$(ARCH64)/libGLESv2.so.2 target=libGLESv2.so.2.0.0
+link path=usr/lib/GL/$(ARCH64)/libGLESv2.so.2.0.0 \
+    target=../../mesa/$(ARCH64)/libGLESv2.so.2.0.0
 link path=usr/lib/GL/$(ARCH64)/libGLU.so target=libGLU.so.1
 link path=usr/lib/GL/$(ARCH64)/libGLU.so.1 \
     target=../../mesa/$(ARCH64)/libGLU.so.1
@@ -78,13 +127,31 @@
 link path=usr/lib/GL/$(ARCH64)/libglapi.so.0 target=libglapi.so.0.0.0
 link path=usr/lib/GL/$(ARCH64)/libglapi.so.0.0.0 \
     target=../../mesa/$(ARCH64)/libglapi.so.0.0.0
+link path=usr/lib/GL/libEGL.so target=libEGL.so.1
+link path=usr/lib/GL/libEGL.so.1 target=libEGL.so.1.0.0
+link path=usr/lib/GL/libEGL.so.1.0.0 target=../mesa/libEGL.so.1.0.0
+link path=usr/lib/GL/libGLESv1_CM.so target=libGLESv1_CM.so.1
+link path=usr/lib/GL/libGLESv1_CM.so.1 target=libGLESv1_CM.so.1.1.0
+link path=usr/lib/GL/libGLESv1_CM.so.1.1.0 target=../mesa/libGLESv1_CM.so.1.1.0
+link path=usr/lib/GL/libGLESv2.so target=libGLESv2.so.2
+link path=usr/lib/GL/libGLESv2.so.2 target=libGLESv2.so.2.0.0
+link path=usr/lib/GL/libGLESv2.so.2.0.0 target=../mesa/libGLESv2.so.2.0.0
 link path=usr/lib/GL/libGLU.so target=libGLU.so.1
 link path=usr/lib/GL/libGLU.so.1 target=../mesa/libGLU.so.1
 link path=usr/lib/GL/libglapi.so target=libglapi.so.0
 link path=usr/lib/GL/libglapi.so.0 target=libglapi.so.0.0.0
 link path=usr/lib/GL/libglapi.so.0.0.0 target=../mesa/libglapi.so.0.0.0
+link path=usr/lib/libEGL.so target=libEGL.so.1
+link path=usr/lib/libEGL.so.1 target=libEGL.so.1.0.0
+link path=usr/lib/libEGL.so.1.0.0 target=GL/libEGL.so.1.0.0
 link path=usr/lib/libGL.so target=libGL.so.1
 link path=usr/lib/libGL.so.1 target=GL/libGL.so.1
+link path=usr/lib/libGLESv1_CM.so target=libGLESv1_CM.so.1
+link path=usr/lib/libGLESv1_CM.so.1 target=libGLESv1_CM.so.1.1.0
+link path=usr/lib/libGLESv1_CM.so.1.1.0 target=GL/libGLESv1_CM.so.1.1.0
+link path=usr/lib/libGLESv2.so target=libGLESv2.so.2
+link path=usr/lib/libGLESv2.so.2 target=libGLESv2.so.2.0.0
+link path=usr/lib/libGLESv2.so.2.0.0 target=GL/libGLESv2.so.2.0.0
 link path=usr/lib/libGLU.so target=libGLU.so.1
 link path=usr/lib/libGLU.so.1 target=GL/libGLU.so.1
 link path=usr/lib/libglapi.so target=libglapi.so.0
@@ -92,18 +159,36 @@
 link path=usr/lib/libglapi.so.0.0.0 target=GL/libglapi.so.0.0.0
 dir  path=usr/lib/mesa
 dir  path=usr/lib/mesa/$(ARCH64)
+link path=usr/lib/mesa/$(ARCH64)/libEGL.so target=libEGL.so.1
+link path=usr/lib/mesa/$(ARCH64)/libEGL.so.1 target=libEGL.so.1.0.0
+file path=usr/lib/mesa/$(ARCH64)/libEGL.so.1.0.0
 link path=usr/lib/mesa/$(ARCH64)/libGL.so target=libGL.so.1
 link path=usr/lib/mesa/$(ARCH64)/libGL.so.1 target=libGL.so.1.2.0
 file path=usr/lib/mesa/$(ARCH64)/libGL.so.1.2.0
+link path=usr/lib/mesa/$(ARCH64)/libGLESv1_CM.so target=libGLESv1_CM.so.1
+link path=usr/lib/mesa/$(ARCH64)/libGLESv1_CM.so.1 target=libGLESv1_CM.so.1.1.0
+file path=usr/lib/mesa/$(ARCH64)/libGLESv1_CM.so.1.1.0
+link path=usr/lib/mesa/$(ARCH64)/libGLESv2.so target=libGLESv2.so.2
+link path=usr/lib/mesa/$(ARCH64)/libGLESv2.so.2 target=libGLESv2.so.2.0.0
+file path=usr/lib/mesa/$(ARCH64)/libGLESv2.so.2.0.0
 link path=usr/lib/mesa/$(ARCH64)/libGLU.so target=libGLU.so.1
 file path=usr/lib/mesa/$(ARCH64)/libGLU.so.1
 link path=usr/lib/mesa/$(ARCH64)/libglapi.so target=libglapi.so.0
 link path=usr/lib/mesa/$(ARCH64)/libglapi.so.0 target=libglapi.so.0.0.0
 file path=usr/lib/mesa/$(ARCH64)/libglapi.so.0.0.0
 link path=usr/lib/mesa/64 target=$(ARCH64)
+link path=usr/lib/mesa/libEGL.so target=libEGL.so.1
+link path=usr/lib/mesa/libEGL.so.1 target=libEGL.so.1.0.0
+file path=usr/lib/mesa/libEGL.so.1.0.0
 link path=usr/lib/mesa/libGL.so target=libGL.so.1
 link path=usr/lib/mesa/libGL.so.1 target=libGL.so.1.2.0
 file path=usr/lib/mesa/libGL.so.1.2.0
+link path=usr/lib/mesa/libGLESv1_CM.so target=libGLESv1_CM.so.1
+link path=usr/lib/mesa/libGLESv1_CM.so.1 target=libGLESv1_CM.so.1.1.0
+file path=usr/lib/mesa/libGLESv1_CM.so.1.1.0
+link path=usr/lib/mesa/libGLESv2.so target=libGLESv2.so.2
+link path=usr/lib/mesa/libGLESv2.so.2 target=libGLESv2.so.2.0.0
+file path=usr/lib/mesa/libGLESv2.so.2.0.0
 link path=usr/lib/mesa/libGLU.so target=libGLU.so.1
 file path=usr/lib/mesa/libGLU.so.1
 link path=usr/lib/mesa/libglapi.so target=libglapi.so.0
@@ -113,7 +198,10 @@
 dir  path=usr/lib/mesa/modules/extensions
 file path=usr/lib/mesa/modules/extensions/libglx.so
 file path=usr/lib/pkgconfig/dri.pc
+file path=usr/lib/pkgconfig/egl.pc
 file path=usr/lib/pkgconfig/gl.pc
+file path=usr/lib/pkgconfig/glesv1_cm.pc
+file path=usr/lib/pkgconfig/glesv2.pc
 file path=usr/lib/pkgconfig/glu.pc
 dir  path=usr/lib/xorg/modules/dri/$(ARCH64)
 file path=usr/lib/xorg/modules/dri/$(ARCH64)/swrast_dri.so
upstream/oracle/x-cons/x-s12-clone