libgtk3: remove non-existent configure options

PATCH New Vicente Olivert Riera 4 participants 11 messages Mar 14, 2017 – Mar 15, 2017

lore

Share & tools

lore

Vicente Olivert Riera

author

2017-03-14 11:46 UTC #0 lore raw

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

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 <[email protected]>

---
 package/libgtk3/libgtk3.mk | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

package/libgtk3/libgtk3.mk +1 -3

index 048029d..210f3e5 100644
@@ -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 = \

Signature · 1 line

2.10.2

Vicente Olivert Riera

author

2017-03-14 11:46 UTC #1 lore raw

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

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 <[email protected]>

---
 package/libgtk3/Config.in | 4 ++++
 1 file changed, 4 insertions(+)

package/libgtk3/Config.in +4 -0

index 738f865..9e0721d 100644
@@ -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

Signature · 1 line

2.10.2

Thomas Petazzoni

2017-03-14 16:22 UTC #2 lore raw

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

Hello,

package/libgtk3/Config.in comment "Wayland GDK backend needs an OpenGL EGL backend provided by mesa3d w/ h · line 73

Quoted 6 lines · Vicente Olivert Riera

config BR2_PACKAGE_LIBGTK3_WAYLAND

package/libgtk3/Config.in +1 -0

 	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

Signature · 3 lines

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

Vicente Olivert Riera

author

2017-03-14 16:39 UTC #3 lore raw

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

Hi Thomas,

Quoted 15 lines · Thomas Petazzoni

Hello,
package/libgtk3/Config.in comment "Wayland GDK backend needs an OpenGL EGL backend provided by mesa3d w/ h · line 73
Quoted 6 lines · Vicente Olivert Riera
config BR2_PACKAGE_LIBGTK3_WAYLAND
package/libgtk3/Config.in +1 -0
 	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?

Quoted 2 lines

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

Quoted 3 lines

Thomas

Thomas Petazzoni

2017-03-14 22:22 UTC #4 lore raw

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

Hello,

Quoted 10 lines · Vicente Olivert Riera

Quoted 6 lines
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

Signature · 3 lines

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

Vicente Olivert Riera

author

2017-03-15 10:31 UTC #5 lore raw

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

Hi Thomas,

Quoted 8 lines · Thomas Petazzoni

Hello,
Quoted 4 lines · Vicente Olivert Riera
Quoted 4 lines
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?

Quoted 8 lines

Quoted 6 lines
Quoted 2 lines
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

Quoted 5 lines

Thanks!
Thomas

Gustavo Zacarias

2017-03-15 12:17 UTC #6 lore raw

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

Quoted 22 lines · Vicente Olivert Riera

Hi Thomas,
Quoted 19 lines · Thomas Petazzoni
Hello,
Quoted 14 lines · Vicente Olivert Riera
Quoted 8 lines
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

Quoted 5 lines

Quoted 1 line
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.

Peter Seiderer

2017-03-14 20:25 UTC #7 lore raw

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

In reply to Vicente Olivert Riera

Hello Vicente,

Quoted 13 lines · 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>
                      ^

Quoted 3 lines

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

Quoted 25 lines

Signed-off-by Vicente Olivert Riera <[email protected]>

---
 package/libgtk3/Config.in | 4 ++++
 1 file changed, 4 insertions(+)

package/libgtk3/Config.in +4 -0

index 738f865..9e0721d 100644
@@ -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

Vicente Olivert Riera

author

2017-03-14 11:46 UTC #8 lore raw

PATCH 3/3 libgtk3: bump version to 3.22.10

In reply to Vicente Olivert Riera

Signed-off-by Vicente Olivert Riera <[email protected]>

---
 package/libgtk3/libgtk3.hash | 4 ++--
 package/libgtk3/libgtk3.mk   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

package/libgtk3/libgtk3.hash +2 -2

index 395d460..2407307 100644
@@ -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

package/libgtk3/libgtk3.mk +1 -1

index 210f3e5..abd4c64 100644
@@ -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+

Signature · 1 line

2.10.2

Thomas Petazzoni

Applied

2017-03-14 22:23 UTC #9 lore raw

PATCH 3/3 libgtk3: bump version to 3.22.10

Hello,

Quoted 5 lines · Vicente Olivert Riera

Signed-off-by Vicente Olivert Riera <[email protected]>

---
 package/libgtk3/libgtk3.hash | 4 ++--
 package/libgtk3/libgtk3.mk   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

Applied to master, thanks.

Thomas

Signature · 3 lines

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

Thomas Petazzoni

Applied

2017-03-14 22:22 UTC #10 lore raw

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

In reply to Vicente Olivert Riera

Hello,

Quoted 6 lines · 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

Quoted 7 lines

Remove non-existent --enable-gtk2-dependency and --disable-introspection configure options from libgtk3.mk.
Signed-off-by Vicente Olivert Riera <[email protected]>
---
 package/libgtk3/libgtk3.mk | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Applied to master, thanks.

Thomas

Signature · 3 lines

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