This is a hack to allow qt5 X11 build with the SGX DDK where all the X11 dependent components are provided by the SGX DDK X11 package under /usr/local/XSGX/lib and /usr/local/XSGX/include. - add additional include and lib search paths - replace the dependency of the X11 related components to libgles2 which is equivalent to the SGX DDK UM
Signed-off-by: Eric Ruei <[email protected]> --- recipes-qt/qt5/nativesdk-qtbase_git.bbappend | 2 ++ recipes-qt/qt5/qt3d_git.bbappend | 2 ++ recipes-qt/qt5/qt5-creator_3.5.1.bbappend | 2 ++ recipes-qt/qt5/qt5-path-hack.inc | 2 ++ .../qt5/qt5-plugin-generic-vboxtouch_git.bbappend | 2 ++ recipes-qt/qt5/qtbase_%.bbappend | 21 ++++++++++++++++++--- recipes-qt/qt5/qtcanvas3d_git.bbappend | 2 ++ recipes-qt/qt5/qtcharts_git.bbappend | 2 ++ recipes-qt/qt5/qtconnectivity_git.bbappend | 2 ++ recipes-qt/qt5/qtdatavis3d_git.bbappend | 2 ++ recipes-qt/qt5/qtdeclarative-render2d_git.bbappend | 2 ++ recipes-qt/qt5/qtdeclarative_git.bbappend | 2 ++ recipes-qt/qt5/qtenginio_git.bbappend | 2 ++ recipes-qt/qt5/qtgraphicaleffects_git.bbappend | 2 ++ recipes-qt/qt5/qtimageformats_git.bbappend | 2 ++ recipes-qt/qt5/qtlocation_git.bbappend | 2 ++ recipes-qt/qt5/qtmultimedia_git.bbappend | 2 ++ recipes-qt/qt5/qtquick1_git.bbappend | 2 ++ recipes-qt/qt5/qtquickcontrols2_git.bbappend | 2 ++ recipes-qt/qt5/qtquickcontrols_git.bbappend | 2 ++ recipes-qt/qt5/qtscript_git.bbappend | 2 ++ recipes-qt/qt5/qtsensors_git.bbappend | 2 ++ recipes-qt/qt5/qtserialbus_git.bbappend | 2 ++ recipes-qt/qt5/qtserialport_git.bbappend | 2 ++ recipes-qt/qt5/qtsvg_git.bbappend | 2 ++ recipes-qt/qt5/qtsystems_git.bbappend | 2 ++ recipes-qt/qt5/qttools_git.bbappend | 2 ++ recipes-qt/qt5/qttranslations_git.bbappend | 2 ++ recipes-qt/qt5/qtvirtualkeyboard_git.bbappend | 2 ++ recipes-qt/qt5/qtwayland-native_git.bbappend | 2 ++ recipes-qt/qt5/qtwayland_git.bbappend | 2 ++ recipes-qt/qt5/qtwebchannel_git.bbappend | 2 ++ recipes-qt/qt5/qtwebengine_git.bbappend | 2 ++ recipes-qt/qt5/qtwebkit-examples_git.bbappend | 2 ++ recipes-qt/qt5/qtwebkit_git.bbappend | 2 ++ recipes-qt/qt5/qtwebsockets_git.bbappend | 2 ++ recipes-qt/qt5/qtx11extras_git.bbappend | 2 ++ recipes-qt/qt5/qtxmlpatterns_git.bbappend | 2 ++ 38 files changed, 92 insertions(+), 3 deletions(-) create mode 100644 recipes-qt/qt5/nativesdk-qtbase_git.bbappend create mode 100644 recipes-qt/qt5/qt3d_git.bbappend create mode 100644 recipes-qt/qt5/qt5-creator_3.5.1.bbappend create mode 100644 recipes-qt/qt5/qt5-path-hack.inc create mode 100644 recipes-qt/qt5/qt5-plugin-generic-vboxtouch_git.bbappend mode change 100644 => 100755 recipes-qt/qt5/qtbase_%.bbappend create mode 100644 recipes-qt/qt5/qtcanvas3d_git.bbappend create mode 100644 recipes-qt/qt5/qtcharts_git.bbappend create mode 100644 recipes-qt/qt5/qtconnectivity_git.bbappend create mode 100644 recipes-qt/qt5/qtdatavis3d_git.bbappend create mode 100644 recipes-qt/qt5/qtdeclarative-render2d_git.bbappend create mode 100644 recipes-qt/qt5/qtdeclarative_git.bbappend create mode 100644 recipes-qt/qt5/qtenginio_git.bbappend create mode 100644 recipes-qt/qt5/qtgraphicaleffects_git.bbappend create mode 100644 recipes-qt/qt5/qtimageformats_git.bbappend create mode 100644 recipes-qt/qt5/qtlocation_git.bbappend create mode 100644 recipes-qt/qt5/qtmultimedia_git.bbappend create mode 100644 recipes-qt/qt5/qtquick1_git.bbappend create mode 100644 recipes-qt/qt5/qtquickcontrols2_git.bbappend create mode 100644 recipes-qt/qt5/qtquickcontrols_git.bbappend create mode 100644 recipes-qt/qt5/qtscript_git.bbappend create mode 100644 recipes-qt/qt5/qtsensors_git.bbappend create mode 100644 recipes-qt/qt5/qtserialbus_git.bbappend create mode 100644 recipes-qt/qt5/qtserialport_git.bbappend create mode 100644 recipes-qt/qt5/qtsvg_git.bbappend create mode 100644 recipes-qt/qt5/qtsystems_git.bbappend create mode 100644 recipes-qt/qt5/qttools_git.bbappend create mode 100644 recipes-qt/qt5/qttranslations_git.bbappend create mode 100644 recipes-qt/qt5/qtvirtualkeyboard_git.bbappend create mode 100644 recipes-qt/qt5/qtwayland-native_git.bbappend create mode 100644 recipes-qt/qt5/qtwayland_git.bbappend create mode 100644 recipes-qt/qt5/qtwebchannel_git.bbappend create mode 100644 recipes-qt/qt5/qtwebengine_git.bbappend create mode 100644 recipes-qt/qt5/qtwebkit-examples_git.bbappend create mode 100644 recipes-qt/qt5/qtwebkit_git.bbappend create mode 100644 recipes-qt/qt5/qtwebsockets_git.bbappend create mode 100644 recipes-qt/qt5/qtx11extras_git.bbappend create mode 100644 recipes-qt/qt5/qtxmlpatterns_git.bbappend diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend new file mode 100644 index 0000000..b07c280 --- /dev/null +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend @@ -0,0 +1,2 @@ +PR_append = ".tisdk0" +include qt5-path-hack.inc diff --git a/recipes-qt/qt5/qt3d_git.bbappend b/recipes-qt/qt5/qt3d_git.bbappend new file mode 100644 index 0000000..b07c280 --- /dev/null +++ b/recipes-qt/qt5/qt3d_git.bbappend @@ -0,0 +1,2 @@ +PR_append = ".tisdk0" +include qt5-path-hack.inc diff --git a/recipes-qt/qt5/qt5-creator_3.5.1.bbappend b/recipes-qt/qt5/qt5-creator_3.5.1.bbappend new file mode 100644 index 0000000..b07c280 --- /dev/null +++ b/recipes-qt/qt5/qt5-creator_3.5.1.bbappend @@ -0,0 +1,2 @@ +PR_append = ".tisdk0" +include qt5-path-hack.inc diff --git a/recipes-qt/qt5/qt5-path-hack.inc b/recipes-qt/qt5/qt5-path-hack.inc new file mode 100644 index 0000000..f9b0aef --- /dev/null +++ b/recipes-qt/qt5/qt5-path-hack.inc @@ -0,0 +1,2 @@ +CXXFLAGS_append = " -I${STAGING_DIR_HOST}/usr/local/XSGX/include -L${STAGING_DIR_HOST}/usr/local/XSGX/lib" +LDFLAGS_append = " -L${STAGING_DIR_HOST}/usr/local/XSGX/lib -Wl,-rpath-link,${STAGING_DIR_HOST}/usr/local/XSGX/lib" diff --git a/recipes-qt/qt5/qt5-plugin-generic-vboxtouch_git.bbappend b/recipes-qt/qt5/qt5-plugin-generic-vboxtouch_git.bbappend new file mode 100644 index 0000000..b07c280 --- /dev/null +++ b/recipes-qt/qt5/qt5-plugin-generic-vboxtouch_git.bbappend @@ -0,0 +1,2 @@ +PR_append = ".tisdk0" +include qt5-path-hack.inc diff --git a/recipes-qt/qt5/qtbase_%.bbappend b/recipes-qt/qt5/qtbase_%.bbappend old mode 100644 new mode 100755 index 98710f3..df013b2 --- a/recipes-qt/qt5/qtbase_%.bbappend +++ b/recipes-qt/qt5/qtbase_%.bbappend @@ -1,8 +1,9 @@ -PR_append = ".tisdk4" +PR_append = ".tisdk5" FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +include qt5-path-hack.inc -GLES_EXTRA_DEPS = "libdrm ${@bb.utils.contains('MACHINE_FEATURES', 'sgx', 'wayland', '', d)}" +GLES_EXTRA_DEPS = "libdrm libgbm ${@bb.utils.contains('MACHINE_FEATURES', 'sgx', 'wayland', '', d)}" # kms packageconfig requires virtual/mesa # @@ -13,6 +14,20 @@ GLES_EXTRA_DEPS = "libdrm ${@bb.utils.contains('MACHINE_FEATURES', 'sgx', 'wayla PACKAGECONFIG[kms] = "-kms,-no-kms,drm virtual/egl" PACKAGECONFIG += "kms" +PACKAGECONFIG[xcursor] = "-xcursor,-no-xcursor,virtual/libgles2" +PACKAGECONFIG[xinput2] = "-xinput2,-no-xinput2,virtual/libgles2" +PACKAGECONFIG[xfixes] = "-xfixes,-no-xfixes,virtual/libgles2" +PACKAGECONFIG[xrandr] = "-xrandr,-no-xrandr,virtual/libgles2" +PACKAGECONFIG[xrender] = "-xrender,-no-xrender,virtual/libgles2" +PACKAGECONFIG[xshape] = "-xshape,-no-xshape" +PACKAGECONFIG[xsync] = "-xsync,-no-xsync" +PACKAGECONFIG[xkb] = "-xkb,-no-xkb -no-xkbcommon,virtual/libgles2" +PACKAGECONFIG[glib] = "-glib,-no-glib,virtual/libgles2" + +PACKAGECONFIG_X11_FORCE = " xsync xshape xrender xrandr xfixes xinput2 xcursor glib xkb " + +PACKAGECONFIG_append = "${@bb.utils.contains('MACHINE_FEATURES', 'xsgx', "${PACKAGECONFIG_X11_FORCE}", '', d)}" + QT_NOSGX_PATCHES = "\ file://0001-calculator-Add-exit-button-for-non-window-environmen.patch \ file://0002-animatedtiles-Add-exit-button-for-non-window-environ.patch \ @@ -20,7 +35,7 @@ QT_NOSGX_PATCHES = "\ " SRC_URI += "\ - ${@bb.utils.contains('MACHINE_FEATURES', 'sgx', '', "${QT_NOSGX_PATCHES}", d)}\ + ${@['',"${QT_NOSGX_PATCHES}"][bb.utils.contains('MACHINE_FEATURES','sgx',False,True,d) and bb.utils.contains('DISTRO_FEATURES','wayland',True,False,d)]} \ file://0001-qtbase-enhance-eglfs_kms-to-handle-DRM-plane-set-req.patch \ " diff --git a/recipes-qt/qt5/qtcanvas3d_git.bbappend b/recipes-qt/qt5/qtcanvas3d_git.bbappend new file mode 100644 index 0000000..b07c280 --- /dev/null +++ b/recipes-qt/qt5/qtcanvas3d_git.bbappend @@ -0,0 +1,2 @@ +PR_append = ".tisdk0" +include qt5-path-hack.inc diff --git a/recipes-qt/qt5/qtcharts_git.bbappend b/recipes-qt/qt5/qtcharts_git.bbappend new file mode 100644 index 0000000..b07c280 --- /dev/null +++ b/recipes-qt/qt5/qtcharts_git.bbappend @@ -0,0 +1,2 @@ +PR_append = ".tisdk0" +include qt5-path-hack.inc diff --git a/recipes-qt/qt5/qtconnectivity_git.bbappend b/recipes-qt/qt5/qtconnectivity_git.bbappend new file mode 100644 index 0000000..b07c280 --- /dev/null +++ b/recipes-qt/qt5/qtconnectivity_git.bbappend @@ -0,0 +1,2 @@ +PR_append = ".tisdk0" +include qt5-path-hack.inc diff --git a/recipes-qt/qt5/qtdatavis3d_git.bbappend b/recipes-qt/qt5/qtdatavis3d_git.bbappend new file mode 100644 index 0000000..b07c280 --- /dev/null +++ b/recipes-qt/qt5/qtdatavis3d_git.bbappend @@ -0,0 +1,2 @@ +PR_append = ".tisdk0" +include qt5-path-hack.inc diff --git a/recipes-qt/qt5/qtdeclarative-render2d_git.bbappend b/recipes-qt/qt5/qtdeclarative-render2d_git.bbappend new file mode 100644 index 0000000..b07c280 --- /dev/null +++ b/recipes-qt/qt5/qtdeclarative-render2d_git.bbappend @@ -0,0 +1,2 @@ +PR_append = ".tisdk0" +include qt5-path-hack.inc diff --git a/recipes-qt/qt5/qtdeclarative_git.bbappend b/recipes-qt/qt5/qtdeclarative_git.bbappend new file mode 100644 index 0000000..b07c280 --- /dev/null +++ b/recipes-qt/qt5/qtdeclarative_git.bbappend @@ -0,0 +1,2 @@ +PR_append = ".tisdk0" +include qt5-path-hack.inc diff --git a/recipes-qt/qt5/qtenginio_git.bbappend b/recipes-qt/qt5/qtenginio_git.bbappend new file mode 100644 index 0000000..b07c280 --- /dev/null +++ b/recipes-qt/qt5/qtenginio_git.bbappend @@ -0,0 +1,2 @@ +PR_append = ".tisdk0" +include qt5-path-hack.inc diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bbappend b/recipes-qt/qt5/qtgraphicaleffects_git.bbappend new file mode 100644 index 0000000..b07c280 --- /dev/null +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bbappend @@ -0,0 +1,2 @@ +PR_append = ".tisdk0" +include qt5-path-hack.inc diff --git a/recipes-qt/qt5/qtimageformats_git.bbappend b/recipes-qt/qt5/qtimageformats_git.bbappend new file mode 100644 index 0000000..b07c280 --- /dev/null +++ b/recipes-qt/qt5/qtimageformats_git.bbappend @@ -0,0 +1,2 @@ +PR_append = ".tisdk0" +include qt5-path-hack.inc diff --git a/recipes-qt/qt5/qtlocation_git.bbappend b/recipes-qt/qt5/qtlocation_git.bbappend new file mode 100644 index 0000000..b07c280 --- /dev/null +++ b/recipes-qt/qt5/qtlocation_git.bbappend @@ -0,0 +1,2 @@ +PR_append = ".tisdk0" +include qt5-path-hack.inc diff --git a/recipes-qt/qt5/qtmultimedia_git.bbappend b/recipes-qt/qt5/qtmultimedia_git.bbappend new file mode 100644 index 0000000..b07c280 --- /dev/null +++ b/recipes-qt/qt5/qtmultimedia_git.bbappend @@ -0,0 +1,2 @@ +PR_append = ".tisdk0" +include qt5-path-hack.inc diff --git a/recipes-qt/qt5/qtquick1_git.bbappend b/recipes-qt/qt5/qtquick1_git.bbappend new file mode 100644 index 0000000..b07c280 --- /dev/null +++ b/recipes-qt/qt5/qtquick1_git.bbappend @@ -0,0 +1,2 @@ +PR_append = ".tisdk0" +include qt5-path-hack.inc diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bbappend b/recipes-qt/qt5/qtquickcontrols2_git.bbappend new file mode 100644 index 0000000..b07c280 --- /dev/null +++ b/recipes-qt/qt5/qtquickcontrols2_git.bbappend @@ -0,0 +1,2 @@ +PR_append = ".tisdk0" +include qt5-path-hack.inc diff --git a/recipes-qt/qt5/qtquickcontrols_git.bbappend b/recipes-qt/qt5/qtquickcontrols_git.bbappend new file mode 100644 index 0000000..b07c280 --- /dev/null +++ b/recipes-qt/qt5/qtquickcontrols_git.bbappend @@ -0,0 +1,2 @@ +PR_append = ".tisdk0" +include qt5-path-hack.inc diff --git a/recipes-qt/qt5/qtscript_git.bbappend b/recipes-qt/qt5/qtscript_git.bbappend new file mode 100644 index 0000000..b07c280 --- /dev/null +++ b/recipes-qt/qt5/qtscript_git.bbappend @@ -0,0 +1,2 @@ +PR_append = ".tisdk0" +include qt5-path-hack.inc diff --git a/recipes-qt/qt5/qtsensors_git.bbappend b/recipes-qt/qt5/qtsensors_git.bbappend new file mode 100644 index 0000000..b07c280 --- /dev/null +++ b/recipes-qt/qt5/qtsensors_git.bbappend @@ -0,0 +1,2 @@ +PR_append = ".tisdk0" +include qt5-path-hack.inc diff --git a/recipes-qt/qt5/qtserialbus_git.bbappend b/recipes-qt/qt5/qtserialbus_git.bbappend new file mode 100644 index 0000000..b07c280 --- /dev/null +++ b/recipes-qt/qt5/qtserialbus_git.bbappend @@ -0,0 +1,2 @@ +PR_append = ".tisdk0" +include qt5-path-hack.inc diff --git a/recipes-qt/qt5/qtserialport_git.bbappend b/recipes-qt/qt5/qtserialport_git.bbappend new file mode 100644 index 0000000..b07c280 --- /dev/null +++ b/recipes-qt/qt5/qtserialport_git.bbappend @@ -0,0 +1,2 @@ +PR_append = ".tisdk0" +include qt5-path-hack.inc diff --git a/recipes-qt/qt5/qtsvg_git.bbappend b/recipes-qt/qt5/qtsvg_git.bbappend new file mode 100644 index 0000000..b07c280 --- /dev/null +++ b/recipes-qt/qt5/qtsvg_git.bbappend @@ -0,0 +1,2 @@ +PR_append = ".tisdk0" +include qt5-path-hack.inc diff --git a/recipes-qt/qt5/qtsystems_git.bbappend b/recipes-qt/qt5/qtsystems_git.bbappend new file mode 100644 index 0000000..b07c280 --- /dev/null +++ b/recipes-qt/qt5/qtsystems_git.bbappend @@ -0,0 +1,2 @@ +PR_append = ".tisdk0" +include qt5-path-hack.inc diff --git a/recipes-qt/qt5/qttools_git.bbappend b/recipes-qt/qt5/qttools_git.bbappend new file mode 100644 index 0000000..b07c280 --- /dev/null +++ b/recipes-qt/qt5/qttools_git.bbappend @@ -0,0 +1,2 @@ +PR_append = ".tisdk0" +include qt5-path-hack.inc diff --git a/recipes-qt/qt5/qttranslations_git.bbappend b/recipes-qt/qt5/qttranslations_git.bbappend new file mode 100644 index 0000000..b07c280 --- /dev/null +++ b/recipes-qt/qt5/qttranslations_git.bbappend @@ -0,0 +1,2 @@ +PR_append = ".tisdk0" +include qt5-path-hack.inc diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bbappend b/recipes-qt/qt5/qtvirtualkeyboard_git.bbappend new file mode 100644 index 0000000..b07c280 --- /dev/null +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bbappend @@ -0,0 +1,2 @@ +PR_append = ".tisdk0" +include qt5-path-hack.inc diff --git a/recipes-qt/qt5/qtwayland-native_git.bbappend b/recipes-qt/qt5/qtwayland-native_git.bbappend new file mode 100644 index 0000000..b07c280 --- /dev/null +++ b/recipes-qt/qt5/qtwayland-native_git.bbappend @@ -0,0 +1,2 @@ +PR_append = ".tisdk0" +include qt5-path-hack.inc diff --git a/recipes-qt/qt5/qtwayland_git.bbappend b/recipes-qt/qt5/qtwayland_git.bbappend new file mode 100644 index 0000000..b07c280 --- /dev/null +++ b/recipes-qt/qt5/qtwayland_git.bbappend @@ -0,0 +1,2 @@ +PR_append = ".tisdk0" +include qt5-path-hack.inc diff --git a/recipes-qt/qt5/qtwebchannel_git.bbappend b/recipes-qt/qt5/qtwebchannel_git.bbappend new file mode 100644 index 0000000..b07c280 --- /dev/null +++ b/recipes-qt/qt5/qtwebchannel_git.bbappend @@ -0,0 +1,2 @@ +PR_append = ".tisdk0" +include qt5-path-hack.inc diff --git a/recipes-qt/qt5/qtwebengine_git.bbappend b/recipes-qt/qt5/qtwebengine_git.bbappend new file mode 100644 index 0000000..b07c280 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine_git.bbappend @@ -0,0 +1,2 @@ +PR_append = ".tisdk0" +include qt5-path-hack.inc diff --git a/recipes-qt/qt5/qtwebkit-examples_git.bbappend b/recipes-qt/qt5/qtwebkit-examples_git.bbappend new file mode 100644 index 0000000..b07c280 --- /dev/null +++ b/recipes-qt/qt5/qtwebkit-examples_git.bbappend @@ -0,0 +1,2 @@ +PR_append = ".tisdk0" +include qt5-path-hack.inc diff --git a/recipes-qt/qt5/qtwebkit_git.bbappend b/recipes-qt/qt5/qtwebkit_git.bbappend new file mode 100644 index 0000000..b07c280 --- /dev/null +++ b/recipes-qt/qt5/qtwebkit_git.bbappend @@ -0,0 +1,2 @@ +PR_append = ".tisdk0" +include qt5-path-hack.inc diff --git a/recipes-qt/qt5/qtwebsockets_git.bbappend b/recipes-qt/qt5/qtwebsockets_git.bbappend new file mode 100644 index 0000000..b07c280 --- /dev/null +++ b/recipes-qt/qt5/qtwebsockets_git.bbappend @@ -0,0 +1,2 @@ +PR_append = ".tisdk0" +include qt5-path-hack.inc diff --git a/recipes-qt/qt5/qtx11extras_git.bbappend b/recipes-qt/qt5/qtx11extras_git.bbappend new file mode 100644 index 0000000..b07c280 --- /dev/null +++ b/recipes-qt/qt5/qtx11extras_git.bbappend @@ -0,0 +1,2 @@ +PR_append = ".tisdk0" +include qt5-path-hack.inc diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bbappend b/recipes-qt/qt5/qtxmlpatterns_git.bbappend new file mode 100644 index 0000000..b07c280 --- /dev/null +++ b/recipes-qt/qt5/qtxmlpatterns_git.bbappend @@ -0,0 +1,2 @@ +PR_append = ".tisdk0" +include qt5-path-hack.inc -- 1.9.1 _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
