unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
blob 71117dd2611bbb3454bbb5033f1f85b3a1536c32 2230 bytes (raw)
name: gnu/packages/patches/cogl-1.22.6-add-eglmesaext-header.patch 	 # note: path name is non-authoritative(*)

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
 
Add references to eglmesaext.h for build to succeed.
This patch should not be necessary in the future as these
have been added to eglext.h.
See https://github.com/KhronosGroup/EGL-Registry/commit/1343ecc9f55d3e8ded6a42d7ccfd33391a1dd35f

From: Brian Woodcox <bw@InSkyData.com>
Date: March 18, 2020

--- a/configure
+++ b/configure
@@ -24156,8 +24156,9 @@
   cat >>confdefs.h <<_ACEOF
 #define HAVE_EGL_EGLEXT_H 1
 _ACEOF
- COGL_EGL_INCLUDES="$COGL_EGL_INCLUDE
-#include <EGL/eglext.h>"
+ COGL_EGL_INCLUDES="$COGL_EGL_INCLUDES
+#include <EGL/eglext.h>
+#include <EGL/eglmesaext.h>"
 fi
 
 done
@@ -25565,8 +25566,8 @@
 fi
 
         COGL_EGL_INCLUDES="#include <EGL/egl.h>
-#include <EGL/eglext.h>"
-
+#include <EGL/eglext.h>
+#include <EGL/eglmesaext.h>"
 
 fi
 
--- a/configure.ac
+++ b/configure.ac
@@ -685,10 +685,15 @@
             AC_SUBST([COGL_EGL_INCLUDES])
 
             AC_CHECK_HEADERS([EGL/eglext.h],
-                             [COGL_EGL_INCLUDES="$COGL_EGL_INCLUDE
+                             [COGL_EGL_INCLUDES="$COGL_EGL_INCLUDES
 #include <EGL/eglext.h>"],
                              [],
                              [$COGL_EGL_INCLUDES])
+            AC_CHECK_HEADERS([EGL/eglmesaext.h],
+                             [COGL_EGL_INCLUDES="$COGL_EGL_INCLUDES
+#include <EGL/eglmesaext.h>"],
+                             [],
+                             [$COGL_EGL_INCLUDES])
 
             # Check for a GLES 1.x Common Profile library with/without EGL.
             #
@@ -1216,6 +1221,13 @@
               [],
               [AC_MSG_ERROR([Unable to locate required EGL headers])],
               [#include <EGL/egl.h>])
+            AC_CHECK_HEADERS(
+              [EGL/eglmesaext.h],
+              [],
+              [AC_MSG_ERROR([Unable to locate required EGL headers])],
+              [#include <EGL/egl.h>
+#include <EGL/eglext.h>
+#include <EGL/eglmesaext.h>])
 
             AC_CHECK_LIB(EGL, [eglInitialize],
               [COGL_EXTRA_LDFLAGS="$COGL_EXTRA_LDFLAGS -lEGL"],
@@ -1226,7 +1238,8 @@
           )
 
         COGL_EGL_INCLUDES="#include <EGL/egl.h>
-#include <EGL/eglext.h>"
+#include <EGL/eglext.h>
+#include <EGL/eglmesaext.h>"
         AC_SUBST([COGL_EGL_INCLUDES])
       ])

debug log:

solving 71117dd261 ...
found 71117dd261 in https://yhetil.org/guix-patches/54EFA16B-27F2-40F4-8FF0-F59BC65BF8AB@inskydata.com/

applying [1/1] https://yhetil.org/guix-patches/54EFA16B-27F2-40F4-8FF0-F59BC65BF8AB@inskydata.com/
diff --git a/gnu/packages/patches/cogl-1.22.6-add-eglmesaext-header.patch b/gnu/packages/patches/cogl-1.22.6-add-eglmesaext-header.patch
new file mode 100644
index 0000000000..71117dd261

1:27: trailing whitespace.
 
1:31: trailing whitespace.
 
1:37: trailing whitespace.
 
1:39: trailing whitespace.
 
1:44: trailing whitespace.
 
Checking patch gnu/packages/patches/cogl-1.22.6-add-eglmesaext-header.patch...
Applied patch gnu/packages/patches/cogl-1.22.6-add-eglmesaext-header.patch cleanly.
warning: squelched 3 whitespace errors
warning: 8 lines add whitespace errors.

index at:
100644 71117dd2611bbb3454bbb5033f1f85b3a1536c32	gnu/packages/patches/cogl-1.22.6-add-eglmesaext-header.patch

(*) Git path names are given by the tree(s) the blob belongs to.
    Blobs themselves have no identifier aside from the hash of its contents.^

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).