From d3191e74169cfd6be04bd1be38505bee267d98cc0306a47dae4252e6be1c76a8 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 10 Mar 2014 11:18:22 +0000 Subject: [PATCH] Accepting request 224818 from KDE:Frameworks5 Init libepoxy package. We'll need it for kwin 5, and Stefan didn't thought it's a good idea to put it in X11:XOrg (sr#224114) OBS-URL: https://build.opensuse.org/request/show/224818 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libepoxy?expand=0&rev=1 --- .gitattributes | 23 ++++ .gitignore | 1 + git_fixes.patch | 315 +++++++++++++++++++++++++++++++++++++++++++++++ libepoxy.changes | 6 + libepoxy.spec | 106 ++++++++++++++++ v1.1.tar.gz | 3 + 6 files changed, 454 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 git_fixes.patch create mode 100644 libepoxy.changes create mode 100644 libepoxy.spec create mode 100644 v1.1.tar.gz diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/git_fixes.patch b/git_fixes.patch new file mode 100644 index 0000000..310ea8d --- /dev/null +++ b/git_fixes.patch @@ -0,0 +1,315 @@ +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 new file mode 100644 index 0000000..7e0d78f --- /dev/null +++ b/libepoxy.changes @@ -0,0 +1,6 @@ +------------------------------------------------------------------- +Wed Feb 26 20:11:18 UTC 2014 - hrvoje.senjan@gmail.com + +- Init libepoxy package + + diff --git a/libepoxy.spec b/libepoxy.spec new file mode 100644 index 0000000..e35175a --- /dev/null +++ b/libepoxy.spec @@ -0,0 +1,106 @@ +# +# spec file for package libepoxy +# +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + +Name: libepoxy +%define sonum 0 +Version: 1.1 +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 +BuildRequires: pkgconfig +BuildRequires: python3 +BuildRequires: pkgconfig(egl) +BuildRequires: pkgconfig(gl) +BuildRequires: pkgconfig(xorg-macros) +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +%description +Epoxy is a library for handling OpenGL function pointer management for you. + +It hides the complexity of dlopen(), dlsym(), glXGetProcAddress(), +eglGetProcAddress(), etc. from the app developer, with very little knowledge +needed on their part. They get to read GL specs and write code using undecorated +function names like glCompileShader(). + +%package -n %{name}%{sonum} +Summary: OpenGL function pointer management library +Group: Development/Libraries/C and C++ + +%description -n %{name}%{sonum} +Epoxy is a library for handling OpenGL function pointer management for you. + +It hides the complexity of dlopen(), dlsym(), glXGetProcAddress(), +eglGetProcAddress(), etc. from the app developer, with very little knowledge +needed on their part. They get to read GL specs and write code using undecorated +function names like glCompileShader(). + +%package devel +Summary: Development files for libepoxy +Group: Development/Libraries/C and C++ +Requires: %{name}%{sonum} = %{version} + +%description devel +Epoxy is a library for handling OpenGL function pointer management for you. + +It hides the complexity of dlopen(), dlsym(), glXGetProcAddress(), +eglGetProcAddress(), etc. from the app developer, with very little knowledge +needed on their part. They get to read GL specs and write code using undecorated +function names like glCompileShader(). + +Development files. + +%prep +%setup -q -n %{name}-%{version} +%patch0 -p1 + +%build +if [ ! -e configure ]; then + NOCONFIGURE=1 ./autogen.sh; +fi; +%configure --disable-static +make %{?_smp_mflags} + +%install +make install DESTDIR="%buildroot"; +rm -f "%buildroot/%{_libdir}"/*.la + +%post -n %{name}%{sonum} -p /sbin/ldconfig + +%postun -n %{name}%{sonum} -p /sbin/ldconfig + +%files -n %{name}%{sonum} +%defattr(-,root,root) +%doc COPYING +%{_libdir}/libepoxy.so.* + +%files devel +%defattr(-,root,root) +%doc COPYING +%{_libdir}/libepoxy.so +%{_libdir}/pkgconfig/epoxy.pc +%{_includedir}/epoxy/ + +%changelog diff --git a/v1.1.tar.gz b/v1.1.tar.gz new file mode 100644 index 0000000..97ae587 --- /dev/null +++ b/v1.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0578f0eb8a4b45a76c3fbbf8a60a9c1ee8cc8214359ad68483bd1aadfe5f39d3 +size 254495