* [Buildroot] [PATCH 1/1] mesa3d: don't remove OpenGL pc when installing Gallium
@ 2016-06-01 3:38 Akihiko Odaki
2016-06-01 3:38 ` [Buildroot] [PATCH 1/1] qt5base: Enable KMS and GBM if Mesa 3D provides EGL Akihiko Odaki
` (3 more replies)
0 siblings, 4 replies; 16+ messages in thread
From: Akihiko Odaki @ 2016-06-01 3:38 UTC (permalink / raw)
To: buildroot
Gallium driver also provides DRI-like infrastructure and OpenGL.
This change prevents from removing pkg-configs of them also when
installing the driver.
Signed-off-by: Akihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp>
---
package/mesa3d/mesa3d.mk | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk
index 4e0d255..a4d84e4 100644
--- a/package/mesa3d/mesa3d.mk
+++ b/package/mesa3d/mesa3d.mk
@@ -94,7 +94,6 @@ endef
ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),)
MESA3D_CONF_OPTS += \
--without-dri-drivers --disable-dri3
-MESA3D_POST_INSTALL_STAGING_HOOKS += MESA3D_REMOVE_OPENGL_PC
else
ifeq ($(BR2_PACKAGE_XPROTO_DRI3PROTO),y)
MESA3D_DEPENDENCIES += xlib_libxshmfence xproto_dri3proto xproto_presentproto
@@ -115,6 +114,10 @@ MESA3D_CONF_OPTS += \
--with-dri-drivers=$(subst $(space),$(comma),$(MESA3D_DRI_DRIVERS-y))
endif
+ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER)$(BR2_PACKAGE_MESA3D_DRI_DRIVER),)
+MESA3D_POST_INSTALL_STAGING_HOOKS += MESA3D_REMOVE_OPENGL_PC
+endif
+
# APIs
ifeq ($(BR2_PACKAGE_MESA3D_OSMESA),y)
@@ -137,6 +140,8 @@ ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y)
MESA3D_PROVIDES += libegl
ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),y)
MESA3D_EGL_PLATFORMS = drm
+else ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4),y)
+MESA3D_EGL_PLATFORMS = drm
else ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VIRGL),y)
MESA3D_EGL_PLATFORMS = drm
endif
--
2.8.3
^ permalink raw reply related [flat|nested] 16+ messages in thread* [Buildroot] [PATCH 1/1] qt5base: Enable KMS and GBM if Mesa 3D provides EGL 2016-06-01 3:38 [Buildroot] [PATCH 1/1] mesa3d: don't remove OpenGL pc when installing Gallium Akihiko Odaki @ 2016-06-01 3:38 ` Akihiko Odaki 2016-06-01 22:14 ` Akihiko Odaki ` (3 more replies) 2016-06-01 3:38 ` [Buildroot] [PATCH 1/1] qt5wayland: new package Akihiko Odaki ` (2 subsequent siblings) 3 siblings, 4 replies; 16+ messages in thread From: Akihiko Odaki @ 2016-06-01 3:38 UTC (permalink / raw) To: buildroot Signed-off-by: Akihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp> --- package/qt5/qt5base/qt5base.mk | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 9ff7af1..3378804 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -20,7 +20,6 @@ QT5BASE_INSTALL_STAGING = YES # want to use the one packaged in Buildroot QT5BASE_CONFIGURE_OPTS += \ -optimized-qmake \ - -no-kms \ -no-cups \ -no-nis \ -no-iconv \ @@ -29,6 +28,14 @@ QT5BASE_CONFIGURE_OPTS += \ -no-pch \ -shared +# Uses libgbm from mesa3d +ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y) +QT5BASE_CONFIGURE_OPTS += -kms -gbm +QT5BASE_DEPENDENCIES += mesa3d +else +QT5BASE_CONFIGURE_OPTS += -no-kms +endif + ifeq ($(BR2_ENABLE_DEBUG),y) QT5BASE_CONFIGURE_OPTS += -debug else -- 2.8.3 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [Buildroot] [PATCH 1/1] qt5base: Enable KMS and GBM if Mesa 3D provides EGL 2016-06-01 3:38 ` [Buildroot] [PATCH 1/1] qt5base: Enable KMS and GBM if Mesa 3D provides EGL Akihiko Odaki @ 2016-06-01 22:14 ` Akihiko Odaki 2016-06-25 11:33 ` Akihiko Odaki ` (2 subsequent siblings) 3 siblings, 0 replies; 16+ messages in thread From: Akihiko Odaki @ 2016-06-01 22:14 UTC (permalink / raw) To: buildroot ping with CC ^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] [PATCH 1/1] qt5base: Enable KMS and GBM if Mesa 3D provides EGL 2016-06-01 3:38 ` [Buildroot] [PATCH 1/1] qt5base: Enable KMS and GBM if Mesa 3D provides EGL Akihiko Odaki 2016-06-01 22:14 ` Akihiko Odaki @ 2016-06-25 11:33 ` Akihiko Odaki 2016-07-05 10:44 ` Thomas Petazzoni 2016-07-07 7:15 ` Thomas Petazzoni 3 siblings, 0 replies; 16+ messages in thread From: Akihiko Odaki @ 2016-06-25 11:33 UTC (permalink / raw) To: buildroot ping ^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] [PATCH 1/1] qt5base: Enable KMS and GBM if Mesa 3D provides EGL 2016-06-01 3:38 ` [Buildroot] [PATCH 1/1] qt5base: Enable KMS and GBM if Mesa 3D provides EGL Akihiko Odaki 2016-06-01 22:14 ` Akihiko Odaki 2016-06-25 11:33 ` Akihiko Odaki @ 2016-07-05 10:44 ` Thomas Petazzoni 2016-07-07 7:15 ` Thomas Petazzoni 3 siblings, 0 replies; 16+ messages in thread From: Thomas Petazzoni @ 2016-07-05 10:44 UTC (permalink / raw) To: buildroot Hello, On Wed, 1 Jun 2016 12:38:09 +0900, Akihiko Odaki wrote: > Signed-off-by: Akihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp> > --- > package/qt5/qt5base/qt5base.mk | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com ^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] [PATCH 1/1] qt5base: Enable KMS and GBM if Mesa 3D provides EGL 2016-06-01 3:38 ` [Buildroot] [PATCH 1/1] qt5base: Enable KMS and GBM if Mesa 3D provides EGL Akihiko Odaki ` (2 preceding siblings ...) 2016-07-05 10:44 ` Thomas Petazzoni @ 2016-07-07 7:15 ` Thomas Petazzoni 3 siblings, 0 replies; 16+ messages in thread From: Thomas Petazzoni @ 2016-07-07 7:15 UTC (permalink / raw) To: buildroot Hello, On Wed, 1 Jun 2016 12:38:09 +0900, Akihiko Odaki wrote: > +# Uses libgbm from mesa3d > +ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y) > +QT5BASE_CONFIGURE_OPTS += -kms -gbm > +QT5BASE_DEPENDENCIES += mesa3d > +else > +QT5BASE_CONFIGURE_OPTS += -no-kms > +endif This is apparently causing some build issue: http://autobuild.buildroot.net/results/2d5/2d580f9439679fd8fe292e2c4dc768dff1ad1867/build-end.log KMS auto-detection... () Project ERROR: libudev development package not found KMS disabled. KMS support cannot be enabled due to functionality tests! Turn on verbose messaging (-v) to ./configure to see the final report. If you believe this message is in error you may use the continue switch (-continue) to ./configure to continue. It looks like to enable KMS you also need udev support to be enabled. Thanks, Thomas -- Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com ^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] [PATCH 1/1] qt5wayland: new package 2016-06-01 3:38 [Buildroot] [PATCH 1/1] mesa3d: don't remove OpenGL pc when installing Gallium Akihiko Odaki 2016-06-01 3:38 ` [Buildroot] [PATCH 1/1] qt5base: Enable KMS and GBM if Mesa 3D provides EGL Akihiko Odaki @ 2016-06-01 3:38 ` Akihiko Odaki 2016-06-01 22:14 ` Akihiko Odaki ` (2 more replies) 2016-06-01 3:38 ` [Buildroot] [PATCH 1/1] webp: allow to enable demux Akihiko Odaki 2016-06-01 6:47 ` [Buildroot] [PATCH 1/1] mesa3d: don't remove OpenGL pc when installing Gallium Thomas Petazzoni 3 siblings, 3 replies; 16+ messages in thread From: Akihiko Odaki @ 2016-06-01 3:38 UTC (permalink / raw) To: buildroot Signed-off-by: Akihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp> --- package/qt5/Config.in | 1 + package/qt5/qt5base/Config.in | 3 ++- package/qt5/qt5base/qt5base.mk | 4 ++++ package/qt5/qt5wayland/Config.in | 16 ++++++++++++++++ package/qt5/qt5wayland/qt5wayland.hash | 4 ++++ package/qt5/qt5wayland/qt5wayland.mk | 34 ++++++++++++++++++++++++++++++++++ 6 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 package/qt5/qt5wayland/Config.in create mode 100644 package/qt5/qt5wayland/qt5wayland.hash create mode 100644 package/qt5/qt5wayland/qt5wayland.mk diff --git a/package/qt5/Config.in b/package/qt5/Config.in index 84cbb0f..b18c135 100644 --- a/package/qt5/Config.in +++ b/package/qt5/Config.in @@ -48,6 +48,7 @@ source "package/qt5/qt5svg/Config.in" source "package/qt5/qt5tools/Config.in" source "package/qt5/qt5webchannel/Config.in" source "package/qt5/qt5websockets/Config.in" +source "package/qt5/qt5wayland/Config.in" source "package/qt5/qt5x11extras/Config.in" source "package/qt5/qt5xmlpatterns/Config.in" comment "technology preview" diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in index 64a7f65..2b8e278 100644 --- a/package/qt5/qt5base/Config.in +++ b/package/qt5/qt5base/Config.in @@ -122,7 +122,8 @@ config BR2_PACKAGE_QT5BASE_GUI select BR2_PACKAGE_QT5BASE_LINUXFB if \ !BR2_PACKAGE_QT5BASE_DIRECTFB && \ !BR2_PACKAGE_QT5BASE_XCB && \ - !BR2_PACKAGE_QT5BASE_EGLFS + !BR2_PACKAGE_QT5BASE_EGLFS && \ + !BR2_PACKAGE_QT5WAYLAND help This option enables the Qt5Gui library. diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 9ff7af1..dcc4967 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -118,6 +118,10 @@ else QT5BASE_CONFIGURE_OPTS += -no-eglfs endif +ifeq ($(BR2_PACKAGE_QT5WAYLAND),y) +QT5BASE_CONFIGURE_OPTS += -no-qpa-platform-guard +endif + QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_OPENSSL),-openssl,-no-openssl) QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_OPENSSL),openssl) diff --git a/package/qt5/qt5wayland/Config.in b/package/qt5/qt5wayland/Config.in new file mode 100644 index 0000000..acfff15 --- /dev/null +++ b/package/qt5/qt5wayland/Config.in @@ -0,0 +1,16 @@ +config BR2_PACKAGE_QT5WAYLAND + bool "qt5wayland" + select BR2_PACKAGE_QT5BASE + select BR2_PACKAGE_QT5DECLARATIVE + select BR2_PACKAGE_QT5JSBACKEND + select BR2_PACKAGE_LIBXKBCOMMON + select BR2_PACKAGE_XKEYBOARD_CONFIG + depends on BR2_PACKAGE_WAYLAND + depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE + help + Qt is a cross-platform application and UI framework for + developers using C++. + + This package corresponds to the qt5wayland module. + + http://qt.io diff --git a/package/qt5/qt5wayland/qt5wayland.hash b/package/qt5/qt5wayland/qt5wayland.hash new file mode 100644 index 0000000..297a208 --- /dev/null +++ b/package/qt5/qt5wayland/qt5wayland.hash @@ -0,0 +1,4 @@ +# Hashes from: http://download.qt.io/official_releases/qt/5.6/5.6.0/submodules/qtwayland-opensource-src-5.6.0.tar.xz.mirrorlist +sha256 b55d0142f245c927970031ef908e98cb20f1d7a2a5441647ed937252fed3bfcc qtwayland-opensource-src-5.6.0.tar.xz +sha1 db3fc8bfa78f808d060e6ce5d79ae4a94e280b33 qtwayland-opensource-src-5.6.0.tar.xz +md5 9dbfb0278eb0891e50b136d8b6eaa62b qtwayland-opensource-src-5.6.0.tar.xz diff --git a/package/qt5/qt5wayland/qt5wayland.mk b/package/qt5/qt5wayland/qt5wayland.mk new file mode 100644 index 0000000..be6cf8f --- /dev/null +++ b/package/qt5/qt5wayland/qt5wayland.mk @@ -0,0 +1,34 @@ +################################################################################ +# +# qt5wayland +# +################################################################################ + +QT5WAYLAND_VERSION = $(QT5_VERSION) +QT5WAYLAND_SITE = $(QT5_SITE) +QT5WAYLAND_SOURCE = qtwayland-opensource-src-$(QT5WAYLAND_VERSION).tar.xz +QT5WAYLAND_DEPENDENCIES = qt5base qt5declarative wayland libxkbcommon xkeyboard-config +ifeq ($(BR2_PACKAGE_HAS_LIBEGL),y) +QT5WAYLAND_DEPENDENCIES += libegl +endif +QT5WAYLAND_INSTALL_STAGING = YES + +define QT5WAYLAND_CONFIGURE_CMDS + (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake) +endef + +define QT5WAYLAND_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) +endef + +define QT5WAYLAND_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install +endef + +define QT5WAYLAND_INSTALL_TARGET_CMDS + cp -dpf $(STAGING_DIR)/usr/lib/libQt5WaylandClient.so* $(TARGET_DIR)/usr/lib + cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/wayland-*-client $(TARGET_DIR)/usr/lib/qt/plugins + cp -dpf $(STAGING_DIR)/usr/lib/qt/plugins/platforms/libqwayland-*.so $(TARGET_DIR)/usr/lib/qt/plugins/platforms +endef + +$(eval $(generic-package)) -- 2.8.3 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [Buildroot] [PATCH 1/1] qt5wayland: new package 2016-06-01 3:38 ` [Buildroot] [PATCH 1/1] qt5wayland: new package Akihiko Odaki @ 2016-06-01 22:14 ` Akihiko Odaki 2016-06-25 11:33 ` Akihiko Odaki 2016-06-27 18:38 ` Peter Seiderer 2 siblings, 0 replies; 16+ messages in thread From: Akihiko Odaki @ 2016-06-01 22:14 UTC (permalink / raw) To: buildroot ping with CC ^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] [PATCH 1/1] qt5wayland: new package 2016-06-01 3:38 ` [Buildroot] [PATCH 1/1] qt5wayland: new package Akihiko Odaki 2016-06-01 22:14 ` Akihiko Odaki @ 2016-06-25 11:33 ` Akihiko Odaki 2016-06-27 18:38 ` Peter Seiderer 2 siblings, 0 replies; 16+ messages in thread From: Akihiko Odaki @ 2016-06-25 11:33 UTC (permalink / raw) To: buildroot ping ^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] [PATCH 1/1] qt5wayland: new package 2016-06-01 3:38 ` [Buildroot] [PATCH 1/1] qt5wayland: new package Akihiko Odaki 2016-06-01 22:14 ` Akihiko Odaki 2016-06-25 11:33 ` Akihiko Odaki @ 2016-06-27 18:38 ` Peter Seiderer 2016-06-27 20:05 ` Peter Seiderer 2016-06-27 20:10 ` Yann E. MORIN 2 siblings, 2 replies; 16+ messages in thread From: Peter Seiderer @ 2016-06-27 18:38 UTC (permalink / raw) To: buildroot Hello Akihiko, thanks for patch submission, some comments below... On Wed, 1 Jun 2016 12:38:10 +0900, Akihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp> wrote: > Signed-off-by: Akihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp> > --- > package/qt5/Config.in | 1 + > package/qt5/qt5base/Config.in | 3 ++- > package/qt5/qt5base/qt5base.mk | 4 ++++ > package/qt5/qt5wayland/Config.in | 16 ++++++++++++++++ > package/qt5/qt5wayland/qt5wayland.hash | 4 ++++ > package/qt5/qt5wayland/qt5wayland.mk | 34 ++++++++++++++++++++++++++++++++++ > 6 files changed, 61 insertions(+), 1 deletion(-) > create mode 100644 package/qt5/qt5wayland/Config.in > create mode 100644 package/qt5/qt5wayland/qt5wayland.hash > create mode 100644 package/qt5/qt5wayland/qt5wayland.mk > > diff --git a/package/qt5/Config.in b/package/qt5/Config.in > index 84cbb0f..b18c135 100644 > --- a/package/qt5/Config.in > +++ b/package/qt5/Config.in > @@ -48,6 +48,7 @@ source "package/qt5/qt5svg/Config.in" > source "package/qt5/qt5tools/Config.in" > source "package/qt5/qt5webchannel/Config.in" > source "package/qt5/qt5websockets/Config.in" > +source "package/qt5/qt5wayland/Config.in" > source "package/qt5/qt5x11extras/Config.in" > source "package/qt5/qt5xmlpatterns/Config.in" > comment "technology preview" > diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in > index 64a7f65..2b8e278 100644 > --- a/package/qt5/qt5base/Config.in > +++ b/package/qt5/qt5base/Config.in > @@ -122,7 +122,8 @@ config BR2_PACKAGE_QT5BASE_GUI > select BR2_PACKAGE_QT5BASE_LINUXFB if \ > !BR2_PACKAGE_QT5BASE_DIRECTFB && \ > !BR2_PACKAGE_QT5BASE_XCB && \ > - !BR2_PACKAGE_QT5BASE_EGLFS > + !BR2_PACKAGE_QT5BASE_EGLFS && \ > + !BR2_PACKAGE_QT5WAYLAND > help > This option enables the Qt5Gui library. > > diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk > index 9ff7af1..dcc4967 100644 > --- a/package/qt5/qt5base/qt5base.mk > +++ b/package/qt5/qt5base/qt5base.mk > @@ -118,6 +118,10 @@ else > QT5BASE_CONFIGURE_OPTS += -no-eglfs > endif > > +ifeq ($(BR2_PACKAGE_QT5WAYLAND),y) > +QT5BASE_CONFIGURE_OPTS += -no-qpa-platform-guard > +endif > + > QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_OPENSSL),-openssl,-no-openssl) > QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_OPENSSL),openssl) > > diff --git a/package/qt5/qt5wayland/Config.in b/package/qt5/qt5wayland/Config.in > new file mode 100644 > index 0000000..acfff15 > --- /dev/null > +++ b/package/qt5/qt5wayland/Config.in > @@ -0,0 +1,16 @@ > +config BR2_PACKAGE_QT5WAYLAND > + bool "qt5wayland" > + select BR2_PACKAGE_QT5BASE > + select BR2_PACKAGE_QT5DECLARATIVE > + select BR2_PACKAGE_QT5JSBACKEND BR2_PACKAGE_QT5JSBACKEND was remove move Buildroot (in 2013?), please remove this line... > + select BR2_PACKAGE_LIBXKBCOMMON > + select BR2_PACKAGE_XKEYBOARD_CONFIG First compile try (for imx6) bailed out with an error about missing 'wayland-egl', fixed by adding: depends on BR2_PACKAGE_MESA3D # provides wayland-egl > + depends on BR2_PACKAGE_WAYLAND > + depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE This dependency is from qt5declarative? Please change to: depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative > + help > + Qt is a cross-platform application and UI framework for > + developers using C++. > + > + This package corresponds to the qt5wayland module. > + > + http://qt.io Comment section missing, e.g.: + +comment "qt5wayland needs mesa3d and wayland" + depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE + depends on !BR2_PACKAGE_MESA3D || !BR2_PACKAGE_WAYLAND > diff --git a/package/qt5/qt5wayland/qt5wayland.hash b/package/qt5/qt5wayland/qt5wayland.hash > new file mode 100644 > index 0000000..297a208 > --- /dev/null > +++ b/package/qt5/qt5wayland/qt5wayland.hash > @@ -0,0 +1,4 @@ > +# Hashes from: http://download.qt.io/official_releases/qt/5.6/5.6.0/submodules/qtwayland-opensource-src-5.6.0.tar.xz.mirrorlist > +sha256 b55d0142f245c927970031ef908e98cb20f1d7a2a5441647ed937252fed3bfcc qtwayland-opensource-src-5.6.0.tar.xz > +sha1 db3fc8bfa78f808d060e6ce5d79ae4a94e280b33 qtwayland-opensource-src-5.6.0.tar.xz > +md5 9dbfb0278eb0891e50b136d8b6eaa62b qtwayland-opensource-src-5.6.0.tar.xz One (the strongest) hash is enough, just keep sha256 and remove sha1/md5... > diff --git a/package/qt5/qt5wayland/qt5wayland.mk b/package/qt5/qt5wayland/qt5wayland.mk > new file mode 100644 > index 0000000..be6cf8f > --- /dev/null > +++ b/package/qt5/qt5wayland/qt5wayland.mk > @@ -0,0 +1,34 @@ > +################################################################################ > +# > +# qt5wayland > +# > +################################################################################ > + > +QT5WAYLAND_VERSION = $(QT5_VERSION) > +QT5WAYLAND_SITE = $(QT5_SITE) > +QT5WAYLAND_SOURCE = qtwayland-opensource-src-$(QT5WAYLAND_VERSION).tar.xz > +QT5WAYLAND_DEPENDENCIES = qt5base qt5declarative wayland libxkbcommon xkeyboard-config > +ifeq ($(BR2_PACKAGE_HAS_LIBEGL),y) > +QT5WAYLAND_DEPENDENCIES += libegl > +endif > +QT5WAYLAND_INSTALL_STAGING = YES > + > +define QT5WAYLAND_CONFIGURE_CMDS > + (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake) > +endef > + > +define QT5WAYLAND_BUILD_CMDS > + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) > +endef > + > +define QT5WAYLAND_INSTALL_STAGING_CMDS > + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install Please add $(QT5_LA_PRL_FILES_FIXUP) as all the other qt5 packages do... > +endef > + Same for: ifeq ($(BR2_STATIC_LIBS),) > +define QT5WAYLAND_INSTALL_TARGET_CMDS > + cp -dpf $(STAGING_DIR)/usr/lib/libQt5WaylandClient.so* $(TARGET_DIR)/usr/lib > + cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/wayland-*-client $(TARGET_DIR)/usr/lib/qt/plugins > + cp -dpf $(STAGING_DIR)/usr/lib/qt/plugins/platforms/libqwayland-*.so $(TARGET_DIR)/usr/lib/qt/plugins/platforms > +endef endif > + > +$(eval $(generic-package)) Only compile tested the package (yet), because weston did not start up without errors on my test system... Regards, Peter ^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] [PATCH 1/1] qt5wayland: new package 2016-06-27 18:38 ` Peter Seiderer @ 2016-06-27 20:05 ` Peter Seiderer 2016-06-27 20:10 ` Yann E. MORIN 1 sibling, 0 replies; 16+ messages in thread From: Peter Seiderer @ 2016-06-27 20:05 UTC (permalink / raw) To: buildroot Hello Akihiko, On Mon, 27 Jun 2016 20:38:12 +0200, Peter Seiderer <ps.report@gmx.net> wrote: > First compile try (for imx6) bailed out with an error about missing 'wayland-egl', fixed > by adding: > > depends on BR2_PACKAGE_MESA3D # provides wayland-egl > Tried on RPi, compiles without mesa3d. Here the test for brcm_egl succeeds... > > Only compile tested the package (yet), because weston did not start up without > errors on my test system... Weston on RPi starts up and: $ ./analogclock -platform wayland Failed to load client buffer integration: wayland-egl But runs and shows the clock on the weston desktop... Regards, Peter > > Regards, > Peter > _______________________________________________ > buildroot mailing list > buildroot at busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] [PATCH 1/1] qt5wayland: new package 2016-06-27 18:38 ` Peter Seiderer 2016-06-27 20:05 ` Peter Seiderer @ 2016-06-27 20:10 ` Yann E. MORIN 1 sibling, 0 replies; 16+ messages in thread From: Yann E. MORIN @ 2016-06-27 20:10 UTC (permalink / raw) To: buildroot Peter, Akihiko On 2016-06-27 20:38 +0200, Peter Seiderer spake thusly: > thanks for patch submission, some comments below... Peter, I think Akihiko sent a new version of this package: http://lists.busybox.net/pipermail/buildroot/2016-June/165271.html https://patchwork.ozlabs.org/patch/640632/ I'll redirect my review to that newer version. Still, I have a comment below on your own review... > On Wed, 1 Jun 2016 12:38:10 +0900, Akihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp> wrote: > > Signed-off-by: Akihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp> > > --- [--SNIP--] > > diff --git a/package/qt5/qt5wayland/Config.in b/package/qt5/qt5wayland/Config.in > > new file mode 100644 > > index 0000000..acfff15 > > --- /dev/null > > +++ b/package/qt5/qt5wayland/Config.in > > @@ -0,0 +1,16 @@ > > +config BR2_PACKAGE_QT5WAYLAND > > + bool "qt5wayland" > > + select BR2_PACKAGE_QT5BASE > > + select BR2_PACKAGE_QT5DECLARATIVE > > + select BR2_PACKAGE_QT5JSBACKEND > > BR2_PACKAGE_QT5JSBACKEND was remove move Buildroot (in 2013?), please remove this line... It's been removed in ecf4dff (qt5: remove qt5jsbackend package), in December 2013. Akihiko, please base your patches on the latest master of Buildroot. > > + select BR2_PACKAGE_LIBXKBCOMMON > > + select BR2_PACKAGE_XKEYBOARD_CONFIG > > First compile try (for imx6) bailed out with an error about missing 'wayland-egl', fixed > by adding: > > depends on BR2_PACKAGE_MESA3D # provides wayland-egl Actually, this is no entirely right. It;s not wrong per-se, but there are other EGL providers that provide wayland-egl. For example, the nvidia-driver is supposed to provide it (I yet have to update this package to the latest release; the version we have in Buildroot is too old to provide wayland-egl). Furthermore, quite a few proprietary EGL implementations may provide it as well. One thing that is right in Peter's comment is that the dependencies is not correct. At the very least, qt5wayland should probably: depends on BR2_PACKAGE_HAS_LIBGLES Yet, this is clearly not enough, as Peter said. We need a libgles (and libegl) implementation that also provide wayland-egl. Unfortunately, we do not have such a thing in Buildroot. I would suggest that we add a new virtual package, BR2_PACKAGE_HAS_WAYLAND_EGL which providers can select. So far, mesa3d is our only provider, but in the future we may (will) have others. After that new virtual package is added, we can add qt5wayland that depend on it. > > + depends on BR2_PACKAGE_WAYLAND > > + depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE > > This dependency is from qt5declarative? > Please change to: > depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative > > > + help > > + Qt is a cross-platform application and UI framework for > > + developers using C++. > > + > > + This package corresponds to the qt5wayland module. > > + > > + http://qt.io > > Comment section missing, e.g.: > > + > +comment "qt5wayland needs mesa3d and wayland" > + depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE > + depends on !BR2_PACKAGE_MESA3D || !BR2_PACKAGE_WAYLAND > > > > > diff --git a/package/qt5/qt5wayland/qt5wayland.hash b/package/qt5/qt5wayland/qt5wayland.hash > > new file mode 100644 > > index 0000000..297a208 > > --- /dev/null > > +++ b/package/qt5/qt5wayland/qt5wayland.hash > > @@ -0,0 +1,4 @@ > > +# Hashes from: http://download.qt.io/official_releases/qt/5.6/5.6.0/submodules/qtwayland-opensource-src-5.6.0.tar.xz.mirrorlist > > +sha256 b55d0142f245c927970031ef908e98cb20f1d7a2a5441647ed937252fed3bfcc qtwayland-opensource-src-5.6.0.tar.xz > > +sha1 db3fc8bfa78f808d060e6ce5d79ae4a94e280b33 qtwayland-opensource-src-5.6.0.tar.xz > > +md5 9dbfb0278eb0891e50b136d8b6eaa62b qtwayland-opensource-src-5.6.0.tar.xz > > One (the strongest) hash is enough, just keep sha256 and remove sha1/md5... It is better to add all hashes published by upstream, even for weak hashes. Only when upstream provides no hash do we only compute a strong ash locally. So what Akihiko did is correct. Akihiko, other comments from Peter are good, so take them into account before you resubmit. I'll further review your v2 now. Regards, Yann E. MORIN. > > diff --git a/package/qt5/qt5wayland/qt5wayland.mk b/package/qt5/qt5wayland/qt5wayland.mk > > new file mode 100644 > > index 0000000..be6cf8f > > --- /dev/null > > +++ b/package/qt5/qt5wayland/qt5wayland.mk > > @@ -0,0 +1,34 @@ > > +################################################################################ > > +# > > +# qt5wayland > > +# > > +################################################################################ > > + > > +QT5WAYLAND_VERSION = $(QT5_VERSION) > > +QT5WAYLAND_SITE = $(QT5_SITE) > > +QT5WAYLAND_SOURCE = qtwayland-opensource-src-$(QT5WAYLAND_VERSION).tar.xz > > +QT5WAYLAND_DEPENDENCIES = qt5base qt5declarative wayland libxkbcommon xkeyboard-config > > +ifeq ($(BR2_PACKAGE_HAS_LIBEGL),y) > > +QT5WAYLAND_DEPENDENCIES += libegl > > +endif > > +QT5WAYLAND_INSTALL_STAGING = YES > > + > > +define QT5WAYLAND_CONFIGURE_CMDS > > + (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake) > > +endef > > + > > +define QT5WAYLAND_BUILD_CMDS > > + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) > > +endef > > + > > +define QT5WAYLAND_INSTALL_STAGING_CMDS > > + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install > > Please add > > $(QT5_LA_PRL_FILES_FIXUP) > > as all the other qt5 packages do... > > > +endef > > + > > Same for: > > ifeq ($(BR2_STATIC_LIBS),) > > +define QT5WAYLAND_INSTALL_TARGET_CMDS > > + cp -dpf $(STAGING_DIR)/usr/lib/libQt5WaylandClient.so* $(TARGET_DIR)/usr/lib > > + cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/wayland-*-client $(TARGET_DIR)/usr/lib/qt/plugins > > + cp -dpf $(STAGING_DIR)/usr/lib/qt/plugins/platforms/libqwayland-*.so $(TARGET_DIR)/usr/lib/qt/plugins/platforms > > +endef > endif > > > + > > +$(eval $(generic-package)) > > Only compile tested the package (yet), because weston did not start up without > errors on my test system... > > Regards, > Peter > _______________________________________________ > buildroot mailing list > buildroot at busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' ^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] [PATCH 1/1] webp: allow to enable demux 2016-06-01 3:38 [Buildroot] [PATCH 1/1] mesa3d: don't remove OpenGL pc when installing Gallium Akihiko Odaki 2016-06-01 3:38 ` [Buildroot] [PATCH 1/1] qt5base: Enable KMS and GBM if Mesa 3D provides EGL Akihiko Odaki 2016-06-01 3:38 ` [Buildroot] [PATCH 1/1] qt5wayland: new package Akihiko Odaki @ 2016-06-01 3:38 ` Akihiko Odaki 2016-06-01 22:14 ` Akihiko Odaki 2016-06-03 12:45 ` Thomas Petazzoni 2016-06-01 6:47 ` [Buildroot] [PATCH 1/1] mesa3d: don't remove OpenGL pc when installing Gallium Thomas Petazzoni 3 siblings, 2 replies; 16+ messages in thread From: Akihiko Odaki @ 2016-06-01 3:38 UTC (permalink / raw) To: buildroot Signed-off-by: Akihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp> --- package/webp/Config.in | 8 ++++++++ package/webp/webp.mk | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/package/webp/Config.in b/package/webp/Config.in index e385b5e..7c4722f 100644 --- a/package/webp/Config.in +++ b/package/webp/Config.in @@ -5,3 +5,11 @@ config BR2_PACKAGE_WEBP compression for images on the web https://developers.google.com/speed/webp/ + +config BR2_PACKAGE_WEBP_DEMUX + bool "webpdemux" + depends on BR2_PACKAGE_WEBP + help + "Demux" is a part of WebPMux for extraction and manipulation of an + extended format WebP file, which can have features like color profile, + metadata and animation. diff --git a/package/webp/webp.mk b/package/webp/webp.mk index 5f2cab7..b609024 100644 --- a/package/webp/webp.mk +++ b/package/webp/webp.mk @@ -17,6 +17,10 @@ WEBP_CONF_OPTS += \ --with-tiffincludedir=$(STAGING_DIR)/usr/include \ --with-tifflibdir=$(STAGING_DIR)/usr/lib +ifeq ($(BR2_PACKAGE_WEBP_DEMUX),y) +WEBP_CONF_OPTS += --enable-libwebpdemux +endif + ifeq ($(BR2_PACKAGE_LIBPNG),y) WEBP_DEPENDENCIES += libpng WEBP_CONF_ENV += ac_cv_path_LIBPNG_CONFIG=$(STAGING_DIR)/usr/bin/libpng-config -- 2.8.3 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [Buildroot] [PATCH 1/1] webp: allow to enable demux 2016-06-01 3:38 ` [Buildroot] [PATCH 1/1] webp: allow to enable demux Akihiko Odaki @ 2016-06-01 22:14 ` Akihiko Odaki 2016-06-03 12:45 ` Thomas Petazzoni 1 sibling, 0 replies; 16+ messages in thread From: Akihiko Odaki @ 2016-06-01 22:14 UTC (permalink / raw) To: buildroot ping with CC ^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] [PATCH 1/1] webp: allow to enable demux 2016-06-01 3:38 ` [Buildroot] [PATCH 1/1] webp: allow to enable demux Akihiko Odaki 2016-06-01 22:14 ` Akihiko Odaki @ 2016-06-03 12:45 ` Thomas Petazzoni 1 sibling, 0 replies; 16+ messages in thread From: Thomas Petazzoni @ 2016-06-03 12:45 UTC (permalink / raw) To: buildroot Hello, On Wed, 1 Jun 2016 12:38:11 +0900, Akihiko Odaki wrote: > +config BR2_PACKAGE_WEBP_DEMUX > + bool "webpdemux" > + depends on BR2_PACKAGE_WEBP We normally use a if BR2_PACKAGE_WEBP ... endif block. > + help > + "Demux" is a part of WebPMux for extraction and manipulation of an > + extended format WebP file, which can have features like color profile, > + metadata and animation. Some lines are slightly too long here, they should not be longer than 72 characters. > +ifeq ($(BR2_PACKAGE_WEBP_DEMUX),y) > +WEBP_CONF_OPTS += --enable-libwebpdemux > +endif And it should be disabled explicitly in an "else" clause. I've fixed up those minor nits in a follow-up commit (I normally fix up the original commit, but I pushed it mistakenly). Thanks for your contribution! Best regards, Thomas -- Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com ^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] [PATCH 1/1] mesa3d: don't remove OpenGL pc when installing Gallium 2016-06-01 3:38 [Buildroot] [PATCH 1/1] mesa3d: don't remove OpenGL pc when installing Gallium Akihiko Odaki ` (2 preceding siblings ...) 2016-06-01 3:38 ` [Buildroot] [PATCH 1/1] webp: allow to enable demux Akihiko Odaki @ 2016-06-01 6:47 ` Thomas Petazzoni 3 siblings, 0 replies; 16+ messages in thread From: Thomas Petazzoni @ 2016-06-01 6:47 UTC (permalink / raw) To: buildroot Hello, Thanks for this patch! Bernd, Gustavo, could you comment on the part that changes in what condition the .pc files are removed? Also, rather than having this hack in Buildroot, what about fixing the issue upstream? mesa3d should not install the .pc file if it is not configured to build/install the corresponding libraries. Akihiko, I also have a comment for you below. On Wed, 1 Jun 2016 12:38:08 +0900, Akihiko Odaki wrote: > ifeq ($(BR2_PACKAGE_MESA3D_OSMESA),y) > @@ -137,6 +140,8 @@ ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y) > MESA3D_PROVIDES += libegl > ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),y) > MESA3D_EGL_PLATFORMS = drm > +else ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4),y) > +MESA3D_EGL_PLATFORMS = drm This change is unrelated, so it should be part of a separate patch. > else ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VIRGL),y) > MESA3D_EGL_PLATFORMS = drm > endif Thanks! Thomas -- Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com ^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2016-07-07 7:15 UTC | newest] Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2016-06-01 3:38 [Buildroot] [PATCH 1/1] mesa3d: don't remove OpenGL pc when installing Gallium Akihiko Odaki 2016-06-01 3:38 ` [Buildroot] [PATCH 1/1] qt5base: Enable KMS and GBM if Mesa 3D provides EGL Akihiko Odaki 2016-06-01 22:14 ` Akihiko Odaki 2016-06-25 11:33 ` Akihiko Odaki 2016-07-05 10:44 ` Thomas Petazzoni 2016-07-07 7:15 ` Thomas Petazzoni 2016-06-01 3:38 ` [Buildroot] [PATCH 1/1] qt5wayland: new package Akihiko Odaki 2016-06-01 22:14 ` Akihiko Odaki 2016-06-25 11:33 ` Akihiko Odaki 2016-06-27 18:38 ` Peter Seiderer 2016-06-27 20:05 ` Peter Seiderer 2016-06-27 20:10 ` Yann E. MORIN 2016-06-01 3:38 ` [Buildroot] [PATCH 1/1] webp: allow to enable demux Akihiko Odaki 2016-06-01 22:14 ` Akihiko Odaki 2016-06-03 12:45 ` Thomas Petazzoni 2016-06-01 6:47 ` [Buildroot] [PATCH 1/1] mesa3d: don't remove OpenGL pc when installing Gallium Thomas Petazzoni
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.