Accepting request 652135 from home:michalsrb:bug1117365:X11:XOrg

- Place khrplatform.h into new package Mesa-KHR-devel. It is now
  required by all devel packages that need it. (bsc#1117365)

- Remove n_drisw-Do-not-use-drisw_put_image_shm.patch,
  add u_constify-struct-drisw_loader_funcs.patch
  and u_drisw-use-separate-drisw_loader_funcs-for-shm.patch.
  * Replace workaround with proper fix for crash in VLC and
    possibly other applications. (boo#1113533)

OBS-URL: https://build.opensuse.org/request/show/652135
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=786

Mesa.spec

@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via https://bugs.opensuse.org/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
 
@@ -135,7 +135,8 @@ Patch18:        n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch
 Patch31:        archlinux_0001-Fix-linkage-against-shared-glapi.patch
 
 Patch54:        n_drirc-disable-rgb10-for-chromium-on-amd.patch
-Patch55:        n_drisw-Do-not-use-drisw_put_image_shm.patch
+Patch55:        u_constify-struct-drisw_loader_funcs.patch
+Patch56:        u_drisw-use-separate-drisw_loader_funcs-for-shm.patch
 
 BuildRequires:  autoconf >= 2.60
 BuildRequires:  automake
@@ -326,6 +327,13 @@ OpenGL|ES and OpenVG.
 This package provides the development environment for compiling
 programs against the EGL library.
 
+%package KHR-devel
+Summary:        Mesa Khronos development headers
+Group:          Development/Libraries/C and C++
+
+%description KHR-devel
+Mesa Khronos development headers.
+
 %package libGL1
 Summary:        The GL/GLX runtime of the Mesa 3D graphics library
 Group:          System/Libraries
@@ -347,6 +355,7 @@ the X Window System.
 %package libGL-devel
 Summary:        GL/GLX development files of the OpenGL API
 Group:          Development/Libraries/C and C++
+Requires:       Mesa-KHR-devel = %{version}
 Requires:       Mesa-libGL1 = %{version}
 %if 0%{?libglvnd}
 Requires:       libglvnd-devel >= 0.1.0
@@ -378,6 +387,7 @@ OpenGL|ES 1.x provides an API for fixed-function hardware.
 %package libGLESv1_CM-devel
 Summary:        Development files for the OpenGL ES 1.x API
 Group:          Development/Libraries/C and C++
+Requires:       Mesa-KHR-devel = %{version}
 Requires:       Mesa-libGLESv1_CM1 = %{version}
 Requires:       pkgconfig(egl)
 %if 0%{?libglvnd}
@@ -417,6 +427,7 @@ ES 3 entry points.
 %package libGLESv2-devel
 Summary:        Development files for the OpenGL ES 2.x API
 Group:          Development/Libraries/C and C++
+Requires:       Mesa-KHR-devel = %{version}
 Requires:       Mesa-libGLESv2-2 = %{version}
 Requires:       pkgconfig(egl)
 %if 0%{?libglvnd}
@@ -438,6 +449,7 @@ applications using the OpenGL|ES 2.x APIs.
 %package libGLESv3-devel
 Summary:        Development files for the OpenGL ES 3.x API
 Group:          Development/Libraries/C and C++
+Requires:       Mesa-KHR-devel = %{version}
 Requires:       pkgconfig(egl)
 %if 0%{?libglvnd} == 0
 Requires:       Mesa-libGLESv2-2 = %{version}
@@ -723,6 +735,7 @@ rm -rf docs/README.{VMS,WIN32,OS2}
 
 %patch54 -p1
 %patch55 -p1
+%patch56 -p1
 
 # Remove requires to libglvnd/libglvnd-devel from baselibs.conf when
 # disabling libglvnd build; ugly ...
@@ -850,7 +863,7 @@ rm %{buildroot}/%{_includedir}/gbm.h
 rm %{buildroot}/%{_libdir}/libgbm.so*
 rm %{buildroot}/%{_libdir}/pkgconfig/gbm.pc
 
-# in libGL-devel
+# in KHR-devel
 rm -rf %{buildroot}/%{_includedir}/KHR
 
 %else
@@ -945,6 +958,10 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
 %endif
 %{_libdir}/pkgconfig/egl.pc
 
+%files KHR-devel
+%dir %{_includedir}/KHR
+%{_includedir}/KHR
+
 %files libGL1
 %if 0%{?libglvnd}
 %{_libdir}/libGLX_mesa.so*
@@ -955,7 +972,6 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
 
 %files libGL-devel
 %dir %{_includedir}/GL
-%{_includedir}/KHR
 %{_includedir}/GL/*.h
 %exclude %{_includedir}/GL/osmesa.h
 %if 0%{?libglvnd} == 0