[Buildroot] [PATCH 1/3] libgtk3: remove non-existent configure options

[Buildroot] [PATCH 1/3] libgtk3: remove non-existent configure options

[Vicente Olivert Riera]

From config.log:

configure: WARNING: unrecognized options: --disable-doc, --disable-docs,
--disable-documentation, --with-xmlto, --with-fop, --enable-ipv6,
--enable-gtk2-dependency, --disable-introspection

Remove non-existent --enable-gtk2-dependency and --disable-introspection
configure options from libgtk3.mk.

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
---
 package/libgtk3/libgtk3.mk | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk
index 048029d..210f3e5 100644
--- a/package/libgtk3/libgtk3.mk
+++ b/package/libgtk3/libgtk3.mk
@@ -20,9 +20,7 @@ LIBGTK3_CONF_ENV = \
 
 LIBGTK3_CONF_OPTS = \
 	--disable-glibtest \
-	--enable-explicit-deps=no \
-	--enable-gtk2-dependency \
-	--disable-introspection
+	--enable-explicit-deps=no
 
 # Override pkg-config pkgdatadir variable, it needs the prefix
 LIBGTK3_MAKE_OPTS = \
-- 
2.10.2

[Buildroot] [PATCH 2/3] libgtk3: gdk-wayland backend depends on libX11

[Vicente Olivert Riera]

Otherwise it will fail to compile with an error like this one:

[Vincent: paths shortened for readability]

  CC       gdkglcontext-wayland.lo
In file included from /usr/include/epoxy/egl_generated.h:11:0,
                 from /usr/include/epoxy/egl.h:44,
                 from gdkglcontext-wayland.h:32,
                 from gdkglcontext-wayland.c:24:
/usr/include/EGL/eglplatform.h:119:22: fatal error: X11/Xlib.h: No such
file or directory
 #include <X11/Xlib.h>
                      ^
compilation terminated.
make[6]: *** [Makefile:682: gdkglcontext-wayland.lo] Error 1

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
---
 package/libgtk3/Config.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/libgtk3/Config.in b/package/libgtk3/Config.in
index 738f865..9e0721d 100644
--- a/package/libgtk3/Config.in
+++ b/package/libgtk3/Config.in
@@ -62,11 +62,15 @@ comment "Wayland GDK backend needs an OpenGL EGL backend provided by mesa3d w/ h
 	depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL || \
 		!BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17
 
+comment "Wayland GDK backend needs libX11 support"
+	depends on !BR2_PACKAGE_XLIB_LIBX11
+
 config BR2_PACKAGE_LIBGTK3_WAYLAND
 	bool "Wayland GDK backend"
 	default y
 	depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND
 	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17
+	depends on BR2_PACKAGE_XLIB_LIBX11
 	select BR2_PACKAGE_WAYLAND
 	select BR2_PACKAGE_WAYLAND_PROTOCOLS
 	select BR2_PACKAGE_LIBXKBCOMMON
-- 
2.10.2

[Buildroot] [PATCH 2/3] libgtk3: gdk-wayland backend depends on libX11

[Thomas Petazzoni]

Hello,

On Tue, 14 Mar 2017 11:46:27 +0000, Vicente Olivert Riera wrote:

>  config BR2_PACKAGE_LIBGTK3_WAYLAND
>  	bool "Wayland GDK backend"
>  	default y
>  	depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND
>  	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17
> +	depends on BR2_PACKAGE_XLIB_LIBX11

This feels weird. Isn't the point of the Wayland backend specifically
to be used with Wayland, and therefore not to depend on anything X.org
related?

Isn't this a bug in Gtk, rather than something we should fix with an
additional dependency?

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

[Buildroot] [PATCH 2/3] libgtk3: gdk-wayland backend depends on libX11

[Vicente Olivert Riera]

Hi Thomas,

On 14/03/17 16:22, Thomas Petazzoni wrote:
> Hello,
> 
> On Tue, 14 Mar 2017 11:46:27 +0000, Vicente Olivert Riera wrote:
> 
>>  config BR2_PACKAGE_LIBGTK3_WAYLAND
>>  	bool "Wayland GDK backend"
>>  	default y
>>  	depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND
>>  	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17
>> +	depends on BR2_PACKAGE_XLIB_LIBX11
> 
> This feels weird. Isn't the point of the Wayland backend specifically
> to be used with Wayland, and therefore not to depend on anything X.org
> related?
> 
> Isn't this a bug in Gtk, rather than something we should fix with an
> additional dependency?

maybe the gdk-wayland backend is necessary to run gtk3 apps on a Wayland
display server, but it still needs some libX11 bits because the support
is not complete. Just guessing :P

Vincent

> 
> Thomas
> 

[Buildroot] [PATCH 2/3] libgtk3: gdk-wayland backend depends on libX11

[Thomas Petazzoni]

Hello,

On Tue, 14 Mar 2017 16:39:04 +0000, Vicente Olivert Riera wrote:

> > This feels weird. Isn't the point of the Wayland backend specifically
> > to be used with Wayland, and therefore not to depend on anything X.org
> > related?
> > 
> > Isn't this a bug in Gtk, rather than something we should fix with an
> > additional dependency?  
> 
> maybe the gdk-wayland backend is necessary to run gtk3 apps on a Wayland
> display server, but it still needs some libX11 bits because the support
> is not complete. Just guessing :P

With which OpenGL ES/EGL provider did you get this build failure?

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

[Buildroot] [PATCH 2/3] libgtk3: gdk-wayland backend depends on libX11

[Vicente Olivert Riera]

Hi Thomas,

On 14/03/17 22:22, Thomas Petazzoni wrote:
> Hello,
> 
> On Tue, 14 Mar 2017 16:39:04 +0000, Vicente Olivert Riera wrote:
> 
>>> This feels weird. Isn't the point of the Wayland backend specifically
>>> to be used with Wayland, and therefore not to depend on anything X.org
>>> related?
>>>
>>> Isn't this a bug in Gtk, rather than something we should fix with an
>>> additional dependency?  
>>
>> maybe the gdk-wayland backend is necessary to run gtk3 apps on a Wayland
>> display server, but it still needs some libX11 bits because the support
>> is not complete. Just guessing :P
> 
> With which OpenGL ES/EGL provider did you get this build failure?

BR2_PACKAGE_MESA3D_OPENGL_EGL

Vincent

> 
> Thanks!
> 
> Thomas
> 

[Buildroot] [PATCH 2/3] libgtk3: gdk-wayland backend depends on libX11

[Gustavo Zacarias]

On 2017-03-15 07:31, Vicente Olivert Riera wrote:

> Hi Thomas,
> 
> On 14/03/17 22:22, Thomas Petazzoni wrote:
>> Hello,
>> 
>> On Tue, 14 Mar 2017 16:39:04 +0000, Vicente Olivert Riera wrote:
>> 
>>>> This feels weird. Isn't the point of the Wayland backend 
>>>> specifically
>>>> to be used with Wayland, and therefore not to depend on anything 
>>>> X.org
>>>> related?
>>>> 
>>>> Isn't this a bug in Gtk, rather than something we should fix with an
>>>> additional dependency?
>>> 
>>> maybe the gdk-wayland backend is necessary to run gtk3 apps on a 
>>> Wayland
>>> display server, but it still needs some libX11 bits because the 
>>> support
>>> is not complete. Just guessing :P
>> 
>> With which OpenGL ES/EGL provider did you get this build failure?
> 
> BR2_PACKAGE_MESA3D_OPENGL_EGL
> 
> Vincent

Hi Vincent, Thomas.
This is libepoxy messing up (not forwarding the mesa headers on), i'll 
send a patch shortly.
Regards.

[Buildroot] [PATCH 2/3] libgtk3: gdk-wayland backend depends on libX11

[Peter Seiderer]

Hello Vicente,

On Tue, 14 Mar 2017 11:46:27 +0000, Vicente Olivert Riera <Vincent.Riera@imgtec.com> wrote:

> Otherwise it will fail to compile with an error like this one:
> 
> [Vincent: paths shortened for readability]
> 
>   CC       gdkglcontext-wayland.lo
> In file included from /usr/include/epoxy/egl_generated.h:11:0,
>                  from /usr/include/epoxy/egl.h:44,
>                  from gdkglcontext-wayland.h:32,
>                  from gdkglcontext-wayland.c:24:
> /usr/include/EGL/eglplatform.h:119:22: fatal error: X11/Xlib.h: No such
> file or directory
>  #include <X11/Xlib.h>
>                       ^
> compilation terminated.
> make[6]: *** [Makefile:682: gdkglcontext-wayland.lo] Error 1
> 

Qt has a similare build failure solved by -DQT_EGL_NO_X11 which is used by
qt5base-5.8.0/src/platformsupport/eglconvenience/qt_egl_p.h:

#ifdef QT_EGL_NO_X11
# define MESA_EGL_NO_X11_HEADERS // MESA
# define WIN_INTERFACE_CUSTOM    // NV
#endif // QT_EGL_NO_X11

#ifdef QT_EGL_WAYLAND
# define WAYLAND // NV
#endif // QT_EGL_WAYLAND

#include <EGL/egl.h>
#include <EGL/eglext.h>

Maybe something similare (define MESA_EGL_NO_X11_HEADERS) works for
the gdk-wayland backend?

Regards,
Peter


> Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
> ---
>  package/libgtk3/Config.in | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/package/libgtk3/Config.in b/package/libgtk3/Config.in
> index 738f865..9e0721d 100644
> --- a/package/libgtk3/Config.in
> +++ b/package/libgtk3/Config.in
> @@ -62,11 +62,15 @@ comment "Wayland GDK backend needs an OpenGL EGL backend provided by mesa3d w/ h
>  	depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL || \
>  		!BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17
>  
> +comment "Wayland GDK backend needs libX11 support"
> +	depends on !BR2_PACKAGE_XLIB_LIBX11
> +
>  config BR2_PACKAGE_LIBGTK3_WAYLAND
>  	bool "Wayland GDK backend"
>  	default y
>  	depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND
>  	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17
> +	depends on BR2_PACKAGE_XLIB_LIBX11
>  	select BR2_PACKAGE_WAYLAND
>  	select BR2_PACKAGE_WAYLAND_PROTOCOLS
>  	select BR2_PACKAGE_LIBXKBCOMMON

[Buildroot] [PATCH 3/3] libgtk3: bump version to 3.22.10

[Vicente Olivert Riera]

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
---
 package/libgtk3/libgtk3.hash | 4 ++--
 package/libgtk3/libgtk3.mk   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/libgtk3/libgtk3.hash b/package/libgtk3/libgtk3.hash
index 395d460..2407307 100644
--- a/package/libgtk3/libgtk3.hash
+++ b/package/libgtk3/libgtk3.hash
@@ -1,2 +1,2 @@
-# From http://ftp.gnome.org/pub/gnome/sources/gtk+/3.22/gtk+-3.22.9.sha256sum
-sha256 e414542c96dc9966d40774451331bd8f73f77b6670226a5bbd057973a0c6a3e1  gtk+-3.22.9.tar.xz
+# From http://ftp.gnome.org/pub/gnome/sources/gtk+/3.22/gtk+-3.22.10.sha256sum
+sha256 352a90b3d09256d597cb2768ee5d685285ccc284ff22adf19df16753a829c554  gtk+-3.22.10.tar.xz
diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk
index 210f3e5..abd4c64 100644
--- a/package/libgtk3/libgtk3.mk
+++ b/package/libgtk3/libgtk3.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 LIBGTK3_VERSION_MAJOR = 3.22
-LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).9
+LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).10
 LIBGTK3_SOURCE = gtk+-$(LIBGTK3_VERSION).tar.xz
 LIBGTK3_SITE = http://ftp.gnome.org/pub/gnome/sources/gtk+/$(LIBGTK3_VERSION_MAJOR)
 LIBGTK3_LICENSE = LGPLv2+
-- 
2.10.2

[Buildroot] [PATCH 3/3] libgtk3: bump version to 3.22.10

[Thomas Petazzoni]

Hello,

On Tue, 14 Mar 2017 11:46:28 +0000, Vicente Olivert Riera wrote:
> Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
> ---
>  package/libgtk3/libgtk3.hash | 4 ++--
>  package/libgtk3/libgtk3.mk   | 2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 1/3] libgtk3: remove non-existent configure options

[Thomas Petazzoni]

Hello,

On Tue, 14 Mar 2017 11:46:26 +0000, Vicente Olivert Riera wrote:
> From config.log:
> 
> configure: WARNING: unrecognized options: --disable-doc, --disable-docs,
> --disable-documentation, --with-xmlto, --with-fop, --enable-ipv6,
> --enable-gtk2-dependency, --disable-introspection
> 
> Remove non-existent --enable-gtk2-dependency and --disable-introspection
> configure options from libgtk3.mk.
> 
> Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
> ---
>  package/libgtk3/libgtk3.mk | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com