* Remove a patch that's no longer needed (as we don't
have a problem with client side decorations anymore)
* Wayland build now depends on wayland-protocols:
Use same WAYLAND_PROTOCOLS_SYSROOT_DIR trick as weston so
protocols are found and multilib build does not break
* Add new binary gtk-query-settings to -dev package
* Rebase patches
* Modify 0003-Add-disable-opengl-configure-option.patch so
that gdkx.h really is generated whenever it changes
* Depend on wayland-protocols in gtk+3-dev if Wayland is enabled as otherwise
the pkg-config files can't be used - RB
(From OE-Core rev: b610145b1aadb093ced72a7958d8df00ef1250b6)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
gtk+3: depend on wayland-protocols if wayland enabled
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Patch is a bit nasty and not maintainer friendly, but it does
make Gtk+3 compile without libepoxy (which means without OpenGL
dev files).
(From OE-Core rev: 82bedec89a86902456e924a3ac2f233b6a069dea)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Rrecommend a similar set of packages as the gtk+ recipe.
Most importantly this actually makes icons render even when other
packages do not drag in the relevant gdkpixbuf loaders.
(From OE-Core rev: 0c686118fa74745571ff4ce6786fd415d39dbeb9)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
configure needs wayland-scanner which comes from wayland-native, add missing
DEPENDS.
(From OE-Core rev: 44d780271a14e54d729335700bb53248b898217a)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Cosmetic change to use "True", not 1 as expand parameter for getVar.
(From OE-Core rev: 4c9d063c72cc021ee22472783f74d73078671813)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Where variables are used in python, we need to ensure they are expanded.
This happens to work at the moment but likely will not happen in future
and isn't good code practise.
Its mostly an issue around key values, since bitbake has already
performed key expansion when these functions are executed.
(From OE-Core rev: 6d1142b56948c048111c4f78d9909c1846ab225b)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
With the autodebug package generation logic, specifically setting FILES_${PN}-dbg
isn't needed in most cases, we can remove them.
(From OE-Core rev: 3ab59d49dd7c18e194b58d1248b4b87709b5a738)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Package new development tool gtk-builder-tool.
* Disable colord support (for explicitness, no functional change)
(From OE-Core rev: 59498a8b4fa69a359e72225d14c554aae133571a)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(From OE-Core rev: 44b8ad12042eb4a1161c6f8359479f3dfa31eab9)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Conflicts:
gtk+3 and gtk+ have the same priority 10 for gtk-update-icon-cache
Turn up gtk+3's priority to fix the conflict.
[YOCTO #8477]
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Gdk initialization ends up calling epoxy GLX api, which calls exit()
if libGL.so.1 is not present. In practice this prevents all GTK+
applications from starting if GLX is not present.
If opengl and x11 distro features are set, make gtk+3 RDEPEND on libgl.
If opengl and x11 distro features are not set, use #ifdef to prevent
the GL initialization.
Remove libgl dependency from gtk3-demo: it can now run without
libgl (although trying to run the glarea demo will exit in that case).
[YOCTO #8529]
(From OE-Core rev: f9540f50ea661e260ec2b82436238cfb989e23c5)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The demo app uses OpenGL (within a GtkGLArea): it needs a runtime
dependency on a GL library. Current GTK+ can only handle
full GL (libGL.so.1) so RDEPEND on libgl.
(From OE-Core rev: 3d95440b77bfe90d20c8b7a96e611b6cf2ffcb70)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If you currently do a DISTRO_FEATURES_remove = "x11" with OE-Core, you
see failures due to dependency problems. The work in resolving this was
partially completed a while back. This adds in the markup mainly for
gtk/gtk3+ recipes and means "bitbake world" will work successfully.
Rather than code the gtk/gtk+ specific distro features into each recipe,
a shared variable is used.
(From OE-Core rev: ef967c70182eeccb59c7511d838a7ecb0b2315c1)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Drop --disable-gtk2-dependency and the patch for
gtk/native/Makefile.am: gtk-update-icon-cache is no longer used at
build time and as a result the option was removed.
* Add dependency to libepoxy
* Add dependency to virtual/mesa for wayland-egl
* Package new binaries gtk3-icon-browser and gtk-encode-symbolic-svg
* Add a backported patch that allows server side window decorations
in all cases
* RRECOMMEND adwaita-icon-theme-symbolic: GTK+ widgets expect a
symbolic theme to be installed
(From OE-Core rev: 8d34b4db648756d3474c809d2895b15299fc8a6a)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Without this each tries to provide libgtk-3.0 which directly conflict when
using multilibs.
(From OE-Core rev: afc4412f9ff14dd45aba6a47bfc87e703f3c4763)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
fix-build-when-wayland-backend-enabled.patch removed as the issue
is fixed in upstream.
(From OE-Core rev: 59fe6f91b39c4aa67e7e1734c3731d49c7ea8376)
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The base_contains is kept as a compatibility method and we ought to
not use it in OE-Core so we can remove it from base metadata in
future.
(From OE-Core rev: d83b16dbf0862be387f84228710cb165c6d2b03b)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
I plan on introducing a git master version for automatically testing upstream
development, so this split makes things a lot easier.
(From OE-Core rev: f245b1f37fc326c85d19a8a48784c44d15b08ea7)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Jussi Kukkonen
Alexander Kanavin
Richard Purdie
Robert Yang
Marko Lindqvist
Otavio Salvador
Christopher Larson
Ross Burton