--- cauldron/mesa/current/SPECS/mesa.spec	2011/04/19 14:52:39	88441
+++ cauldron/mesa/current/SPECS/mesa.spec	2011/04/19 14:54:29	88442
@@ -42,16 +42,24 @@
 %define gluname			mesaglu
 %define glutname		mesaglut
 %define glwname			mesaglw
+%define glesv1name		mesaglesv1
+%define glesv2name		mesaglesv2
+
 %define eglmajor		1
 %define glmajor			1
 %define glumajor		1
 %define glutmajor		3
 %define glwmajor		1
+%define glesv1major		1
+%define glesv2major		2
+
 %define libeglname              %mklibname %{eglname} %{eglmajor}
 %define libglname		%mklibname %{glname} %{glmajor}
 %define libgluname		%mklibname %{gluname} %{glumajor}
 %define libglutname		%mklibname %{glutname} %{glutmajor}
 %define libglwname		%mklibname %{glwname} %{glwmajor}
+%define libglesv1name		%mklibname %{glesv1name}_ %{glesv1major}
+%define libglesv2name		%mklibname %{glesv2name}_ %{glesv2major}
 
 %define dridrivers		%mklibname dri-drivers
 
@@ -61,6 +69,8 @@
 %define libgluname_virt		lib%{gluname}
 %define libglutname_virt	lib%{glutname}
 %define libglwname_virt		lib%{glwname}
+%define libglesv1name_virt	lib%{glesv1name}
+%define libglesv2name_virt	lib%{glesv2name}
 
 %define oldlibglname		%mklibname MesaGL 1
 %define oldlibgluname		%mklibname MesaGLU 1
@@ -287,6 +297,33 @@
 Provides:	libegl-devel
 %endif
 
+
+%package -n %{libglesv1name}
+Summary:	Files for Mesa (glesv1 libs)
+Group:		System/Libraries
+Provides:	%{libglesv1name_virt} = %{version}-%{release}
+
+%package -n %{libglesv1name}-devel
+Summary:	Development files for glesv1 libs
+Group:		Development/C
+Requires:	%{libglesv1name} = %{version}-%{release}
+Provides:	lib%{glesv1name}-devel
+Provides:	%{glesv1name}-devel
+Provides:	libglesv1-devel
+
+%package -n %{libglesv2name}
+Summary:	Files for Mesa (glesv2 libs)
+Group:		System/Libraries
+Provides:	%{libglesv2name_virt} = %{version}-%{release}
+
+%package -n %{libglesv2name}-devel
+Summary:	Development files for glesv2 libs
+Group:		Development/C
+Requires:	%{libglesv2name} = %{version}-%{release}
+Provides:	lib%{glesv2name}-devel
+Provides:	%{glesv2name}-devel
+Provides:	libglesv2-devel
+
 %package	common-devel
 Summary:	Meta package for mesa devel
 Group:		Development/C
@@ -302,6 +339,9 @@
 %else
 Requires:	libglut-devel
 %endif
+Requires:	%{libeglname}-devel = %{version}
+Requires:	%{libglesv1name}-devel = %{version}
+Requires:	%{libglesv2name}-devel = %{version}
 
 #------------------------------------------------------------------------------
 
@@ -375,6 +415,24 @@
 
 This package contains the headers needed to compile Mesa programs.
 
+%description -n %{libglesv1name}
+OpenGL ES is a low-level, lightweight API for advanced embedded graphics using
+well-defined subset profiles of OpenGL.
+
+This package provides the OpenGL ES library version 1.
+
+%description -n %{libglesv1name}-devel
+This package contains the headers needed to compile OpenGL ES 1 programs.
+
+%description -n %{libglesv2name}
+OpenGL ES is a low-level, lightweight API for advanced embedded graphics using
+well-defined subset profiles of OpenGL.
+
+This package provides the OpenGL ES library version 2.
+
+%description -n %{libglesv2name}-devel
+This package contains the headers needed to compile OpenGL ES 2 programs.
+
 #------------------------------------------------------------------------------
 
 %prep
@@ -428,6 +486,8 @@
 %else
 		--disable-egl \
 %endif
+		--enable-gles1 \
+		--enable-gles2 \
 %if %{with_mesaglut}
 		--enable-glut
 %else
@@ -515,10 +575,23 @@
 %if %{enable_egl}
 %files -n %{libeglname}
 %defattr(-,root,root)
+%doc docs/COPYING
 %{_libdir}/libEGL.so.%{eglmajor}*
-%{_libdir}/libegldri.so.1*
+%dir %{_libdir}/egl
+%{_libdir}/egl/egl_dri2.so
+%{_libdir}/egl/egl_glx.so
 %endif
 
+%files -n %{libglesv1name}
+%defattr(-,root,root)
+%doc docs/COPYING
+%{_libdir}/libGLESv1_CM.so.%{glesv1major}*
+
+%files -n %{libglesv2name}
+%defattr(-,root,root)
+%doc docs/COPYING
+%{_libdir}/libGLESv2.so.%{glesv2major}*
+
 %files -n %{libglname}-devel
 %defattr(-,root,root)
 %doc docs/COPYING
@@ -576,11 +649,22 @@
 %if %{enable_egl}
 %files -n %{libeglname}-devel
 %defattr(-,root,root)
+%doc docs/COPYING
+%{_includedir}/EGL
+%{_includedir}/KHR
 %{_libdir}/libEGL.so
-%{_libdir}/libegldri.so
-%{_includedir}/gles/egl*.h
 %{_libdir}/pkgconfig/egl.pc
 %endif
 
 
+%files -n %{libglesv1name}-devel
+%defattr(-,root,root)
+%{_includedir}/GLES
+%{_libdir}/libGLESv1_CM.so
+%{_libdir}/pkgconfig/glesv1_cm.pc
 
+%files -n %{libglesv2name}-devel
+%defattr(-,root,root)
+%{_includedir}/GLES2
+%{_libdir}/libGLESv2.so
+%{_libdir}/pkgconfig/glesv2.pc