diff options
5 files changed, 96 insertions, 33 deletions
diff --git a/recipes-graphics/mesa/mesa-demos/0001-YOCIMX-8300-Fix-mesa-demos-build-break-on-GCC-14.patch b/recipes-graphics/mesa/mesa-demos/0001-YOCIMX-8300-Fix-mesa-demos-build-break-on-GCC-14.patch new file mode 100644 index 000000000..91b736ee7 --- /dev/null +++ b/recipes-graphics/mesa/mesa-demos/0001-YOCIMX-8300-Fix-mesa-demos-build-break-on-GCC-14.patch | |||
| @@ -0,0 +1,59 @@ | |||
| 1 | From 400c42cda81a859bd5950567eaffe394053ccc99 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Wujian Sun <wujian.sun_1@nxp.com> | ||
| 3 | Date: Thu, 5 Dec 2024 10:32:05 +0800 | ||
| 4 | Subject: [PATCH] YOCIMX-8300 Fix mesa-demos build break on GCC 14 | ||
| 5 | |||
| 6 | | ../mesa-demos-8.5.0/src/egl/opengl/eglkms.c: In function 'main': | ||
| 7 | | ../mesa-demos-8.5.0/src/egl/opengl/eglkms.c:190:24: error: passing | ||
| 8 | argument 1 of 'eglGetDisplay' from incompatible pointer type | ||
| 9 | [-Wincompatible-pointer-types] | ||
| 10 | | 190 | dpy = eglGetDisplay(gbm); | ||
| 11 | | | ^~~ | ||
| 12 | | | | | ||
| 13 | | | struct gbm_device * | ||
| 14 | | In file included from ../mesa-demos-8.5.0/src/egl/opengl/eglkms.c:33: | ||
| 15 | |||
| 16 | Type' {aka 'struct wl_display *'} but argument is of type 'struct | ||
| 17 | gbm_device *' | ||
| 18 | | 143 | EGLAPI EGLDisplay EGLAPIENTRY eglGetDisplay | ||
| 19 | (EGLNativeDisplayType display_id); | ||
| 20 | | | | ||
| 21 | ~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~ | ||
| 22 | | ../mesa-demos-8.5.0/src/egl/opengl/eglkms.c:229:50: error: passing | ||
| 23 | argument 3 of 'eglCreateWindowSurface' from incompatible pointer type | ||
| 24 | [-Wincompatible-pointer-types] | ||
| 25 | | 229 | surface = eglCreateWindowSurface(dpy, config, gs, NULL); | ||
| 26 | | | ^~ | ||
| 27 | | | | | ||
| 28 | | | struct | ||
| 29 | gbm_surface * | ||
| 30 | |||
| 31 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/demos/-/merge_requests/205] | ||
| 32 | |||
| 33 | Signed-off-by: Wujian Sun <wujian.sun_1@nxp.com> | ||
| 34 | --- | ||
| 35 | src/egl/opengl/eglkms.c | 4 ++-- | ||
| 36 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| 37 | |||
| 38 | diff --git a/src/egl/opengl/eglkms.c b/src/egl/opengl/eglkms.c | ||
| 39 | index 832962b..57adc7b 100644 | ||
| 40 | --- a/src/egl/opengl/eglkms.c | ||
| 41 | +++ b/src/egl/opengl/eglkms.c | ||
| 42 | @@ -187,7 +187,7 @@ int main(int argc, char *argv[]) | ||
| 43 | goto close_fd; | ||
| 44 | } | ||
| 45 | |||
| 46 | - dpy = eglGetDisplay(gbm); | ||
| 47 | + dpy = eglGetDisplay((EGLNativeDisplayType) gbm); | ||
| 48 | if (dpy == EGL_NO_DISPLAY) { | ||
| 49 | fprintf(stderr, "eglGetDisplay() failed\n"); | ||
| 50 | ret = -1; | ||
| 51 | @@ -226,7 +226,7 @@ int main(int argc, char *argv[]) | ||
| 52 | gs = gbm_surface_create(gbm, kms.mode.hdisplay, kms.mode.vdisplay, | ||
| 53 | GBM_BO_FORMAT_XRGB8888, | ||
| 54 | GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING); | ||
| 55 | - surface = eglCreateWindowSurface(dpy, config, gs, NULL); | ||
| 56 | + surface = eglCreateWindowSurface(dpy, config, (EGLNativeWindowType) gs, NULL); | ||
| 57 | |||
| 58 | if (!eglMakeCurrent(dpy, surface, surface, ctx)) { | ||
| 59 | fprintf(stderr, "failed to make context current\n"); | ||
diff --git a/recipes-graphics/mesa/mesa-demos/0001-egl-clear-backgrounds-black.patch b/recipes-graphics/mesa/mesa-demos/0001-egl-clear-backgrounds-black.patch index fa46823f1..fb9091129 100644 --- a/recipes-graphics/mesa/mesa-demos/0001-egl-clear-backgrounds-black.patch +++ b/recipes-graphics/mesa/mesa-demos/0001-egl-clear-backgrounds-black.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From cad7eb0f0487aea64c4460bd6ad95b5c9537d35a Mon Sep 17 00:00:00 2001 | 1 | From f5a6600ff8312a7c0f30273ab783c1d822749a73 Mon Sep 17 00:00:00 2001 |
| 2 | From: Jiyu Yang <jiyu.yang@nxp.com> | 2 | From: Jiyu Yang <jiyu.yang@nxp.com> |
| 3 | Date: Thu, 11 Apr 2024 16:30:50 +0800 | 3 | Date: Thu, 11 Apr 2024 16:30:50 +0800 |
| 4 | Subject: [PATCH] egl: clear backgrounds black | 4 | Subject: [PATCH] egl: clear backgrounds black |
| @@ -13,18 +13,15 @@ Signed-off-by: Jiyu Yang <jiyu.yang@nxp.com> | |||
| 13 | 1 file changed, 1 insertion(+), 1 deletion(-) | 13 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 14 | 14 | ||
| 15 | diff --git a/src/egl/opengles2/es2gears.c b/src/egl/opengles2/es2gears.c | 15 | diff --git a/src/egl/opengles2/es2gears.c b/src/egl/opengles2/es2gears.c |
| 16 | index db67f3a9..4e81afe7 100644 | 16 | index 9501f61..e421a8a 100644 |
| 17 | --- a/src/egl/opengles2/es2gears.c | 17 | --- a/src/egl/opengles2/es2gears.c |
| 18 | +++ b/src/egl/opengles2/es2gears.c | 18 | +++ b/src/egl/opengles2/es2gears.c |
| 19 | @@ -515,7 +515,7 @@ gears_draw(void) | 19 | @@ -350,7 +350,7 @@ gears_draw(void) |
| 20 | GLfloat transform[16]; | 20 | GLfloat transform[16]; |
| 21 | identity(transform); | 21 | mat4_identity(transform); |
| 22 | 22 | ||
| 23 | - glClearColor(0.0, 0.0, 0.0, 0.0); | 23 | - glClearColor(0.0, 0.0, 0.0, 0.0); |
| 24 | + glClearColor(0.0, 0.0, 0.0, 1.0); | 24 | + glClearColor(0.0, 0.0, 0.0, 1.0); |
| 25 | glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); | 25 | glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); |
| 26 | 26 | ||
| 27 | /* Translate and rotate the view */ | 27 | /* Translate and rotate the view */ |
| 28 | -- | ||
| 29 | 2.34.1 | ||
| 30 | |||
diff --git a/recipes-graphics/mesa/mesa-demos/Replace-glWindowPos2iARB-calls-with-glWindowPos2i.patch b/recipes-graphics/mesa/mesa-demos/Replace-glWindowPos2iARB-calls-with-glWindowPos2i.patch index 8401793cd..2e87ed155 100644 --- a/recipes-graphics/mesa/mesa-demos/Replace-glWindowPos2iARB-calls-with-glWindowPos2i.patch +++ b/recipes-graphics/mesa/mesa-demos/Replace-glWindowPos2iARB-calls-with-glWindowPos2i.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From 757649a766f90e745f24df1d191caeef15c71399 Mon Sep 17 00:00:00 2001 | 1 | From e453ac82b6ffd8f1d0de4c8ac8fd4bab6b924958 Mon Sep 17 00:00:00 2001 |
| 2 | From: Otavio Salvador <otavio@ossystems.com.br> | 2 | From: Otavio Salvador <otavio@ossystems.com.br> |
| 3 | Date: Tue, 4 Jun 2013 09:28:51 -0300 | 3 | Date: Tue, 4 Jun 2013 09:28:51 -0300 |
| 4 | Subject: [PATCH] Replace glWindowPos2iARB calls with glWindowPos2i | 4 | Subject: [PATCH] Replace glWindowPos2iARB calls with glWindowPos2i |
| @@ -34,7 +34,7 @@ Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | |||
| 34 | 20 files changed, 28 insertions(+), 28 deletions(-) | 34 | 20 files changed, 28 insertions(+), 28 deletions(-) |
| 35 | 35 | ||
| 36 | diff --git a/src/demos/copypix.c b/src/demos/copypix.c | 36 | diff --git a/src/demos/copypix.c b/src/demos/copypix.c |
| 37 | index 286c5a9..041b567 100644 | 37 | index 164d8c0..2d062a7 100644 |
| 38 | --- a/src/demos/copypix.c | 38 | --- a/src/demos/copypix.c |
| 39 | +++ b/src/demos/copypix.c | 39 | +++ b/src/demos/copypix.c |
| 40 | @@ -54,7 +54,7 @@ static void Display( void ) | 40 | @@ -54,7 +54,7 @@ static void Display( void ) |
| @@ -56,7 +56,7 @@ index 286c5a9..041b567 100644 | |||
| 56 | glPixelZoom(1, 1); | 56 | glPixelZoom(1, 1); |
| 57 | 57 | ||
| 58 | diff --git a/src/demos/engine.c b/src/demos/engine.c | 58 | diff --git a/src/demos/engine.c b/src/demos/engine.c |
| 59 | index 928fcbb..beace4c 100644 | 59 | index 410d889..b24638a 100644 |
| 60 | --- a/src/demos/engine.c | 60 | --- a/src/demos/engine.c |
| 61 | +++ b/src/demos/engine.c | 61 | +++ b/src/demos/engine.c |
| 62 | @@ -971,7 +971,7 @@ Draw(void) | 62 | @@ -971,7 +971,7 @@ Draw(void) |
| @@ -69,7 +69,7 @@ index 928fcbb..beace4c 100644 | |||
| 69 | if (lit) | 69 | if (lit) |
| 70 | glEnable(GL_LIGHTING); | 70 | glEnable(GL_LIGHTING); |
| 71 | diff --git a/src/demos/fogcoord.c b/src/demos/fogcoord.c | 71 | diff --git a/src/demos/fogcoord.c b/src/demos/fogcoord.c |
| 72 | index 567eec0..e833009 100644 | 72 | index ea9a3ae..ed0483f 100644 |
| 73 | --- a/src/demos/fogcoord.c | 73 | --- a/src/demos/fogcoord.c |
| 74 | +++ b/src/demos/fogcoord.c | 74 | +++ b/src/demos/fogcoord.c |
| 75 | @@ -68,14 +68,14 @@ PrintInfo(void) | 75 | @@ -68,14 +68,14 @@ PrintInfo(void) |
| @@ -90,7 +90,7 @@ index 567eec0..e833009 100644 | |||
| 90 | } | 90 | } |
| 91 | 91 | ||
| 92 | diff --git a/src/glsl/shadow_sampler.c b/src/glsl/shadow_sampler.c | 92 | diff --git a/src/glsl/shadow_sampler.c b/src/glsl/shadow_sampler.c |
| 93 | index b830030..eb82d8b 100644 | 93 | index 5f0f192..16a2201 100644 |
| 94 | --- a/src/glsl/shadow_sampler.c | 94 | --- a/src/glsl/shadow_sampler.c |
| 95 | +++ b/src/glsl/shadow_sampler.c | 95 | +++ b/src/glsl/shadow_sampler.c |
| 96 | @@ -85,7 +85,7 @@ Redisplay(void) | 96 | @@ -85,7 +85,7 @@ Redisplay(void) |
| @@ -103,7 +103,7 @@ index b830030..eb82d8b 100644 | |||
| 103 | 103 | ||
| 104 | { | 104 | { |
| 105 | diff --git a/src/tests/auxbuffer.c b/src/tests/auxbuffer.c | 105 | diff --git a/src/tests/auxbuffer.c b/src/tests/auxbuffer.c |
| 106 | index 5fa399a..0cd5f47 100644 | 106 | index d4f7c2d..5ff1785 100644 |
| 107 | --- a/src/tests/auxbuffer.c | 107 | --- a/src/tests/auxbuffer.c |
| 108 | +++ b/src/tests/auxbuffer.c | 108 | +++ b/src/tests/auxbuffer.c |
| 109 | @@ -419,7 +419,7 @@ event_loop(Display *dpy, Window win) | 109 | @@ -419,7 +419,7 @@ event_loop(Display *dpy, Window win) |
| @@ -116,7 +116,7 @@ index 5fa399a..0cd5f47 100644 | |||
| 116 | glCopyPixels(0, 0, WinWidth, WinHeight, GL_COLOR); | 116 | glCopyPixels(0, 0, WinWidth, WinHeight, GL_COLOR); |
| 117 | glEnable(GL_DEPTH_TEST); | 117 | glEnable(GL_DEPTH_TEST); |
| 118 | diff --git a/src/tests/copypixrate.c b/src/tests/copypixrate.c | 118 | diff --git a/src/tests/copypixrate.c b/src/tests/copypixrate.c |
| 119 | index 2f64e0a..df1f9b0 100644 | 119 | index 4c12fbd..e80f3cb 100644 |
| 120 | --- a/src/tests/copypixrate.c | 120 | --- a/src/tests/copypixrate.c |
| 121 | +++ b/src/tests/copypixrate.c | 121 | +++ b/src/tests/copypixrate.c |
| 122 | @@ -91,7 +91,7 @@ BlitOne(void) | 122 | @@ -91,7 +91,7 @@ BlitOne(void) |
| @@ -129,7 +129,7 @@ index 2f64e0a..df1f9b0 100644 | |||
| 129 | } | 129 | } |
| 130 | } | 130 | } |
| 131 | diff --git a/src/tests/drawbuffers.c b/src/tests/drawbuffers.c | 131 | diff --git a/src/tests/drawbuffers.c b/src/tests/drawbuffers.c |
| 132 | index fa2f8a7..cd5033f 100644 | 132 | index f017d25..36b241f 100644 |
| 133 | --- a/src/tests/drawbuffers.c | 133 | --- a/src/tests/drawbuffers.c |
| 134 | +++ b/src/tests/drawbuffers.c | 134 | +++ b/src/tests/drawbuffers.c |
| 135 | @@ -88,7 +88,7 @@ Display(void) | 135 | @@ -88,7 +88,7 @@ Display(void) |
| @@ -142,7 +142,7 @@ index fa2f8a7..cd5033f 100644 | |||
| 142 | 142 | ||
| 143 | free(buffer); | 143 | free(buffer); |
| 144 | diff --git a/src/tests/drawbuffers2.c b/src/tests/drawbuffers2.c | 144 | diff --git a/src/tests/drawbuffers2.c b/src/tests/drawbuffers2.c |
| 145 | index 5bcf0b2..84d444b 100644 | 145 | index 0cb8d47..ac1a5aa 100644 |
| 146 | --- a/src/tests/drawbuffers2.c | 146 | --- a/src/tests/drawbuffers2.c |
| 147 | +++ b/src/tests/drawbuffers2.c | 147 | +++ b/src/tests/drawbuffers2.c |
| 148 | @@ -112,7 +112,7 @@ Display(void) | 148 | @@ -112,7 +112,7 @@ Display(void) |
| @@ -155,7 +155,7 @@ index 5bcf0b2..84d444b 100644 | |||
| 155 | 155 | ||
| 156 | free(buffer); | 156 | free(buffer); |
| 157 | diff --git a/src/tests/fbotest1.c b/src/tests/fbotest1.c | 157 | diff --git a/src/tests/fbotest1.c b/src/tests/fbotest1.c |
| 158 | index 161903c..5930a6d 100644 | 158 | index 322ea30..19082b6 100644 |
| 159 | --- a/src/tests/fbotest1.c | 159 | --- a/src/tests/fbotest1.c |
| 160 | +++ b/src/tests/fbotest1.c | 160 | +++ b/src/tests/fbotest1.c |
| 161 | @@ -61,7 +61,7 @@ Display( void ) | 161 | @@ -61,7 +61,7 @@ Display( void ) |
| @@ -168,7 +168,7 @@ index 161903c..5930a6d 100644 | |||
| 168 | 168 | ||
| 169 | free(buffer); | 169 | free(buffer); |
| 170 | diff --git a/src/tests/fbotest2.c b/src/tests/fbotest2.c | 170 | diff --git a/src/tests/fbotest2.c b/src/tests/fbotest2.c |
| 171 | index 6ef7f12..11c867e 100644 | 171 | index 05554e4..e6a6c29 100644 |
| 172 | --- a/src/tests/fbotest2.c | 172 | --- a/src/tests/fbotest2.c |
| 173 | +++ b/src/tests/fbotest2.c | 173 | +++ b/src/tests/fbotest2.c |
| 174 | @@ -72,7 +72,7 @@ Display( void ) | 174 | @@ -72,7 +72,7 @@ Display( void ) |
| @@ -190,7 +190,7 @@ index 6ef7f12..11c867e 100644 | |||
| 190 | 190 | ||
| 191 | free(buffer); | 191 | free(buffer); |
| 192 | diff --git a/src/tests/fbotest3.c b/src/tests/fbotest3.c | 192 | diff --git a/src/tests/fbotest3.c b/src/tests/fbotest3.c |
| 193 | index 19f684d..e6d7710 100644 | 193 | index a3ac340..c320794 100644 |
| 194 | --- a/src/tests/fbotest3.c | 194 | --- a/src/tests/fbotest3.c |
| 195 | +++ b/src/tests/fbotest3.c | 195 | +++ b/src/tests/fbotest3.c |
| 196 | @@ -79,7 +79,7 @@ Display( void ) | 196 | @@ -79,7 +79,7 @@ Display( void ) |
| @@ -203,7 +203,7 @@ index 19f684d..e6d7710 100644 | |||
| 203 | 203 | ||
| 204 | free(buffer); | 204 | free(buffer); |
| 205 | diff --git a/src/tests/readrate.c b/src/tests/readrate.c | 205 | diff --git a/src/tests/readrate.c b/src/tests/readrate.c |
| 206 | index 3859cf4..81eb8a3 100644 | 206 | index 8a9a02f..9709835 100644 |
| 207 | --- a/src/tests/readrate.c | 207 | --- a/src/tests/readrate.c |
| 208 | +++ b/src/tests/readrate.c | 208 | +++ b/src/tests/readrate.c |
| 209 | @@ -85,7 +85,7 @@ MeasureFormat(struct format_type *fmt, GLint width, GLint height, GLuint pbo) | 209 | @@ -85,7 +85,7 @@ MeasureFormat(struct format_type *fmt, GLint width, GLint height, GLuint pbo) |
| @@ -242,7 +242,7 @@ index 3859cf4..81eb8a3 100644 | |||
| 242 | } | 242 | } |
| 243 | 243 | ||
| 244 | diff --git a/src/tests/viewmemory.c b/src/tests/viewmemory.c | 244 | diff --git a/src/tests/viewmemory.c b/src/tests/viewmemory.c |
| 245 | index 16044b9..3584c33 100644 | 245 | index 16054b6..ff7b4eb 100644 |
| 246 | --- a/src/tests/viewmemory.c | 246 | --- a/src/tests/viewmemory.c |
| 247 | +++ b/src/tests/viewmemory.c | 247 | +++ b/src/tests/viewmemory.c |
| 248 | @@ -95,7 +95,7 @@ Draw(void) | 248 | @@ -95,7 +95,7 @@ Draw(void) |
| @@ -255,7 +255,7 @@ index 16044b9..3584c33 100644 | |||
| 255 | 255 | ||
| 256 | glutSwapBuffers(); | 256 | glutSwapBuffers(); |
| 257 | diff --git a/src/trivial/clear-fbo-scissor.c b/src/trivial/clear-fbo-scissor.c | 257 | diff --git a/src/trivial/clear-fbo-scissor.c b/src/trivial/clear-fbo-scissor.c |
| 258 | index a30935c..5c15200 100644 | 258 | index 2d1ee4f..6d06330 100644 |
| 259 | --- a/src/trivial/clear-fbo-scissor.c | 259 | --- a/src/trivial/clear-fbo-scissor.c |
| 260 | +++ b/src/trivial/clear-fbo-scissor.c | 260 | +++ b/src/trivial/clear-fbo-scissor.c |
| 261 | @@ -182,7 +182,7 @@ Draw(void) | 261 | @@ -182,7 +182,7 @@ Draw(void) |
| @@ -268,7 +268,7 @@ index a30935c..5c15200 100644 | |||
| 268 | 268 | ||
| 269 | free(buffer); | 269 | free(buffer); |
| 270 | diff --git a/src/trivial/clear-fbo-tex.c b/src/trivial/clear-fbo-tex.c | 270 | diff --git a/src/trivial/clear-fbo-tex.c b/src/trivial/clear-fbo-tex.c |
| 271 | index de84f98..f0fbdf6 100644 | 271 | index 94534bd..6a38c4b 100644 |
| 272 | --- a/src/trivial/clear-fbo-tex.c | 272 | --- a/src/trivial/clear-fbo-tex.c |
| 273 | +++ b/src/trivial/clear-fbo-tex.c | 273 | +++ b/src/trivial/clear-fbo-tex.c |
| 274 | @@ -140,7 +140,7 @@ static void Draw( void ) | 274 | @@ -140,7 +140,7 @@ static void Draw( void ) |
| @@ -281,7 +281,7 @@ index de84f98..f0fbdf6 100644 | |||
| 281 | 281 | ||
| 282 | free(buffer); | 282 | free(buffer); |
| 283 | diff --git a/src/trivial/clear-fbo.c b/src/trivial/clear-fbo.c | 283 | diff --git a/src/trivial/clear-fbo.c b/src/trivial/clear-fbo.c |
| 284 | index 10d830b..3fee3e3 100644 | 284 | index 2065836..ad39401 100644 |
| 285 | --- a/src/trivial/clear-fbo.c | 285 | --- a/src/trivial/clear-fbo.c |
| 286 | +++ b/src/trivial/clear-fbo.c | 286 | +++ b/src/trivial/clear-fbo.c |
| 287 | @@ -116,7 +116,7 @@ Draw(void) | 287 | @@ -116,7 +116,7 @@ Draw(void) |
| @@ -294,7 +294,7 @@ index 10d830b..3fee3e3 100644 | |||
| 294 | 294 | ||
| 295 | free(buffer); | 295 | free(buffer); |
| 296 | diff --git a/src/trivial/readpixels.c b/src/trivial/readpixels.c | 296 | diff --git a/src/trivial/readpixels.c b/src/trivial/readpixels.c |
| 297 | index ccce4ed..74e0546 100644 | 297 | index fb88570..da9030e 100644 |
| 298 | --- a/src/trivial/readpixels.c | 298 | --- a/src/trivial/readpixels.c |
| 299 | +++ b/src/trivial/readpixels.c | 299 | +++ b/src/trivial/readpixels.c |
| 300 | @@ -71,7 +71,7 @@ static void Draw(void) | 300 | @@ -71,7 +71,7 @@ static void Draw(void) |
| @@ -307,7 +307,7 @@ index ccce4ed..74e0546 100644 | |||
| 307 | glDrawPixels(Width, Height, GL_RGBA, GL_FLOAT, image); | 307 | glDrawPixels(Width, Height, GL_RGBA, GL_FLOAT, image); |
| 308 | free(image); | 308 | free(image); |
| 309 | diff --git a/src/trivial/tri-fbo.c b/src/trivial/tri-fbo.c | 309 | diff --git a/src/trivial/tri-fbo.c b/src/trivial/tri-fbo.c |
| 310 | index d5800b2..dd1f21a 100644 | 310 | index 76985a9..21c0ec0 100644 |
| 311 | --- a/src/trivial/tri-fbo.c | 311 | --- a/src/trivial/tri-fbo.c |
| 312 | +++ b/src/trivial/tri-fbo.c | 312 | +++ b/src/trivial/tri-fbo.c |
| 313 | @@ -119,7 +119,7 @@ static void Draw( void ) | 313 | @@ -119,7 +119,7 @@ static void Draw( void ) |
| @@ -320,7 +320,7 @@ index d5800b2..dd1f21a 100644 | |||
| 320 | 320 | ||
| 321 | 321 | ||
| 322 | diff --git a/src/xdemos/glxsnoop.c b/src/xdemos/glxsnoop.c | 322 | diff --git a/src/xdemos/glxsnoop.c b/src/xdemos/glxsnoop.c |
| 323 | index 2215cfd..13d2b2d 100644 | 323 | index 294297a..abb32a8 100644 |
| 324 | --- a/src/xdemos/glxsnoop.c | 324 | --- a/src/xdemos/glxsnoop.c |
| 325 | +++ b/src/xdemos/glxsnoop.c | 325 | +++ b/src/xdemos/glxsnoop.c |
| 326 | @@ -91,7 +91,7 @@ redraw(Display *dpy, Window srcWin, Window dstWin ) | 326 | @@ -91,7 +91,7 @@ redraw(Display *dpy, Window srcWin, Window dstWin ) |
| @@ -350,6 +350,3 @@ index f670983..d010085 100644 | |||
| 350 | glCopyPixels(0, 0, Width[0], Height[0], GL_COLOR); | 350 | glCopyPixels(0, 0, Width[0], Height[0], GL_COLOR); |
| 351 | } | 351 | } |
| 352 | 352 | ||
| 353 | -- | ||
| 354 | 1.8.1 | ||
| 355 | |||
diff --git a/recipes-graphics/mesa/mesa-demos/fix-clear-build-break.patch b/recipes-graphics/mesa/mesa-demos/fix-clear-build-break.patch index 459a6ebd4..17fb208c9 100644 --- a/recipes-graphics/mesa/mesa-demos/fix-clear-build-break.patch +++ b/recipes-graphics/mesa/mesa-demos/fix-clear-build-break.patch | |||
| @@ -1,10 +1,18 @@ | |||
| 1 | mesa-demos: Add extension header to fix build break now that gl1 is removed | 1 | From d152655a1421f0cdf7ce22c35a36c367c07af587 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Tue, 26 Aug 2014 14:44:17 -0500 | ||
| 4 | Subject: [PATCH] mesa-demos: Add extension header to fix build break now that | ||
| 5 | gl1 is removed | ||
| 2 | 6 | ||
| 3 | Upstream-Status: Pending | 7 | Upstream-Status: Pending |
| 4 | 8 | ||
| 5 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 10 | --- | ||
| 11 | src/egl/opengles1/clear.c | 2 +- | ||
| 12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 13 | |||
| 6 | diff --git a/src/egl/opengles1/clear.c b/src/egl/opengles1/clear.c | 14 | diff --git a/src/egl/opengles1/clear.c b/src/egl/opengles1/clear.c |
| 7 | index 9fe1b5291e1905fd6fe572063ed707d59ce45a81..ca9954a21b5f475709dbdef07f90b900962fcbc7 100644 | 15 | index 9fe1b52..ca9954a 100644 |
| 8 | --- a/src/egl/opengles1/clear.c | 16 | --- a/src/egl/opengles1/clear.c |
| 9 | +++ b/src/egl/opengles1/clear.c | 17 | +++ b/src/egl/opengles1/clear.c |
| 10 | @@ -34,7 +34,7 @@ | 18 | @@ -34,7 +34,7 @@ |
diff --git a/recipes-graphics/mesa/mesa-demos_%.bbappend b/recipes-graphics/mesa/mesa-demos_%.bbappend index 1c5dd3daf..7d3e7ca1c 100644 --- a/recipes-graphics/mesa/mesa-demos_%.bbappend +++ b/recipes-graphics/mesa/mesa-demos_%.bbappend | |||
| @@ -3,7 +3,9 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" | |||
| 3 | SRC_URI:append:imxgpu = " \ | 3 | SRC_URI:append:imxgpu = " \ |
| 4 | file://Replace-glWindowPos2iARB-calls-with-glWindowPos2i.patch \ | 4 | file://Replace-glWindowPos2iARB-calls-with-glWindowPos2i.patch \ |
| 5 | file://fix-clear-build-break.patch \ | 5 | file://fix-clear-build-break.patch \ |
| 6 | file://0001-egl-clear-backgrounds-black.patch" | 6 | file://0001-egl-clear-backgrounds-black.patch \ |
| 7 | file://0001-YOCIMX-8300-Fix-mesa-demos-build-break-on-GCC-14.patch \ | ||
| 8 | " | ||
| 7 | 9 | ||
| 8 | REQUIRED_DISTRO_FEATURES:remove:imxgpu = "x11" | 10 | REQUIRED_DISTRO_FEATURES:remove:imxgpu = "x11" |
| 9 | 11 | ||
