From dd438d980ef58999cf66ee89c3cf90b130c2b5734b39e17a9cacd838ee5875b5 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 22 May 2014 07:04:11 +0000 Subject: [PATCH] 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 --- git_fixes.patch | 315 ----------------------------------------------- libepoxy.changes | 15 +++ libepoxy.spec | 6 +- v1.1.tar.gz | 3 - v1.2.tar.gz | 3 + 5 files changed, 20 insertions(+), 322 deletions(-) delete mode 100644 git_fixes.patch delete mode 100644 v1.1.tar.gz create mode 100644 v1.2.tar.gz diff --git a/git_fixes.patch b/git_fixes.patch deleted file mode 100644 index 310ea8d..0000000 --- a/git_fixes.patch +++ /dev/null @@ -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; - - void glBindVertexArrayOES - GLuint array -+ - - - void glBindVertexBuffer -@@ -8858,6 +8859,7 @@ typedef unsigned int GLhandleARB; - GLint dstY1 - GLbitfield mask - GLenum filter -+ - - - void glBufferAddressRangeNV -@@ -9161,6 +9163,7 @@ typedef unsigned int GLhandleARB; - GLsync sync - GLbitfield flags - GLuint64 timeout -+ - - - void glClipPlane -@@ -9956,6 +9959,7 @@ typedef unsigned int GLhandleARB; - GLint border - GLsizei imageSize - const void *data -+ - - - void glCompressedTexSubImage1D -@@ -10054,6 +10058,7 @@ typedef unsigned int GLhandleARB; - GLenum format - GLsizei imageSize - const void *data -+ - - - void glCompressedTextureImage1DEXT -@@ -10583,6 +10588,7 @@ typedef unsigned int GLhandleARB; - GLint y - GLsizei width - GLsizei height -+ - - - void glCopyTextureImage1DEXT -@@ -11061,6 +11067,7 @@ typedef unsigned int GLhandleARB; - - void glDeleteSyncAPPLE - GLsync sync -+ - - - void glDeleteTextures -@@ -11101,6 +11108,7 @@ typedef unsigned int GLhandleARB; - void glDeleteVertexArraysOES - GLsizei n - const GLuint *arrays -+ - - - void glDeleteVertexShaderEXT -@@ -11312,6 +11320,7 @@ typedef unsigned int GLhandleARB; - GLint first - GLsizei count - GLsizei primcount -+ - - - void glDrawArraysInstancedARB -@@ -11343,6 +11352,7 @@ typedef unsigned int GLhandleARB; - GLint first - GLsizei count - GLsizei primcount -+ - - - void glDrawBuffer -@@ -11432,6 +11442,7 @@ typedef unsigned int GLhandleARB; - GLenum type - const void *indices - GLsizei primcount -+ - - - void glDrawElementsInstancedARB -@@ -11486,6 +11497,7 @@ typedef unsigned int GLhandleARB; - GLenum type - const void *indices - GLsizei primcount -+ - - - void glDrawMeshArraysSUN -@@ -12034,6 +12046,7 @@ typedef unsigned int GLhandleARB; - GLsync glFenceSyncAPPLE - GLenum condition - GLbitfield flags -+ - - - void glFinalCombinerInputNV -@@ -12090,6 +12103,7 @@ typedef unsigned int GLhandleARB; - GLenum target - GLintptr offset - GLsizeiptr length -+ - - - void glFlushMappedNamedBufferRangeEXT -@@ -12473,6 +12487,7 @@ typedef unsigned int GLhandleARB; - GLuint texture - GLint level - GLint zoffset -+ - - - void glFramebufferTextureARB -@@ -12772,6 +12787,7 @@ typedef unsigned int GLhandleARB; - void glGenVertexArraysOES - GLsizei n - GLuint *arrays -+ - - - GLuint glGenVertexShadersEXT -@@ -13601,6 +13617,7 @@ typedef unsigned int GLhandleARB; - void glGetInteger64vAPPLE - GLenum pname - GLint64 *params -+ - - - void glGetIntegerIndexedvEXT -@@ -14436,6 +14453,7 @@ typedef unsigned int GLhandleARB; - GLsizei *length - GLenum *binaryFormat - void *binary -+ - - - void glGetProgramEnvParameterIivNV -@@ -14884,6 +14902,7 @@ typedef unsigned int GLhandleARB; - GLsizei bufSize - GLsizei *length - GLint *values -+ - - - void glGetTexBumpParameterfvATI -@@ -16141,6 +16160,7 @@ typedef unsigned int GLhandleARB; - - GLboolean glIsSyncAPPLE - GLsync sync -+ - - - GLboolean glIsTexture -@@ -16187,6 +16207,7 @@ typedef unsigned int GLhandleARB; - - GLboolean glIsVertexArrayOES - GLuint array -+ - - - GLboolean glIsVertexAttribEnabledAPPLE -@@ -16590,6 +16611,7 @@ typedef unsigned int GLhandleARB; - GLintptr offset - GLsizeiptr length - GLbitfield access -+ - - - void glMapControlPointsNV -@@ -19137,6 +19159,7 @@ typedef unsigned int GLhandleARB; - GLenum binaryFormat - const void *binary - GLint length -+ - - - void glProgramBufferParametersIivNV -@@ -20858,6 +20881,7 @@ typedef unsigned int GLhandleARB; - GLenum internalformat - GLsizei width - GLsizei height -+ - - - void glRenderbufferStorageOES -@@ -22696,6 +22720,7 @@ typedef unsigned int GLhandleARB; - GLenum format - GLenum type - const void *pixels -+ - - - void glTexImage4DSGIS -@@ -22822,6 +22847,7 @@ typedef unsigned int GLhandleARB; - GLsizei levels - GLenum internalformat - GLsizei width -+ - - - void glTexStorage2D -@@ -22838,6 +22864,7 @@ typedef unsigned int GLhandleARB; - GLenum internalformat - GLsizei width - GLsizei height -+ - - - void glTexStorage2DMultisample -@@ -22865,6 +22892,7 @@ typedef unsigned int GLhandleARB; - GLsizei width - GLsizei height - GLsizei depth -+ - - - void glTexStorage3DMultisample -@@ -22983,6 +23011,7 @@ typedef unsigned int GLhandleARB; - GLenum format - GLenum type - const void *pixels -+ - - - void glTexSubImage4DSGIS -@@ -25474,6 +25503,7 @@ typedef unsigned int GLhandleARB; - void glVertexAttribDivisorANGLE - GLuint index - GLuint divisor -+ - - - void glVertexAttribDivisorARB -@@ -25491,6 +25521,7 @@ typedef unsigned int GLhandleARB; - void glVertexAttribDivisorNV - GLuint index - GLuint divisor -+ - - - void glVertexAttribFormat -@@ -26601,6 +26632,7 @@ typedef unsigned int GLhandleARB; - GLsync sync - GLbitfield flags - GLuint64 timeout -+ - - - void glWeightPathsNV -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); - } diff --git a/libepoxy.changes b/libepoxy.changes index 7e0d78f..f96a71c 100644 --- a/libepoxy.changes +++ b/libepoxy.changes @@ -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 diff --git a/libepoxy.spec b/libepoxy.spec index e35175a..5d78c60 100644 --- a/libepoxy.spec +++ b/libepoxy.spec @@ -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 diff --git a/v1.1.tar.gz b/v1.1.tar.gz deleted file mode 100644 index 97ae587..0000000 --- a/v1.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0578f0eb8a4b45a76c3fbbf8a60a9c1ee8cc8214359ad68483bd1aadfe5f39d3 -size 254495 diff --git a/v1.2.tar.gz b/v1.2.tar.gz new file mode 100644 index 0000000..6d3adf8 --- /dev/null +++ b/v1.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:42c328440f60a5795835c5ec4bdfc1329e75bba16b6e22b3a87ed17e9679e8f6 +size 267110