* [Buildroot] [PATCH v2 0/6] Bump Qt5 to version 5.1.1
@ 2013-09-20 5:43 Fatih Aşıcı
2013-09-20 5:43 ` [Buildroot] [PATCH v2 1/6] qt5: bump to 5.1.1 Fatih Aşıcı
` (5 more replies)
0 siblings, 6 replies; 19+ messages in thread
From: Fatih Aşıcı @ 2013-09-20 5:43 UTC (permalink / raw)
To: buildroot
These patches bump qt5 to the latest stable version (5.1.1). They also add
the new module packages provided with 5.1 series.
Changes v1 -> v2:
- Mention upstreamed patches and removed configure options in the commit log
(suggested by Thomas Petazzoni)
- Give numbers to the patch filenames (suggested by Arnout Vandecappelle and
Thomas Petazzoni)
- Remove unused configure options in module packages with a separate patch
(suggested by Thomas Petazzoni)
- Write names of license files to .mk files found in new packages (suggested
by Thomas Petazzoni)
Fatih A??c? (6):
qt5: bump to 5.1.1
qt5quickcontrols: new package
qt5sensors: new package
qt5serialport: new package
qt5x11extras: new package
qt5: remove configure options from module packages
package/qt5/Config.in | 4 ++
package/qt5/qt5.mk | 4 +-
package/qt5/qt5base/Config.in | 2 +
...nce-add-egl-to-CONFIG-to-get-correct-incl.patch | 32 -----------
...-Add-egl-cflags-when-opengles2-is-enabled.patch | 32 +++++++++++
.../qt5/qt5base/qt5base-0002-mkspecs-files.patch | 5 +-
package/qt5/qt5base/qt5base.mk | 10 ++--
package/qt5/qt5declarative/qt5declarative.mk | 2 +-
.../qt5/qt5graphicaleffects/qt5graphicaleffects.mk | 1 -
package/qt5/qt5imageformats/qt5imageformats.mk | 1 -
.../qt5jsbackend-0002-fix-uclibc.patch | 33 ------------
package/qt5/qt5jsbackend/qt5jsbackend.mk | 1 -
package/qt5/qt5multimedia/qt5multimedia.mk | 1 -
package/qt5/qt5quick1/qt5quick1.mk | 4 +-
package/qt5/qt5quickcontrols/Config.in | 20 +++++++
package/qt5/qt5quickcontrols/qt5quickcontrols.mk | 37 +++++++++++++
package/qt5/qt5script/qt5script.mk | 1 -
package/qt5/qt5sensors/Config.in | 10 ++++
package/qt5/qt5sensors/qt5sensors.mk | 56 ++++++++++++++++++++
package/qt5/qt5serialport/Config.in | 10 ++++
package/qt5/qt5serialport/qt5serialport.mk | 40 ++++++++++++++
package/qt5/qt5svg/qt5svg.mk | 1 -
package/qt5/qt5webkit/qt5webkit.mk | 1 -
package/qt5/qt5x11extras/Config.in | 11 ++++
package/qt5/qt5x11extras/qt5x11extras.mk | 40 ++++++++++++++
package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 1 -
26 files changed, 276 insertions(+), 84 deletions(-)
delete mode 100644 package/qt5/qt5base/qt5base-0001-eglconvenience-add-egl-to-CONFIG-to-get-correct-incl.patch
create mode 100644 package/qt5/qt5base/qt5base-0001-xcb-Add-egl-cflags-when-opengles2-is-enabled.patch
delete mode 100644 package/qt5/qt5jsbackend/qt5jsbackend-0002-fix-uclibc.patch
create mode 100644 package/qt5/qt5quickcontrols/Config.in
create mode 100644 package/qt5/qt5quickcontrols/qt5quickcontrols.mk
create mode 100644 package/qt5/qt5sensors/Config.in
create mode 100644 package/qt5/qt5sensors/qt5sensors.mk
create mode 100644 package/qt5/qt5serialport/Config.in
create mode 100644 package/qt5/qt5serialport/qt5serialport.mk
create mode 100644 package/qt5/qt5x11extras/Config.in
create mode 100644 package/qt5/qt5x11extras/qt5x11extras.mk
--
1.7.10.4
^ permalink raw reply [flat|nested] 19+ messages in thread* [Buildroot] [PATCH v2 1/6] qt5: bump to 5.1.1 2013-09-20 5:43 [Buildroot] [PATCH v2 0/6] Bump Qt5 to version 5.1.1 Fatih Aşıcı @ 2013-09-20 5:43 ` Fatih Aşıcı 2013-09-20 7:20 ` Espen Frimann Koren ` (3 more replies) 2013-09-20 5:43 ` [Buildroot] [PATCH v2 2/6] qt5quickcontrols: new package Fatih Aşıcı ` (4 subsequent siblings) 5 siblings, 4 replies; 19+ messages in thread From: Fatih Aşıcı @ 2013-09-20 5:43 UTC (permalink / raw) To: buildroot Following patches are removed since they are upstreamed: - qt5base/qt5base-0001-eglconvenience-add-egl-to-CONFIG-to-get-correct-incl.patch - qt5jsbackend/qt5jsbackend-0002-fix-uclibc.patch Remove "-nomake demos" from configure options since "demos" directory is merged into examples. Signed-off-by: Fatih A??c? <fatih.asici@gmail.com> --- package/qt5/qt5.mk | 4 +-- package/qt5/qt5base/Config.in | 2 ++ ...nce-add-egl-to-CONFIG-to-get-correct-incl.patch | 32 ------------------- ...-Add-egl-cflags-when-opengles2-is-enabled.patch | 32 +++++++++++++++++++ .../qt5/qt5base/qt5base-0002-mkspecs-files.patch | 5 +-- package/qt5/qt5base/qt5base.mk | 10 ++++-- package/qt5/qt5declarative/qt5declarative.mk | 1 + .../qt5jsbackend-0002-fix-uclibc.patch | 33 -------------------- package/qt5/qt5quick1/qt5quick1.mk | 3 +- 9 files changed, 48 insertions(+), 74 deletions(-) delete mode 100644 package/qt5/qt5base/qt5base-0001-eglconvenience-add-egl-to-CONFIG-to-get-correct-incl.patch create mode 100644 package/qt5/qt5base/qt5base-0001-xcb-Add-egl-cflags-when-opengles2-is-enabled.patch delete mode 100644 package/qt5/qt5jsbackend/qt5jsbackend-0002-fix-uclibc.patch diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk index fce0ca3..671a217 100644 --- a/package/qt5/qt5.mk +++ b/package/qt5/qt5.mk @@ -1,5 +1,5 @@ -QT5_VERSION = 5.0.2 -QT5_SITE = http://download.qt-project.org/archive/qt/5.0/$(QT5_VERSION)/submodules/ +QT5_VERSION = 5.1.1 +QT5_SITE = http://download.qt-project.org/official_releases/qt/5.1/$(QT5_VERSION)/submodules/ include $(sort $(wildcard package/qt5/*/*.mk)) define QT5_LA_PRL_FILES_FIXUP diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in index 9c7fd15..e433373 100644 --- a/package/qt5/qt5base/Config.in +++ b/package/qt5/qt5base/Config.in @@ -104,6 +104,7 @@ if BR2_PACKAGE_QT5BASE_GUI config BR2_PACKAGE_QT5BASE_WIDGETS bool "widgets module" + select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_QT5BASE_XCB help This option enables the Qt5Widgets library. @@ -122,6 +123,7 @@ config BR2_PACKAGE_QT5BASE_XCB select BR2_PACKAGE_XCB_UTIL_IMAGE select BR2_PACKAGE_XCB_UTIL_KEYSYMS select BR2_PACKAGE_XCB_UTIL_WM + select BR2_PACKAGE_LIBXKBCOMMON comment "X.org XCB backend available if X.org is enabled" depends on !BR2_PACKAGE_XORG7 diff --git a/package/qt5/qt5base/qt5base-0001-eglconvenience-add-egl-to-CONFIG-to-get-correct-incl.patch b/package/qt5/qt5base/qt5base-0001-eglconvenience-add-egl-to-CONFIG-to-get-correct-incl.patch deleted file mode 100644 index a85a5aa..0000000 --- a/package/qt5/qt5base/qt5base-0001-eglconvenience-add-egl-to-CONFIG-to-get-correct-incl.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 588c60d0c3d11e79d19860fa62b03c935658d13a Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> -Date: Sun, 13 Jan 2013 14:36:48 +0100 -Subject: [PATCH qtbase] eglconvenience: add egl to CONFIG to get correct include - paths - -The eglconvenience code includes <EGL/egl.h>. Therefore, it should get -the appropriate EGL-specific include paths from QMAKE_INCDIR_EGL, -otherwise the build might if the EGL library has its headers in -special locations. In order to achieve this, we simply add the "egl" -feature to the list of features imported by eglconvenience. - -Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> ---- - .../eglconvenience/eglconvenience.pri | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/platformsupport/eglconvenience/eglconvenience.pri b/src/platformsupport/eglconvenience/eglconvenience.pri -index 188eb1c..8996cea 100644 ---- a/src/platformsupport/eglconvenience/eglconvenience.pri -+++ b/src/platformsupport/eglconvenience/eglconvenience.pri -@@ -5,6 +5,7 @@ contains(QT_CONFIG,egl) { - SOURCES += \ - $$PWD/qeglconvenience.cpp \ - $$PWD/qeglplatformcontext.cpp -+ CONFIG += egl - - contains(QT_CONFIG,xlib) { - HEADERS += \ --- -1.7.9.5 - diff --git a/package/qt5/qt5base/qt5base-0001-xcb-Add-egl-cflags-when-opengles2-is-enabled.patch b/package/qt5/qt5base/qt5base-0001-xcb-Add-egl-cflags-when-opengles2-is-enabled.patch new file mode 100644 index 0000000..87acd9b --- /dev/null +++ b/package/qt5/qt5base/qt5base-0001-xcb-Add-egl-cflags-when-opengles2-is-enabled.patch @@ -0,0 +1,32 @@ +From cbffa1e467a4c8b9e8061364b69e250b23fb7b59 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fatih=20A=C5=9F=C4=B1c=C4=B1?= <fatih.asici@gmail.com> +Date: Sun, 15 Sep 2013 11:15:33 +0300 +Subject: [PATCH] xcb: Add egl cflags when opengles2 is enabled +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This patch is sent to upstream and applied: +https://qt.gitorious.org/qt/qtbase/commit/ff7b57bbb936bc86a64aa2a947fa8984adf400c8 + +Signed-off-by: Fatih A??c? <fatih.asici@gmail.com> +--- + src/plugins/platforms/xcb/xcb-plugin.pro | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/plugins/platforms/xcb/xcb-plugin.pro b/src/plugins/platforms/xcb/xcb-plugin.pro +index 8299528..bc21afe 100644 +--- a/src/plugins/platforms/xcb/xcb-plugin.pro ++++ b/src/plugins/platforms/xcb/xcb-plugin.pro +@@ -73,7 +73,7 @@ contains(QT_CONFIG, xcb-render) { + contains(QT_CONFIG, opengl) { + contains(QT_CONFIG, opengles2) { + DEFINES += XCB_USE_EGL +- LIBS += -lEGL ++ CONFIG += egl + HEADERS += qxcbeglsurface.h + + # EGL on MeeGo 1.2 Harmattan needs this macro to map EGLNativeDisplayType +-- +1.7.10.4 + diff --git a/package/qt5/qt5base/qt5base-0002-mkspecs-files.patch b/package/qt5/qt5base/qt5base-0002-mkspecs-files.patch index bfa9c15..e406cfc 100644 --- a/package/qt5/qt5base/qt5base-0002-mkspecs-files.patch +++ b/package/qt5/qt5base/qt5base-0002-mkspecs-files.patch @@ -14,9 +14,9 @@ Index: b/mkspecs/devices/linux-buildroot-g++/qmake.conf =================================================================== --- /dev/null +++ b/mkspecs/devices/linux-buildroot-g++/qmake.conf -@@ -0,0 +1,43 @@ +@@ -0,0 +1,44 @@ +MAKEFILE_GENERATOR = UNIX -+CONFIG += incremental gdb_dwarf_index ++CONFIG += incremental gdb_dwarf_index +QMAKE_INCREMENTAL_STYLE = sublib + +include(../../common/linux.conf) @@ -41,6 +41,7 @@ Index: b/mkspecs/devices/linux-buildroot-g++/qmake.conf +# modifications to linux.conf +QMAKE_AR = $${BUILDROOT_CROSS_COMPILE}ar cqs +QMAKE_OBJCOPY = $${BUILDROOT_CROSS_COMPILE}objcopy ++QMAKE_NM = $${BUILDROOT_CROSS_COMPILE}nm -P +QMAKE_STRIP = $${BUILDROOT_CROSS_COMPILE}strip + +#modifications to gcc-base.conf diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index ddc5574..0106c2c 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -84,13 +84,17 @@ QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),-directfb,-no-dir QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),directfb) ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y) -QT5BASE_CONFIGURE_OPTS += -xcb +QT5BASE_CONFIGURE_OPTS += -xcb -system-xkbcommon QT5BASE_DEPENDENCIES += \ libxcb \ xcb-util-wm \ xcb-util-image \ xcb-util-keysyms \ - xlib_libX11 + xlib_libX11 \ + libxkbcommon +ifeq ($(BR2_PACKAGE_QT5BASE_WIDGETS),y) +QT5BASE_DEPENDENCIES += xlib_libXext +endif else QT5BASE_CONFIGURE_OPTS += -no-xcb endif @@ -172,7 +176,7 @@ define QT5BASE_CONFIGURE_CMDS -sysroot $(STAGING_DIR) \ -plugindir /usr/lib/qt/plugins \ -no-rpath \ - -nomake examples -nomake demos -nomake tests \ + -nomake examples -nomake tests \ -device buildroot \ -no-c++11 \ $(QT5BASE_CONFIGURE_OPTS) \ diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk index 603c0e7..943f33d 100644 --- a/package/qt5/qt5declarative/qt5declarative.mk +++ b/package/qt5/qt5declarative/qt5declarative.mk @@ -39,6 +39,7 @@ ifeq ($(BR2_PREFER_STATIC_LIB),) define QT5DECLARATIVE_INSTALL_TARGET_LIBS cp -dpf $(STAGING_DIR)/usr/lib/libQt5Qml*.so.* $(TARGET_DIR)/usr/lib cp -dpf $(STAGING_DIR)/usr/lib/libQt5Quick*.so.* $(TARGET_DIR)/usr/lib + cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/accessible $(TARGET_DIR)/usr/lib/qt/plugins cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/qml* $(TARGET_DIR)/usr/lib/qt/plugins endef endif diff --git a/package/qt5/qt5jsbackend/qt5jsbackend-0002-fix-uclibc.patch b/package/qt5/qt5jsbackend/qt5jsbackend-0002-fix-uclibc.patch deleted file mode 100644 index 50a6dbc..0000000 --- a/package/qt5/qt5jsbackend/qt5jsbackend-0002-fix-uclibc.patch +++ /dev/null @@ -1,33 +0,0 @@ -Fix build on uClibc - -Patch taken from https://code.google.com/p/v8/source/detail?r=12094. - -Review URL: https://chromiumcodereview.appspot.com/10784012 -Patch from Remi Duraffort <remi.duraffort@st.com>. - -Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> - -Index: qt5jsbackend-5.0.0/src/3rdparty/v8/src/platform-linux.cc -=================================================================== ---- qt5jsbackend-5.0.0.orig/src/3rdparty/v8/src/platform-linux.cc 2012-12-18 20:04:01.000000000 +0100 -+++ qt5jsbackend-5.0.0/src/3rdparty/v8/src/platform-linux.cc 2013-03-03 20:31:46.000000000 +0100 -@@ -1030,7 +1030,8 @@ - sample->fp = reinterpret_cast<Address>(mcontext.gregs[REG_RBP]); - #elif V8_HOST_ARCH_ARM - // An undefined macro evaluates to 0, so this applies to Android's Bionic also. --#if (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3)) -+#if (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3) && \ -+ !defined(__UCLIBC__)) - sample->pc = reinterpret_cast<Address>(mcontext.gregs[R15]); - sample->sp = reinterpret_cast<Address>(mcontext.gregs[R13]); - sample->fp = reinterpret_cast<Address>(mcontext.gregs[R11]); -@@ -1038,7 +1039,8 @@ - sample->pc = reinterpret_cast<Address>(mcontext.arm_pc); - sample->sp = reinterpret_cast<Address>(mcontext.arm_sp); - sample->fp = reinterpret_cast<Address>(mcontext.arm_fp); --#endif // (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3)) -+#endif // (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3) && -+ // !defined(__UCLIBC__)) - #elif V8_HOST_ARCH_MIPS - sample->pc = reinterpret_cast<Address>(mcontext.pc); - sample->sp = reinterpret_cast<Address>(mcontext.gregs[29]); diff --git a/package/qt5/qt5quick1/qt5quick1.mk b/package/qt5/qt5quick1/qt5quick1.mk index 9bd36db..d1b0b36 100644 --- a/package/qt5/qt5quick1/qt5quick1.mk +++ b/package/qt5/qt5quick1/qt5quick1.mk @@ -35,8 +35,7 @@ endef define QT5QUICK1_INSTALL_TARGET_CMDS cp -dpf $(STAGING_DIR)/usr/lib/libQt5Declarative.so.* $(TARGET_DIR)/usr/lib - cp -dpf $(STAGING_DIR)/usr/lib/qt/plugins/qmltooling/libqmldbg_inspector.so $(TARGET_DIR)/usr/lib/qt/plugins/qmltooling/ - cp -dpf $(STAGING_DIR)/usr/lib/qt/plugins/qmltooling/libqmldbg_tcp_qtdeclarative.so $(TARGET_DIR)/usr/lib/qt/plugins/qmltooling/ + cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/qml1tooling $(TARGET_DIR)/usr/lib/qt/plugins/ cp -dpfr $(STAGING_DIR)/usr/imports $(TARGET_DIR)/usr endef -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* [Buildroot] [PATCH v2 1/6] qt5: bump to 5.1.1 2013-09-20 5:43 ` [Buildroot] [PATCH v2 1/6] qt5: bump to 5.1.1 Fatih Aşıcı @ 2013-09-20 7:20 ` Espen Frimann Koren 2013-09-20 8:33 ` Fatih Aşıcı 2013-10-04 12:09 ` Ezequiel Garcia ` (2 subsequent siblings) 3 siblings, 1 reply; 19+ messages in thread From: Espen Frimann Koren @ 2013-09-20 7:20 UTC (permalink / raw) To: buildroot Thank you for taking care of this. Unfortunately doesn't it work yet. The configuration part is OK. After a long while it is going to compile the file eglconvenience/qeglconvenience.cpp, and then it complains about not finding X11/Xlib.h. This is because the symbol EGL_API_FB must be defined. I saw some discussion about this and that you have filed a bug to Qt. It is a Qt-problem you think? Sp1 On 20 September 2013 07:43, Fatih A??c? <fatih.asici@gmail.com> wrote: > Following patches are removed since they are upstreamed: > - > qt5base/qt5base-0001-eglconvenience-add-egl-to-CONFIG-to-get-correct-incl.patch > - qt5jsbackend/qt5jsbackend-0002-fix-uclibc.patch > > Remove "-nomake demos" from configure options since "demos" directory is > merged into examples. > > Signed-off-by: Fatih A??c? <fatih.asici@gmail.com> > --- > package/qt5/qt5.mk | 4 +-- > package/qt5/qt5base/Config.in | 2 ++ > ...nce-add-egl-to-CONFIG-to-get-correct-incl.patch | 32 > ------------------- > ...-Add-egl-cflags-when-opengles2-is-enabled.patch | 32 > +++++++++++++++++++ > .../qt5/qt5base/qt5base-0002-mkspecs-files.patch | 5 +-- > package/qt5/qt5base/qt5base.mk | 10 ++++-- > package/qt5/qt5declarative/qt5declarative.mk | 1 + > .../qt5jsbackend-0002-fix-uclibc.patch | 33 > -------------------- > package/qt5/qt5quick1/qt5quick1.mk | 3 +- > 9 files changed, 48 insertions(+), 74 deletions(-) > delete mode 100644 > package/qt5/qt5base/qt5base-0001-eglconvenience-add-egl-to-CONFIG-to-get-correct-incl.patch > create mode 100644 > package/qt5/qt5base/qt5base-0001-xcb-Add-egl-cflags-when-opengles2-is-enabled.patch > delete mode 100644 > package/qt5/qt5jsbackend/qt5jsbackend-0002-fix-uclibc.patch > > diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk > index fce0ca3..671a217 100644 > --- a/package/qt5/qt5.mk > +++ b/package/qt5/qt5.mk > @@ -1,5 +1,5 @@ > -QT5_VERSION = 5.0.2 > -QT5_SITE = > http://download.qt-project.org/archive/qt/5.0/$(QT5_VERSION)/submodules/ > +QT5_VERSION = 5.1.1 > +QT5_SITE = > http://download.qt-project.org/official_releases/qt/5.1/$(QT5_VERSION)/submodules/ > include $(sort $(wildcard package/qt5/*/*.mk)) > > define QT5_LA_PRL_FILES_FIXUP > diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in > index 9c7fd15..e433373 100644 > --- a/package/qt5/qt5base/Config.in > +++ b/package/qt5/qt5base/Config.in > @@ -104,6 +104,7 @@ if BR2_PACKAGE_QT5BASE_GUI > > config BR2_PACKAGE_QT5BASE_WIDGETS > bool "widgets module" > + select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_QT5BASE_XCB > help > This option enables the Qt5Widgets library. > > @@ -122,6 +123,7 @@ config BR2_PACKAGE_QT5BASE_XCB > select BR2_PACKAGE_XCB_UTIL_IMAGE > select BR2_PACKAGE_XCB_UTIL_KEYSYMS > select BR2_PACKAGE_XCB_UTIL_WM > + select BR2_PACKAGE_LIBXKBCOMMON > > comment "X.org XCB backend available if X.org is enabled" > depends on !BR2_PACKAGE_XORG7 > diff --git > a/package/qt5/qt5base/qt5base-0001-eglconvenience-add-egl-to-CONFIG-to-get-correct-incl.patch > b/package/qt5/qt5base/qt5base-0001-eglconvenience-add-egl-to-CONFIG-to-get-correct-incl.patch > deleted file mode 100644 > index a85a5aa..0000000 > --- > a/package/qt5/qt5base/qt5base-0001-eglconvenience-add-egl-to-CONFIG-to-get-correct-incl.patch > +++ /dev/null > @@ -1,32 +0,0 @@ > -From 588c60d0c3d11e79d19860fa62b03c935658d13a Mon Sep 17 00:00:00 2001 > -From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> > -Date: Sun, 13 Jan 2013 14:36:48 +0100 > -Subject: [PATCH qtbase] eglconvenience: add egl to CONFIG to get correct > include > - paths > - > -The eglconvenience code includes <EGL/egl.h>. Therefore, it should get > -the appropriate EGL-specific include paths from QMAKE_INCDIR_EGL, > -otherwise the build might if the EGL library has its headers in > -special locations. In order to achieve this, we simply add the "egl" > -feature to the list of features imported by eglconvenience. > - > -Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> > ---- > - .../eglconvenience/eglconvenience.pri | 1 + > - 1 file changed, 1 insertion(+) > - > -diff --git a/src/platformsupport/eglconvenience/eglconvenience.pri > b/src/platformsupport/eglconvenience/eglconvenience.pri > -index 188eb1c..8996cea 100644 > ---- a/src/platformsupport/eglconvenience/eglconvenience.pri > -+++ b/src/platformsupport/eglconvenience/eglconvenience.pri > -@@ -5,6 +5,7 @@ contains(QT_CONFIG,egl) { > - SOURCES += \ > - $$PWD/qeglconvenience.cpp \ > - $$PWD/qeglplatformcontext.cpp > -+ CONFIG += egl > - > - contains(QT_CONFIG,xlib) { > - HEADERS += \ > --- > -1.7.9.5 > - > diff --git > a/package/qt5/qt5base/qt5base-0001-xcb-Add-egl-cflags-when-opengles2-is-enabled.patch > b/package/qt5/qt5base/qt5base-0001-xcb-Add-egl-cflags-when-opengles2-is-enabled.patch > new file mode 100644 > index 0000000..87acd9b > --- /dev/null > +++ > b/package/qt5/qt5base/qt5base-0001-xcb-Add-egl-cflags-when-opengles2-is-enabled.patch > @@ -0,0 +1,32 @@ > +From cbffa1e467a4c8b9e8061364b69e250b23fb7b59 Mon Sep 17 00:00:00 2001 > +From: =?UTF-8?q?Fatih=20A=C5=9F=C4=B1c=C4=B1?= <fatih.asici@gmail.com> > +Date: Sun, 15 Sep 2013 11:15:33 +0300 > +Subject: [PATCH] xcb: Add egl cflags when opengles2 is enabled > +MIME-Version: 1.0 > +Content-Type: text/plain; charset=UTF-8 > +Content-Transfer-Encoding: 8bit > + > +This patch is sent to upstream and applied: > + > https://qt.gitorious.org/qt/qtbase/commit/ff7b57bbb936bc86a64aa2a947fa8984adf400c8 > + > +Signed-off-by: Fatih A??c? <fatih.asici@gmail.com> > +--- > + src/plugins/platforms/xcb/xcb-plugin.pro | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/src/plugins/platforms/xcb/xcb-plugin.prob/src/plugins/platforms/xcb/ > xcb-plugin.pro > +index 8299528..bc21afe 100644 > +--- a/src/plugins/platforms/xcb/xcb-plugin.pro > ++++ b/src/plugins/platforms/xcb/xcb-plugin.pro > +@@ -73,7 +73,7 @@ contains(QT_CONFIG, xcb-render) { > + contains(QT_CONFIG, opengl) { > + contains(QT_CONFIG, opengles2) { > + DEFINES += XCB_USE_EGL > +- LIBS += -lEGL > ++ CONFIG += egl > + HEADERS += qxcbeglsurface.h > + > + # EGL on MeeGo 1.2 Harmattan needs this macro to map > EGLNativeDisplayType > +-- > +1.7.10.4 > + > diff --git a/package/qt5/qt5base/qt5base-0002-mkspecs-files.patch > b/package/qt5/qt5base/qt5base-0002-mkspecs-files.patch > index bfa9c15..e406cfc 100644 > --- a/package/qt5/qt5base/qt5base-0002-mkspecs-files.patch > +++ b/package/qt5/qt5base/qt5base-0002-mkspecs-files.patch > @@ -14,9 +14,9 @@ Index: b/mkspecs/devices/linux-buildroot-g++/qmake.conf > =================================================================== > --- /dev/null > +++ b/mkspecs/devices/linux-buildroot-g++/qmake.conf > -@@ -0,0 +1,43 @@ > +@@ -0,0 +1,44 @@ > +MAKEFILE_GENERATOR = UNIX > -+CONFIG += incremental gdb_dwarf_index > ++CONFIG += incremental gdb_dwarf_index > +QMAKE_INCREMENTAL_STYLE = sublib > + > +include(../../common/linux.conf) > @@ -41,6 +41,7 @@ Index: b/mkspecs/devices/linux-buildroot-g++/qmake.conf > +# modifications to linux.conf > +QMAKE_AR = $${BUILDROOT_CROSS_COMPILE}ar cqs > +QMAKE_OBJCOPY = $${BUILDROOT_CROSS_COMPILE}objcopy > ++QMAKE_NM = $${BUILDROOT_CROSS_COMPILE}nm -P > +QMAKE_STRIP = $${BUILDROOT_CROSS_COMPILE}strip > + > +#modifications to gcc-base.conf > diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/ > qt5base.mk > index ddc5574..0106c2c 100644 > --- a/package/qt5/qt5base/qt5base.mk > +++ b/package/qt5/qt5base/qt5base.mk > @@ -84,13 +84,17 @@ QT5BASE_CONFIGURE_OPTS += $(if > $(BR2_PACKAGE_QT5BASE_DIRECTFB),-directfb,-no-dir > QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),directfb) > > ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y) > -QT5BASE_CONFIGURE_OPTS += -xcb > +QT5BASE_CONFIGURE_OPTS += -xcb -system-xkbcommon > QT5BASE_DEPENDENCIES += \ > libxcb \ > xcb-util-wm \ > xcb-util-image \ > xcb-util-keysyms \ > - xlib_libX11 > + xlib_libX11 \ > + libxkbcommon > +ifeq ($(BR2_PACKAGE_QT5BASE_WIDGETS),y) > +QT5BASE_DEPENDENCIES += xlib_libXext > +endif > else > QT5BASE_CONFIGURE_OPTS += -no-xcb > endif > @@ -172,7 +176,7 @@ define QT5BASE_CONFIGURE_CMDS > -sysroot $(STAGING_DIR) \ > -plugindir /usr/lib/qt/plugins \ > -no-rpath \ > - -nomake examples -nomake demos -nomake tests \ > + -nomake examples -nomake tests \ > -device buildroot \ > -no-c++11 \ > $(QT5BASE_CONFIGURE_OPTS) \ > diff --git a/package/qt5/qt5declarative/qt5declarative.mkb/package/qt5/qt5declarative/ > qt5declarative.mk > index 603c0e7..943f33d 100644 > --- a/package/qt5/qt5declarative/qt5declarative.mk > +++ b/package/qt5/qt5declarative/qt5declarative.mk > @@ -39,6 +39,7 @@ ifeq ($(BR2_PREFER_STATIC_LIB),) > define QT5DECLARATIVE_INSTALL_TARGET_LIBS > cp -dpf $(STAGING_DIR)/usr/lib/libQt5Qml*.so.* > $(TARGET_DIR)/usr/lib > cp -dpf $(STAGING_DIR)/usr/lib/libQt5Quick*.so.* > $(TARGET_DIR)/usr/lib > + cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/accessible > $(TARGET_DIR)/usr/lib/qt/plugins > cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/qml* > $(TARGET_DIR)/usr/lib/qt/plugins > endef > endif > diff --git a/package/qt5/qt5jsbackend/qt5jsbackend-0002-fix-uclibc.patch > b/package/qt5/qt5jsbackend/qt5jsbackend-0002-fix-uclibc.patch > deleted file mode 100644 > index 50a6dbc..0000000 > --- a/package/qt5/qt5jsbackend/qt5jsbackend-0002-fix-uclibc.patch > +++ /dev/null > @@ -1,33 +0,0 @@ > -Fix build on uClibc > - > -Patch taken from https://code.google.com/p/v8/source/detail?r=12094. > - > -Review URL: https://chromiumcodereview.appspot.com/10784012 > -Patch from Remi Duraffort <remi.duraffort@st.com>. > - > -Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> > - > -Index: qt5jsbackend-5.0.0/src/3rdparty/v8/src/platform-linux.cc > -=================================================================== > ---- qt5jsbackend-5.0.0.orig/src/3rdparty/v8/src/platform-linux.cc > 2012-12-18 20:04:01.000000000 +0100 > -+++ qt5jsbackend-5.0.0/src/3rdparty/v8/src/platform-linux.cc 2013-03-03 > 20:31:46.000000000 +0100 > -@@ -1030,7 +1030,8 @@ > - sample->fp = reinterpret_cast<Address>(mcontext.gregs[REG_RBP]); > - #elif V8_HOST_ARCH_ARM > - // An undefined macro evaluates to 0, so this applies to Android's > Bionic also. > --#if (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3)) > -+#if (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3) && \ > -+ !defined(__UCLIBC__)) > - sample->pc = reinterpret_cast<Address>(mcontext.gregs[R15]); > - sample->sp = reinterpret_cast<Address>(mcontext.gregs[R13]); > - sample->fp = reinterpret_cast<Address>(mcontext.gregs[R11]); > -@@ -1038,7 +1039,8 @@ > - sample->pc = reinterpret_cast<Address>(mcontext.arm_pc); > - sample->sp = reinterpret_cast<Address>(mcontext.arm_sp); > - sample->fp = reinterpret_cast<Address>(mcontext.arm_fp); > --#endif // (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3)) > -+#endif // (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3) && > -+ // !defined(__UCLIBC__)) > - #elif V8_HOST_ARCH_MIPS > - sample->pc = reinterpret_cast<Address>(mcontext.pc); > - sample->sp = reinterpret_cast<Address>(mcontext.gregs[29]); > diff --git a/package/qt5/qt5quick1/qt5quick1.mk b/package/qt5/qt5quick1/ > qt5quick1.mk > index 9bd36db..d1b0b36 100644 > --- a/package/qt5/qt5quick1/qt5quick1.mk > +++ b/package/qt5/qt5quick1/qt5quick1.mk > @@ -35,8 +35,7 @@ endef > > define QT5QUICK1_INSTALL_TARGET_CMDS > cp -dpf $(STAGING_DIR)/usr/lib/libQt5Declarative.so.* > $(TARGET_DIR)/usr/lib > - cp -dpf > $(STAGING_DIR)/usr/lib/qt/plugins/qmltooling/libqmldbg_inspector.so > $(TARGET_DIR)/usr/lib/qt/plugins/qmltooling/ > - cp -dpf > $(STAGING_DIR)/usr/lib/qt/plugins/qmltooling/libqmldbg_tcp_qtdeclarative.so > $(TARGET_DIR)/usr/lib/qt/plugins/qmltooling/ > + cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/qml1tooling > $(TARGET_DIR)/usr/lib/qt/plugins/ > cp -dpfr $(STAGING_DIR)/usr/imports $(TARGET_DIR)/usr > endef > > -- > 1.7.10.4 > > _______________________________________________ > buildroot mailing list > buildroot at busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20130920/a348dc02/attachment-0001.html> ^ permalink raw reply [flat|nested] 19+ messages in thread
* [Buildroot] [PATCH v2 1/6] qt5: bump to 5.1.1 2013-09-20 7:20 ` Espen Frimann Koren @ 2013-09-20 8:33 ` Fatih Aşıcı 0 siblings, 0 replies; 19+ messages in thread From: Fatih Aşıcı @ 2013-09-20 8:33 UTC (permalink / raw) To: buildroot On Fri, 2013-09-20 at 09:20 +0200, Espen Frimann Koren wrote: > Thank you for taking care of this. > > Unfortunately doesn't it work yet. The configuration part is OK. > > After a long while it is going to compile the file > eglconvenience/qeglconvenience.cpp, and then it complains about not > finding X11/Xlib.h. This is because the symbol EGL_API_FB must be > defined. I saw some discussion about this and that you have filed a > bug to Qt. It is a Qt-problem you think? > Did you apply this patch[1]? [1] http://patchwork.ozlabs.org/patch/275885/ ^ permalink raw reply [flat|nested] 19+ messages in thread
* [Buildroot] [PATCH v2 1/6] qt5: bump to 5.1.1 2013-09-20 5:43 ` [Buildroot] [PATCH v2 1/6] qt5: bump to 5.1.1 Fatih Aşıcı 2013-09-20 7:20 ` Espen Frimann Koren @ 2013-10-04 12:09 ` Ezequiel Garcia 2013-10-05 21:21 ` Fatih Aşıcı 2013-10-14 14:13 ` Ezequiel García 2013-10-26 17:09 ` Peter Korsgaard 3 siblings, 1 reply; 19+ messages in thread From: Ezequiel Garcia @ 2013-10-04 12:09 UTC (permalink / raw) To: buildroot Hi Fatih, Nice work! On Fri, Sep 20, 2013 at 08:43:10AM +0300, Fatih A??c? wrote: > Following patches are removed since they are upstreamed: > - qt5base/qt5base-0001-eglconvenience-add-egl-to-CONFIG-to-get-correct-incl.patch > - qt5jsbackend/qt5jsbackend-0002-fix-uclibc.patch > > Remove "-nomake demos" from configure options since "demos" directory is > merged into examples. > > Signed-off-by: Fatih A??c? <fatih.asici@gmail.com> > --- > package/qt5/qt5.mk | 4 +-- > package/qt5/qt5base/Config.in | 2 ++ > ...nce-add-egl-to-CONFIG-to-get-correct-incl.patch | 32 ------------------- > ...-Add-egl-cflags-when-opengles2-is-enabled.patch | 32 +++++++++++++++++++ > .../qt5/qt5base/qt5base-0002-mkspecs-files.patch | 5 +-- > package/qt5/qt5base/qt5base.mk | 10 ++++-- > package/qt5/qt5declarative/qt5declarative.mk | 1 + > .../qt5jsbackend-0002-fix-uclibc.patch | 33 -------------------- > package/qt5/qt5quick1/qt5quick1.mk | 3 +- > 9 files changed, 48 insertions(+), 74 deletions(-) > delete mode 100644 package/qt5/qt5base/qt5base-0001-eglconvenience-add-egl-to-CONFIG-to-get-correct-incl.patch > create mode 100644 package/qt5/qt5base/qt5base-0001-xcb-Add-egl-cflags-when-opengles2-is-enabled.patch > delete mode 100644 package/qt5/qt5jsbackend/qt5jsbackend-0002-fix-uclibc.patch > I'm trying the series right now and noticed that qt5base build fails if PNG is not enabled. Apparently, you noticed first as you already reported this and provided a fix: https://bugreports.qt-project.org/browse/QTBUG-33496 Care to add this patch as well to Buildroot and push the fix upstream? Apparently with this new version of Qt5, the examples get built: they aren't built with the current v5.0.2. So, it would be nice to add support to build the examples (which we had in Qt 4.8). I think embedded developers might find examples of great use: I use them to quickly check the hardware support is OK (test touchscreen, the buttons, and so on). I would do it myself, but I tried to use something like this: diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 0106c2c..9585b10 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -176,7 +176,6 @@ define QT5BASE_CONFIGURE_CMDS -sysroot $(STAGING_DIR) \ -plugindir /usr/lib/qt/plugins \ -no-rpath \ - -nomake examples -nomake tests \ -device buildroot \ -no-c++11 \ $(QT5BASE_CONFIGURE_OPTS) \ And for some reason it tries to build the widgets/windowcontainer example which depends on OpenGL. This is wrong since OpenGL is disabled. I'm not sure what can be happening, since this example is not built in my desktop (also non-OpenGL) Qt5 build. Maybe you can take a look and fix? If you know the workaround to fix the above I can try to push the patch myself. Thanks! -- Ezequiel Garc?a, Free Electrons Embedded Linux, Kernel and Android Engineering http://free-electrons.com ^ permalink raw reply related [flat|nested] 19+ messages in thread
* [Buildroot] [PATCH v2 1/6] qt5: bump to 5.1.1 2013-10-04 12:09 ` Ezequiel Garcia @ 2013-10-05 21:21 ` Fatih Aşıcı 0 siblings, 0 replies; 19+ messages in thread From: Fatih Aşıcı @ 2013-10-05 21:21 UTC (permalink / raw) To: buildroot Hi, On Friday 04 October 2013 09:09:58 Ezequiel Garcia wrote: > I'm trying the series right now and noticed that qt5base build fails if > PNG is not enabled. Apparently, you noticed first as you already > reported this and provided a fix: > > https://bugreports.qt-project.org/browse/QTBUG-33496 > > Care to add this patch as well to Buildroot and push the fix upstream? > > Apparently with this new version of Qt5, the examples get built: they > aren't built with the current v5.0.2. > > So, it would be nice to add support to build the examples (which we > had in Qt 4.8). > > I think embedded developers might find examples of great use: I use them to > quickly check the hardware support is OK (test touchscreen, the buttons, > and so on). > > I would do it myself, but I tried to use something like this: > > diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk > index 0106c2c..9585b10 100644 > --- a/package/qt5/qt5base/qt5base.mk > +++ b/package/qt5/qt5base/qt5base.mk > @@ -176,7 +176,6 @@ define QT5BASE_CONFIGURE_CMDS > -sysroot $(STAGING_DIR) \ > -plugindir /usr/lib/qt/plugins \ > -no-rpath \ > - -nomake examples -nomake tests \ > -device buildroot \ > -no-c++11 \ > $(QT5BASE_CONFIGURE_OPTS) \ > > And for some reason it tries to build the widgets/windowcontainer > example which depends on OpenGL. This is wrong since OpenGL is disabled. > I'm not sure what can be happening, since this example is not built in > my desktop (also non-OpenGL) Qt5 build. > > Maybe you can take a look and fix? If you know the workaround to fix the > above I can try to push the patch myself. I have sent two patches to the list for both issues. They are based on my patch series bumping version to 5.1.1. ^ permalink raw reply [flat|nested] 19+ messages in thread
* [Buildroot] [PATCH v2 1/6] qt5: bump to 5.1.1 2013-09-20 5:43 ` [Buildroot] [PATCH v2 1/6] qt5: bump to 5.1.1 Fatih Aşıcı 2013-09-20 7:20 ` Espen Frimann Koren 2013-10-04 12:09 ` Ezequiel Garcia @ 2013-10-14 14:13 ` Ezequiel García 2013-10-26 17:09 ` Peter Korsgaard 3 siblings, 0 replies; 19+ messages in thread From: Ezequiel García @ 2013-10-14 14:13 UTC (permalink / raw) To: buildroot On 20 September 2013 02:43, Fatih A??c? <fatih.asici@gmail.com> wrote: > Following patches are removed since they are upstreamed: > - qt5base/qt5base-0001-eglconvenience-add-egl-to-CONFIG-to-get-correct-incl.patch > - qt5jsbackend/qt5jsbackend-0002-fix-uclibc.patch > > Remove "-nomake demos" from configure options since "demos" directory is > merged into examples. > > Signed-off-by: Fatih A??c? <fatih.asici@gmail.com> > --- > package/qt5/qt5.mk | 4 +-- > package/qt5/qt5base/Config.in | 2 ++ > ...nce-add-egl-to-CONFIG-to-get-correct-incl.patch | 32 ------------------- > ...-Add-egl-cflags-when-opengles2-is-enabled.patch | 32 +++++++++++++++++++ > .../qt5/qt5base/qt5base-0002-mkspecs-files.patch | 5 +-- > package/qt5/qt5base/qt5base.mk | 10 ++++-- > package/qt5/qt5declarative/qt5declarative.mk | 1 + > .../qt5jsbackend-0002-fix-uclibc.patch | 33 -------------------- > package/qt5/qt5quick1/qt5quick1.mk | 3 +- > 9 files changed, 48 insertions(+), 74 deletions(-) > delete mode 100644 package/qt5/qt5base/qt5base-0001-eglconvenience-add-egl-to-CONFIG-to-get-correct-incl.patch > create mode 100644 package/qt5/qt5base/qt5base-0001-xcb-Add-egl-cflags-when-opengles2-is-enabled.patch > delete mode 100644 package/qt5/qt5jsbackend/qt5jsbackend-0002-fix-uclibc.patch > > diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk > index fce0ca3..671a217 100644 > --- a/package/qt5/qt5.mk > +++ b/package/qt5/qt5.mk > @@ -1,5 +1,5 @@ > -QT5_VERSION = 5.0.2 > -QT5_SITE = http://download.qt-project.org/archive/qt/5.0/$(QT5_VERSION)/submodules/ > +QT5_VERSION = 5.1.1 > +QT5_SITE = http://download.qt-project.org/official_releases/qt/5.1/$(QT5_VERSION)/submodules/ > include $(sort $(wildcard package/qt5/*/*.mk)) > > define QT5_LA_PRL_FILES_FIXUP > diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in > index 9c7fd15..e433373 100644 > --- a/package/qt5/qt5base/Config.in > +++ b/package/qt5/qt5base/Config.in > @@ -104,6 +104,7 @@ if BR2_PACKAGE_QT5BASE_GUI > > config BR2_PACKAGE_QT5BASE_WIDGETS > bool "widgets module" > + select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_QT5BASE_XCB > help > This option enables the Qt5Widgets library. > > @@ -122,6 +123,7 @@ config BR2_PACKAGE_QT5BASE_XCB > select BR2_PACKAGE_XCB_UTIL_IMAGE > select BR2_PACKAGE_XCB_UTIL_KEYSYMS > select BR2_PACKAGE_XCB_UTIL_WM > + select BR2_PACKAGE_LIBXKBCOMMON > > comment "X.org XCB backend available if X.org is enabled" > depends on !BR2_PACKAGE_XORG7 > diff --git a/package/qt5/qt5base/qt5base-0001-eglconvenience-add-egl-to-CONFIG-to-get-correct-incl.patch b/package/qt5/qt5base/qt5base-0001-eglconvenience-add-egl-to-CONFIG-to-get-correct-incl.patch > deleted file mode 100644 > index a85a5aa..0000000 > --- a/package/qt5/qt5base/qt5base-0001-eglconvenience-add-egl-to-CONFIG-to-get-correct-incl.patch > +++ /dev/null > @@ -1,32 +0,0 @@ > -From 588c60d0c3d11e79d19860fa62b03c935658d13a Mon Sep 17 00:00:00 2001 > -From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> > -Date: Sun, 13 Jan 2013 14:36:48 +0100 > -Subject: [PATCH qtbase] eglconvenience: add egl to CONFIG to get correct include > - paths > - > -The eglconvenience code includes <EGL/egl.h>. Therefore, it should get > -the appropriate EGL-specific include paths from QMAKE_INCDIR_EGL, > -otherwise the build might if the EGL library has its headers in > -special locations. In order to achieve this, we simply add the "egl" > -feature to the list of features imported by eglconvenience. > - > -Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> > ---- > - .../eglconvenience/eglconvenience.pri | 1 + > - 1 file changed, 1 insertion(+) > - > -diff --git a/src/platformsupport/eglconvenience/eglconvenience.pri b/src/platformsupport/eglconvenience/eglconvenience.pri > -index 188eb1c..8996cea 100644 > ---- a/src/platformsupport/eglconvenience/eglconvenience.pri > -+++ b/src/platformsupport/eglconvenience/eglconvenience.pri > -@@ -5,6 +5,7 @@ contains(QT_CONFIG,egl) { > - SOURCES += \ > - $$PWD/qeglconvenience.cpp \ > - $$PWD/qeglplatformcontext.cpp > -+ CONFIG += egl > - > - contains(QT_CONFIG,xlib) { > - HEADERS += \ > --- > -1.7.9.5 > - > diff --git a/package/qt5/qt5base/qt5base-0001-xcb-Add-egl-cflags-when-opengles2-is-enabled.patch b/package/qt5/qt5base/qt5base-0001-xcb-Add-egl-cflags-when-opengles2-is-enabled.patch > new file mode 100644 > index 0000000..87acd9b > --- /dev/null > +++ b/package/qt5/qt5base/qt5base-0001-xcb-Add-egl-cflags-when-opengles2-is-enabled.patch > @@ -0,0 +1,32 @@ > +From cbffa1e467a4c8b9e8061364b69e250b23fb7b59 Mon Sep 17 00:00:00 2001 > +From: =?UTF-8?q?Fatih=20A=C5=9F=C4=B1c=C4=B1?= <fatih.asici@gmail.com> > +Date: Sun, 15 Sep 2013 11:15:33 +0300 > +Subject: [PATCH] xcb: Add egl cflags when opengles2 is enabled > +MIME-Version: 1.0 > +Content-Type: text/plain; charset=UTF-8 > +Content-Transfer-Encoding: 8bit > + > +This patch is sent to upstream and applied: > +https://qt.gitorious.org/qt/qtbase/commit/ff7b57bbb936bc86a64aa2a947fa8984adf400c8 > + > +Signed-off-by: Fatih A??c? <fatih.asici@gmail.com> > +--- > + src/plugins/platforms/xcb/xcb-plugin.pro | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/src/plugins/platforms/xcb/xcb-plugin.pro b/src/plugins/platforms/xcb/xcb-plugin.pro > +index 8299528..bc21afe 100644 > +--- a/src/plugins/platforms/xcb/xcb-plugin.pro > ++++ b/src/plugins/platforms/xcb/xcb-plugin.pro > +@@ -73,7 +73,7 @@ contains(QT_CONFIG, xcb-render) { > + contains(QT_CONFIG, opengl) { > + contains(QT_CONFIG, opengles2) { > + DEFINES += XCB_USE_EGL > +- LIBS += -lEGL > ++ CONFIG += egl > + HEADERS += qxcbeglsurface.h > + > + # EGL on MeeGo 1.2 Harmattan needs this macro to map EGLNativeDisplayType > +-- > +1.7.10.4 > + > diff --git a/package/qt5/qt5base/qt5base-0002-mkspecs-files.patch b/package/qt5/qt5base/qt5base-0002-mkspecs-files.patch > index bfa9c15..e406cfc 100644 > --- a/package/qt5/qt5base/qt5base-0002-mkspecs-files.patch > +++ b/package/qt5/qt5base/qt5base-0002-mkspecs-files.patch > @@ -14,9 +14,9 @@ Index: b/mkspecs/devices/linux-buildroot-g++/qmake.conf > =================================================================== > --- /dev/null > +++ b/mkspecs/devices/linux-buildroot-g++/qmake.conf > -@@ -0,0 +1,43 @@ > +@@ -0,0 +1,44 @@ > +MAKEFILE_GENERATOR = UNIX > -+CONFIG += incremental gdb_dwarf_index > ++CONFIG += incremental gdb_dwarf_index > +QMAKE_INCREMENTAL_STYLE = sublib > + > +include(../../common/linux.conf) > @@ -41,6 +41,7 @@ Index: b/mkspecs/devices/linux-buildroot-g++/qmake.conf > +# modifications to linux.conf > +QMAKE_AR = $${BUILDROOT_CROSS_COMPILE}ar cqs > +QMAKE_OBJCOPY = $${BUILDROOT_CROSS_COMPILE}objcopy > ++QMAKE_NM = $${BUILDROOT_CROSS_COMPILE}nm -P > +QMAKE_STRIP = $${BUILDROOT_CROSS_COMPILE}strip > + > +#modifications to gcc-base.conf > diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk > index ddc5574..0106c2c 100644 > --- a/package/qt5/qt5base/qt5base.mk > +++ b/package/qt5/qt5base/qt5base.mk > @@ -84,13 +84,17 @@ QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),-directfb,-no-dir > QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),directfb) > > ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y) > -QT5BASE_CONFIGURE_OPTS += -xcb > +QT5BASE_CONFIGURE_OPTS += -xcb -system-xkbcommon > QT5BASE_DEPENDENCIES += \ > libxcb \ > xcb-util-wm \ > xcb-util-image \ > xcb-util-keysyms \ > - xlib_libX11 > + xlib_libX11 \ > + libxkbcommon > +ifeq ($(BR2_PACKAGE_QT5BASE_WIDGETS),y) > +QT5BASE_DEPENDENCIES += xlib_libXext > +endif > else > QT5BASE_CONFIGURE_OPTS += -no-xcb > endif > @@ -172,7 +176,7 @@ define QT5BASE_CONFIGURE_CMDS > -sysroot $(STAGING_DIR) \ > -plugindir /usr/lib/qt/plugins \ > -no-rpath \ > - -nomake examples -nomake demos -nomake tests \ > + -nomake examples -nomake tests \ > -device buildroot \ > -no-c++11 \ > $(QT5BASE_CONFIGURE_OPTS) \ > diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk > index 603c0e7..943f33d 100644 > --- a/package/qt5/qt5declarative/qt5declarative.mk > +++ b/package/qt5/qt5declarative/qt5declarative.mk > @@ -39,6 +39,7 @@ ifeq ($(BR2_PREFER_STATIC_LIB),) > define QT5DECLARATIVE_INSTALL_TARGET_LIBS > cp -dpf $(STAGING_DIR)/usr/lib/libQt5Qml*.so.* $(TARGET_DIR)/usr/lib > cp -dpf $(STAGING_DIR)/usr/lib/libQt5Quick*.so.* $(TARGET_DIR)/usr/lib > + cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/accessible $(TARGET_DIR)/usr/lib/qt/plugins > cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/qml* $(TARGET_DIR)/usr/lib/qt/plugins > endef > endif > diff --git a/package/qt5/qt5jsbackend/qt5jsbackend-0002-fix-uclibc.patch b/package/qt5/qt5jsbackend/qt5jsbackend-0002-fix-uclibc.patch > deleted file mode 100644 > index 50a6dbc..0000000 > --- a/package/qt5/qt5jsbackend/qt5jsbackend-0002-fix-uclibc.patch > +++ /dev/null > @@ -1,33 +0,0 @@ > -Fix build on uClibc > - > -Patch taken from https://code.google.com/p/v8/source/detail?r=12094. > - > -Review URL: https://chromiumcodereview.appspot.com/10784012 > -Patch from Remi Duraffort <remi.duraffort@st.com>. > - > -Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> > - > -Index: qt5jsbackend-5.0.0/src/3rdparty/v8/src/platform-linux.cc > -=================================================================== > ---- qt5jsbackend-5.0.0.orig/src/3rdparty/v8/src/platform-linux.cc 2012-12-18 20:04:01.000000000 +0100 > -+++ qt5jsbackend-5.0.0/src/3rdparty/v8/src/platform-linux.cc 2013-03-03 20:31:46.000000000 +0100 > -@@ -1030,7 +1030,8 @@ > - sample->fp = reinterpret_cast<Address>(mcontext.gregs[REG_RBP]); > - #elif V8_HOST_ARCH_ARM > - // An undefined macro evaluates to 0, so this applies to Android's Bionic also. > --#if (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3)) > -+#if (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3) && \ > -+ !defined(__UCLIBC__)) > - sample->pc = reinterpret_cast<Address>(mcontext.gregs[R15]); > - sample->sp = reinterpret_cast<Address>(mcontext.gregs[R13]); > - sample->fp = reinterpret_cast<Address>(mcontext.gregs[R11]); > -@@ -1038,7 +1039,8 @@ > - sample->pc = reinterpret_cast<Address>(mcontext.arm_pc); > - sample->sp = reinterpret_cast<Address>(mcontext.arm_sp); > - sample->fp = reinterpret_cast<Address>(mcontext.arm_fp); > --#endif // (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3)) > -+#endif // (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3) && > -+ // !defined(__UCLIBC__)) > - #elif V8_HOST_ARCH_MIPS > - sample->pc = reinterpret_cast<Address>(mcontext.pc); > - sample->sp = reinterpret_cast<Address>(mcontext.gregs[29]); > diff --git a/package/qt5/qt5quick1/qt5quick1.mk b/package/qt5/qt5quick1/qt5quick1.mk > index 9bd36db..d1b0b36 100644 > --- a/package/qt5/qt5quick1/qt5quick1.mk > +++ b/package/qt5/qt5quick1/qt5quick1.mk > @@ -35,8 +35,7 @@ endef > > define QT5QUICK1_INSTALL_TARGET_CMDS > cp -dpf $(STAGING_DIR)/usr/lib/libQt5Declarative.so.* $(TARGET_DIR)/usr/lib > - cp -dpf $(STAGING_DIR)/usr/lib/qt/plugins/qmltooling/libqmldbg_inspector.so $(TARGET_DIR)/usr/lib/qt/plugins/qmltooling/ > - cp -dpf $(STAGING_DIR)/usr/lib/qt/plugins/qmltooling/libqmldbg_tcp_qtdeclarative.so $(TARGET_DIR)/usr/lib/qt/plugins/qmltooling/ > + cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/qml1tooling $(TARGET_DIR)/usr/lib/qt/plugins/ > cp -dpfr $(STAGING_DIR)/usr/imports $(TARGET_DIR)/usr > endef > > -- > 1.7.10.4 > Tested-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar> Hope Peter picks this soon ;-) -- Ezequiel Garc?a, VanguardiaSur www.vanguardiasur.com.ar ^ permalink raw reply [flat|nested] 19+ messages in thread
* [Buildroot] [PATCH v2 1/6] qt5: bump to 5.1.1 2013-09-20 5:43 ` [Buildroot] [PATCH v2 1/6] qt5: bump to 5.1.1 Fatih Aşıcı ` (2 preceding siblings ...) 2013-10-14 14:13 ` Ezequiel García @ 2013-10-26 17:09 ` Peter Korsgaard 3 siblings, 0 replies; 19+ messages in thread From: Peter Korsgaard @ 2013-10-26 17:09 UTC (permalink / raw) To: buildroot >>>>> "Fatih" == Fatih A??c? <fatih.asici@gmail.com> writes: > Following patches are removed since they are upstreamed: > - qt5base/qt5base-0001-eglconvenience-add-egl-to-CONFIG-to-get-correct-incl.patch > - qt5jsbackend/qt5jsbackend-0002-fix-uclibc.patch > Remove "-nomake demos" from configure options since "demos" directory is > merged into examples. Committed, thanks. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 19+ messages in thread
* [Buildroot] [PATCH v2 2/6] qt5quickcontrols: new package 2013-09-20 5:43 [Buildroot] [PATCH v2 0/6] Bump Qt5 to version 5.1.1 Fatih Aşıcı 2013-09-20 5:43 ` [Buildroot] [PATCH v2 1/6] qt5: bump to 5.1.1 Fatih Aşıcı @ 2013-09-20 5:43 ` Fatih Aşıcı 2013-10-26 17:10 ` Peter Korsgaard 2013-09-20 5:43 ` [Buildroot] [PATCH v2 3/6] qt5sensors: " Fatih Aşıcı ` (3 subsequent siblings) 5 siblings, 1 reply; 19+ messages in thread From: Fatih Aşıcı @ 2013-09-20 5:43 UTC (permalink / raw) To: buildroot Signed-off-by: Fatih A??c? <fatih.asici@gmail.com> --- package/qt5/Config.in | 1 + package/qt5/qt5quickcontrols/Config.in | 20 ++++++++++++ package/qt5/qt5quickcontrols/qt5quickcontrols.mk | 37 ++++++++++++++++++++++ 3 files changed, 58 insertions(+) create mode 100644 package/qt5/qt5quickcontrols/Config.in create mode 100644 package/qt5/qt5quickcontrols/qt5quickcontrols.mk diff --git a/package/qt5/Config.in b/package/qt5/Config.in index 2945d96..b5b742c 100644 --- a/package/qt5/Config.in +++ b/package/qt5/Config.in @@ -22,6 +22,7 @@ source "package/qt5/qt5imageformats/Config.in" source "package/qt5/qt5jsbackend/Config.in" source "package/qt5/qt5multimedia/Config.in" source "package/qt5/qt5quick1/Config.in" +source "package/qt5/qt5quickcontrols/Config.in" source "package/qt5/qt5script/Config.in" source "package/qt5/qt5svg/Config.in" source "package/qt5/qt5webkit/Config.in" diff --git a/package/qt5/qt5quickcontrols/Config.in b/package/qt5/qt5quickcontrols/Config.in new file mode 100644 index 0000000..3d80630 --- /dev/null +++ b/package/qt5/qt5quickcontrols/Config.in @@ -0,0 +1,20 @@ +config BR2_PACKAGE_QT5QUICKCONTROLS + bool "qt5quickcontrols" + select BR2_PACKAGE_QT5BASE + select BR2_PACKAGE_QT5BASE_NETWORK + select BR2_PACKAGE_QT5DECLARATIVE + # qt5declarative -> qt5jsbackend + depends on BR2_PACKAGE_QT5JSBACKEND_AVAILABLE + depends on BR2_PACKAGE_HAS_OPENGL_EGL + depends on BR2_PACKAGE_HAS_OPENGL_ES + help + Qt is a cross-platform application and UI framework for + developers using C++. + + This package corresponds to the qt5quickcontrols module. + + http://qt-project.org + +comment "qt5quickcontrols requires an OpenGL-capable backend" + depends on (!BR2_PACKAGE_HAS_OPENGL_EGL || !BR2_PACKAGE_HAS_OPENGL_ES) && \ + BR2_PACKAGE_QT5JSBACKEND_AVAILABLE diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk new file mode 100644 index 0000000..f9008b4 --- /dev/null +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk @@ -0,0 +1,37 @@ +################################################################################ +# +# qt5quickcontrols +# +################################################################################ + +QT5QUICKCONTROLS_VERSION = $(QT5_VERSION) +QT5QUICKCONTROLS_SITE = $(QT5_SITE) +QT5QUICKCONTROLS_SOURCE = qtquickcontrols-opensource-src-$(QT5QUICKCONTROLS_VERSION).tar.xz +QT5QUICKCONTROLS_DEPENDENCIES = qt5base qt5declarative +QT5QUICKCONTROLS_INSTALL_STAGING = YES + +ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) +QT5QUICKCONTROLS_LICENSE = LGPLv2.1 or GPLv3.0 +QT5QUICKCONTROLS_LICENSE_FILES = LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt +else +QT5QUICKCONTROLS_LICENSE = Commercial license +QT5QUICKCONTROLS_REDISTRIBUTE = NO +endif + +define QT5QUICKCONTROLS_CONFIGURE_CMDS + (cd $(@D); $(HOST_DIR)/usr/bin/qmake) +endef + +define QT5QUICKCONTROLS_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) +endef + +define QT5QUICKCONTROLS_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install +endef + +define QT5QUICKCONTROLS_INSTALL_TARGET_CMDS + cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick $(TARGET_DIR)/usr/qml +endef + +$(eval $(generic-package)) -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* [Buildroot] [PATCH v2 2/6] qt5quickcontrols: new package 2013-09-20 5:43 ` [Buildroot] [PATCH v2 2/6] qt5quickcontrols: new package Fatih Aşıcı @ 2013-10-26 17:10 ` Peter Korsgaard 0 siblings, 0 replies; 19+ messages in thread From: Peter Korsgaard @ 2013-10-26 17:10 UTC (permalink / raw) To: buildroot >>>>> "Fatih" == Fatih A??c? <fatih.asici@gmail.com> writes: > Signed-off-by: Fatih A??c? <fatih.asici@gmail.com> Committed, thanks. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 19+ messages in thread
* [Buildroot] [PATCH v2 3/6] qt5sensors: new package 2013-09-20 5:43 [Buildroot] [PATCH v2 0/6] Bump Qt5 to version 5.1.1 Fatih Aşıcı 2013-09-20 5:43 ` [Buildroot] [PATCH v2 1/6] qt5: bump to 5.1.1 Fatih Aşıcı 2013-09-20 5:43 ` [Buildroot] [PATCH v2 2/6] qt5quickcontrols: new package Fatih Aşıcı @ 2013-09-20 5:43 ` Fatih Aşıcı 2013-10-26 17:10 ` Peter Korsgaard 2013-09-20 5:43 ` [Buildroot] [PATCH v2 4/6] qt5serialport: " Fatih Aşıcı ` (2 subsequent siblings) 5 siblings, 1 reply; 19+ messages in thread From: Fatih Aşıcı @ 2013-09-20 5:43 UTC (permalink / raw) To: buildroot Signed-off-by: Fatih A??c? <fatih.asici@gmail.com> --- package/qt5/Config.in | 1 + package/qt5/qt5sensors/Config.in | 10 ++++++ package/qt5/qt5sensors/qt5sensors.mk | 56 ++++++++++++++++++++++++++++++++++ 3 files changed, 67 insertions(+) create mode 100644 package/qt5/qt5sensors/Config.in create mode 100644 package/qt5/qt5sensors/qt5sensors.mk diff --git a/package/qt5/Config.in b/package/qt5/Config.in index b5b742c..8488578 100644 --- a/package/qt5/Config.in +++ b/package/qt5/Config.in @@ -24,6 +24,7 @@ source "package/qt5/qt5multimedia/Config.in" source "package/qt5/qt5quick1/Config.in" source "package/qt5/qt5quickcontrols/Config.in" source "package/qt5/qt5script/Config.in" +source "package/qt5/qt5sensors/Config.in" source "package/qt5/qt5svg/Config.in" source "package/qt5/qt5webkit/Config.in" source "package/qt5/qt5xmlpatterns/Config.in" diff --git a/package/qt5/qt5sensors/Config.in b/package/qt5/qt5sensors/Config.in new file mode 100644 index 0000000..3e1c4b7 --- /dev/null +++ b/package/qt5/qt5sensors/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_QT5SENSORS + bool "qt5sensors" + select BR2_PACKAGE_QT5BASE + help + Qt is a cross-platform application and UI framework for + developers using C++. + + This package corresponds to the qt5sensors module. + + http://qt-project.org diff --git a/package/qt5/qt5sensors/qt5sensors.mk b/package/qt5/qt5sensors/qt5sensors.mk new file mode 100644 index 0000000..21ec36c --- /dev/null +++ b/package/qt5/qt5sensors/qt5sensors.mk @@ -0,0 +1,56 @@ +################################################################################ +# +# qt5sensors +# +################################################################################ + +QT5SENSORS_VERSION = $(QT5_VERSION) +QT5SENSORS_SITE = $(QT5_SITE) +QT5SENSORS_SOURCE = qtsensors-opensource-src-$(QT5SENSORS_VERSION).tar.xz +QT5SENSORS_DEPENDENCIES = qt5base +QT5SENSORS_INSTALL_STAGING = YES + +ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) +QT5SENSORS_LICENSE = LGPLv2.1 or GPLv3.0 +QT5SENSORS_LICENSE_FILES = LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt +else +QT5SENSORS_LICENSE = Commercial license +QT5SENSORS_REDISTRIBUTE = NO +endif + +ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) +QT5SENSORS_DEPENDENCIES += qt5declarative +endif + +define QT5SENSORS_CONFIGURE_CMDS + (cd $(@D); $(HOST_DIR)/usr/bin/qmake) +endef + +define QT5SENSORS_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) +endef + +define QT5SENSORS_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install + $(QT5_LA_PRL_FILES_FIXUP) +endef + +ifeq ($(BR2_PREFER_STATIC_LIB),) +define QT5SENSORS_INSTALL_TARGET_LIBS + cp -dpf $(STAGING_DIR)/usr/lib/libQt5Sensors.so.* $(TARGET_DIR)/usr/lib + cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/sensor* $(TARGET_DIR)/usr/lib/qt/plugins +endef +endif + +ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) +define QT5SENSORS_INSTALL_TARGET_QMLS + cp -dpfr $(STAGING_DIR)/usr/qml/QtSensors $(TARGET_DIR)/usr/qml +endef +endif + +define QT5SENSORS_INSTALL_TARGET_CMDS + $(QT5SENSORS_INSTALL_TARGET_LIBS) + $(QT5SENSORS_INSTALL_TARGET_QMLS) +endef + +$(eval $(generic-package)) -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* [Buildroot] [PATCH v2 3/6] qt5sensors: new package 2013-09-20 5:43 ` [Buildroot] [PATCH v2 3/6] qt5sensors: " Fatih Aşıcı @ 2013-10-26 17:10 ` Peter Korsgaard 0 siblings, 0 replies; 19+ messages in thread From: Peter Korsgaard @ 2013-10-26 17:10 UTC (permalink / raw) To: buildroot >>>>> "Fatih" == Fatih A??c? <fatih.asici@gmail.com> writes: > Signed-off-by: Fatih A??c? <fatih.asici@gmail.com> Committed, thanks. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 19+ messages in thread
* [Buildroot] [PATCH v2 4/6] qt5serialport: new package 2013-09-20 5:43 [Buildroot] [PATCH v2 0/6] Bump Qt5 to version 5.1.1 Fatih Aşıcı ` (2 preceding siblings ...) 2013-09-20 5:43 ` [Buildroot] [PATCH v2 3/6] qt5sensors: " Fatih Aşıcı @ 2013-09-20 5:43 ` Fatih Aşıcı 2013-10-26 17:10 ` Peter Korsgaard 2013-09-20 5:43 ` [Buildroot] [PATCH v2 5/6] qt5x11extras: " Fatih Aşıcı 2013-09-20 5:43 ` [Buildroot] [PATCH v2 6/6] qt5: remove configure options from module packages Fatih Aşıcı 5 siblings, 1 reply; 19+ messages in thread From: Fatih Aşıcı @ 2013-09-20 5:43 UTC (permalink / raw) To: buildroot Signed-off-by: Fatih A??c? <fatih.asici@gmail.com> --- package/qt5/Config.in | 1 + package/qt5/qt5serialport/Config.in | 10 +++++++ package/qt5/qt5serialport/qt5serialport.mk | 40 ++++++++++++++++++++++++++++ 3 files changed, 51 insertions(+) create mode 100644 package/qt5/qt5serialport/Config.in create mode 100644 package/qt5/qt5serialport/qt5serialport.mk diff --git a/package/qt5/Config.in b/package/qt5/Config.in index 8488578..fa10155 100644 --- a/package/qt5/Config.in +++ b/package/qt5/Config.in @@ -25,6 +25,7 @@ source "package/qt5/qt5quick1/Config.in" source "package/qt5/qt5quickcontrols/Config.in" source "package/qt5/qt5script/Config.in" source "package/qt5/qt5sensors/Config.in" +source "package/qt5/qt5serialport/Config.in" source "package/qt5/qt5svg/Config.in" source "package/qt5/qt5webkit/Config.in" source "package/qt5/qt5xmlpatterns/Config.in" diff --git a/package/qt5/qt5serialport/Config.in b/package/qt5/qt5serialport/Config.in new file mode 100644 index 0000000..772de88 --- /dev/null +++ b/package/qt5/qt5serialport/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_QT5SERIALPORT + bool "qt5serialport" + select BR2_PACKAGE_QT5BASE + help + Qt is a cross-platform application and UI framework for + developers using C++. + + This package corresponds to the qt5serialport module. + + http://qt-project.org diff --git a/package/qt5/qt5serialport/qt5serialport.mk b/package/qt5/qt5serialport/qt5serialport.mk new file mode 100644 index 0000000..0328ef8 --- /dev/null +++ b/package/qt5/qt5serialport/qt5serialport.mk @@ -0,0 +1,40 @@ +################################################################################ +# +# qt5serialport +# +################################################################################ + +QT5SERIALPORT_VERSION = $(QT5_VERSION) +QT5SERIALPORT_SITE = $(QT5_SITE) +QT5SERIALPORT_SOURCE = qtserialport-opensource-src-$(QT5SERIALPORT_VERSION).tar.xz +QT5SERIALPORT_DEPENDENCIES = qt5base +QT5SERIALPORT_INSTALL_STAGING = YES + +ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) +QT5SERIALPORT_LICENSE = LGPLv2.1 or GPLv3.0 +QT5SERIALPORT_LICENSE_FILES = LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt +else +QT5SERIALPORT_LICENSE = Commercial license +QT5SERIALPORT_REDISTRIBUTE = NO +endif + +define QT5SERIALPORT_CONFIGURE_CMDS + (cd $(@D); $(HOST_DIR)/usr/bin/qmake) +endef + +define QT5SERIALPORT_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) +endef + +define QT5SERIALPORT_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install + $(QT5_LA_PRL_FILES_FIXUP) +endef + +ifeq ($(BR2_PREFER_STATIC_LIB),) +define QT5SERIALPORT_INSTALL_TARGET_CMDS + cp -dpf $(STAGING_DIR)/usr/lib/libQt5SerialPort.so.* $(TARGET_DIR)/usr/lib +endef +endif + +$(eval $(generic-package)) -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* [Buildroot] [PATCH v2 4/6] qt5serialport: new package 2013-09-20 5:43 ` [Buildroot] [PATCH v2 4/6] qt5serialport: " Fatih Aşıcı @ 2013-10-26 17:10 ` Peter Korsgaard 0 siblings, 0 replies; 19+ messages in thread From: Peter Korsgaard @ 2013-10-26 17:10 UTC (permalink / raw) To: buildroot >>>>> "Fatih" == Fatih A??c? <fatih.asici@gmail.com> writes: > Signed-off-by: Fatih A??c? <fatih.asici@gmail.com> Committed, thanks. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 19+ messages in thread
* [Buildroot] [PATCH v2 5/6] qt5x11extras: new package 2013-09-20 5:43 [Buildroot] [PATCH v2 0/6] Bump Qt5 to version 5.1.1 Fatih Aşıcı ` (3 preceding siblings ...) 2013-09-20 5:43 ` [Buildroot] [PATCH v2 4/6] qt5serialport: " Fatih Aşıcı @ 2013-09-20 5:43 ` Fatih Aşıcı 2013-10-26 17:10 ` Peter Korsgaard 2013-09-20 5:43 ` [Buildroot] [PATCH v2 6/6] qt5: remove configure options from module packages Fatih Aşıcı 5 siblings, 1 reply; 19+ messages in thread From: Fatih Aşıcı @ 2013-09-20 5:43 UTC (permalink / raw) To: buildroot Signed-off-by: Fatih A??c? <fatih.asici@gmail.com> --- package/qt5/Config.in | 1 + package/qt5/qt5x11extras/Config.in | 11 ++++++++ package/qt5/qt5x11extras/qt5x11extras.mk | 40 ++++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+) create mode 100644 package/qt5/qt5x11extras/Config.in create mode 100644 package/qt5/qt5x11extras/qt5x11extras.mk diff --git a/package/qt5/Config.in b/package/qt5/Config.in index fa10155..87b869a 100644 --- a/package/qt5/Config.in +++ b/package/qt5/Config.in @@ -28,5 +28,6 @@ source "package/qt5/qt5sensors/Config.in" source "package/qt5/qt5serialport/Config.in" source "package/qt5/qt5svg/Config.in" source "package/qt5/qt5webkit/Config.in" +source "package/qt5/qt5x11extras/Config.in" source "package/qt5/qt5xmlpatterns/Config.in" endif diff --git a/package/qt5/qt5x11extras/Config.in b/package/qt5/qt5x11extras/Config.in new file mode 100644 index 0000000..79ff9b9 --- /dev/null +++ b/package/qt5/qt5x11extras/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_QT5X11EXTRAS + bool "qt5x11extras" + select BR2_PACKAGE_QT5BASE_WIDGETS + depends on BR2_PACKAGE_QT5BASE_XCB + help + Qt is a cross-platform application and UI framework for + developers using C++. + + This package corresponds to the qt5x11extras module. + + http://qt-project.org diff --git a/package/qt5/qt5x11extras/qt5x11extras.mk b/package/qt5/qt5x11extras/qt5x11extras.mk new file mode 100644 index 0000000..237fe32 --- /dev/null +++ b/package/qt5/qt5x11extras/qt5x11extras.mk @@ -0,0 +1,40 @@ +################################################################################ +# +# qt5x11extras +# +################################################################################ + +QT5X11EXTRAS_VERSION = $(QT5_VERSION) +QT5X11EXTRAS_SITE = $(QT5_SITE) +QT5X11EXTRAS_SOURCE = qtx11extras-opensource-src-$(QT5X11EXTRAS_VERSION).tar.xz +QT5X11EXTRAS_DEPENDENCIES = qt5base +QT5X11EXTRAS_INSTALL_STAGING = YES + +ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) +QT5X11EXTRAS_LICENSE = LGPLv2.1 or GPLv3.0 +QT5X11EXTRAS_LICENSE_FILES = LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt +else +QT5X11EXTRAS_LICENSE = Commercial license +QT5X11EXTRAS_REDISTRIBUTE = NO +endif + +define QT5X11EXTRAS_CONFIGURE_CMDS + (cd $(@D); $(HOST_DIR)/usr/bin/qmake) +endef + +define QT5X11EXTRAS_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) +endef + +define QT5X11EXTRAS_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install + $(QT5_LA_PRL_FILES_FIXUP) +endef + +ifeq ($(BR2_PREFER_STATIC_LIB),) +define QT5X11EXTRAS_INSTALL_TARGET_CMDS + cp -dpf $(STAGING_DIR)/usr/lib/libQt5X11Extras.so.* $(TARGET_DIR)/usr/lib +endef +endif + +$(eval $(generic-package)) -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* [Buildroot] [PATCH v2 5/6] qt5x11extras: new package 2013-09-20 5:43 ` [Buildroot] [PATCH v2 5/6] qt5x11extras: " Fatih Aşıcı @ 2013-10-26 17:10 ` Peter Korsgaard 0 siblings, 0 replies; 19+ messages in thread From: Peter Korsgaard @ 2013-10-26 17:10 UTC (permalink / raw) To: buildroot >>>>> "Fatih" == Fatih A??c? <fatih.asici@gmail.com> writes: > Signed-off-by: Fatih A??c? <fatih.asici@gmail.com> Committed, thanks. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 19+ messages in thread
* [Buildroot] [PATCH v2 6/6] qt5: remove configure options from module packages 2013-09-20 5:43 [Buildroot] [PATCH v2 0/6] Bump Qt5 to version 5.1.1 Fatih Aşıcı ` (4 preceding siblings ...) 2013-09-20 5:43 ` [Buildroot] [PATCH v2 5/6] qt5x11extras: " Fatih Aşıcı @ 2013-09-20 5:43 ` Fatih Aşıcı 2013-09-20 14:52 ` Thomas Petazzoni 2013-10-09 21:15 ` Peter Korsgaard 5 siblings, 2 replies; 19+ messages in thread From: Fatih Aşıcı @ 2013-09-20 5:43 UTC (permalink / raw) To: buildroot These packages do not have configure scripts. Signed-off-by: Fatih A??c? <fatih.asici@gmail.com> --- package/qt5/qt5declarative/qt5declarative.mk | 1 - package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk | 1 - package/qt5/qt5imageformats/qt5imageformats.mk | 1 - package/qt5/qt5jsbackend/qt5jsbackend.mk | 1 - package/qt5/qt5multimedia/qt5multimedia.mk | 1 - package/qt5/qt5quick1/qt5quick1.mk | 1 - package/qt5/qt5script/qt5script.mk | 1 - package/qt5/qt5svg/qt5svg.mk | 1 - package/qt5/qt5webkit/qt5webkit.mk | 1 - package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 1 - 10 files changed, 10 deletions(-) diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk index 943f33d..11b9287 100644 --- a/package/qt5/qt5declarative/qt5declarative.mk +++ b/package/qt5/qt5declarative/qt5declarative.mk @@ -11,7 +11,6 @@ QT5DECLARATIVE_DEPENDENCIES = qt5base qt5xmlpatterns qt5jsbackend QT5DECLARATIVE_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -QT5DECLARATIVE_CONFIGURE_OPTS += -opensource -confirm-license QT5DECLARATIVE_LICENSE = LGPLv2.1 or GPLv3.0 QT5DECLARATIVE_LICENSE_FILES = LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt else diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk index fc9a2ec..1e492c9 100644 --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk @@ -11,7 +11,6 @@ QT5GRAPHICALEFFECTS_DEPENDENCIES = qt5base qt5declarative QT5GRAPHICALEFFECTS_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -QT5GRAPHICALEFFECTS_CONFIGURE_OPTS += -opensource -confirm-license QT5GRAPHICALEFFECTS_LICENSE = LGPLv2.1 or GPLv3.0 # Here we would like to get license files from qt5base, but qt5base # may not be extracted at the time we get the legal-info for diff --git a/package/qt5/qt5imageformats/qt5imageformats.mk b/package/qt5/qt5imageformats/qt5imageformats.mk index 10d744b..52192c6 100644 --- a/package/qt5/qt5imageformats/qt5imageformats.mk +++ b/package/qt5/qt5imageformats/qt5imageformats.mk @@ -11,7 +11,6 @@ QT5IMAGEFORMATS_DEPENDENCIES = qt5base QT5IMAGEFORMATS_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -QT5IMAGEFORMATS_CONFIGURE_OPTS += -opensource -confirm-license QT5IMAGEFORMATS_LICENSE = LGPLv2.1 or GPLv3.0 QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt else diff --git a/package/qt5/qt5jsbackend/qt5jsbackend.mk b/package/qt5/qt5jsbackend/qt5jsbackend.mk index d065f0b..9eccd23 100644 --- a/package/qt5/qt5jsbackend/qt5jsbackend.mk +++ b/package/qt5/qt5jsbackend/qt5jsbackend.mk @@ -11,7 +11,6 @@ QT5JSBACKEND_DEPENDENCIES = qt5base QT5JSBACKEND_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -QT5JSBACKEND_CONFIGURE_OPTS += -opensource -confirm-license QT5JSBACKEND_LICENSE = LGPLv2.1 or GPLv3.0 QT5JSBACKEND_LICENSE_FILES = LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt else diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk index 8f62274..1a3ca6b 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.mk +++ b/package/qt5/qt5multimedia/qt5multimedia.mk @@ -11,7 +11,6 @@ QT5MULTIMEDIA_DEPENDENCIES = qt5base qt5declarative QT5MULTIMEDIA_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -QT5MULTIMEDIA_CONFIGURE_OPTS += -opensource -confirm-license QT5MULTIMEDIA_LICENSE = LGPLv2.1 or GPLv3.0 # Here we would like to get license files from qt5base, but qt5base # may not be extracted at the time we get the legal-info for diff --git a/package/qt5/qt5quick1/qt5quick1.mk b/package/qt5/qt5quick1/qt5quick1.mk index d1b0b36..f9bb3e8 100644 --- a/package/qt5/qt5quick1/qt5quick1.mk +++ b/package/qt5/qt5quick1/qt5quick1.mk @@ -12,7 +12,6 @@ QT5QUICK1_DEPENDENCIES = qt5base qt5xmlpatterns qt5script qt5declarative qt5jsba QT5QUICK1_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -QT5QUICK1_CONFIGURE_OPTS += -opensource -confirm-license QT5QUICK1_LICENSE = LGPLv2.1 or GPLv3.0 QT5QUICK1_LICENSE_FILES = LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt else diff --git a/package/qt5/qt5script/qt5script.mk b/package/qt5/qt5script/qt5script.mk index e436474..e62e0ac 100644 --- a/package/qt5/qt5script/qt5script.mk +++ b/package/qt5/qt5script/qt5script.mk @@ -11,7 +11,6 @@ QT5SCRIPT_DEPENDENCIES = qt5base QT5SCRIPT_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -QT5SCRIPT_CONFIGURE_OPTS += -opensource -confirm-license QT5SCRIPT_LICENSE = LGPLv2.1 or GPLv3.0 QT5SCRIPT_LICENSE_FILES = LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt else diff --git a/package/qt5/qt5svg/qt5svg.mk b/package/qt5/qt5svg/qt5svg.mk index 8a31ac8..2ff7fc8 100644 --- a/package/qt5/qt5svg/qt5svg.mk +++ b/package/qt5/qt5svg/qt5svg.mk @@ -11,7 +11,6 @@ QT5SVG_DEPENDENCIES = qt5base QT5SVG_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -QT5SVG_CONFIGURE_OPTS += -opensource -confirm-license QT5SVG_LICENSE = LGPLv2.1 or GPLv3.0 # Here we would like to get license files from qt5base, but qt5base # may not be extracted at the time we get the legal-info for qt5svg. diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk index 320a2ea..87b15a9 100644 --- a/package/qt5/qt5webkit/qt5webkit.mk +++ b/package/qt5/qt5webkit/qt5webkit.mk @@ -11,7 +11,6 @@ QT5WEBKIT_DEPENDENCIES = qt5base sqlite host-ruby host-gperf QT5WEBKIT_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -QT5WEBKIT_CONFIGURE_OPTS += -opensource -confirm-license QT5WEBKIT_LICENSE = LGPLv2.1 or GPLv3.0 # Here we would like to get license files from qt5base, but qt5base # may not be extracted at the time we get the legal-info for diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk index 322fd70..6f4fdc8 100644 --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk @@ -11,7 +11,6 @@ QT5XMLPATTERNS_DEPENDENCIES = qt5base QT5XMLPATTERNS_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -QT5XMLPATTERNS_CONFIGURE_OPTS += -opensource -confirm-license QT5XMLPATTERNS_LICENSE = LGPLv2.1 or GPLv3.0 QT5XMLPATTERNS_LICENSE_FILES = LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt else -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* [Buildroot] [PATCH v2 6/6] qt5: remove configure options from module packages 2013-09-20 5:43 ` [Buildroot] [PATCH v2 6/6] qt5: remove configure options from module packages Fatih Aşıcı @ 2013-09-20 14:52 ` Thomas Petazzoni 2013-10-09 21:15 ` Peter Korsgaard 1 sibling, 0 replies; 19+ messages in thread From: Thomas Petazzoni @ 2013-09-20 14:52 UTC (permalink / raw) To: buildroot Dear Fatih A??c?, On Fri, 20 Sep 2013 08:43:15 +0300, Fatih A??c? wrote: > These packages do not have configure scripts. > > Signed-off-by: Fatih A??c? <fatih.asici@gmail.com> Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> -- Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com ^ permalink raw reply [flat|nested] 19+ messages in thread
* [Buildroot] [PATCH v2 6/6] qt5: remove configure options from module packages 2013-09-20 5:43 ` [Buildroot] [PATCH v2 6/6] qt5: remove configure options from module packages Fatih Aşıcı 2013-09-20 14:52 ` Thomas Petazzoni @ 2013-10-09 21:15 ` Peter Korsgaard 1 sibling, 0 replies; 19+ messages in thread From: Peter Korsgaard @ 2013-10-09 21:15 UTC (permalink / raw) To: buildroot >>>>> "Fatih" == Fatih A??c? <fatih.asici@gmail.com> writes: Fatih> These packages do not have configure scripts. Fatih> Signed-off-by: Fatih A??c? <fatih.asici@gmail.com> Committed, thanks. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 19+ messages in thread
end of thread, other threads:[~2013-10-26 17:10 UTC | newest] Thread overview: 19+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-09-20 5:43 [Buildroot] [PATCH v2 0/6] Bump Qt5 to version 5.1.1 Fatih Aşıcı 2013-09-20 5:43 ` [Buildroot] [PATCH v2 1/6] qt5: bump to 5.1.1 Fatih Aşıcı 2013-09-20 7:20 ` Espen Frimann Koren 2013-09-20 8:33 ` Fatih Aşıcı 2013-10-04 12:09 ` Ezequiel Garcia 2013-10-05 21:21 ` Fatih Aşıcı 2013-10-14 14:13 ` Ezequiel García 2013-10-26 17:09 ` Peter Korsgaard 2013-09-20 5:43 ` [Buildroot] [PATCH v2 2/6] qt5quickcontrols: new package Fatih Aşıcı 2013-10-26 17:10 ` Peter Korsgaard 2013-09-20 5:43 ` [Buildroot] [PATCH v2 3/6] qt5sensors: " Fatih Aşıcı 2013-10-26 17:10 ` Peter Korsgaard 2013-09-20 5:43 ` [Buildroot] [PATCH v2 4/6] qt5serialport: " Fatih Aşıcı 2013-10-26 17:10 ` Peter Korsgaard 2013-09-20 5:43 ` [Buildroot] [PATCH v2 5/6] qt5x11extras: " Fatih Aşıcı 2013-10-26 17:10 ` Peter Korsgaard 2013-09-20 5:43 ` [Buildroot] [PATCH v2 6/6] qt5: remove configure options from module packages Fatih Aşıcı 2013-09-20 14:52 ` Thomas Petazzoni 2013-10-09 21:15 ` Peter Korsgaard
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox