$ git diff --patch-with-stat --summary 98a63c64298ae648d57558fc5af8ebae9e99986d..c86df48311a68841edec5ee93c309d96f4534b56
.abf.yml | 2 +-
...ude-install-GL-headers-when-GL-is-enabled.patch | 28 ---
...figure-option-to-disable-glesv1-or-glesv2.patch | 122 ----------
0002-egl-Sync-with-Khronos.patch | 62 ------
0003-Update-GL-gl.h-to-match-Mesa.patch | 245 ---------------------
0004-Provide-an-empty-GLES3-gl3ext.h-header.patch | 46 ----
libglvnd-1.3.0-fix-linking.patch | 12 +
libglvnd.spec | 31 +--
8 files changed, 24 insertions(+), 524 deletions(-)
delete mode 100644 0000-include-install-GL-headers-when-GL-is-enabled.patch
delete mode 100644 0001-Add-a-configure-option-to-disable-glesv1-or-glesv2.patch
delete mode 100644 0002-egl-Sync-with-Khronos.patch
delete mode 100644 0003-Update-GL-gl.h-to-match-Mesa.patch
delete mode 100644 0004-Provide-an-empty-GLES3-gl3ext.h-header.patch
create mode 100644 libglvnd-1.3.0-fix-linking.patch
diff --git a/.abf.yml b/.abf.yml
index f838f30..55d9182 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
sources:
- libglvnd-1.2.0.tar.gz: 3548cda22ca3f49edb03f584b85a76db964a014a
+ libglvnd-1.3.0.tar.gz: 5627e6eff158139175e74694baf2473752070d46
diff --git a/0000-include-install-GL-headers-when-GL-is-enabled.patch b/0000-include-install-GL-headers-when-GL-is-enabled.patch
deleted file mode 100644
index eae2733..0000000
--- a/0000-include-install-GL-headers-when-GL-is-enabled.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 6f52473dac08c44b081b792874b4ce73122096da Mon Sep 17 00:00:00 2001
-From: Eric Engestrom <eric@engestrom.ch>
-Date: Mon, 30 Sep 2019 16:06:42 +0100
-Subject: [PATCH 0/4] include: install GL headers when GL is enabled
-
-A typo made it depend on EGL instead.
-
-Fixes: ab9b5fcc3bf90064418f ("Install the GL/GLES/GLX/EGL header files.")
----
- include/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/Makefile.am b/include/Makefile.am
-index 1e33d2d..3d81d17 100644
---- a/include/Makefile.am
-+++ b/include/Makefile.am
-@@ -39,7 +39,7 @@ EGL_HEADER_FILES = \
- EGL/eglext.h \
- EGL/eglplatform.h
-
--if ENABLE_EGL_HEADERS
-+if ENABLE_GL_HEADERS
- nobase_include_HEADERS += $(GL_HEADER_FILES)
- else
- noinst_HEADERS += $(GL_HEADER_FILES)
---
-2.24.0
-
diff --git a/0001-Add-a-configure-option-to-disable-glesv1-or-glesv2.patch b/0001-Add-a-configure-option-to-disable-glesv1-or-glesv2.patch
deleted file mode 100644
index 68c2b20..0000000
--- a/0001-Add-a-configure-option-to-disable-glesv1-or-glesv2.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-From 3a1fb32c3b2ba0bc28952759c33dc98bb5260125 Mon Sep 17 00:00:00 2001
-From: Laurent Carlier <lordheavym@gmail.com>
-Date: Tue, 8 Oct 2019 16:34:16 +0000
-Subject: [PATCH 1/4] Add a configure option to disable glesv1 or glesv2
-
-Because mesa can be built without glesv1 so it breaks autodetection.
-
-Fixes: https://bugs.archlinux.org/task/64032 ('mesa-demos doesn't build, unable to find GLES/gl.h')
----
- configure.ac | 23 +++++++++++++++--------
- include/Makefile.am | 24 ++++++++++++++++++------
- src/Makefile.am | 4 +++-
- 3 files changed, 36 insertions(+), 15 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index faa0379..eb68d3b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -70,13 +70,19 @@ if test "x$enable_x11" != "xyes" -a "x$enable_glx" = "xyes" ; then
- AC_MSG_ERROR([Can't build GLX without X11.])
- fi
-
--AC_ARG_ENABLE([gles],
-- [AS_HELP_STRING([--disable-gles],
-- [Do not build the libGLES*.so libraries @<:@default=enabled@:>@])],
-- [enable_gles="$enableval"],
-- [enable_gles=yes]
--)
--AM_CONDITIONAL([ENABLE_GLES], [test "x$enable_gles" = "xyes"])
-+AC_ARG_ENABLE([gles1],
-+ [AS_HELP_STRING([--disable-gles1],
-+ [disable support for OpenGL ES 1.x API @<:@default=enabled@:>@])],
-+ [enable_gles1="$enableval"],
-+ [enable_gles1=yes])
-+AM_CONDITIONAL([ENABLE_GLES1], [test "x$enable_gles1" = "xyes"])
-+
-+AC_ARG_ENABLE([gles2],
-+ [AS_HELP_STRING([--disable-gles2],
-+ [disable support for OpenGL ES 2.x and 3.x API @<:@default=enabled@:>@])],
-+ [enable_gles2="$enableval"],
-+ [enable_gles2=yes])
-+AM_CONDITIONAL([ENABLE_GLES2], [test "x$enable_gles2" = "xyes"])
-
- AC_ARG_ENABLE([headers],
- [AS_HELP_STRING([--disable-headers],
-@@ -87,7 +93,8 @@ AC_ARG_ENABLE([headers],
- AM_CONDITIONAL([ENABLE_GL_HEADERS], [test "x$enable_headers" = "xyes"])
- AM_CONDITIONAL([ENABLE_EGL_HEADERS], [test "x$enable_headers" = "xyes" -a "x$enable_egl" = "xyes"])
- AM_CONDITIONAL([ENABLE_GLX_HEADERS], [test "x$enable_headers" = "xyes" -a "x$enable_glx" = "xyes"])
--AM_CONDITIONAL([ENABLE_GLES_HEADERS], [test "x$enable_headers" = "xyes" -a "x$enable_gles" = "xyes"])
-+AM_CONDITIONAL([ENABLE_GLES1_HEADERS], [test "x$enable_headers" = "xyes" -a "x$enable_gles1" = "xyes"])
-+AM_CONDITIONAL([ENABLE_GLES2_HEADERS], [test "x$enable_headers" = "xyes" -a "x$enable_gles2" = "xyes"])
-
- dnl
- dnl Arch/platform-specific settings. Copied from mesa
-diff --git a/include/Makefile.am b/include/Makefile.am
-index 3d81d17..0c41dc7 100644
---- a/include/Makefile.am
-+++ b/include/Makefile.am
-@@ -17,14 +17,18 @@ GL_HEADER_FILES = \
- GL/glext.h \
- KHR/khrplatform.h
-
--GLES_HEADER_FILES = \
-+GLES1_HEADER_FILES = \
- GLES/egl.h \
- GLES/gl.h \
- GLES/glext.h \
-- GLES/glplatform.h \
-+ GLES/glplatform.h
-+
-+GLES2_HEADER_FILES = \
- GLES2/gl2ext.h \
- GLES2/gl2.h \
-- GLES2/gl2platform.h \
-+ GLES2/gl2platform.h
-+
-+GLES3_HEADER_FILES = \
- GLES3/gl31.h \
- GLES3/gl32.h \
- GLES3/gl3.h \
-@@ -45,10 +49,18 @@ else
- noinst_HEADERS += $(GL_HEADER_FILES)
- endif
-
--if ENABLE_GLES_HEADERS
--nobase_include_HEADERS += $(GLES_HEADER_FILES)
-+if ENABLE_GLES1_HEADERS
-+nobase_include_HEADERS += $(GLES1_HEADER_FILES)
-+else
-+noinst_HEADERS += $(GLES1_HEADER_FILES)
-+endif
-+
-+if ENABLE_GLES2_HEADERS
-+nobase_include_HEADERS += $(GLES2_HEADER_FILES)
-+nobase_include_HEADERS += $(GLES3_HEADER_FILES)
- else
--noinst_HEADERS += $(GLES_HEADER_FILES)
-+noinst_HEADERS += $(GLES2_HEADER_FILES)
-+noinst_HEADERS += $(GLES3_HEADER_FILES)
- endif
-
- if ENABLE_GLX_HEADERS
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 5f7ce79..821346f 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -12,8 +12,10 @@ SUBDIRS += GLX
- SUBDIRS += GL
- endif
-
--if ENABLE_GLES
-+if ENABLE_GLES1
- SUBDIRS += GLESv1
-+endif
-+if ENABLE_GLES2
- SUBDIRS += GLESv2
- endif
-
---
-2.24.0
-
diff --git a/0002-egl-Sync-with-Khronos.patch b/0002-egl-Sync-with-Khronos.patch
deleted file mode 100644
index a7ef93e..0000000
--- a/0002-egl-Sync-with-Khronos.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 51233cc52cbcbe25f8461830913c06f5b5bc9508 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Thu, 17 Oct 2019 11:51:37 -0400
-Subject: [PATCH 2/4] egl: Sync with Khronos
-
- commit de3a5e867d906a04a5c37ee0d89e7f01d3598eb9
- Author: Ken Russell <kbrussel@alum.mit.edu>
- Date: Sat Oct 12 05:44:43 2019 -0700
-
- Reserve enums 0x34A0..0x34AF for ANGLE project. (#93)
-
-Closes: https://gitlab.freedesktop.org/glvnd/libglvnd/issues/193
----
- include/EGL/eglplatform.h | 6 ++++++
- src/generate/xml/egl.xml | 7 +++++--
- 2 files changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/include/EGL/eglplatform.h b/include/EGL/eglplatform.h
-index 29ab288..5ab49c1 100644
---- a/include/EGL/eglplatform.h
-+++ b/include/EGL/eglplatform.h
-@@ -116,6 +116,12 @@ typedef intptr_t EGLNativeDisplayType;
- typedef intptr_t EGLNativePixmapType;
- typedef intptr_t EGLNativeWindowType;
-
-+#elif defined(__unix__) && defined(EGL_NO_X11)
-+
-+typedef void *EGLNativeDisplayType;
-+typedef khronos_uintptr_t EGLNativePixmapType;
-+typedef khronos_uintptr_t EGLNativeWindowType;
-+
- #elif defined(__unix__) || defined(USE_X11)
-
- /* X11 (tentative) */
-diff --git a/src/generate/xml/egl.xml b/src/generate/xml/egl.xml
-index c27f172..6bc2ea2 100644
---- a/src/generate/xml/egl.xml
-+++ b/src/generate/xml/egl.xml
-@@ -1002,6 +1002,9 @@
- <enum value="0x3490" name="EGL_GL_COLORSPACE_DISPLAY_P3_PASSTHROUGH_EXT"/>
- <unused start="0x3491" end="0x349F"/>
- </enums>
-+ <enums namespace="EGL" start="0x34A0" end="0x34AF" vendor="ANGLE" comment="Reserved for Ken Russell - ANGLE (via github pull request)">
-+ <unused start="0x34A0" end="0x34AF"/>
-+ </enums>
-
- <!-- Please remember that new enumerant allocations must be obtained by
- request to the Khronos API registrar (see comments at the top of this
-@@ -1012,8 +1015,8 @@
-
- <!-- Reservable for future use. To generate a new range, allocate multiples
- of 16 starting at the lowest available point in this block. -->
-- <enums namespace="EGL" start="0x34A0" end="0x3FFF" vendor="KHR" comment="Reserved for future use">
-- <unused start="0x34A0" end="0x3FFF"/>
-+ <enums namespace="EGL" start="0x34B0" end="0x3FFF" vendor="KHR" comment="Reserved for future use">
-+ <unused start="0x34B0" end="0x3FFF"/>
- </enums>
-
- <enums namespace="EGL" start="0x8F70" end="0x8F7F" vendor="HI" comment="For Mark Callow, Khronos bug 4055. Shared with GL.">
---
-2.24.0
-
diff --git a/0003-Update-GL-gl.h-to-match-Mesa.patch b/0003-Update-GL-gl.h-to-match-Mesa.patch
deleted file mode 100644
index 87ac86b..0000000
--- a/0003-Update-GL-gl.h-to-match-Mesa.patch
+++ /dev/null
@@ -1,245 +0,0 @@
-From 5dfdc5a6dc60a3bdc63cd4510dabacba388da13a Mon Sep 17 00:00:00 2001
-From: Kyle Brenneman <kbrenneman@nvidia.com>
-Date: Tue, 22 Oct 2019 16:46:09 -0600
-Subject: [PATCH 3/4] Update GL/gl.h to match Mesa.
-
-Updated GL/gl.h to match the copy from Mesa at commit
-a0829cf23b307ca44ab8c4505974fb7c8d71a35a.
----
- include/GL/gl.h | 147 ++++++------------------------------------------
- 1 file changed, 17 insertions(+), 130 deletions(-)
-
-diff --git a/include/GL/gl.h b/include/GL/gl.h
-index 3f8cb62..2518dfb 100644
---- a/include/GL/gl.h
-+++ b/include/GL/gl.h
-@@ -27,40 +27,24 @@
- #ifndef __gl_h_
- #define __gl_h_
-
--#if defined(USE_MGL_NAMESPACE)
--#include "gl_mangle.h"
--#endif
--
--
- /**********************************************************************
-- * Begin system-specific stuff. Do not do any of this when building
-- * for SciTech SNAP, as this is all done before this header file is
-- * included.
-+ * Begin system-specific stuff.
- */
--#if !defined(__SCITECH_SNAP__)
--
--#if defined(__BEOS__)
--#include <stdlib.h> /* to get some BeOS-isms */
--#endif
--
--#if !defined(OPENSTEP) && (defined(NeXT) || defined(NeXT_PDO))
--#define OPENSTEP
--#endif
-
- #if defined(_WIN32) && !defined(__WIN32__) && !defined(__CYGWIN__)
- #define __WIN32__
- #endif
-
--#if !defined(OPENSTEP) && (defined(__WIN32__) && !defined(__CYGWIN__))
-+#if defined(__WIN32__) && !defined(__CYGWIN__)
- # if (defined(_MSC_VER) || defined(__MINGW32__)) && defined(BUILD_GL32) /* tag specify we're building mesa as a DLL */
- # define GLAPI __declspec(dllexport)
- # elif (defined(_MSC_VER) || defined(__MINGW32__)) && defined(_DLL) /* tag specifying we're building for DLL runtime support */
- # define GLAPI __declspec(dllimport)
- # else /* for use with static link lib build of Win32 edition only */
- # define GLAPI extern
--# endif /* _STATIC_MESA support */
-+# endif
- # if defined(__MINGW32__) && defined(GL_NO_STDCALL) || defined(UNDER_CE) /* The generated DLLs by MingW with STDCALL are not compatible with the ones done by Microsoft's compilers */
--# define GLAPIENTRY
-+# define GLAPIENTRY
- # else
- # define GLAPIENTRY __stdcall
- # endif
-@@ -72,10 +56,6 @@
- # define GLAPIENTRY
- #endif /* WIN32 && !CYGWIN */
-
--#if (defined(__BEOS__) && defined(__POWERPC__)) || defined(__QUICKDRAW__)
--# define PRAGMA_EXPORT_SUPPORTED 1
--#endif
--
- /*
- * WINDOWS: Include windows.h here to define APIENTRY.
- * It is also useful when applications include this file by
-@@ -91,10 +71,6 @@
- #include <windows.h>
- #endif
-
--#if defined(macintosh) && PRAGMA_IMPORT_SUPPORTED
--#pragma import on
--#endif
--
- #ifndef GLAPI
- #define GLAPI extern
- #endif
-@@ -116,15 +92,6 @@
- #define GLAPIENTRYP GLAPIENTRY *
- #endif
-
--#ifdef CENTERLINE_CLPP
--#define signed
--#endif
--
--#if defined(PRAGMA_EXPORT_SUPPORTED)
--#pragma export on
--#endif
--
--#endif /* !__SCITECH_SNAP__ */
- /*
- * End system-specific stuff.
- **********************************************************************/
-@@ -718,7 +685,7 @@ typedef double GLclampd; /* double precision float in [0,1] */
- #define GL_LIST_BIT 0x00020000
- #define GL_TEXTURE_BIT 0x00040000
- #define GL_SCISSOR_BIT 0x00080000
--#define GL_ALL_ATTRIB_BITS 0x000FFFFF
-+#define GL_ALL_ATTRIB_BITS 0xFFFFFFFF
-
-
- /* OpenGL 1.1 */
-@@ -1738,6 +1705,7 @@ GLAPI void GLAPIENTRY glGetSeparableFilter( GLenum target, GLenum format,
-
-
-
-+
- /*
- * OpenGL 1.3
- */
-@@ -2085,26 +2053,6 @@ typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVARBPROC) (GLenum target, const GLsh
-
-
-
--#if GL_ARB_shader_objects
--
--#ifndef GL_MESA_shader_debug
--#define GL_MESA_shader_debug 1
--
--#define GL_DEBUG_OBJECT_MESA 0x8759
--#define GL_DEBUG_PRINT_MESA 0x875A
--#define GL_DEBUG_ASSERT_MESA 0x875B
--
--GLAPI GLhandleARB GLAPIENTRY glCreateDebugObjectMESA (void);
--GLAPI void GLAPIENTRY glClearDebugLogMESA (GLhandleARB obj, GLenum logType, GLenum shaderType);
--GLAPI void GLAPIENTRY glGetDebugLogMESA (GLhandleARB obj, GLenum logType, GLenum shaderType, GLsizei maxLength,
-- GLsizei *length, GLcharARB *debugLog);
--GLAPI GLsizei GLAPIENTRY glGetDebugLogLengthMESA (GLhandleARB obj, GLenum logType, GLenum shaderType);
--
--#endif /* GL_MESA_shader_debug */
--
--#endif /* GL_ARB_shader_objects */
--
--
- /*
- * ???. GL_MESA_packed_depth_stencil
- * XXX obsolete
-@@ -2121,60 +2069,6 @@ GLAPI GLsizei GLAPIENTRY glGetDebugLogLengthMESA (GLhandleARB obj, GLenum logTyp
- #endif /* GL_MESA_packed_depth_stencil */
-
-
--#ifndef GL_MESA_program_debug
--#define GL_MESA_program_debug 1
--
--#define GL_FRAGMENT_PROGRAM_POSITION_MESA 0x8bb0
--#define GL_FRAGMENT_PROGRAM_CALLBACK_MESA 0x8bb1
--#define GL_FRAGMENT_PROGRAM_CALLBACK_FUNC_MESA 0x8bb2
--#define GL_FRAGMENT_PROGRAM_CALLBACK_DATA_MESA 0x8bb3
--#define GL_VERTEX_PROGRAM_POSITION_MESA 0x8bb4
--#define GL_VERTEX_PROGRAM_CALLBACK_MESA 0x8bb5
--#define GL_VERTEX_PROGRAM_CALLBACK_FUNC_MESA 0x8bb6
--#define GL_VERTEX_PROGRAM_CALLBACK_DATA_MESA 0x8bb7
--
--typedef void (*GLprogramcallbackMESA)(GLenum target, GLvoid *data);
--
--GLAPI void GLAPIENTRY glProgramCallbackMESA(GLenum target, GLprogramcallbackMESA callback, GLvoid *data);
--
--GLAPI void GLAPIENTRY glGetProgramRegisterfvMESA(GLenum target, GLsizei len, const GLubyte *name, GLfloat *v);
--
--#endif /* GL_MESA_program_debug */
--
--
--#ifndef GL_MESA_texture_array
--#define GL_MESA_texture_array 1
--
--/* GL_MESA_texture_array uses the same enum values as GL_EXT_texture_array.
-- */
--#ifndef GL_EXT_texture_array
--
--#ifdef GL_GLEXT_PROTOTYPES
--GLAPI void APIENTRY glFramebufferTextureLayerEXT(GLenum target,
-- GLenum attachment, GLuint texture, GLint level, GLint layer);
--#endif /* GL_GLEXT_PROTOTYPES */
--
--#if 0
--/* (temporarily) disabled because of collision with typedef in glext.h
-- * that happens if apps include both gl.h and glext.h
-- */
--typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYEREXTPROC) (GLenum target,
-- GLenum attachment, GLuint texture, GLint level, GLint layer);
--#endif
--
--#define GL_TEXTURE_1D_ARRAY_EXT 0x8C18
--#define GL_PROXY_TEXTURE_1D_ARRAY_EXT 0x8C19
--#define GL_TEXTURE_2D_ARRAY_EXT 0x8C1A
--#define GL_PROXY_TEXTURE_2D_ARRAY_EXT 0x8C1B
--#define GL_TEXTURE_BINDING_1D_ARRAY_EXT 0x8C1C
--#define GL_TEXTURE_BINDING_2D_ARRAY_EXT 0x8C1D
--#define GL_MAX_ARRAY_TEXTURE_LAYERS_EXT 0x88FF
--#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT 0x8CD4
--#endif
--
--#endif
--
--
- #ifndef GL_ATI_blend_equation_separate
- #define GL_ATI_blend_equation_separate 1
-
-@@ -2186,27 +2080,20 @@ typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEATIPROC) (GLenum modeRGB, GLen
- #endif /* GL_ATI_blend_equation_separate */
-
-
--/**
-- ** NOTE!!!!! If you add new functions to this file, or update
-- ** glext.h be sure to regenerate the gl_mangle.h file. See comments
-- ** in that file for details.
-- **/
--
--
--
--/**********************************************************************
-- * Begin system-specific stuff
-- */
--#if defined(PRAGMA_EXPORT_SUPPORTED)
--#pragma export off
-+/* GL_OES_EGL_image */
-+#if !defined(GL_OES_EGL_image) && !defined(GL_EXT_EGL_image_storage)
-+typedef void* GLeglImageOES;
- #endif
-
--#if defined(macintosh) && PRAGMA_IMPORT_SUPPORTED
--#pragma import off
-+#ifndef GL_OES_EGL_image
-+#define GL_OES_EGL_image 1
-+#ifdef GL_GLEXT_PROTOTYPES
-+GLAPI void APIENTRY glEGLImageTargetTexture2DOES (GLenum target, GLeglImageOES image);
-+GLAPI void APIENTRY glEGLImageTargetRenderbufferStorageOES (GLenum target, GLeglImageOES image);
-+#endif
-+typedef void (APIENTRYP PFNGLEGLIMAGETARGETTEXTURE2DOESPROC) (GLenum target, GLeglImageOES image);
-+typedef void (APIENTRYP PFNGLEGLIMAGETARGETRENDERBUFFERSTORAGEOESPROC) (GLenum target, GLeglImageOES image);
- #endif
--/*
-- * End system-specific stuff
-- **********************************************************************/
-
-
- #ifdef __cplusplus
---
-2.24.0
-
diff --git a/0004-Provide-an-empty-GLES3-gl3ext.h-header.patch b/0004-Provide-an-empty-GLES3-gl3ext.h-header.patch
deleted file mode 100644
index 2b6ea45..0000000
--- a/0004-Provide-an-empty-GLES3-gl3ext.h-header.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From f4668353266a33e71ab7cdbb99595edbaff03ace Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Wed, 6 Nov 2019 11:13:56 -0800
-Subject: [PATCH 4/4] Provide an empty GLES3/gl3ext.h header
-
-The one in Mesa is empty but appears to come from some Khronos
-repository, but gl3ext.h has never existed in the OpenGL-Registry
-repository on github. Provide it for backwards compatibility.
-
-Closes: https://gitlab.freedesktop.org/glvnd/libglvnd/issues/195
----
- include/GLES3/gl3ext.h | 9 +++++++++
- include/Makefile.am | 1 +
- 2 files changed, 10 insertions(+)
- create mode 100644 include/GLES3/gl3ext.h
-
-diff --git a/include/GLES3/gl3ext.h b/include/GLES3/gl3ext.h
-new file mode 100644
-index 0000000..484ea17
---- /dev/null
-+++ b/include/GLES3/gl3ext.h
-@@ -0,0 +1,9 @@
-+#ifndef __gl3ext_h_
-+#define __gl3ext_h_
-+
-+/*
-+ * This file is intentionally empty and is provided for source compatibility
-+ * with Mesa.
-+ */
-+
-+#endif /* __gl3ext_h_ */
-diff --git a/include/Makefile.am b/include/Makefile.am
-index 0c41dc7..c821de1 100644
---- a/include/Makefile.am
-+++ b/include/Makefile.am
-@@ -31,6 +31,7 @@ GLES2_HEADER_FILES = \
- GLES3_HEADER_FILES = \
- GLES3/gl31.h \
- GLES3/gl32.h \
-+ GLES3/gl3ext.h \
- GLES3/gl3.h \
- GLES3/gl3platform.h
-
---
-2.24.0
-
diff --git a/libglvnd-1.3.0-fix-linking.patch b/libglvnd-1.3.0-fix-linking.patch
new file mode 100644
index 0000000..4954847
--- /dev/null
+++ b/libglvnd-1.3.0-fix-linking.patch
@@ -0,0 +1,12 @@
+diff -Naur libglvnd-1.3.0/tests/dummy/meson.build libglvnd-1.3.0.tpg/tests/dummy/meson.build
+--- libglvnd-1.3.0/tests/dummy/meson.build 2019-12-05 21:44:43.000000000 +0000
++++ libglvnd-1.3.0.tpg/tests/dummy/meson.build 2019-12-09 11:23:30.733028337 +0000
+@@ -39,7 +39,7 @@
+ ['GLX_dummy.c'],
+ include_directories : [inc_dispatch, inc_glx, inc_include],
+ link_with: [libpatchentrypoints],
+- dependencies : [idep_trace, idep_utils_misc],
++ dependencies : [idep_trace, idep_utils_misc, dep_x11],
+ )
+
+ # The ICD loader expects to load a .so.0, but meson generates the .X.Y.Z
diff --git a/libglvnd.spec b/libglvnd.spec
index 6f289c9..283691e 100644
--- a/libglvnd.spec
+++ b/libglvnd.spec
@@ -1,12 +1,7 @@
%global __provides_exclude_from %{_libdir}/%{name}
%global __requires_exclude_from %{_libdir}/%{name}
-%define _disable_ld_as_needed 1
%global optflags %{optflags} -O3 -Wstrict-aliasing=0
-# (tpg) 2019-10-04 https://github.com/NVIDIA/libglvnd/issues/191
-%ifnarch %{riscv}
-%global ldflags %{ldflags} -fuse-ld=gold
-%endif
%define major 0
%define libgldispatch %mklibname gldispatch %{major}
@@ -23,18 +18,14 @@
Summary: The GL Vendor-Neutral Dispatch library
Name: libglvnd
-Version: 1.2.0
-Release: 5
+Version: 1.3.0
+Release: 1
License: MIT
Group: System/Libraries
Url: https://github.com/NVIDIA/libglvnd
Source0: https://github.com/NVIDIA/libglvnd/releases/download/v%{version}/%{name}-%{version}.tar.gz
-# (tpg) patches from upstream git
-Patch0: 0000-include-install-GL-headers-when-GL-is-enabled.patch
-Patch1: 0001-Add-a-configure-option-to-disable-glesv1-or-glesv2.patch
-Patch2: 0002-egl-Sync-with-Khronos.patch
-Patch3: 0003-Update-GL-gl.h-to-match-Mesa.patch
-Patch4: 0004-Provide-an-empty-GLES3-gl3ext.h-header.patch
+Patch0: libglvnd-1.3.0-fix-linking.patch
+BuildRequires: meson
BuildRequires: python-libxml2
BuildRequires: pkgconfig(glproto)
BuildRequires: pkgconfig(x11)
@@ -207,16 +198,16 @@ initially, has file conflicts with them).
%autosetup -p1
%build
-autoreconf -vif
-%configure \
- --disable-static \
- --enable-asm \
- --enable-tls
+%meson \
+ -Dasm=enabled \
+ -Dx11=enabled \
+ -Dglx=enabled \
+ -Dtls=enabled
-%make_build
+%meson_build
%install
-%make_install
+%meson_install
# Create directory layout
mkdir -p %{buildroot}%{_sysconfdir}/glvnd/egl_vendor.d