qtbase: create empty oe-device-extra.pri
PATCH 1/4 qtbase: create empty oe-device-extra.pri
From: Herve Jourdain <[email protected]>
During configure, it complains it can't find oe-device-extra.pri, but it doesn't result in any error. Fix it, though, just in case.
--- recipes-qt/qt5/qtbase_git.bb | 3 +++ 1 file changed, 3 insertions(+)
recipes-qt/qt5/qtbase_git.bb +3 -0
@@ -130,6 +130,9 @@ QT_CONFIG_FLAGS += " \ " do_configure() { + # Avoid qmake error "Cannot read [...]/usr/lib/qt5/mkspecs/oe-device-extra.pri: No such file or directory" during configuration + touch ${S}/mkspecs/oe-device-extra.pri + ${S}/configure -v \ -opensource -confirm-license \ -sysroot ${STAGING_DIR_TARGET} \
Signature · 1 line
2.10.2
PATCH 2/4 qtwayland: Add libxkbcommon in the dependencies
From: Herve Jourdain <[email protected]>
xkb should be optional, but it's not for the moment, so add it to the dependencies.
--- recipes-qt/qt5/qtwayland_git.bb | 1 + 1 file changed, 1 insertion(+)
recipes-qt/qt5/qtwayland_git.bb +1 -0
@@ -2,6 +2,7 @@ require qt5.inc require qt5-git.inc DEPENDS += "qtbase qtdeclarative wayland wayland-native qtwayland-native" +DEPENDS_append_class-target = " libxkbcommon" LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )" LIC_FILES_CHKSUM = " \
Signature · 1 line
2.10.2
PATCH 3/4 qtwayland: fix build without xkbcommon-evdev
In reply to Martin Jansa* xkbcommon-evdev isn't enabled in default qtbase PACKAGECONFIG
* use patch from https://bugreports.qt.io/browse/QTBUG-57767
--- .../0001-fix-build-without-xkbcommon-evdev.patch | 44 ++++++++++++++++++++++ recipes-qt/qt5/qtwayland_git.bb | 3 ++ 2 files changed, 47 insertions(+) create mode 100644 recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch
recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch new file +44 -0
@@ -0,0 +1,44 @@ +From c93dbe53e8a1b2203c750a66c7efe6fc9a326903 Mon Sep 17 00:00:00 2001 +From: Raphael Freudiger <[email protected]> +Date: Thu, 22 Dec 2016 13:54:31 +0100 +Subject: [PATCH] fix build without xkbcommon-evdev + +Signed-off-by: Raphael Freudiger <[email protected]> +--- + src/compositor/compositor_api/qwaylandkeyboard.cpp | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +diff --git a/src/compositor/compositor_api/qwaylandkeyboard.cpp b/src/compositor/compositor_api/qwaylandkeyboard.cpp +index 55381b4..5c054c6 100644 +--- a/src/compositor/compositor_api/qwaylandkeyboard.cpp ++++ b/src/compositor/compositor_api/qwaylandkeyboard.cpp +@@ -338,12 +338,6 @@ void QWaylandKeyboardPrivate::createXKBState(xkb_keymap *keymap) + xkb_state = xkb_state_new(keymap); + } + +-uint QWaylandKeyboardPrivate::toWaylandXkbV1Key(const uint nativeScanCode) +-{ +- const uint offset = 8; +- Q_ASSERT(nativeScanCode >= offset); +- return nativeScanCode - offset; +-} + + void QWaylandKeyboardPrivate::createXKBKeymap() + { +@@ -373,6 +367,13 @@ void QWaylandKeyboardPrivate::createXKBKeymap() + } + #endif + ++uint QWaylandKeyboardPrivate::toWaylandXkbV1Key(const uint nativeScanCode) ++{ ++ const uint offset = 8; ++ Q_ASSERT(nativeScanCode >= offset); ++ return nativeScanCode - offset; ++} ++ + void QWaylandKeyboardPrivate::sendRepeatInfo() + { + Q_FOREACH (Resource *resource, resourceMap()) { +-- +2.1.4 +
recipes-qt/qt5/qtwayland_git.bb +3 -0
@@ -43,4 +43,7 @@ EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" SRCREV = "0e2a950895805457a45abe860bc91a7cc4ba405e" +# From https://bugreports.qt.io/browse/QTBUG-57767 +SRC_URI += "file://0001-fix-build-without-xkbcommon-evdev.patch" + BBCLASSEXTEND =+ "native nativesdk"
Signature · 1 line
2.10.2
Re: [PATCH][meta-qt5 3/4] qtwayland: fix build without xkbcommon-evdev
This isn't enough at least in some setups, but it's good start (it works after you add -lxkbcommon in 2 incorrectly generated Makefiles) and at least it documents that xkbcommon-evdev is now needed to be set in qtbase PACKAGECONFIG.
Quoted 85 lines · Martin Jansa
* xkbcommon-evdev isn't enabled in default qtbase PACKAGECONFIG
* use patch from https://bugreports.qt.io/browse/QTBUG-57767Signed-off-by Martin Jansa <[email protected]>--- .../0001-fix-build-without-xkbcommon-evdev.patch | 44 ++++++++++++++++++++++ recipes-qt/qt5/qtwayland_git.bb | 3 ++ 2 files changed, 47 insertions(+) create mode 100644 recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch
recipes-qt/qt5/qtwayland/0001-fix-build-without- new file +0
-0xkbcommon-evdev.patch
recipes-qt/qt5/qtwayland/0001-fix-build-without- new file +11
-0@@ -0,0 +1,44 @@ +From c93dbe53e8a1b2203c750a66c7efe6fc9a326903 Mon Sep 17 00:00:00 2001 +From: Raphael Freudiger <[email protected]> +Date: Thu, 22 Dec 2016 13:54:31 +0100 +Subject: [PATCH] fix build without xkbcommon-evdev + +Signed-off-by: Raphael Freudiger <[email protected]> +--- + src/compositor/compositor_api/qwaylandkeyboard.cpp | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +diff --git a/src/compositor/compositor_api/qwaylandkeyboard.cppb/src/compositor/compositor_api/qwaylandkeyboard.cpp
+index 55381b4..5c054c6 100644
+--- a/src/compositor/compositor_api/qwaylandkeyboard.cpp
++++ b/src/compositor/compositor_api/qwaylandkeyboard.cpp
+@@ -338,12 +338,6 @@ voidQWaylandKeyboardPrivate::createXKBState(xkb_keymap *keymap)recipes-qt/qt5/qtwayland/0001-fix-build-without- new file +4
-0+ xkb_state = xkb_state_new(keymap); + } + +-uint QWaylandKeyboardPrivate::toWaylandXkbV1Key(const uintnativeScanCode)
+-{ +- const uint offset = 8; +- Q_ASSERT(nativeScanCode >= offset); +- return nativeScanCode - offset; +-}recipes-qt/qt5/qtwayland/0001-fix-build-without- new file +8
-0+ + void QWaylandKeyboardPrivate::createXKBKeymap() + { +@@ -373,6 +367,13 @@ void QWaylandKeyboardPrivate::createXKBKeymap() + } + #endif + ++uint QWaylandKeyboardPrivate::toWaylandXkbV1Key(const uintnativeScanCode)
++{++ const uint offset = 8; ++ Q_ASSERT(nativeScanCode >= offset); ++ return nativeScanCode - offset;++}
++
+ voidQWaylandKeyboardPrivate::sendRepeatInfo()
+ {recipes-qt/qt5/qtwayland/0001-fix-build-without- new file +4
-0+ Q_FOREACH (Resource *resource, resourceMap()) { +-- +2.1.4 +recipes-qt/qt5/qtwayland_ renamed from recipes-qt/qt5/qtwayland_git.bb +0
-0git.bb
index 21abd54..d42d80a 100644recipes-qt/qt5/qtwayland_git.bb +3
-1@@ -43,4 +43,7 @@ EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" SRCREV = "0e2a950895805457a45abe860bc91a7cc4ba405e" +# From https://bugreports.qt.io/browse/QTBUG-57767 +SRC_URI += "file://0001-fix-build-without-xkbcommon-evdev.patch" + BBCLASSEXTEND =+ "native nativesdk" --2.10.2
Re: [PATCH][meta-qt5 3/4] qtwayland: fix build without xkbcommon-evdev
Quoted 4 lines · Martin Jansa
This isn't enough at least in some setups, but it's good start (it works after you add -lxkbcommon in 2 incorrectly generated Makefiles) and at least it documents that xkbcommon-evdev is now needed to be set in qtbase PACKAGECONFIG.
Can qtwayland 5.8 be built w/o "x11" in DISTRO_FEATURES?
I have X-less setup and obviously don't get xkbcommon-evdev in PACKAGECONFIG, thus:
| /usr/src/debug/qtwayland/5.8.0+gitAUTOINC+0e2a950895-r0/git/src/shared/qwaylandxkb.cpp:297: error: undefined reference to 'xkb_keysym_to_utf32' | /usr/src/debug/qtwayland/5.8.0+gitAUTOINC+0e2a950895-r0/git/src/shared/qwaylandxkb.cpp:337: error: undefined reference to 'xkb_state_mod_name_is_active' | /usr/src/debug/qtwayland/5.8.0+gitAUTOINC+0e2a950895-r0/git/src/shared/qwaylandxkb.cpp:339: error: undefined reference to 'xkb_state_mod_name_is_active' | /usr/src/debug/qtwayland/5.8.0+gitAUTOINC+0e2a950895-r0/git/src/shared/qwaylandxkb.cpp:341: error: undefined reference to 'xkb_state_mod_name_is_active' | /usr/src/debug/qtwayland/5.8.0+gitAUTOINC+0e2a950895-r0/git/src/shared/qwaylandxkb.cpp:343: error: undefined reference to 'xkb_state_mod_name_is_active'
Signature · 1 line
Denys
Quoted 93 lines
Quoted 85 lines · Martin Jansa
* xkbcommon-evdev isn't enabled in default qtbase PACKAGECONFIG
* use patch from https://bugreports.qt.io/browse/QTBUG-57767Signed-off-by Martin Jansa <[email protected]>--- .../0001-fix-build-without-xkbcommon-evdev.patch | 44 ++++++++++++++++++++++ recipes-qt/qt5/qtwayland_git.bb | 3 ++ 2 files changed, 47 insertions(+) create mode 100644 recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch
recipes-qt/qt5/qtwayland/0001-fix-build-without- new file +0
-0xkbcommon-evdev.patch
recipes-qt/qt5/qtwayland/0001-fix-build-without- new file +11
-0@@ -0,0 +1,44 @@ +From c93dbe53e8a1b2203c750a66c7efe6fc9a326903 Mon Sep 17 00:00:00 2001 +From: Raphael Freudiger <[email protected]> +Date: Thu, 22 Dec 2016 13:54:31 +0100 +Subject: [PATCH] fix build without xkbcommon-evdev + +Signed-off-by: Raphael Freudiger <[email protected]> +--- + src/compositor/compositor_api/qwaylandkeyboard.cpp | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +diff --git a/src/compositor/compositor_api/qwaylandkeyboard.cppb/src/compositor/compositor_api/qwaylandkeyboard.cpp
+index 55381b4..5c054c6 100644
+--- a/src/compositor/compositor_api/qwaylandkeyboard.cpp
++++ b/src/compositor/compositor_api/qwaylandkeyboard.cpp
+@@ -338,12 +338,6 @@ voidQWaylandKeyboardPrivate::createXKBState(xkb_keymap *keymap)recipes-qt/qt5/qtwayland/0001-fix-build-without- new file +4
-0+ xkb_state = xkb_state_new(keymap); + } + +-uint QWaylandKeyboardPrivate::toWaylandXkbV1Key(const uintnativeScanCode)
+-{ +- const uint offset = 8; +- Q_ASSERT(nativeScanCode >= offset); +- return nativeScanCode - offset; +-}recipes-qt/qt5/qtwayland/0001-fix-build-without- new file +8
-0+ + void QWaylandKeyboardPrivate::createXKBKeymap() + { +@@ -373,6 +367,13 @@ void QWaylandKeyboardPrivate::createXKBKeymap() + } + #endif + ++uint QWaylandKeyboardPrivate::toWaylandXkbV1Key(const uintnativeScanCode)
++{++ const uint offset = 8; ++ Q_ASSERT(nativeScanCode >= offset); ++ return nativeScanCode - offset;++}
++
+ voidQWaylandKeyboardPrivate::sendRepeatInfo()
+ {recipes-qt/qt5/qtwayland/0001-fix-build-without- new file +4
-0+ Q_FOREACH (Resource *resource, resourceMap()) { +-- +2.1.4 +recipes-qt/qt5/qtwayland_ renamed from recipes-qt/qt5/qtwayland_git.bb +0
-0git.bb
index 21abd54..d42d80a 100644recipes-qt/qt5/qtwayland_git.bb +3
-1@@ -43,4 +43,7 @@ EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" SRCREV = "0e2a950895805457a45abe860bc91a7cc4ba405e" +# From https://bugreports.qt.io/browse/QTBUG-57767 +SRC_URI += "file://0001-fix-build-without-xkbcommon-evdev.patch" + BBCLASSEXTEND =+ "native nativesdk" --2.10.2
Signature · 4 lines
_______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [PATCH][meta-qt5 3/4] qtwayland: fix build without xkbcommon-evdev
Yes, it can be built, but you need to enable xkbcommon-evdev which works even in DISTROs without x11, like I did in:
https://github.com/webOS-ports/meta-webos-ports/commit/03e259ca0fd95b38bf985064a8e9d2eb47a8a59f
Quoted 138 lines · Denys Dmytriyenko
Quoted 4 lines · Martin Jansa
This isn't enough at least in some setups, but it's good start (it works after you add -lxkbcommon in 2 incorrectly generated Makefiles) and at least it documents that xkbcommon-evdev is now needed to be set in qtbase PACKAGECONFIG.
Can qtwayland 5.8 be built w/o "x11" in
DISTRO_FEATURES?I have X-less setup and obviously don't get xkbcommon-evdev in PACKAGECONFIG,
thus:|
/usr/src/debug/qtwayland/5.8.0+gitAUTOINC+0e2a950895-r0/git/src/shared/qwaylandxkb.cpp:297: error: undefined reference to 'xkb_keysym_to_utf32'
|/usr/src/debug/qtwayland/5.8.0+gitAUTOINC+0e2a950895-r0/git/src/shared/qwaylandxkb.cpp:337: error: undefined reference to 'xkb_state_mod_name_is_active'
|/usr/src/debug/qtwayland/5.8.0+gitAUTOINC+0e2a950895-r0/git/src/shared/qwaylandxkb.cpp:339: error: undefined reference to 'xkb_state_mod_name_is_active'
|/usr/src/debug/qtwayland/5.8.0+gitAUTOINC+0e2a950895-r0/git/src/shared/qwaylandxkb.cpp:341: error: undefined reference to 'xkb_state_mod_name_is_active'
|/usr/src/debug/qtwayland/5.8.0+gitAUTOINC+0e2a950895-r0/git/src/shared/qwaylandxkb.cpp:343: error: undefined reference to 'xkb_state_mod_name_is_active'--
DenysQuoted 15 lines
Quoted 12 lines · Martin Jansa
* xkbcommon-evdev isn't enabled in default qtbase PACKAGECONFIG
* use patch from https://bugreports.qt.io/browse/QTBUG-57767Signed-off-by Martin Jansa <[email protected]>--- .../0001-fix-build-without-xkbcommon-evdev.patch | 44 ++++++++++++++++++++++ recipes-qt/qt5/qtwayland_git.bb | 3 ++ 2 files changed, 47 insertions(+) create mode 100644 recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch
Quoted 1 line
Review
Quoted 1 line
(quoted diff) +0
-0xkbcommon-evdev.patch
Quoted 1 line
Quoted 1 line
b/recipes-qt/qt5/qtwayland/0001-fix-build-without-
xkbcommon-evdev.patch
Quoted 7 lines
recipes-qt/qt5/qtwayland/0001-fix-build-without- line 1
Quoted 7 lines
new file mode 100644
index 0000000..e1e978erecipes-qt/qt5/qtwayland/0001-fix-build-without- new file +0
-0xkbcommon-evdev.patch
recipes-qt/qt5/qtwayland/0001-fix-build-without- new file +1
-0@@ -0,0 +1,44 @@ +From c93dbe53e8a1b2203c750a66c7efe6fc9a326903 Mon Sep 17 00:00:002001
Quoted 7 lines
recipes-qt/qt5/qtwayland/0001-fix-build-without- line 8
Quoted 7 lines
recipes-qt/qt5/qtwayland/0001-fix-build-without- new file +7
-0+From: Raphael Freudiger <[email protected]> +Date: Thu, 22 Dec 2016 13:54:31 +0100 +Subject: [PATCH] fix build without xkbcommon-evdev + +Signed-off-by: Raphael Freudiger <[email protected]> +--- + src/compositor/compositor_api/qwaylandkeyboard.cpp | 13+++++++------
Quoted 8 lines
Quoted 8 lines
recipes-qt/qt5/qtwayland/0001-fix-build-without- new file +3
-0+ 1 file changed, 7 insertions(+), 6 deletions(-) + +diff --git a/src/compositor/compositor_api/qwaylandkeyboard.cppb/src/compositor/compositor_api/qwaylandkeyboard.cpp +index 55381b4..5c054c6 100644
+--- a/src/compositor/compositor_api/qwaylandkeyboard.cpp ++++ b/src/compositor/compositor_api/qwaylandkeyboard.cpp +@@ -338,12 +338,6 @@ void QWaylandKeyboardPrivate::createXKBState(xkb_keymap
Quoted 25 lines
Quoted 25 lines
*keymap)
recipes-qt/qt5/qtwayland/0001-fix-build-without- new file +4
-0+ xkb_state = xkb_state_new(keymap); + } + +-uint QWaylandKeyboardPrivate::toWaylandXkbV1Key(const uintnativeScanCode)
+-{ +- const uint offset = 8; +- Q_ASSERT(nativeScanCode >= offset); +- return nativeScanCode - offset; +-}recipes-qt/qt5/qtwayland/0001-fix-build-without- new file +8
-0+ + void QWaylandKeyboardPrivate::createXKBKeymap() + { +@@ -373,6 +367,13 @@ void QWaylandKeyboardPrivate::createXKBKeymap() + } + #endif + ++uint QWaylandKeyboardPrivate::toWaylandXkbV1Key(const uintnativeScanCode)
++{++ const uint offset = 8; ++ Q_ASSERT(nativeScanCode >= offset); ++ return nativeScanCode - offset;++}
Quoted 8 lines
Review
Quoted 8 lines
++
+ voidQWaylandKeyboardPrivate::sendRepeatInfo()
+ {recipes-qt/qt5/qtwayland/0001-fix-build-without- new file +4
-0+ Q_FOREACH (Resource *resource, resourceMap()) { +-- +2.1.4 +(quoted diff) +0
-0b/recipes-qt/qt5/qtwayland_
Quoted 5 lines
recipes-qt/qt5/qtwayland_git.bb EXTRA_QMAKEVARS_CONFIGURE +=
Quoted 5 lines
git.bb
index 21abd54..d42d80a 100644recipes-qt/qt5/qtwayland_git.bb +0
-0@@ -43,4 +43,7 @@ EXTRA_QMAKEVARS_CONFIGURE +="${PACKAGECONFIG_CONFARGS}"
Quoted 16 lines
Quoted 11 lines
recipes-qt/qt5/qtwayland_git.bb +3
-1SRCREV = "0e2a950895805457a45abe860bc91a7cc4ba405e" +# From https://bugreports.qt.io/browse/QTBUG-57767 +SRC_URI += "file://0001-fix-build-without-xkbcommon-evdev.patch" + BBCLASSEXTEND =+ "native nativesdk" --2.10.2
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
PATCH 4/4 qtwebengine: disable generate_character_data
In reply to Martin Jansa* qtwebengine 5.8 fails to build it, because it mixes binaries for x86_64 host and x86 target when building for qemux86 on 64bit host
https://bugreports.qt.io/browse/QTBUG-57705
--- recipes-qt/qt5/qtwebengine_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-qt/qt5/qtwebengine_git.bb +1 -1
@@ -24,7 +24,7 @@ DEPENDS += " \ " DEPENDS += "yasm-native" -EXTRA_QMAKEVARS_PRE += "GYP_CONFIG+=use_system_yasm" +EXTRA_QMAKEVARS_PRE += "GYP_CONFIG+=use_system_yasm GYP_CONFIG+=generate_character_data=0" # To use system ffmpeg you need to enable also libwebp, opus, vpx # Only depenedencies available in oe-core are enabled by default
Signature · 1 line
2.10.2