commit 62ae634553eb4a38f2ac389177aab4d9e57a5763 Author: Matt Housh <jaeger@crux.ninja> Date: Mon Dec 30 20:58:09 2019 -0600 libglvnd: updated to version 1.3.0 diff --git a/libglvnd/.footprint b/libglvnd/.footprint index 49cc58f2..f96b04d6 100644 --- a/libglvnd/.footprint +++ b/libglvnd/.footprint @@ -23,6 +23,7 @@ drwxr-xr-x root/root usr/include/GLES3/ -rw-r--r-- root/root usr/include/GLES3/gl3.h -rw-r--r-- root/root usr/include/GLES3/gl31.h -rw-r--r-- root/root usr/include/GLES3/gl32.h +-rw-r--r-- root/root usr/include/GLES3/gl3ext.h -rw-r--r-- root/root usr/include/GLES3/gl3platform.h drwxr-xr-x root/root usr/include/KHR/ -rw-r--r-- root/root usr/include/KHR/khrplatform.h diff --git a/libglvnd/.signature b/libglvnd/.signature index 3a7fdd31..02554044 100644 --- a/libglvnd/.signature +++ b/libglvnd/.signature @@ -1,7 +1,6 @@ untrusted comment: verify with /etc/ports/xorg.pub -RWTSGWF5Q7TndLPAAeFwtMYJIBxy28nptWIzWvCTqQUVoeSHDDoqDQsXY7uz1LkglGp4OzwoktcTGEL3bJper0NeZRx4fADmIAc= -SHA256 (Pkgfile) = 41415263e2543a7045d4c14eb959a03ee11646a42979d32d22182eed4b82b3a8 -SHA256 (.footprint) = 6e5412046d01e7bd766b15881b96a863720629161689e0da437fd80659888470 -SHA256 (libglvnd-1.2.0.tar.gz) = 37981bd3320261f14140b8aef6e2e6c08c7e75b6a98dcea034670017f3f1312a -SHA256 (update-gl_h-to-match-mesa.patch) = 28b9f0a898702965a09ccee94c38901459571366ae214ce3dda6522edc02b098 -SHA256 (eglplatform.h) = 4573234a78a1f11841bc92f30b9ef62476d2f6937399be929420d8a79d5de423 +RWTSGWF5Q7TndGX7wJm+TWbKyFwPGlRzqvN59Wi5WemnNtuNkvHpSoQzDtoDMrg5EKhM0SHAgXklrfUtynLuhlhdcvCMXiUB5g0= +SHA256 (Pkgfile) = d54b97bc1e2a98af03e6c077a92d3b3eb7ce6fac753d548291c74442e8b079b7 +SHA256 (.footprint) = 6985f48e756c581f213eaf84b8f0234a608ec31c3ead594210caf1e5f0e62f72 +SHA256 (libglvnd-1.3.0.tar.gz) = fabf98e72e172a1402617f5daade4dd79c752a77ab1688e0c1a0ffc49605040f +SHA256 (eglplatform.h) = fb6f2775ee3f3536de579b232b6bc48261a6678f91ab39bf8a1c1e05dde68d04 diff --git a/libglvnd/Pkgfile b/libglvnd/Pkgfile index 924f42f3..3177ce34 100644 --- a/libglvnd/Pkgfile +++ b/libglvnd/Pkgfile @@ -4,17 +4,14 @@ # Depends on: xorg-libxext name=libglvnd -version=1.2.0 -release=3 +version=1.3.0 +release=1 source=(https://github.com/NVIDIA/$name/archive/v$version/$name-$version.tar.gz \ - update-gl_h-to-match-mesa.patch eglplatform.h) + eglplatform.h) build() { cd $name-$version - # https://gitlab.freedesktop.org/glvnd/libglvnd/merge_requests/195 - patch -p1 -i $SRC/update-gl_h-to-match-mesa.patch - autoreconf -if ./configure --prefix=/usr make diff --git a/libglvnd/eglplatform.h b/libglvnd/eglplatform.h index 4876dbd4..939539e6 100644 --- a/libglvnd/eglplatform.h +++ b/libglvnd/eglplatform.h @@ -55,6 +55,12 @@ #endif #define EGLAPIENTRYP EGLAPIENTRY* +#if defined(MESA_EGL_NO_X11_HEADERS) && !defined(EGL_NO_X11) +#warning "`MESA_EGL_NO_X11_HEADERS` is deprecated, and doesn't work with the unmodified Khronos header" +#warning "Please use `EGL_NO_X11` instead, as `MESA_EGL_NO_X11_HEADERS` will be removed soon" +#define EGL_NO_X11 +#endif + /* The types NativeDisplayType, NativeWindowType, and NativePixmapType * are aliases of window-system-dependent types, such as X Display * or * Windows Device Context. They must be defined in platform-specific @@ -116,15 +122,13 @@ typedef intptr_t EGLNativeDisplayType; typedef intptr_t EGLNativePixmapType; typedef intptr_t EGLNativeWindowType; -#elif defined(__unix__) || defined(__APPLE__) +#elif defined(__unix__) && defined(EGL_NO_X11) -#if defined(MESA_EGL_NO_X11_HEADERS) - -typedef void *EGLNativeDisplayType; +typedef void *EGLNativeDisplayType; typedef khronos_uintptr_t EGLNativePixmapType; typedef khronos_uintptr_t EGLNativeWindowType; -#else +#elif defined(__unix__) || defined(USE_X11) /* X11 (tentative) */ #include <X11/Xlib.h> @@ -134,7 +138,11 @@ typedef Display *EGLNativeDisplayType; typedef Pixmap EGLNativePixmapType; typedef Window EGLNativeWindowType; -#endif /* MESA_EGL_NO_X11_HEADERS */ +#elif defined(__APPLE__) + +typedef int EGLNativeDisplayType; +typedef void *EGLNativePixmapType; +typedef void *EGLNativeWindowType; #elif defined(__HAIKU__) diff --git a/libglvnd/update-gl_h-to-match-mesa.patch b/libglvnd/update-gl_h-to-match-mesa.patch deleted file mode 100644 index 93936125..00000000 --- a/libglvnd/update-gl_h-to-match-mesa.patch +++ /dev/null @@ -1,231 +0,0 @@ -diff --git a/include/GL/gl.h b/include/GL/gl.h -index 3f8cb6259f73962079b893b238f7869d0227f5dd..2518dfbb40deeb26bf1389c115fa293dc13e07fa 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