From be66567c61051d74811956bc45f8e534447947d2daef76d79085f81f2694c9c1 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Thu, 13 Jun 2019 09:44:09 +0000
Subject: [PATCH] - n_glesv1_cm-glesv2.patch   * reenables build of GLESv1_CM
 and GLESv2 ... - readded pkgconfig files for GLESv1_CM and GLESv2 to
 filelists - removed again virtual provides for   * pkgconfig(glesv1_cm)   *
 pkgconfig(glesv2)

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=841
---
 Mesa-drivers.changes     | 10 ++++++++++
 Mesa-drivers.spec        |  6 ++++--
 Mesa.changes             | 10 ++++++++++
 Mesa.spec                |  6 ++++--
 n_glesv1_cm-glesv2.patch | 11 +++++++++++
 5 files changed, 39 insertions(+), 4 deletions(-)
 create mode 100644 n_glesv1_cm-glesv2.patch

diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes
index 1f6d539..8b390b9 100644
--- a/Mesa-drivers.changes
+++ b/Mesa-drivers.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu Jun 13 09:34:13 UTC 2019 - Stefan Dirsch <sndirsch@suse.com>
+
+- n_glesv1_cm-glesv2.patch
+  * reenables build of GLESv1_CM and GLESv2 ...
+- readded pkgconfig files for GLESv1_CM and GLESv2 to filelists
+- removed again virtual provides for 
+  * pkgconfig(glesv1_cm)
+  * pkgconfig(glesv2)
+
 -------------------------------------------------------------------
 Wed Jun 12 03:51:43 UTC 2019 - Stefan Dirsch <sndirsch@suse.com>
 
diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec
index d16e319..0b23baa 100644
--- a/Mesa-drivers.spec
+++ b/Mesa-drivers.spec
@@ -131,6 +131,7 @@ Source7:        Mesa.keyring
 # never to be upstreamed
 Patch54:        n_drirc-disable-rgb10-for-chromium-on-amd.patch
 Patch58:        u_dep_xcb.patch
+Patch60:        n_glesv1_cm-glesv2.patch
 
 BuildRequires:  bison
 BuildRequires:  fdupes
@@ -393,7 +394,6 @@ Requires:       pkgconfig(egl)
 %if 0%{?libglvnd}
 Requires:       libglvnd-devel >= 0.1.0
 %endif
-Provides:       pkgconfig(glesv1_cm)
 
 %description libGLESv1_CM-devel
 OpenGL|ES is an API for full-function 2D and 3D
@@ -434,7 +434,6 @@ Requires:       pkgconfig(egl)
 %if 0%{?libglvnd}
 Requires:       libglvnd-devel >= 0.1.0
 %endif
-Provides:       pkgconfig(glesv2)
 
 %description libGLESv2-devel
 OpenGL|ES is an API for full-function 2D and 3D
@@ -732,6 +731,7 @@ rm -rf docs/README.{VMS,WIN32,OS2}
 
 %patch54 -p1
 %patch58 -p1
+%patch60 -p1
 
 # Remove requires to libglvnd/libglvnd-devel from baselibs.conf when
 # disabling libglvnd build; ugly ...
@@ -1004,6 +1004,7 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
 %if 0%{?libglvnd} == 0
 %{_libdir}/libGLESv1_CM.so
 %endif
+%{_libdir}/pkgconfig/glesv1_cm.pc
 
 %files libGLESv2-2
 %if 0%{?libglvnd} == 0
@@ -1015,6 +1016,7 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
 %if 0%{?libglvnd} == 0
 %{_libdir}/libGLESv2.so
 %endif
+%{_libdir}/pkgconfig/glesv2.pc
 
 %files libGLESv3-devel
 %{_includedir}/GLES3
diff --git a/Mesa.changes b/Mesa.changes
index 1f6d539..8b390b9 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu Jun 13 09:34:13 UTC 2019 - Stefan Dirsch <sndirsch@suse.com>
+
+- n_glesv1_cm-glesv2.patch
+  * reenables build of GLESv1_CM and GLESv2 ...
+- readded pkgconfig files for GLESv1_CM and GLESv2 to filelists
+- removed again virtual provides for 
+  * pkgconfig(glesv1_cm)
+  * pkgconfig(glesv2)
+
 -------------------------------------------------------------------
 Wed Jun 12 03:51:43 UTC 2019 - Stefan Dirsch <sndirsch@suse.com>
 
diff --git a/Mesa.spec b/Mesa.spec
index edb0e6f..345f83f 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -130,6 +130,7 @@ Source7:        Mesa.keyring
 # never to be upstreamed
 Patch54:        n_drirc-disable-rgb10-for-chromium-on-amd.patch
 Patch58:        u_dep_xcb.patch
+Patch60:        n_glesv1_cm-glesv2.patch
 
 BuildRequires:  bison
 BuildRequires:  fdupes
@@ -392,7 +393,6 @@ Requires:       pkgconfig(egl)
 %if 0%{?libglvnd}
 Requires:       libglvnd-devel >= 0.1.0
 %endif
-Provides:       pkgconfig(glesv1_cm)
 
 %description libGLESv1_CM-devel
 OpenGL|ES is an API for full-function 2D and 3D
@@ -433,7 +433,6 @@ Requires:       pkgconfig(egl)
 %if 0%{?libglvnd}
 Requires:       libglvnd-devel >= 0.1.0
 %endif
-Provides:       pkgconfig(glesv2)
 
 %description libGLESv2-devel
 OpenGL|ES is an API for full-function 2D and 3D
@@ -731,6 +730,7 @@ rm -rf docs/README.{VMS,WIN32,OS2}
 
 %patch54 -p1
 %patch58 -p1
+%patch60 -p1
 
 # Remove requires to libglvnd/libglvnd-devel from baselibs.conf when
 # disabling libglvnd build; ugly ...
@@ -1003,6 +1003,7 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
 %if 0%{?libglvnd} == 0
 %{_libdir}/libGLESv1_CM.so
 %endif
+%{_libdir}/pkgconfig/glesv1_cm.pc
 
 %files libGLESv2-2
 %if 0%{?libglvnd} == 0
@@ -1014,6 +1015,7 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
 %if 0%{?libglvnd} == 0
 %{_libdir}/libGLESv2.so
 %endif
+%{_libdir}/pkgconfig/glesv2.pc
 
 %files libGLESv3-devel
 %{_includedir}/GLES3
diff --git a/n_glesv1_cm-glesv2.patch b/n_glesv1_cm-glesv2.patch
new file mode 100644
index 0000000..ed612d1
--- /dev/null
+++ b/n_glesv1_cm-glesv2.patch
@@ -0,0 +1,11 @@
+--- mesa/src/mapi/meson.build.orig	2019-06-13 11:14:34.705848000 +0200
++++ mesa/src/mapi/meson.build	2019-06-13 11:21:00.995161000 +0200
+@@ -35,7 +35,7 @@ if with_shared_glapi
+ else
+   libglapi = []
+ endif
+-if not with_glvnd
++if with_glvnd
+   if with_gles1
+     subdir('es1api')
+   endif