diff options
author | Markus Volk <f_l_k@t-online.de> | 2024-03-03 11:33:29 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-03-05 12:24:49 +0000 |
commit | d3b384e899556c4bac8cef1fc43fb054602e3183 (patch) | |
tree | 48b8980ca580481de2131cc056c0fa3c2f619a15 /meta | |
parent | 486f87659ff3db742d18f5c8a55b93286d6ec2e6 (diff) | |
download | poky-d3b384e899556c4bac8cef1fc43fb054602e3183.tar.gz |
gtk+3: update 3.24.38 -> 3.24.41
- update opengl.patch
Overview of Changes in GTK+ 3.24.41, 23-01-2024
===============================================
* Fix a crash introduced in the X11 changes in 3.24.40
* Build fixes
* Wayland: Fix interpretation of gtk-shell protocol
Overview of Changes in GTK+ 3.24.40, 17-01-2024
===============================================
* GtkEmojiChooser:
- Update to CLDR v44
- Add more translations
* GtkGestures:
- Preserve accuracy when translating events
* X11
- Support 'virtual' XRANDR monitors
* MacOs:
- Use consistent event coordinates
* Translation updates:
Georgian
Hebrew
Swedish
Overview of Changes in GTK+ 3.24.39, 19-12-2023
===============================================
* GtkMountOperation:
- Avoid a segfault
* GtkTooltip:
- Fix some positioning problems
* GtkFileChooser:
- Handle webdav in the pathbar
* GtkFileChooserNative:
- Fix closing portal file choosers
* GDK:
- Handle offscreen windows better in some places
* Wayland:
- Create pad devices on enter
- Ensure device-added/removed are emitted
- Make stylus button mappings compatible with X11
- Try harder to preserve cursor size with scaling
- Avoid oob access to cursor images
- Support tiling in xdg-shell
- Avoid using legacy cursor names
- Fix buffer size for scaled custom cursors
* X11:
- Remove slow path in gdk_cairo_draw_from_gl
- Trap more XRANDR errors
* MacOs:
- Make gdkquartz-cocoa-access.h usable again
- Silence secure-restore message
* Translation updates
Belarusian
British English
Catalan
Chinese (China)
Czech
Danish
Esperanto
Farsi
Georgian
Greek
Hebrew
Icelandic
Kazakh
Korean
Polish
Punjabi
Romanian
Slovak
Slovenian
Spanish
Turkish
(From OE-Core rev: 2378f50d32aa955a269fc747de3af2cb28767741)
Signed-off-by: Markus Volk <f_l_k@t-online.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+3/opengl.patch | 25 | ||||
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+3_3.24.41.bb (renamed from meta/recipes-gnome/gtk+/gtk+3_3.24.38.bb) | 2 |
2 files changed, 14 insertions, 13 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+3/opengl.patch b/meta/recipes-gnome/gtk+/gtk+3/opengl.patch index 7354265e10..8f2feb0ee7 100644 --- a/meta/recipes-gnome/gtk+/gtk+3/opengl.patch +++ b/meta/recipes-gnome/gtk+/gtk+3/opengl.patch | |||
@@ -141,17 +141,18 @@ diff --git a/gdk/gdkgl.c b/gdk/gdkgl.c | |||
141 | index 9690077cc2..55f85ef605 100644 | 141 | index 9690077cc2..55f85ef605 100644 |
142 | --- a/gdk/gdkgl.c | 142 | --- a/gdk/gdkgl.c |
143 | +++ b/gdk/gdkgl.c | 143 | +++ b/gdk/gdkgl.c |
144 | @@ -26,7 +26,9 @@ | 144 | @@ -21,8 +21,9 @@ |
145 | # include "win32/gdkwin32.h" | 145 | #include "gdkglcontextprivate.h" |
146 | #endif | ||
147 | 146 | ||
147 | #include "gdkinternals.h" | ||
148 | - | ||
148 | +#ifdef HAVE_OPENGL | 149 | +#ifdef HAVE_OPENGL |
149 | #include <epoxy/gl.h> | 150 | #include <epoxy/gl.h> |
150 | +#endif | 151 | +#endif |
151 | #include <math.h> | 152 | #include <math.h> |
152 | #include <string.h> | 153 | #include <string.h> |
153 | 154 | ||
154 | @@ -40,6 +42,7 @@ gdk_cairo_surface_mark_as_direct (cairo_surface_t *surface, | 155 | @@ -36,6 +37,7 @@ |
155 | g_object_ref (window), g_object_unref); | 156 | g_object_ref (window), g_object_unref); |
156 | } | 157 | } |
157 | 158 | ||
@@ -159,7 +160,7 @@ index 9690077cc2..55f85ef605 100644 | |||
159 | static const char * | 160 | static const char * |
160 | get_vertex_type_name (int type) | 161 | get_vertex_type_name (int type) |
161 | { | 162 | { |
162 | @@ -212,6 +215,7 @@ use_texture_rect_program (GdkGLContextPaintData *paint_data) | 163 | @@ -208,6 +210,7 @@ |
163 | glUseProgram (paint_data->current_program->program); | 164 | glUseProgram (paint_data->current_program->program); |
164 | } | 165 | } |
165 | } | 166 | } |
@@ -167,7 +168,7 @@ index 9690077cc2..55f85ef605 100644 | |||
167 | 168 | ||
168 | void | 169 | void |
169 | gdk_gl_texture_quads (GdkGLContext *paint_context, | 170 | gdk_gl_texture_quads (GdkGLContext *paint_context, |
170 | @@ -220,6 +224,7 @@ gdk_gl_texture_quads (GdkGLContext *paint_context, | 171 | @@ -216,6 +219,7 @@ |
171 | GdkTexturedQuad *quads, | 172 | GdkTexturedQuad *quads, |
172 | gboolean flip_colors) | 173 | gboolean flip_colors) |
173 | { | 174 | { |
@@ -175,7 +176,7 @@ index 9690077cc2..55f85ef605 100644 | |||
175 | GdkGLContextPaintData *paint_data = gdk_gl_context_get_paint_data (paint_context); | 176 | GdkGLContextPaintData *paint_data = gdk_gl_context_get_paint_data (paint_context); |
176 | GdkGLContextProgram *program; | 177 | GdkGLContextProgram *program; |
177 | GdkWindow *window = gdk_gl_context_get_window (paint_context); | 178 | GdkWindow *window = gdk_gl_context_get_window (paint_context); |
178 | @@ -293,6 +298,7 @@ gdk_gl_texture_quads (GdkGLContext *paint_context, | 179 | @@ -289,6 +293,7 @@ |
179 | 180 | ||
180 | glDisableVertexAttribArray (program->position_location); | 181 | glDisableVertexAttribArray (program->position_location); |
181 | glDisableVertexAttribArray (program->uv_location); | 182 | glDisableVertexAttribArray (program->uv_location); |
@@ -183,15 +184,15 @@ index 9690077cc2..55f85ef605 100644 | |||
183 | } | 184 | } |
184 | 185 | ||
185 | /* x,y,width,height describes a rectangle in the gl render buffer | 186 | /* x,y,width,height describes a rectangle in the gl render buffer |
186 | @@ -341,6 +347,7 @@ gdk_cairo_draw_from_gl (cairo_t *cr, | 187 | @@ -337,6 +342,7 @@ |
187 | int width, | 188 | int width, |
188 | int height) | 189 | int height) |
189 | { | 190 | { |
190 | +#ifdef HAVE_OPENGL | 191 | +#ifdef HAVE_OPENGL |
191 | GdkGLContext *paint_context; | 192 | GdkGLContext *paint_context, *current_context; |
192 | cairo_surface_t *image; | 193 | cairo_surface_t *image; |
193 | cairo_matrix_t matrix; | 194 | cairo_matrix_t matrix; |
194 | @@ -718,6 +725,7 @@ out: | 195 | @@ -703,6 +709,7 @@ |
195 | if (clip_region) | 196 | if (clip_region) |
196 | cairo_region_destroy (clip_region); | 197 | cairo_region_destroy (clip_region); |
197 | 198 | ||
@@ -199,7 +200,7 @@ index 9690077cc2..55f85ef605 100644 | |||
199 | } | 200 | } |
200 | 201 | ||
201 | /* This is always called with the paint context current */ | 202 | /* This is always called with the paint context current */ |
202 | @@ -725,6 +733,7 @@ void | 203 | @@ -710,6 +717,7 @@ |
203 | gdk_gl_texture_from_surface (cairo_surface_t *surface, | 204 | gdk_gl_texture_from_surface (cairo_surface_t *surface, |
204 | cairo_region_t *region) | 205 | cairo_region_t *region) |
205 | { | 206 | { |
@@ -207,7 +208,7 @@ index 9690077cc2..55f85ef605 100644 | |||
207 | GdkGLContext *paint_context; | 208 | GdkGLContext *paint_context; |
208 | cairo_surface_t *image; | 209 | cairo_surface_t *image; |
209 | double device_x_offset, device_y_offset; | 210 | double device_x_offset, device_y_offset; |
210 | @@ -825,4 +834,5 @@ gdk_gl_texture_from_surface (cairo_surface_t *surface, | 211 | @@ -810,4 +818,5 @@ |
211 | 212 | ||
212 | glDisable (GL_SCISSOR_TEST); | 213 | glDisable (GL_SCISSOR_TEST); |
213 | glDeleteTextures (1, &texture_id); | 214 | glDeleteTextures (1, &texture_id); |
diff --git a/meta/recipes-gnome/gtk+/gtk+3_3.24.38.bb b/meta/recipes-gnome/gtk+/gtk+3_3.24.41.bb index c23c46a689..17e90c59f0 100644 --- a/meta/recipes-gnome/gtk+/gtk+3_3.24.38.bb +++ b/meta/recipes-gnome/gtk+/gtk+3_3.24.41.bb | |||
@@ -5,7 +5,7 @@ MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" | |||
5 | SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz \ | 5 | SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz \ |
6 | file://opengl.patch \ | 6 | file://opengl.patch \ |
7 | " | 7 | " |
8 | SRC_URI[sha256sum] = "ce11decf018b25bdd8505544a4f87242854ec88be054d9ade5f3a20444dd8ee7" | 8 | SRC_URI[sha256sum] = "47da61487af3087a94bc49296fd025ca0bc02f96ef06c556e7c8988bd651b6fa" |
9 | 9 | ||
10 | S = "${WORKDIR}/gtk+-${PV}" | 10 | S = "${WORKDIR}/gtk+-${PV}" |
11 | 11 | ||