Accepting request 516841 from home:michalsrb:branches:bnc1052776:X11:XOrg

- U_Fix-typo-in-LIBRARY_FEATURE_NAMES.patch
  * Fix typo that caused gles 3.1 and 3.2 symbols to be missing in
    the generated libraries. (bnc#1052776)

OBS-URL: https://build.opensuse.org/request/show/516841
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libglvnd?expand=0&rev=17

U_Fix-typo-in-LIBRARY_FEATURE_NAMES.patch

@@ -0,0 +1,29 @@
+Git-commit: 37fc6caa4b80bb7c75a8285d36d168cbf6932ef2
+Patch-mainline: To-be-upstreamed
+Author: Michal Srb <msrb@suse.com>
+Subject: Fix typo in _LIBRARY_FEATURE_NAMES.
+References: bnc#1052776
+
+The missing comma caused the "GL_ES_VERSION_3_1" and "GL_ES_VERSION_3_2" to
+concatenate into non-existing feature name. Symbols from gles 3.1 and 3.2 were
+then missing in the generated files.
+---
+ src/generate/genCommon.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/generate/genCommon.py b/src/generate/genCommon.py
+index b486ad0..5c721ac 100644
+--- a/src/generate/genCommon.py
++++ b/src/generate/genCommon.py
+@@ -44,7 +44,7 @@ _LIBRARY_FEATURE_NAMES = {
+     )),
+     "glesv1" : frozenset(("GL_VERSION_ES_CM_1_0", "GL_OES_point_size_array")),
+     "glesv2" : frozenset(("GL_ES_VERSION_2_0", "GL_ES_VERSION_3_0",
+-            "GL_ES_VERSION_3_1" "GL_ES_VERSION_3_2",
++            "GL_ES_VERSION_3_1", "GL_ES_VERSION_3_2",
+     )),
+ }
+ 
+-- 
+2.12.3
+

libglvnd.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Aug 14 13:35:51 UTC 2017 - msrb@suse.com
+
+- U_Fix-typo-in-LIBRARY_FEATURE_NAMES.patch
+  * Fix typo that caused gles 3.1 and 3.2 symbols to be missing in
+    the generated libraries. (bnc#1052776)
+
 -------------------------------------------------------------------
 Wed Jun 21 14:48:46 UTC 2017 - zaitor@opensuse.org
 

libglvnd.spec

@@ -29,6 +29,7 @@ Url:            https://github.com/NVIDIA/libglvnd
 # Source is _service generated
 Source:         %name-%version.tar.gz
 Source1:        baselibs.conf
+Patch1:         U_Fix-typo-in-LIBRARY_FEATURE_NAMES.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  libtool
@@ -61,6 +62,7 @@ development.
 
 %prep
 %setup -q -n %name-%version
+%patch1 -p1
 
 %build
 ./autogen.sh