diff options
Diffstat (limited to 'meta/recipes-gnome/gtk+/gtk+3/opengl.patch')
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+3/opengl.patch | 48 |
1 files changed, 10 insertions, 38 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+3/opengl.patch b/meta/recipes-gnome/gtk+/gtk+3/opengl.patch index ddec2c72d7..7354265e10 100644 --- a/meta/recipes-gnome/gtk+/gtk+3/opengl.patch +++ b/meta/recipes-gnome/gtk+/gtk+3/opengl.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From a6fb8ee9cfd5e0f8c4450d48b582614e2de8201c Mon Sep 17 00:00:00 2001 | 1 | From 4a0716f04fb25b51b08e994bd5a900b2e7f7fed5 Mon Sep 17 00:00:00 2001 |
2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> | 2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> |
3 | Date: Fri, 16 Oct 2015 16:35:16 +0300 | 3 | Date: Fri, 16 Oct 2015 16:35:16 +0300 |
4 | Subject: [PATCH] Do not try to initialize GL without libGL | 4 | Subject: [PATCH] Do not try to initialize GL without libGL |
@@ -16,7 +16,6 @@ before calling epoxy APIs. | |||
16 | Upstream-Status: Denied | 16 | Upstream-Status: Denied |
17 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | 17 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> |
18 | --- | 18 | --- |
19 | config.h.meson | 2 ++ | ||
20 | demos/gtk-demo/meson.build | 5 ++++- | 19 | demos/gtk-demo/meson.build | 5 ++++- |
21 | docs/tools/meson.build | 7 +++++-- | 20 | docs/tools/meson.build | 7 +++++-- |
22 | docs/tools/widgets.c | 6 +++++- | 21 | docs/tools/widgets.c | 6 +++++- |
@@ -26,7 +25,6 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | |||
26 | gdk/gdkglcontext.c | 6 ++++++ | 25 | gdk/gdkglcontext.c | 6 ++++++ |
27 | gdk/gdkwindow.c | 13 +++++++++++++ | 26 | gdk/gdkwindow.c | 13 +++++++++++++ |
28 | gdk/meson.build | 8 +++++++- | 27 | gdk/meson.build | 8 +++++++- |
29 | gdk/x11/Makefile.am | 2 -- | ||
30 | gdk/x11/gdkdisplay-x11.c | 6 +++++- | 28 | gdk/x11/gdkdisplay-x11.c | 6 +++++- |
31 | gdk/x11/gdkvisual-x11.c | 5 +++++ | 29 | gdk/x11/gdkvisual-x11.c | 5 +++++ |
32 | gdk/x11/gdkwindow-x11.c | 4 ++++ | 30 | gdk/x11/gdkwindow-x11.c | 4 ++++ |
@@ -39,21 +37,8 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | |||
39 | meson_options.txt | 2 ++ | 37 | meson_options.txt | 2 ++ |
40 | tests/meson.build | 9 +++++++-- | 38 | tests/meson.build | 9 +++++++-- |
41 | testsuite/gtk/objects-finalize.c | 2 ++ | 39 | testsuite/gtk/objects-finalize.c | 2 ++ |
42 | 23 files changed, 130 insertions(+), 15 deletions(-) | 40 | 21 files changed, 128 insertions(+), 13 deletions(-) |
43 | 41 | ||
44 | diff --git a/config.h.meson b/config.h.meson | ||
45 | index b502611cb7..0bf6678d5e 100644 | ||
46 | --- a/config.h.meson | ||
47 | +++ b/config.h.meson | ||
48 | @@ -20,6 +20,8 @@ | ||
49 | /* define if we have colord */ | ||
50 | #mesondefine HAVE_COLORD | ||
51 | |||
52 | +#mesondefine HAVE_OPENGL | ||
53 | + | ||
54 | /* Define if the GNU dcgettext() function is already present or preinstalled. | ||
55 | */ | ||
56 | #mesondefine HAVE_DCGETTEXT | ||
57 | diff --git a/demos/gtk-demo/meson.build b/demos/gtk-demo/meson.build | 42 | diff --git a/demos/gtk-demo/meson.build b/demos/gtk-demo/meson.build |
58 | index 252da16d05..4b57cff6ac 100644 | 43 | index 252da16d05..4b57cff6ac 100644 |
59 | --- a/demos/gtk-demo/meson.build | 44 | --- a/demos/gtk-demo/meson.build |
@@ -367,19 +352,6 @@ index 4bb1bf2b6c..64172b8d3e 100644 | |||
367 | 352 | ||
368 | gdkconfig = configure_file( | 353 | gdkconfig = configure_file( |
369 | input : 'gdkconfig.h.meson', | 354 | input : 'gdkconfig.h.meson', |
370 | diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am | ||
371 | index 32b1f24434..d73eee604a 100644 | ||
372 | --- a/gdk/x11/Makefile.am | ||
373 | +++ b/gdk/x11/Makefile.am | ||
374 | @@ -40,8 +40,6 @@ libgdk_x11_la_SOURCES = \ | ||
375 | gdkeventtranslator.c \ | ||
376 | gdkeventtranslator.h \ | ||
377 | gdkgeometry-x11.c \ | ||
378 | - gdkglcontext-x11.c \ | ||
379 | - gdkglcontext-x11.h \ | ||
380 | gdkkeys-x11.c \ | ||
381 | gdkmain-x11.c \ | ||
382 | gdkmonitor-x11.c \ | ||
383 | diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c | 355 | diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c |
384 | index 7e08f472cc..30fd7b6089 100644 | 356 | index 7e08f472cc..30fd7b6089 100644 |
385 | --- a/gdk/x11/gdkdisplay-x11.c | 357 | --- a/gdk/x11/gdkdisplay-x11.c |
@@ -642,10 +614,10 @@ index 4fd0c3039c..a8e59ed077 100644 | |||
642 | if (GDK_IS_WAYLAND_DISPLAY (gdk_display_get_default ())) | 614 | if (GDK_IS_WAYLAND_DISPLAY (gdk_display_get_default ())) |
643 | { | 615 | { |
644 | diff --git a/meson.build b/meson.build | 616 | diff --git a/meson.build b/meson.build |
645 | index f2e63a8655..eea5347930 100644 | 617 | index aed48fc3f6..bfc33af0f6 100644 |
646 | --- a/meson.build | 618 | --- a/meson.build |
647 | +++ b/meson.build | 619 | +++ b/meson.build |
648 | @@ -136,6 +136,7 @@ wayland_enabled = get_option('wayland_backend') | 620 | @@ -137,6 +137,7 @@ wayland_enabled = get_option('wayland_backend') |
649 | broadway_enabled = get_option('broadway_backend') | 621 | broadway_enabled = get_option('broadway_backend') |
650 | quartz_enabled = get_option('quartz_backend') | 622 | quartz_enabled = get_option('quartz_backend') |
651 | win32_enabled = get_option('win32_backend') | 623 | win32_enabled = get_option('win32_backend') |
@@ -653,7 +625,7 @@ index f2e63a8655..eea5347930 100644 | |||
653 | 625 | ||
654 | os_unix = false | 626 | os_unix = false |
655 | os_linux = false | 627 | os_linux = false |
656 | @@ -450,7 +451,7 @@ pangocairo_dep = dependency('pangocairo', version: cairo_req, | 628 | @@ -430,7 +431,7 @@ pangocairo_dep = dependency('pangocairo', version: cairo_req, |
657 | fallback : ['pango', 'libpangocairo_dep']) | 629 | fallback : ['pango', 'libpangocairo_dep']) |
658 | pixbuf_dep = dependency('gdk-pixbuf-2.0', version: gdk_pixbuf_req, | 630 | pixbuf_dep = dependency('gdk-pixbuf-2.0', version: gdk_pixbuf_req, |
659 | fallback : ['gdk-pixbuf', 'gdkpixbuf_dep']) | 631 | fallback : ['gdk-pixbuf', 'gdkpixbuf_dep']) |
@@ -662,7 +634,7 @@ index f2e63a8655..eea5347930 100644 | |||
662 | fallback: ['libepoxy', 'libepoxy_dep']) | 634 | fallback: ['libepoxy', 'libepoxy_dep']) |
663 | atk_dep = dependency('atk', version: atk_req, | 635 | atk_dep = dependency('atk', version: atk_req, |
664 | fallback : ['atk', 'libatk_dep']) | 636 | fallback : ['atk', 'libatk_dep']) |
665 | @@ -496,6 +497,10 @@ if tracker3_enabled | 637 | @@ -476,6 +477,10 @@ if tracker3_enabled |
666 | endif | 638 | endif |
667 | endif | 639 | endif |
668 | 640 | ||
@@ -671,9 +643,9 @@ index f2e63a8655..eea5347930 100644 | |||
671 | +endif | 643 | +endif |
672 | + | 644 | + |
673 | if iso_codes_dep.found() | 645 | if iso_codes_dep.found() |
674 | cdata.set_quoted('ISO_CODES_PREFIX', iso_codes_dep.get_pkgconfig_variable('prefix')) | 646 | cdata.set_quoted('ISO_CODES_PREFIX', iso_codes_dep.get_variable(pkgconfig: 'prefix')) |
675 | else | 647 | else |
676 | @@ -926,9 +931,15 @@ else | 648 | @@ -912,9 +917,15 @@ else |
677 | gio_packages = ['gio-2.0', glib_req] | 649 | gio_packages = ['gio-2.0', glib_req] |
678 | endif | 650 | endif |
679 | 651 | ||
@@ -690,7 +662,7 @@ index f2e63a8655..eea5347930 100644 | |||
690 | ['fribidi', fribidi_req])) | 662 | ['fribidi', fribidi_req])) |
691 | 663 | ||
692 | gtk_packages = ' '.join([ | 664 | gtk_packages = ' '.join([ |
693 | @@ -942,7 +953,7 @@ pkgconf.set('GTK_PACKAGES', gtk_packages) | 665 | @@ -928,7 +939,7 @@ pkgconf.set('GTK_PACKAGES', gtk_packages) |
694 | # Requires.private | 666 | # Requires.private |
695 | pc_gdk_extra_libs += cairo_libs | 667 | pc_gdk_extra_libs += cairo_libs |
696 | 668 | ||
@@ -761,5 +733,5 @@ index 24540e313f..e0f863ab6a 100644 | |||
761 | /* Not allowed to finalize a GdkPixbufLoader without calling gdk_pixbuf_loader_close() */ | 733 | /* Not allowed to finalize a GdkPixbufLoader without calling gdk_pixbuf_loader_close() */ |
762 | all_types[i] != GDK_TYPE_PIXBUF_LOADER && | 734 | all_types[i] != GDK_TYPE_PIXBUF_LOADER && |
763 | -- | 735 | -- |
764 | 2.34.1 | 736 | 2.30.2 |
765 | 737 | ||