From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter Seiderer Date: Tue, 28 Jun 2016 22:56:05 +0200 Subject: [Buildroot] qt5wayland: new package In-Reply-To: <20160626055917.3371-1-akihiko.odaki.4i@stu.hosei.ac.jp> References: <20160626055917.3371-1-akihiko.odaki.4i@stu.hosei.ac.jp> Message-ID: <20160628225605.73f11bb7@gmx.net> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net Hello Akihiko, one more suggestion for your patch (see below)... On Sun, 26 Jun 2016 14:59:17 +0900, Akihiko Odaki wrote: > Signed-off-by: Akihiko Odaki > > 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 783cf3c..1d4750b 100644 > --- a/package/qt5/qt5base/qt5base.mk > +++ b/package/qt5/qt5base/qt5base.mk > @@ -122,6 +122,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..9de278f > --- /dev/null > +++ b/package/qt5/qt5wayland/qt5wayland.hash > @@ -0,0 +1,4 @@ > +# Hashes from: https://download.qt.io/official_releases/qt/5.6/5.6.1-1/submodules/qtwayland-opensource-src-5.6.1-1.tar.xz.mirrorlist > +sha256 8489b2b96f1e383ee11a00a686b9cd65418893ec3fc604d5d08dc644e27ddbba qtwayland-opensource-src-5.6.1-1.tar.xz > +sha1 f56d654aae2223fb012a86a3f69e1b7564fd07f4 qtwayland-opensource-src-5.6.1-1.tar.xz > +md5 ec57727a3b485b35cc3948f9e64af9d2 qtwayland-opensource-src-5.6.1-1.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 > + The license part is missing here, e.g: ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) QT53D_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs) QT53D_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LICENSE.LGPLv3 LGPL_EXCEPTION.txt LICENSE.FDL else QT53D_LICENSE = Commercial license QT53D_REDISTRIBUTE = NO endif Regards, Peter > +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)) > _______________________________________________ > buildroot mailing list > buildroot at busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot