diff options
| author | Jani Suonpera <jani.suonpera@qt.io> | 2021-10-07 15:32:05 +0300 |
|---|---|---|
| committer | Jani Suonpera <jani.suonpera@qt.io> | 2021-10-08 12:25:45 +0300 |
| commit | 1ffd2e712f878c740d4f7b25c0604eafd481cb4f (patch) | |
| tree | b21b82d1b1ac36db5bf1de9c689f7a41e371fcec /recipes-qt/qt5/qtwayland_git.bb | |
| parent | 84d2b9fdae42c762c4f790992b6ed088afccf57f (diff) | |
| parent | b6680da369626c932afb784fb28836881cd0457a (diff) | |
Merge remote-tracking branch 'github/master' into lts-5.15
Task-number: QTBUG-96310
Change-Id: Iec7ca30851b8e4d172faa0066685259d050bfd74
Diffstat (limited to 'recipes-qt/qt5/qtwayland_git.bb')
| -rw-r--r-- | recipes-qt/qt5/qtwayland_git.bb | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 18ef4051..76a85edd 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb @@ -1,8 +1,10 @@ require qt5.inc require qt5-lts.inc +inherit pkgconfig + DEPENDS += "qtbase qtdeclarative wayland wayland-native qtwayland-native" -DEPENDS_append_class-target = " libxkbcommon" +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 = " \ @@ -15,7 +17,9 @@ LIC_FILES_CHKSUM = " \ # Patches from https://github.com/meta-qt5/qtwayland/commits/b5.15 # 5.15.meta-qt5.1 -SRC_URI += "file://0001-tst_seatv4-Include-array.patch" +SRC_URI += "file://0001-tst_seatv4-Include-array.patch \ + file://0001-linux-dmabuf-unstable-v1-Include-missing-array-heade.patch \ + " PACKAGECONFIG ?= " \ wayland-client \ @@ -24,12 +28,12 @@ PACKAGECONFIG ?= " \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcomposite-egl xcomposite-glx', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'vulkan', 'wayland-vulkan-server-buffer', '', d)} \ " -PACKAGECONFIG_class-native ?= "" -PACKAGECONFIG_class-nativesdk ?= "" -QMAKE_PROFILES_class-native = "${S}/src/qtwaylandscanner" -QMAKE_PROFILES_class-nativesdk = "${S}/src/qtwaylandscanner" -B_class-native = "${SEPB}/src/qtwaylandscanner" -B_class-nativesdk = "${SEPB}/src/qtwaylandscanner" +PACKAGECONFIG:class-native ?= "" +PACKAGECONFIG:class-nativesdk ?= "" +QMAKE_PROFILES:class-native = "${S}/src/qtwaylandscanner" +QMAKE_PROFILES:class-nativesdk = "${S}/src/qtwaylandscanner" +B:class-native = "${SEPB}/src/qtwaylandscanner" +B:class-nativesdk = "${SEPB}/src/qtwaylandscanner" PACKAGECONFIG[wayland-client] = "-feature-wayland-client,-no-feature-wayland-client" PACKAGECONFIG[wayland-server] = "-feature-wayland-server,-no-feature-wayland-server" @@ -49,4 +53,4 @@ BBCLASSEXTEND =+ "native nativesdk" # The same issue as in qtbase: # http://errors.yoctoproject.org/Errors/Details/152641/ -LDFLAGS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" +LDFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" |