Accepting request 234495 from X11:XOrg
Update to 1.2 (forwarded request 234429 from sumski) OBS-URL: https://build.opensuse.org/request/show/234495 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libepoxy?expand=0&rev=2
This commit is contained in:
Stephan Kulow
Git OBS Bridge
parent
d3191e7416
commit
dd438d980e
315
git_fixes.patch
315
git_fixes.patch
@ -1,315 +0,0 @@
|
||||
diff --git a/include/epoxy/egl.h b/include/epoxy/egl.h
|
||||
index 5771ccd..f1c3f56 100644
|
||||
--- a/include/epoxy/egl.h
|
||||
+++ b/include/epoxy/egl.h
|
||||
@@ -45,8 +45,8 @@ extern "C" {
|
||||
|
||||
#include "epoxy/egl_generated.h"
|
||||
|
||||
-bool epoxy_has_egl_extension(EGLDisplay *dpy, const char *extension);
|
||||
-int epoxy_egl_version(EGLDisplay *dpy);
|
||||
+bool epoxy_has_egl_extension(EGLDisplay dpy, const char *extension);
|
||||
+int epoxy_egl_version(EGLDisplay dpy);
|
||||
|
||||
#ifdef __cplusplus
|
||||
} /* extern "C" */
|
||||
diff --git a/registry/gl.xml b/registry/gl.xml
|
||||
index 78a1248..d903dc6 100644
|
||||
--- a/registry/gl.xml
|
||||
+++ b/registry/gl.xml
|
||||
@@ -8499,6 +8499,7 @@ typedef unsigned int GLhandleARB;
|
||||
<command>
|
||||
<proto>void <name>glBindVertexArrayOES</name></proto>
|
||||
<param><ptype>GLuint</ptype> <name>array</name></param>
|
||||
+ <alias name="glBindVertexArray"/>
|
||||
</command>
|
||||
<command>
|
||||
<proto>void <name>glBindVertexBuffer</name></proto>
|
||||
@@ -8858,6 +8859,7 @@ typedef unsigned int GLhandleARB;
|
||||
<param><ptype>GLint</ptype> <name>dstY1</name></param>
|
||||
<param><ptype>GLbitfield</ptype> <name>mask</name></param>
|
||||
<param><ptype>GLenum</ptype> <name>filter</name></param>
|
||||
+ <alias name="glBlitFramebuffer"/>
|
||||
</command>
|
||||
<command>
|
||||
<proto>void <name>glBufferAddressRangeNV</name></proto>
|
||||
@@ -9161,6 +9163,7 @@ typedef unsigned int GLhandleARB;
|
||||
<param><ptype>GLsync</ptype> <name>sync</name></param>
|
||||
<param><ptype>GLbitfield</ptype> <name>flags</name></param>
|
||||
<param><ptype>GLuint64</ptype> <name>timeout</name></param>
|
||||
+ <alias name="glClientWaitSync"/>
|
||||
</command>
|
||||
<command>
|
||||
<proto>void <name>glClipPlane</name></proto>
|
||||
@@ -9956,6 +9959,7 @@ typedef unsigned int GLhandleARB;
|
||||
<param><ptype>GLint</ptype> <name>border</name></param>
|
||||
<param><ptype>GLsizei</ptype> <name>imageSize</name></param>
|
||||
<param>const void *<name>data</name></param>
|
||||
+ <alias name="glCompressedTexImage3D"/>
|
||||
</command>
|
||||
<command>
|
||||
<proto>void <name>glCompressedTexSubImage1D</name></proto>
|
||||
@@ -10054,6 +10058,7 @@ typedef unsigned int GLhandleARB;
|
||||
<param><ptype>GLenum</ptype> <name>format</name></param>
|
||||
<param><ptype>GLsizei</ptype> <name>imageSize</name></param>
|
||||
<param>const void *<name>data</name></param>
|
||||
+ <alias name="glCompressedTexSubImage3D"/>
|
||||
</command>
|
||||
<command>
|
||||
<proto>void <name>glCompressedTextureImage1DEXT</name></proto>
|
||||
@@ -10583,6 +10588,7 @@ typedef unsigned int GLhandleARB;
|
||||
<param><ptype>GLint</ptype> <name>y</name></param>
|
||||
<param><ptype>GLsizei</ptype> <name>width</name></param>
|
||||
<param><ptype>GLsizei</ptype> <name>height</name></param>
|
||||
+ <alias name="glCopyTexSubImage3D"/>
|
||||
</command>
|
||||
<command>
|
||||
<proto>void <name>glCopyTextureImage1DEXT</name></proto>
|
||||
@@ -11061,6 +11067,7 @@ typedef unsigned int GLhandleARB;
|
||||
<command>
|
||||
<proto>void <name>glDeleteSyncAPPLE</name></proto>
|
||||
<param><ptype>GLsync</ptype> <name>sync</name></param>
|
||||
+ <alias name="glDeleteSync"/>
|
||||
</command>
|
||||
<command>
|
||||
<proto>void <name>glDeleteTextures</name></proto>
|
||||
@@ -11101,6 +11108,7 @@ typedef unsigned int GLhandleARB;
|
||||
<proto>void <name>glDeleteVertexArraysOES</name></proto>
|
||||
<param><ptype>GLsizei</ptype> <name>n</name></param>
|
||||
<param>const <ptype>GLuint</ptype> *<name>arrays</name></param>
|
||||
+ <alias name="glDeleteVertexArrays"/>
|
||||
</command>
|
||||
<command>
|
||||
<proto>void <name>glDeleteVertexShaderEXT</name></proto>
|
||||
@@ -11312,6 +11320,7 @@ typedef unsigned int GLhandleARB;
|
||||
<param><ptype>GLint</ptype> <name>first</name></param>
|
||||
<param><ptype>GLsizei</ptype> <name>count</name></param>
|
||||
<param><ptype>GLsizei</ptype> <name>primcount</name></param>
|
||||
+ <alias name="glDrawArraysInstanced"/>
|
||||
</command>
|
||||
<command>
|
||||
<proto>void <name>glDrawArraysInstancedARB</name></proto>
|
||||
@@ -11343,6 +11352,7 @@ typedef unsigned int GLhandleARB;
|
||||
<param><ptype>GLint</ptype> <name>first</name></param>
|
||||
<param><ptype>GLsizei</ptype> <name>count</name></param>
|
||||
<param><ptype>GLsizei</ptype> <name>primcount</name></param>
|
||||
+ <alias name="glDrawArraysInstanced"/>
|
||||
</command>
|
||||
<command>
|
||||
<proto>void <name>glDrawBuffer</name></proto>
|
||||
@@ -11432,6 +11442,7 @@ typedef unsigned int GLhandleARB;
|
||||
<param><ptype>GLenum</ptype> <name>type</name></param>
|
||||
<param>const void *<name>indices</name></param>
|
||||
<param><ptype>GLsizei</ptype> <name>primcount</name></param>
|
||||
+ <alias name="glDrawElementsInstanced"/>
|
||||
</command>
|
||||
<command>
|
||||
<proto>void <name>glDrawElementsInstancedARB</name></proto>
|
||||
@@ -11486,6 +11497,7 @@ typedef unsigned int GLhandleARB;
|
||||
<param><ptype>GLenum</ptype> <name>type</name></param>
|
||||
<param>const void *<name>indices</name></param>
|
||||
<param><ptype>GLsizei</ptype> <name>primcount</name></param>
|
||||
+ <alias name="glDrawElementsInstanced"/>
|
||||
</command>
|
||||
<command>
|
||||
<proto>void <name>glDrawMeshArraysSUN</name></proto>
|
||||
@@ -12034,6 +12046,7 @@ typedef unsigned int GLhandleARB;
|
||||
<proto><ptype>GLsync</ptype> <name>glFenceSyncAPPLE</name></proto>
|
||||
<param><ptype>GLenum</ptype> <name>condition</name></param>
|
||||
<param><ptype>GLbitfield</ptype> <name>flags</name></param>
|
||||
+ <alias name="glFenceSync"/>
|
||||
</command>
|
||||
<command>
|
||||
<proto>void <name>glFinalCombinerInputNV</name></proto>
|
||||
@@ -12090,6 +12103,7 @@ typedef unsigned int GLhandleARB;
|
||||
<param><ptype>GLenum</ptype> <name>target</name></param>
|
||||
<param><ptype>GLintptr</ptype> <name>offset</name></param>
|
||||
<param><ptype>GLsizeiptr</ptype> <name>length</name></param>
|
||||
+ <alias name="glFlushMappedBufferRange"/>
|
||||
</command>
|
||||
<command>
|
||||
<proto>void <name>glFlushMappedNamedBufferRangeEXT</name></proto>
|
||||
@@ -12473,6 +12487,7 @@ typedef unsigned int GLhandleARB;
|
||||
<param><ptype>GLuint</ptype> <name>texture</name></param>
|
||||
<param><ptype>GLint</ptype> <name>level</name></param>
|
||||
<param><ptype>GLint</ptype> <name>zoffset</name></param>
|
||||
+ <alias name="glFramebufferTexture3D"/>
|
||||
</command>
|
||||
<command>
|
||||
<proto>void <name>glFramebufferTextureARB</name></proto>
|
||||
@@ -12772,6 +12787,7 @@ typedef unsigned int GLhandleARB;
|
||||
<proto>void <name>glGenVertexArraysOES</name></proto>
|
||||
<param><ptype>GLsizei</ptype> <name>n</name></param>
|
||||
<param><ptype>GLuint</ptype> *<name>arrays</name></param>
|
||||
+ <alias name="glGenVertexArrays"/>
|
||||
</command>
|
||||
<command>
|
||||
<proto><ptype>GLuint</ptype> <name>glGenVertexShadersEXT</name></proto>
|
||||
@@ -13601,6 +13617,7 @@ typedef unsigned int GLhandleARB;
|
||||
<proto>void <name>glGetInteger64vAPPLE</name></proto>
|
||||
<param><ptype>GLenum</ptype> <name>pname</name></param>
|
||||
<param><ptype>GLint64</ptype> *<name>params</name></param>
|
||||
+ <alias name="glGetInteger64v"/>
|
||||
</command>
|
||||
<command>
|
||||
<proto>void <name>glGetIntegerIndexedvEXT</name></proto>
|
||||
@@ -14436,6 +14453,7 @@ typedef unsigned int GLhandleARB;
|
||||
<param><ptype>GLsizei</ptype> *<name>length</name></param>
|
||||
<param><ptype>GLenum</ptype> *<name>binaryFormat</name></param>
|
||||
<param len="bufSize">void *<name>binary</name></param>
|
||||
+ <alias name="glGetProgramBinary"/>
|
||||
</command>
|
||||
<command>
|
||||
<proto>void <name>glGetProgramEnvParameterIivNV</name></proto>
|
||||
@@ -14884,6 +14902,7 @@ typedef unsigned int GLhandleARB;
|
||||
<param><ptype>GLsizei</ptype> <name>bufSize</name></param>
|
||||
<param><ptype>GLsizei</ptype> *<name>length</name></param>
|
||||
<param len="bufSize"><ptype>GLint</ptype> *<name>values</name></param>
|
||||
+ <alias name="glGetSynciv"/>
|
||||
</command>
|
||||
<command>
|
||||
<proto>void <name>glGetTexBumpParameterfvATI</name></proto>
|
||||
@@ -16141,6 +16160,7 @@ typedef unsigned int GLhandleARB;
|
||||
<command>
|
||||
<proto><ptype>GLboolean</ptype> <name>glIsSyncAPPLE</name></proto>
|
||||
<param><ptype>GLsync</ptype> <name>sync</name></param>
|
||||
+ <alias name="glIsSync"/>
|
||||
</command>
|
||||
<command>
|
||||
<proto group="Boolean"><ptype>GLboolean</ptype> <name>glIsTexture</name></proto>
|
||||
@@ -16187,6 +16207,7 @@ typedef unsigned int GLhandleARB;
|
||||
<command>
|
||||
<proto><ptype>GLboolean</ptype> <name>glIsVertexArrayOES</name></proto>
|
||||
<param><ptype>GLuint</ptype> <name>array</name></param>
|
||||
+ <alias name="glIsVertexArray"/>
|
||||
</command>
|
||||
<command>
|
||||
<proto group="Boolean"><ptype>GLboolean</ptype> <name>glIsVertexAttribEnabledAPPLE</name></proto>
|
||||
@@ -16590,6 +16611,7 @@ typedef unsigned int GLhandleARB;
|
||||
<param><ptype>GLintptr</ptype> <name>offset</name></param>
|
||||
<param><ptype>GLsizeiptr</ptype> <name>length</name></param>
|
||||
<param><ptype>GLbitfield</ptype> <name>access</name></param>
|
||||
+ <alias name="glMapBufferRange"/>
|
||||
</command>
|
||||
<command>
|
||||
<proto>void <name>glMapControlPointsNV</name></proto>
|
||||
@@ -19137,6 +19159,7 @@ typedef unsigned int GLhandleARB;
|
||||
<param><ptype>GLenum</ptype> <name>binaryFormat</name></param>
|
||||
<param>const void *<name>binary</name></param>
|
||||
<param><ptype>GLint</ptype> <name>length</name></param>
|
||||
+ <alias name="glProgramBinary"/>
|
||||
</command>
|
||||
<command>
|
||||
<proto>void <name>glProgramBufferParametersIivNV</name></proto>
|
||||
@@ -20858,6 +20881,7 @@ typedef unsigned int GLhandleARB;
|
||||
<param><ptype>GLenum</ptype> <name>internalformat</name></param>
|
||||
<param><ptype>GLsizei</ptype> <name>width</name></param>
|
||||
<param><ptype>GLsizei</ptype> <name>height</name></param>
|
||||
+ <alias name="glRenderbufferStorageMultisample"/>
|
||||
</command>
|
||||
<command>
|
||||
<proto>void <name>glRenderbufferStorageOES</name></proto>
|
||||
@@ -22696,6 +22720,7 @@ typedef unsigned int GLhandleARB;
|
||||
<param><ptype>GLenum</ptype> <name>format</name></param>
|
||||
<param><ptype>GLenum</ptype> <name>type</name></param>
|
||||
<param>const void *<name>pixels</name></param>
|
||||
+ <alias name="glTexImage3D"/>
|
||||
</command>
|
||||
<command>
|
||||
<proto>void <name>glTexImage4DSGIS</name></proto>
|
||||
@@ -22822,6 +22847,7 @@ typedef unsigned int GLhandleARB;
|
||||
<param><ptype>GLsizei</ptype> <name>levels</name></param>
|
||||
<param><ptype>GLenum</ptype> <name>internalformat</name></param>
|
||||
<param><ptype>GLsizei</ptype> <name>width</name></param>
|
||||
+ <alias name="glTexStorage1D"/>
|
||||
</command>
|
||||
<command>
|
||||
<proto>void <name>glTexStorage2D</name></proto>
|
||||
@@ -22838,6 +22864,7 @@ typedef unsigned int GLhandleARB;
|
||||
<param><ptype>GLenum</ptype> <name>internalformat</name></param>
|
||||
<param><ptype>GLsizei</ptype> <name>width</name></param>
|
||||
<param><ptype>GLsizei</ptype> <name>height</name></param>
|
||||
+ <alias name="glTexStorage2D"/>
|
||||
</command>
|
||||
<command>
|
||||
<proto>void <name>glTexStorage2DMultisample</name></proto>
|
||||
@@ -22865,6 +22892,7 @@ typedef unsigned int GLhandleARB;
|
||||
<param><ptype>GLsizei</ptype> <name>width</name></param>
|
||||
<param><ptype>GLsizei</ptype> <name>height</name></param>
|
||||
<param><ptype>GLsizei</ptype> <name>depth</name></param>
|
||||
+ <alias name="glTexStorage3D"/>
|
||||
</command>
|
||||
<command>
|
||||
<proto>void <name>glTexStorage3DMultisample</name></proto>
|
||||
@@ -22983,6 +23011,7 @@ typedef unsigned int GLhandleARB;
|
||||
<param><ptype>GLenum</ptype> <name>format</name></param>
|
||||
<param><ptype>GLenum</ptype> <name>type</name></param>
|
||||
<param>const void *<name>pixels</name></param>
|
||||
+ <alias name="glTexSubImage3D"/>
|
||||
</command>
|
||||
<command>
|
||||
<proto>void <name>glTexSubImage4DSGIS</name></proto>
|
||||
@@ -25474,6 +25503,7 @@ typedef unsigned int GLhandleARB;
|
||||
<proto>void <name>glVertexAttribDivisorANGLE</name></proto>
|
||||
<param><ptype>GLuint</ptype> <name>index</name></param>
|
||||
<param><ptype>GLuint</ptype> <name>divisor</name></param>
|
||||
+ <alias name="glVertexAttribDivisor"/>
|
||||
</command>
|
||||
<command>
|
||||
<proto>void <name>glVertexAttribDivisorARB</name></proto>
|
||||
@@ -25491,6 +25521,7 @@ typedef unsigned int GLhandleARB;
|
||||
<proto>void <name>glVertexAttribDivisorNV</name></proto>
|
||||
<param><ptype>GLuint</ptype> <name>index</name></param>
|
||||
<param><ptype>GLuint</ptype> <name>divisor</name></param>
|
||||
+ <alias name="glVertexAttribDivisor"/>
|
||||
</command>
|
||||
<command>
|
||||
<proto>void <name>glVertexAttribFormat</name></proto>
|
||||
@@ -26601,6 +26632,7 @@ typedef unsigned int GLhandleARB;
|
||||
<param><ptype>GLsync</ptype> <name>sync</name></param>
|
||||
<param><ptype>GLbitfield</ptype> <name>flags</name></param>
|
||||
<param><ptype>GLuint64</ptype> <name>timeout</name></param>
|
||||
+ <alias name="glWaitSync"/>
|
||||
</command>
|
||||
<command>
|
||||
<proto>void <name>glWeightPathsNV</name></proto>
|
||||
diff --git a/src/dispatch_egl.c b/src/dispatch_egl.c
|
||||
index 09eae00..8e13798 100644
|
||||
--- a/src/dispatch_egl.c
|
||||
+++ b/src/dispatch_egl.c
|
||||
@@ -30,7 +30,7 @@
|
||||
PUBLIC int
|
||||
epoxy_conservative_egl_version(void)
|
||||
{
|
||||
- EGLDisplay *dpy = eglGetCurrentDisplay();
|
||||
+ EGLDisplay dpy = eglGetCurrentDisplay();
|
||||
|
||||
if (!dpy)
|
||||
return 14;
|
||||
@@ -39,7 +39,7 @@ epoxy_conservative_egl_version(void)
|
||||
}
|
||||
|
||||
PUBLIC int
|
||||
-epoxy_egl_version(EGLDisplay *dpy)
|
||||
+epoxy_egl_version(EGLDisplay dpy)
|
||||
{
|
||||
int major, minor;
|
||||
const char *version_string;
|
||||
@@ -54,7 +54,7 @@ epoxy_egl_version(EGLDisplay *dpy)
|
||||
bool
|
||||
epoxy_conservative_has_egl_extension(const char *ext)
|
||||
{
|
||||
- EGLDisplay *dpy = eglGetCurrentDisplay();
|
||||
+ EGLDisplay dpy = eglGetCurrentDisplay();
|
||||
|
||||
if (!dpy)
|
||||
return true;
|
||||
@@ -63,7 +63,7 @@ epoxy_conservative_has_egl_extension(const char *ext)
|
||||
}
|
||||
|
||||
PUBLIC bool
|
||||
-epoxy_has_egl_extension(EGLDisplay *dpy, const char *ext)
|
||||
+epoxy_has_egl_extension(EGLDisplay dpy, const char *ext)
|
||||
{
|
||||
return epoxy_extension_in_string(eglQueryString(dpy, EGL_EXTENSIONS), ext);
|
||||
}
|
||||
@ -1,3 +1,18 @@
|
||||
-------------------------------------------------------------------
|
||||
Sat May 17 12:52:18 UTC 2014 - hrvoje.senjan@gmail.com
|
||||
|
||||
- Update to 1.2
|
||||
*This is a bugfix and feature release. On the feature side of
|
||||
things, it brings in an updated registry with support for
|
||||
GLES 3.1 and EGL 1.5, along with miscellaneous other extensions,
|
||||
and many more aliases for GLES functions. On the bugfix side,
|
||||
it should be much more portable to non-Mesa drivers (nvidia binary
|
||||
in particular) and systems with mixed Mesa and non-Mesa drivers,
|
||||
and actually install the wgl headers in the windows build.
|
||||
- Explicitly BuildRequire pkgconfig(x11), and don't count other
|
||||
packages drag it in
|
||||
- Drop git_fixes.patch, merged upstream
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 26 20:11:18 UTC 2014 - hrvoje.senjan@gmail.com
|
||||
|
||||
|
||||
@ -18,15 +18,13 @@
|
||||
|
||||
Name: libepoxy
|
||||
%define sonum 0
|
||||
Version: 1.1
|
||||
Version: 1.2
|
||||
Release: 0
|
||||
Summary: OpenGL function pointer management library
|
||||
License: MIT
|
||||
Group: Development/Libraries/C and C++
|
||||
Url: https://github.com/anholt/libepoxy
|
||||
Source: https://github.com/anholt/%{name}/archive/v%{version}.tar.gz
|
||||
# PATCH-FIX-UPSTREAM git_fixes.patch -- import fixes from git
|
||||
Patch0: git_fixes.patch
|
||||
BuildRequires: autoconf >= 2.60
|
||||
BuildRequires: automake
|
||||
BuildRequires: libtool
|
||||
@ -34,6 +32,7 @@ BuildRequires: pkgconfig
|
||||
BuildRequires: python3
|
||||
BuildRequires: pkgconfig(egl)
|
||||
BuildRequires: pkgconfig(gl)
|
||||
BuildRequires: pkgconfig(x11)
|
||||
BuildRequires: pkgconfig(xorg-macros)
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
@ -74,7 +73,6 @@ Development files.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{version}
|
||||
%patch0 -p1
|
||||
|
||||
%build
|
||||
if [ ! -e configure ]; then
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:0578f0eb8a4b45a76c3fbbf8a60a9c1ee8cc8214359ad68483bd1aadfe5f39d3
|
||||
size 254495
|
||||
3
v1.2.tar.gz
Normal file
3
v1.2.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:42c328440f60a5795835c5ec4bdfc1329e75bba16b6e22b3a87ed17e9679e8f6
|
||||
size 267110
|
||||
Loading…
Reference in New Issue
Block a user