From 740471f6025831e7747d1fab844042be0bbed00d Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 3 Aug 2018 14:38:13 +0300 Subject: tegra-t18x: update to Drive 5.0 Linux Drive CX2 Using [5.0.2.0] Drive 5.0 Linux Drive CX2 Change-Id: Ia21bca95f216347164e824d57bf7b7ce32243f87 Reviewed-by: Mikko Gronoff --- .../recipes/connman-conf/connman-conf.bbappend | 40 ----- .../recipes/connman-conf/connman-conf/main.conf | 4 - .../recipes/egl-gles-nv/egl-gles-nv_1.0.bbappend | 33 ---- .../recipes/firmware/tegra-firmware_1.0.bbappend | 35 ----- .../graphics-headers/graphics-headers_1.0.bbappend | 30 ---- .../recipes/libdrm-nv/libdrm-nv_%.bbappend | 30 ++++ .../linux-libc-headers_4.%.bbappend | 6 +- .../recipes/linux/linux-nvidia.bbappend | 9 +- .../linux-nvidia/0001-Disable-more-warnings.patch | 27 ++++ .../0001-Fix-misleading-indentation-error.patch | 42 ----- meta-nvidia-extras/recipes/ppp/ppp_2.4.%.bbappend | 30 ---- .../recipes/qt5/qtwebengine_git.bbappend | 31 ---- .../recipes/systemd/systemd-compat-units.bbappend | 3 +- .../recipes/tegra-drivers/tegra-drivers/egl.pc | 12 -- .../recipes/tegra-drivers/tegra-drivers_%.bbappend | 14 +- .../recipes/wayland/wayland_%.bbappend | 6 +- .../recipes/weston/NVIDIA-weston-configure.patch | 30 ++++ ...1-configure.ac-Fix-wayland-protocols-path.patch | 29 ---- .../weston/weston/0001-make-error-portable.patch | 80 ---------- ...ch-Provide-a-default-version-that-doesn-t.patch | 174 --------------------- .../add-config-option-for-no-input-device.patch | 125 --------------- .../weston/explicit-enable-disable-systemd.patch | 70 --------- .../recipes/weston/weston/libsystemd.patch | 53 ------- .../weston/make-lcms-explicitly-configurable.patch | 43 ----- .../make-libwebp-explicitly-configurable.patch | 37 ----- .../recipes/weston/weston/weston.desktop | 9 -- .../recipes/weston/weston/weston.png | Bin 2383 -> 0 bytes .../recipes/weston/weston/xwayland.weston-start | 7 - .../recipes/weston/weston_%.bbappend | 105 +++++++++---- meta-nvidia-extras/recipes/weston/weston_1.9.0.bb | 104 ------------ 30 files changed, 171 insertions(+), 1047 deletions(-) delete mode 100644 meta-nvidia-extras/recipes/connman-conf/connman-conf.bbappend delete mode 100644 meta-nvidia-extras/recipes/connman-conf/connman-conf/main.conf delete mode 100644 meta-nvidia-extras/recipes/egl-gles-nv/egl-gles-nv_1.0.bbappend delete mode 100644 meta-nvidia-extras/recipes/firmware/tegra-firmware_1.0.bbappend delete mode 100644 meta-nvidia-extras/recipes/graphics-headers/graphics-headers_1.0.bbappend create mode 100644 meta-nvidia-extras/recipes/libdrm-nv/libdrm-nv_%.bbappend create mode 100644 meta-nvidia-extras/recipes/linux/linux-nvidia/0001-Disable-more-warnings.patch delete mode 100644 meta-nvidia-extras/recipes/linux/linux-nvidia/0001-Fix-misleading-indentation-error.patch delete mode 100644 meta-nvidia-extras/recipes/ppp/ppp_2.4.%.bbappend delete mode 100644 meta-nvidia-extras/recipes/qt5/qtwebengine_git.bbappend delete mode 100644 meta-nvidia-extras/recipes/tegra-drivers/tegra-drivers/egl.pc create mode 100644 meta-nvidia-extras/recipes/weston/NVIDIA-weston-configure.patch delete mode 100644 meta-nvidia-extras/recipes/weston/weston/0001-configure.ac-Fix-wayland-protocols-path.patch delete mode 100644 meta-nvidia-extras/recipes/weston/weston/0001-make-error-portable.patch delete mode 100644 meta-nvidia-extras/recipes/weston/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch delete mode 100644 meta-nvidia-extras/recipes/weston/weston/add-config-option-for-no-input-device.patch delete mode 100644 meta-nvidia-extras/recipes/weston/weston/explicit-enable-disable-systemd.patch delete mode 100644 meta-nvidia-extras/recipes/weston/weston/libsystemd.patch delete mode 100644 meta-nvidia-extras/recipes/weston/weston/make-lcms-explicitly-configurable.patch delete mode 100644 meta-nvidia-extras/recipes/weston/weston/make-libwebp-explicitly-configurable.patch delete mode 100644 meta-nvidia-extras/recipes/weston/weston/weston.desktop delete mode 100644 meta-nvidia-extras/recipes/weston/weston/weston.png delete mode 100644 meta-nvidia-extras/recipes/weston/weston/xwayland.weston-start delete mode 100644 meta-nvidia-extras/recipes/weston/weston_1.9.0.bb (limited to 'meta-nvidia-extras') diff --git a/meta-nvidia-extras/recipes/connman-conf/connman-conf.bbappend b/meta-nvidia-extras/recipes/connman-conf/connman-conf.bbappend deleted file mode 100644 index 3cfe234..0000000 --- a/meta-nvidia-extras/recipes/connman-conf/connman-conf.bbappend +++ /dev/null @@ -1,40 +0,0 @@ -############################################################################ -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -FILES_${PN} += "etc/connman/main.conf" - -SRC_URI += "file://main.conf \ - " - -do_install_append() { - install -d ${D}${sysconfdir}/connman - install -m 0644 ${WORKDIR}/main.conf ${D}${sysconfdir}/connman/main.conf -} diff --git a/meta-nvidia-extras/recipes/connman-conf/connman-conf/main.conf b/meta-nvidia-extras/recipes/connman-conf/connman-conf/main.conf deleted file mode 100644 index a1e45b9..0000000 --- a/meta-nvidia-extras/recipes/connman-conf/connman-conf/main.conf +++ /dev/null @@ -1,4 +0,0 @@ -[General] -PreferredTechnologies=ethernet,wifi,cellular -NetworkInterfaceBlacklist=eth0 - diff --git a/meta-nvidia-extras/recipes/egl-gles-nv/egl-gles-nv_1.0.bbappend b/meta-nvidia-extras/recipes/egl-gles-nv/egl-gles-nv_1.0.bbappend deleted file mode 100644 index 4314a20..0000000 --- a/meta-nvidia-extras/recipes/egl-gles-nv/egl-gles-nv_1.0.bbappend +++ /dev/null @@ -1,33 +0,0 @@ -############################################################################ -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -PROVIDES = "virtual/egl virtual/libgles2" -RPROVIDES_${PN} = "libegl libegl-dev libgles2 libgles2-dev" -RCONFLICTS_${PN} = "libegl-mesa libegl-mesa-dev libgles2-mesa libgles2-mesa-dev" -RREPLACES_${PN} = "libegl-mesa lbegl-mesa-dev libgles2-mesa libgles2-mesa-dev" diff --git a/meta-nvidia-extras/recipes/firmware/tegra-firmware_1.0.bbappend b/meta-nvidia-extras/recipes/firmware/tegra-firmware_1.0.bbappend deleted file mode 100644 index d3e2337..0000000 --- a/meta-nvidia-extras/recipes/firmware/tegra-firmware_1.0.bbappend +++ /dev/null @@ -1,35 +0,0 @@ -############################################################################ -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -# WARNING: FILESEXTRAPATHS-variable, must always use _prepend (or _append) -FILESEXTRAPATHS_tegra-x1_prepend = "__default:" -FILESEXTRAPATHS_tegra-t18x_prepend = "__default:" - -# ERROR: QA Issue: Files/directories were installed but not shipped in any package -FILES_${PN}-gk20a = "${FILES__${PN}-gk20a}" diff --git a/meta-nvidia-extras/recipes/graphics-headers/graphics-headers_1.0.bbappend b/meta-nvidia-extras/recipes/graphics-headers/graphics-headers_1.0.bbappend deleted file mode 100644 index df91dfe..0000000 --- a/meta-nvidia-extras/recipes/graphics-headers/graphics-headers_1.0.bbappend +++ /dev/null @@ -1,30 +0,0 @@ -############################################################################ -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -ALLOW_EMPTY_${PN} = "1" diff --git a/meta-nvidia-extras/recipes/libdrm-nv/libdrm-nv_%.bbappend b/meta-nvidia-extras/recipes/libdrm-nv/libdrm-nv_%.bbappend new file mode 100644 index 0000000..46e3bbb --- /dev/null +++ b/meta-nvidia-extras/recipes/libdrm-nv/libdrm-nv_%.bbappend @@ -0,0 +1,30 @@ +############################################################################ +## +## Copyright (C) 2018 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the Boot to Qt meta layer. +## +## $QT_BEGIN_LICENSE:GPL$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. +## +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 or (at your option) any later version +## approved by the KDE Free Qt Foundation. The licenses are as published by +## the Free Software Foundation and appearing in the file LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################ + +RDEPENDS_${PN} += "tegra-drivers" diff --git a/meta-nvidia-extras/recipes/linux-libc-headers/linux-libc-headers_4.%.bbappend b/meta-nvidia-extras/recipes/linux-libc-headers/linux-libc-headers_4.%.bbappend index c7730c6..9fa1a9c 100644 --- a/meta-nvidia-extras/recipes/linux-libc-headers/linux-libc-headers_4.%.bbappend +++ b/meta-nvidia-extras/recipes/linux-libc-headers/linux-libc-headers_4.%.bbappend @@ -16,11 +16,11 @@ KERN_DIR := "${LNX_TOPDIR}_src/kernel" # Kernel source is the kernel tarball in PDK SRC_URI = "file://${KERN_DIR}/linux.tar.bz2" -PV = "4.4" +PV = "4.9" # Extracting linux.tar.bz2 creates directories -# /vibrante-oss-src/kernel -S = "${WORKDIR}/vibrante-oss-src/kernel" +# /drive-oss-src/kernel +S = "${WORKDIR}/drive-oss-src/kernel" # Need to pass this to for oe_runmake explicitly for building outside kerneldir EXTRA_OEMAKE += " -C ${S} O=${B}" diff --git a/meta-nvidia-extras/recipes/linux/linux-nvidia.bbappend b/meta-nvidia-extras/recipes/linux/linux-nvidia.bbappend index 835dfe8..a2103ba 100644 --- a/meta-nvidia-extras/recipes/linux/linux-nvidia.bbappend +++ b/meta-nvidia-extras/recipes/linux/linux-nvidia.bbappend @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2018 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -28,14 +28,11 @@ ############################################################################ FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" -SRC_URI += "file://0001-Fix-misleading-indentation-error.patch;patchdir=.." +SRC_URI += "file://0001-Disable-more-warnings.patch" CROSS_COMPILE_PREFIX = "${CROSS_COMPILE}" -PACKAGES += "kernel-devicetree" -FILES_kernel-devicetree = "/boot/*.dtb" - -RDEPENDS_kernel-base = "kernel-image kernel-devicetree" +RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "${KERNEL_PACKAGE_NAME}-image ${KERNEL_PACKAGE_NAME}-devicetree" python do_patch () { bb.build.exec_func('patch_do_patch', d) diff --git a/meta-nvidia-extras/recipes/linux/linux-nvidia/0001-Disable-more-warnings.patch b/meta-nvidia-extras/recipes/linux/linux-nvidia/0001-Disable-more-warnings.patch new file mode 100644 index 0000000..d881d57 --- /dev/null +++ b/meta-nvidia-extras/recipes/linux/linux-nvidia/0001-Disable-more-warnings.patch @@ -0,0 +1,27 @@ +From d863ce14300576c53492713140eb0dfacba1d8ab Mon Sep 17 00:00:00 2001 +From: Samuli Piippo +Date: Fri, 28 Sep 2018 13:30:56 +0300 +Subject: [PATCH] Disable more warnings + +Current compiler options are more strict than the old kernel is +prepared. Disable those warnings. +--- + Makefile | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/Makefile b/Makefile +index 43a6127..d3e40f3 100644 +--- a/Makefile ++++ b/Makefile +@@ -627,6 +627,11 @@ ARCH_AFLAGS := + ARCH_CFLAGS := + include arch/$(SRCARCH)/Makefile + ++KBUILD_CFLAGS += $(call cc-disable-warning,format-overflow,) ++KBUILD_CFLAGS += $(call cc-disable-warning,format-truncation,) ++KBUILD_CFLAGS += $(call cc-disable-warning,int-in-bool-context,) ++KBUILD_CFLAGS += $(call cc-disable-warning,misleading-indentation,) ++KBUILD_CFLAGS += $(call cc-disable-warning,tautological-compare,) + KBUILD_CFLAGS += $(call cc-option,-fno-delete-null-pointer-checks,) + KBUILD_CFLAGS += $(call cc-disable-warning,frame-address,) + diff --git a/meta-nvidia-extras/recipes/linux/linux-nvidia/0001-Fix-misleading-indentation-error.patch b/meta-nvidia-extras/recipes/linux/linux-nvidia/0001-Fix-misleading-indentation-error.patch deleted file mode 100644 index a344adc..0000000 --- a/meta-nvidia-extras/recipes/linux/linux-nvidia/0001-Fix-misleading-indentation-error.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 33d112e943590020f2cda2a403a755531833b016 Mon Sep 17 00:00:00 2001 -From: Samuli Piippo -Date: Fri, 31 Mar 2017 09:42:18 +0300 -Subject: [PATCH] Fix misleading-indentation error - -error: this 'if' clause does not guard... [-Werror=misleading-indentation] - if (!runlist->active_channels) ---- - nvgpu/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c | 16 ++++++++-------- - 1 file changed, 8 insertions(+), 8 deletions(-) - -diff --git a/nvgpu/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c b/nvgpu/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c -index 3e57c67..e2fe4db 100644 ---- a/nvgpu/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c -+++ b/nvgpu/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c -@@ -209,15 +209,15 @@ static int init_runlist(struct gk20a *g, struct fifo_gk20a *f) - if (!runlist->active_channels) - goto clean_up_runlist; - -- runlist_size = sizeof(u16) * f->num_channels; -- for (i = 0; i < MAX_RUNLIST_BUFFERS; i++) { -- int err = gk20a_gmmu_alloc_sys(g, runlist_size, -- &runlist->mem[i]); -- if (err) { -- dev_err(d, "memory allocation failed\n"); -- goto clean_up_runlist; -- } -+ runlist_size = sizeof(u16) * f->num_channels; -+ for (i = 0; i < MAX_RUNLIST_BUFFERS; i++) { -+ int err = gk20a_gmmu_alloc_sys(g, runlist_size, -+ &runlist->mem[i]); -+ if (err) { -+ dev_err(d, "memory allocation failed\n"); -+ goto clean_up_runlist; - } -+ } - mutex_init(&runlist->mutex); - - /* None of buffers is pinned if this value doesn't change. --- -2.7.4 - diff --git a/meta-nvidia-extras/recipes/ppp/ppp_2.4.%.bbappend b/meta-nvidia-extras/recipes/ppp/ppp_2.4.%.bbappend deleted file mode 100644 index ca8f573..0000000 --- a/meta-nvidia-extras/recipes/ppp/ppp_2.4.%.bbappend +++ /dev/null @@ -1,30 +0,0 @@ -############################################################################ -## -## Copyright (C) 2018 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -SRC_URI_remove = "file://ppp-fix-building-with-linux-4.8.patch" diff --git a/meta-nvidia-extras/recipes/qt5/qtwebengine_git.bbappend b/meta-nvidia-extras/recipes/qt5/qtwebengine_git.bbappend deleted file mode 100644 index 94178db..0000000 --- a/meta-nvidia-extras/recipes/qt5/qtwebengine_git.bbappend +++ /dev/null @@ -1,31 +0,0 @@ -############################################################################ -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -CXXFLAGS +=" -DWIN_INTERFACE_CUSTOM" -COMPATIBLE_MACHINE_aarch64 = "(.*)" diff --git a/meta-nvidia-extras/recipes/systemd/systemd-compat-units.bbappend b/meta-nvidia-extras/recipes/systemd/systemd-compat-units.bbappend index 7c2f7b5..c9081a5 100644 --- a/meta-nvidia-extras/recipes/systemd/systemd-compat-units.bbappend +++ b/meta-nvidia-extras/recipes/systemd/systemd-compat-units.bbappend @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2018 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -28,3 +28,4 @@ ############################################################################ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" +RDEPENDS_${PN} += "bash" diff --git a/meta-nvidia-extras/recipes/tegra-drivers/tegra-drivers/egl.pc b/meta-nvidia-extras/recipes/tegra-drivers/tegra-drivers/egl.pc deleted file mode 100644 index da1f5f7..0000000 --- a/meta-nvidia-extras/recipes/tegra-drivers/tegra-drivers/egl.pc +++ /dev/null @@ -1,12 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=/usr/lib -includedir=/usr/include - -Name: egl -Description: Mesa EGL library -Requires.private: libdrm >= 2.4.24 -Version: 9.1.6 -Libs: -L${libdir} -lEGL -Libs.private: -lm -lpthread -ldl -Cflags: -I${includedir} diff --git a/meta-nvidia-extras/recipes/tegra-drivers/tegra-drivers_%.bbappend b/meta-nvidia-extras/recipes/tegra-drivers/tegra-drivers_%.bbappend index 2cc22df..7e23d32 100644 --- a/meta-nvidia-extras/recipes/tegra-drivers/tegra-drivers_%.bbappend +++ b/meta-nvidia-extras/recipes/tegra-drivers/tegra-drivers_%.bbappend @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2016 The Qt Company Ltd. +## Copyright (C) 2018 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -27,11 +27,6 @@ ## ############################################################################ -FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" - -SRC_URI += " file://egl.pc" -FILES_${PN} += "egl.pc" - GRAPHICS_PACKAGES = " \ virtual/libgles2 \ virtual/libegl \ @@ -42,8 +37,5 @@ GRAPHICS_PACKAGES = " \ libgbm \ libgbm-dev \ " - -do_install_append_tegra-t18x() { - install -d ${D}/usr/lib/pkgconfig - install -m 0775 ${WORKDIR}/egl.pc ${D}/${libdir}/pkgconfig -} +RDEPENDS_${PN}-nvidia-egl-wayland += "wayland" +INSANE_SKIP_${PN}-gst += "file-rdeps" diff --git a/meta-nvidia-extras/recipes/wayland/wayland_%.bbappend b/meta-nvidia-extras/recipes/wayland/wayland_%.bbappend index f05607c..209cc19 100644 --- a/meta-nvidia-extras/recipes/wayland/wayland_%.bbappend +++ b/meta-nvidia-extras/recipes/wayland/wayland_%.bbappend @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2018 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Boot to Qt meta layer. @@ -27,8 +27,4 @@ ## ############################################################################ -FILESEXTRAPATHS_append := ":${LNX_TOPDIR}_src/wayland" - -SRC_URI = "file://wayland-1.11.0-src.tar.gz" - DEPENDS_append_class-target = " wayland-egl" diff --git a/meta-nvidia-extras/recipes/weston/NVIDIA-weston-configure.patch b/meta-nvidia-extras/recipes/weston/NVIDIA-weston-configure.patch new file mode 100644 index 0000000..b7230cb --- /dev/null +++ b/meta-nvidia-extras/recipes/weston/NVIDIA-weston-configure.patch @@ -0,0 +1,30 @@ +diff --git a/configure.ac b/configure.ac +index 691878f..0564bb2 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -174,10 +174,10 @@ AC_ARG_ENABLE(drm-compositor, [ --enable-drm-compositor],, + AM_CONDITIONAL(ENABLE_DRM_COMPOSITOR, test x$enable_drm_compositor = xyes) + if test x$enable_drm_compositor = xyes; then + AC_DEFINE([BUILD_DRM_COMPOSITOR], [1], [Build the DRM compositor]) +- PKG_CHECK_MODULES(DRM_COMPOSITOR, [libudev >= 136 libdrm >= 2.4.30 gbm mtdev >= 1.1.0]) +- PKG_CHECK_MODULES(DRM_COMPOSITOR_GBM, [gbm >= 10.2], +- [AC_DEFINE([HAVE_GBM_FD_IMPORT], 1, [gbm supports dmabuf import])], +- [AC_MSG_WARN([gbm does not support dmabuf import, will omit that capability])]) ++ PKG_CHECK_MODULES(DRM_COMPOSITOR, [libudev >= 136 libdrm mtdev >= 1.1.0]) ++ #PKG_CHECK_MODULES(DRM_COMPOSITOR_GBM, [gbm >= 10.2], ++ #[AC_DEFINE([HAVE_GBM_FD_IMPORT], 1, [gbm supports dmabuf import])], ++ #[AC_MSG_WARN([gbm does not support dmabuf import, will omit that capability])]) + fi + + AC_ARG_ENABLE(eglstream-compositor, [ --enable-eglstream-compositor],, +@@ -190,8 +190,8 @@ fi + PKG_CHECK_MODULES(LIBINPUT_BACKEND, [libinput >= 0.8.0]) + PKG_CHECK_MODULES(COMPOSITOR, [$COMPOSITOR_MODULES]) + +-PKG_CHECK_MODULES(WAYLAND_PROTOCOLS, [wayland-protocols >= 1.2], +- [ac_wayland_protocols_pkgdatadir=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`]) ++#PKG_CHECK_MODULES(WAYLAND_PROTOCOLS, [wayland-protocols >= 1.2], ++# [ac_wayland_protocols_pkgdatadir=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`]) + AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, $ac_wayland_protocols_pkgdatadir) + + AC_ARG_ENABLE(wayland-compositor, [ --enable-wayland-compositor],, diff --git a/meta-nvidia-extras/recipes/weston/weston/0001-configure.ac-Fix-wayland-protocols-path.patch b/meta-nvidia-extras/recipes/weston/weston/0001-configure.ac-Fix-wayland-protocols-path.patch deleted file mode 100644 index 5f4d79c..0000000 --- a/meta-nvidia-extras/recipes/weston/weston/0001-configure.ac-Fix-wayland-protocols-path.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 1cfc1434a5d385a74de593ec7601674dba39e2fe Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen -Date: Wed, 11 May 2016 16:16:30 +0300 -Subject: [PATCH] configure.ac: Fix wayland-protocols path - -The wayland-protocols directory is used during build: Fix the path -to point to sysroot specified in recipe. - -Normally PKG_CONFIG_SYSROOT_DIR could be used in configure.ac but that -breaks multilib weston as it would point to multilib sysroot when the -(allarch) wayland-protocols is actually in the machine sysroot. - -Signed-off-by: Jussi Kukkonen -Upstream-Status: Inappropriate [embedded specific] ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/configure.ac -+++ b/configure.ac -@@ -187,7 +187,7 @@ PKG_CHECK_MODULES(LIBINPUT_BACKEND, [lib - PKG_CHECK_MODULES(COMPOSITOR, [$COMPOSITOR_MODULES]) - - PKG_CHECK_MODULES(WAYLAND_PROTOCOLS, [wayland-protocols >= 1.7], -- [ac_wayland_protocols_pkgdatadir=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`]) -+ [ac_wayland_protocols_pkgdatadir=${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`]) - AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, $ac_wayland_protocols_pkgdatadir) - - AC_ARG_ENABLE(wayland-compositor, [ --enable-wayland-compositor],, diff --git a/meta-nvidia-extras/recipes/weston/weston/0001-make-error-portable.patch b/meta-nvidia-extras/recipes/weston/weston/0001-make-error-portable.patch deleted file mode 100644 index 148848d..0000000 --- a/meta-nvidia-extras/recipes/weston/weston/0001-make-error-portable.patch +++ /dev/null @@ -1,80 +0,0 @@ -From c22e90365d89346258394833cbcad03ff32b2e27 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 29 May 2015 20:56:00 -0700 -Subject: [PATCH weston] make error() portable - -error() is not posix but gnu extension so may not be available on all -kind of systemsi e.g. musl. - -Signed-off-by: Khem Raj ---- -Upstream-Status: Submitted - - configure.ac | 2 ++ - src/weston-error.h | 20 ++++++++++++++++++++ - src/weston-launch.c | 2 +- - 3 files changed, 23 insertions(+), 1 deletion(-) - create mode 100644 src/weston-error.h - -diff --git a/configure.ac b/configure.ac -index 263fc22..f52cd62 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -57,6 +57,8 @@ AC_CHECK_DECL(CLOCK_MONOTONIC,[], - [[#include ]]) - AC_CHECK_HEADERS([execinfo.h]) - -+AC_CHECK_HEADERS([error.h]) -+ - AC_CHECK_FUNCS([mkostemp strchrnul initgroups posix_fallocate]) - - COMPOSITOR_MODULES="wayland-server >= 1.7.93 pixman-1 >= 0.25.2" -diff --git a/src/weston-error.h b/src/weston-error.h -new file mode 100644 -index 0000000..2089d02 ---- /dev/null -+++ b/src/weston-error.h -@@ -0,0 +1,20 @@ -+#ifndef _WESTON_ERROR_H -+#define _WESTON_ERROR_H -+ -+#if defined(HAVE_ERROR_H) -+#include -+#else -+#include -+#include -+#define _weston_error(S, E, F, ...) do { \ -+ if (E) \ -+ err(S, F ": %s", ##__VA_ARGS__, strerror(E)); \ -+ else \ -+ err(S, F, ##__VA_ARGS__); \ -+} while(0) -+ -+#define error _weston_error -+#endif -+ -+#endif -+ -diff --git a/src/weston-launch.c b/src/weston-launch.c -index 10c66de..3e6d30a 100644 ---- a/src/weston-launch.c -+++ b/src/weston-launch.c -@@ -30,7 +30,6 @@ - #include - #include - --#include - #include - - #include -@@ -56,6 +55,7 @@ - #endif - - #include "weston-launch.h" -+#include "weston-error.h" - - #define DRM_MAJOR 226 - --- -2.1.4 - diff --git a/meta-nvidia-extras/recipes/weston/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch b/meta-nvidia-extras/recipes/weston/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch deleted file mode 100644 index 70b9888..0000000 --- a/meta-nvidia-extras/recipes/weston/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch +++ /dev/null @@ -1,174 +0,0 @@ -From 8ff6ed03ec4079f32e9b34085414e57be4730e04 Mon Sep 17 00:00:00 2001 -From: Tom Hochstein -Date: Wed, 22 Feb 2017 15:53:30 +0200 -Subject: [PATCH] weston-launch: Provide a default version that doesn't require - PAM - -weston-launch requires PAM for starting weston as a non-root user. - -Since starting weston as root is a valid use case by itself, if -PAM is not available, provide a default version of weston-launch -without non-root-user support. - -Upstream-Status: Pending - -Signed-off-by: Tom Hochstein -Signed-off-by: Jussi Kukkonen ---- - configure.ac | 9 +++++++-- - libweston/weston-launch.c | 20 ++++++++++++++++++++ - 2 files changed, 27 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 46cb2c7..bb45f46 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -435,13 +435,17 @@ AC_ARG_ENABLE(resize-optimization, - AS_IF([test "x$enable_resize_optimization" = "xyes"], - [AC_DEFINE([USE_RESIZE_POOL], [1], [Use resize memory pool as a performance optimization])]) - -+AC_ARG_WITH(pam, -+ AS_HELP_STRING([--with-pam], [Use PAM]), -+ [use_pam=$withval], [use_pam=yes]) - AC_ARG_ENABLE(weston-launch, [ --enable-weston-launch],, enable_weston_launch=yes) - AM_CONDITIONAL(BUILD_WESTON_LAUNCH, test x$enable_weston_launch = xyes) --if test x$enable_weston_launch = xyes; then -+if test x$enable_weston_launch = xyes -a x$use_pam = xyes; then - WESTON_SEARCH_LIBS([PAM], [pam], [pam_open_session], [have_pam=yes], [have_pam=no]) - if test x$have_pam = xno; then -- AC_ERROR([weston-launch requires pam]) -+ AC_ERROR([PAM support is explicitly requested, but libpam couldn't be found]) - fi -+ AC_DEFINE([HAVE_PAM], [1], [Define if PAM is available]) - fi - - AM_CONDITIONAL(HAVE_PANGO, test "x$have_pango" = "xyes") -@@ -701,6 +705,7 @@ AC_MSG_RESULT([ - Enable developer documentation ${enable_devdocs} - - weston-launch utility ${enable_weston_launch} -+ PAM support ${use_pam} - systemd-login support ${have_systemd_login} - systemd notify support ${enable_systemd_notify} - -diff --git a/libweston/weston-launch.c b/libweston/weston-launch.c -index 0491896..07e7469 100644 ---- a/libweston/weston-launch.c -+++ b/libweston/weston-launch.c -@@ -51,7 +51,9 @@ - - #include - #include -+#ifdef HAVE_PAM - #include -+#endif - - #ifdef HAVE_SYSTEMD_LOGIN - #include -@@ -93,8 +95,10 @@ drmSetMaster(int drm_fd) - #endif - - struct weston_launch { -+#ifdef HAVE_PAM - struct pam_conv pc; - pam_handle_t *ph; -+#endif - int tty; - int ttynr; - int sock[2]; -@@ -181,6 +185,7 @@ weston_launch_allowed(struct weston_launch *wl) - return false; - } - -+#ifdef HAVE_PAM - static int - pam_conversation_fn(int msg_count, - const struct pam_message **messages, -@@ -221,6 +226,7 @@ setup_pam(struct weston_launch *wl) - - return 0; - } -+#endif - - static int - setup_launcher_socket(struct weston_launch *wl) -@@ -414,6 +420,7 @@ quit(struct weston_launch *wl, int status) - close(wl->signalfd); - close(wl->sock[0]); - -+#ifdef HAVE_PAM - if (wl->new_user) { - err = pam_close_session(wl->ph, 0); - if (err) -@@ -421,6 +428,7 @@ quit(struct weston_launch *wl, int status) - err, pam_strerror(wl->ph, err)); - pam_end(wl->ph, err); - } -+#endif - - if (ioctl(wl->tty, KDSKBMUTE, 0) && - ioctl(wl->tty, KDSKBMODE, wl->kb_mode)) -@@ -600,6 +608,7 @@ setup_session(struct weston_launch *wl, char **child_argv) - setenv("HOME", wl->pw->pw_dir, 1); - setenv("SHELL", wl->pw->pw_shell, 1); - -+#ifdef HAVE_PAM - env = pam_getenvlist(wl->ph); - if (env) { - for (i = 0; env[i]; ++i) { -@@ -608,6 +617,7 @@ setup_session(struct weston_launch *wl, char **child_argv) - } - free(env); - } -+#endif - - /* - * We open a new session, so it makes sense -@@ -675,7 +685,9 @@ static void - help(const char *name) - { - fprintf(stderr, "Usage: %s [args...] [-- [weston args..]]\n", name); -+#ifdef HAVE_PAM - fprintf(stderr, " -u, --user Start session as specified username\n"); -+#endif - fprintf(stderr, " -t, --tty Start session on alternative tty\n"); - fprintf(stderr, " -v, --verbose Be verbose\n"); - fprintf(stderr, " -h, --help Display this help message\n"); -@@ -688,7 +700,9 @@ main(int argc, char *argv[]) - int i, c; - char *tty = NULL; - struct option opts[] = { -+#ifdef HAVE_PAM - { "user", required_argument, NULL, 'u' }, -+#endif - { "tty", required_argument, NULL, 't' }, - { "verbose", no_argument, NULL, 'v' }, - { "help", no_argument, NULL, 'h' }, -@@ -700,9 +714,13 @@ main(int argc, char *argv[]) - while ((c = getopt_long(argc, argv, "u:t::vh", opts, &i)) != -1) { - switch (c) { - case 'u': -+#ifdef HAVE_PAM - wl.new_user = optarg; - if (getuid() != 0) - error(1, 0, "Permission denied. -u allowed for root only"); -+#else -+ error(1, 0, "-u is unsupported in this weston-launch build"); -+#endif - break; - case 't': - tty = optarg; -@@ -740,8 +758,10 @@ main(int argc, char *argv[]) - if (setup_tty(&wl, tty) < 0) - exit(EXIT_FAILURE); - -+#ifdef HAVE_PAM - if (wl.new_user && setup_pam(&wl) < 0) - exit(EXIT_FAILURE); -+#endif - - if (setup_launcher_socket(&wl) < 0) - exit(EXIT_FAILURE); --- -2.1.4 - diff --git a/meta-nvidia-extras/recipes/weston/weston/add-config-option-for-no-input-device.patch b/meta-nvidia-extras/recipes/weston/weston/add-config-option-for-no-input-device.patch deleted file mode 100644 index 93376ef..0000000 --- a/meta-nvidia-extras/recipes/weston/weston/add-config-option-for-no-input-device.patch +++ /dev/null @@ -1,125 +0,0 @@ -From 6c89292024cc08d4499916dc153c354175bd81c4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Daniel=20D=C3=ADaz?= -Date: Fri, 21 Oct 2016 14:03:13 -0500 -Subject: [PATCH] Add configuration option for no input device. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -[Backported from master, 75b7197.) - -As it has been discussed in the past [1], running Weston -without any input device at launch might be beneficial for -some use cases. - -Certainly, it's best for the vast majority of users (and -the project) to require an input device to be present, as -to avoid frustration and hassle, but for those brave souls -that so prefer, this patch lets them run without any input -device at all. - -This introduces a simple configuration in weston.ini: - [core] - require-input=true - -True is the default, so no behavioral change is introduced. - -[1] https://lists.freedesktop.org/archives/wayland-devel/2015-November/025193.html - -Signed-off-by: Daniel Díaz -Reviewed-by: Peter Hutterer -Reviewed-by: Daniel Stone ---- - man/weston.ini.man | 5 +++++ - src/compositor.h | 4 ++++ - src/libinput-seat.c | 6 ++++++ - src/main.c | 5 +++++ - weston.ini.in | 1 + - 5 files changed, 21 insertions(+) - -diff --git a/man/weston.ini.man b/man/weston.ini.man -index a9b6026..668b16f 100644 ---- a/man/weston.ini.man -+++ b/man/weston.ini.man -@@ -169,6 +169,11 @@ time, the one specified in the command-line will be used. On the other - hand, if none of these sets the value, default idle timeout will be - set to 300 seconds. - .RS -+.PP -+.RE -+.TP 7 -+.BI "require-input=" true -+require an input device for launch - - .SH "LIBINPUT SECTION" - The -diff --git a/src/compositor.h b/src/compositor.h -index c4c81f0..292a412 100644 ---- a/src/compositor.h -+++ b/src/compositor.h -@@ -701,6 +701,10 @@ struct weston_compositor { - - void *user_data; - void (*exit)(struct weston_compositor *c); -+ -+ /* Whether to let the compositor run without any input device. */ -+ bool require_input; -+ - }; - - struct weston_buffer { -diff --git a/src/libinput-seat.c b/src/libinput-seat.c -index c9f9ed2..1c4c358 100644 ---- a/src/libinput-seat.c -+++ b/src/libinput-seat.c -@@ -250,6 +250,12 @@ udev_input_enable(struct udev_input *input) - devices_found = 1; - } - -+ if (devices_found == 0 && !c->require_input) { -+ weston_log("warning: no input devices found, but none required " -+ "as per configuration.\n"); -+ return 0; -+ } -+ - if (devices_found == 0) { - weston_log( - "warning: no input devices on entering Weston. " -diff --git a/src/main.c b/src/main.c -index a98570e..b8632e9 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -658,6 +658,7 @@ int main(int argc, char *argv[]) - struct wl_client *primary_client; - struct wl_listener primary_client_destroyed; - struct weston_seat *seat; -+ int require_input; - - const struct weston_option core_options[] = { - { WESTON_OPTION_STRING, "backend", 'B', &backend }, -@@ -737,6 +738,10 @@ int main(int argc, char *argv[]) - if (weston_compositor_init_config(ec, config) < 0) - goto out_signals; - -+ weston_config_section_get_bool(section, "require-input", -+ &require_input, true); -+ ec->require_input = require_input; -+ - if (backend_init(ec, &argc, argv, config) < 0) { - weston_log("fatal: failed to create compositor backend\n"); - goto out_signals; -diff --git a/weston.ini.in b/weston.ini.in -index 06b51df..e9ef992 100644 ---- a/weston.ini.in -+++ b/weston.ini.in -@@ -2,6 +2,7 @@ - #modules=xwayland.so,cms-colord.so - #shell=desktop-shell.so - #gbm-format=xrgb2101010 -+#require-input=true - - [shell] - background-image=/usr/share/backgrounds/gnome/Aqua.jpg --- -1.9.1 - diff --git a/meta-nvidia-extras/recipes/weston/weston/explicit-enable-disable-systemd.patch b/meta-nvidia-extras/recipes/weston/weston/explicit-enable-disable-systemd.patch deleted file mode 100644 index a40eaf1..0000000 --- a/meta-nvidia-extras/recipes/weston/weston/explicit-enable-disable-systemd.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 8e1efcd40b3bad81c83744e2e120d70c2b567ef2 Mon Sep 17 00:00:00 2001 -From: Frederico Cadete -Date: Mon, 28 Sep 2015 00:30:10 +0200 -Subject: configure.ac: add explicit enable/disable for systemd-login support - -Otherwise, auto-enable depending on whether the system has the necessary -libraries. - -[Updated help text as per pq suggestion -- bwh] - -Reviewed-by: Bryce Harrington -Reviewed-by: Pekka Paalanen -Tested-by: Pekka Paalanen - -Upstream-Status: Backport -Backported from Weston git: -http://cgit.freedesktop.org/wayland/weston/commit/?id=8e1efc - -Signed-off-by: Joshua Lock - -diff --git a/configure.ac b/configure.ac -index a9cd429..67e80d0 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -380,18 +380,30 @@ AC_ARG_ENABLE(resize-optimization, - AS_IF([test "x$enable_resize_optimization" = "xyes"], - [AC_DEFINE([USE_RESIZE_POOL], [1], [Use resize memory pool as a performance optimization])]) - --PKG_CHECK_MODULES(SYSTEMD_LOGIN, -- [libsystemd >= 209], -- [have_systemd_login_209=yes;have_systemd_login=yes], -- [have_systemd_login_209=no;have_systemd_login=no]) -- --# Older versions of systemd package systemd-login separately. Fall back on that --AS_IF([test x$have_systemd_login != xyes],[ -- PKG_CHECK_MODULES(SYSTEMD_LOGIN, -- [libsystemd-login >= 198], -- [have_systemd_login=yes], -- [have_systemd_login=no]) -- ]) -+AC_ARG_ENABLE(systemd-login, -+ AS_HELP_STRING([--enable-systemd-login], -+ [Enable logind support]),, -+ enable_systemd_login=auto) -+if test x$enable_systemd_login != xno; then -+ PKG_CHECK_MODULES(SYSTEMD_LOGIN, -+ [libsystemd >= 209], -+ [have_systemd_login_209=yes;have_systemd_login=yes], -+ [have_systemd_login_209=no;have_systemd_login=no]) -+ -+ # Older versions of systemd package systemd-login separately. Fall back on that -+ AS_IF([test x$have_systemd_login != xyes],[ -+ PKG_CHECK_MODULES(SYSTEMD_LOGIN, -+ [libsystemd-login >= 198], -+ [have_systemd_login=yes], -+ [have_systemd_login=no]) -+ ]) -+else -+ have_systemd_login=no -+fi -+ -+if test "x$have_systemd_login" = "xno" -a "x$enable_systemd_login" = "xyes"; then -+ AC_MSG_ERROR([systemd-login support explicitly enabled, but can't find libsystemd>=209 or libsystemd-login]) -+fi - - AS_IF([test "x$have_systemd_login" = "xyes"], - [AC_DEFINE([HAVE_SYSTEMD_LOGIN], [1], [Have systemd-login])]) --- -cgit v0.10.2 - diff --git a/meta-nvidia-extras/recipes/weston/weston/libsystemd.patch b/meta-nvidia-extras/recipes/weston/weston/libsystemd.patch deleted file mode 100644 index 2d28d56..0000000 --- a/meta-nvidia-extras/recipes/weston/weston/libsystemd.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 5eb025a867b42f8bc7bc73279eac8de58e51a13e Mon Sep 17 00:00:00 2001 -From: Frederico Cadete -Date: Mon, 28 Sep 2015 00:30:09 +0200 -Subject: configure.ac: add support for new versions of systemd - -Starting from systemd version 209, a single libsystemd.pc is provided. -For previous versions, fall back on libsystemd-login.pc. - -Signed-off-by: Frederico Cadete -Reviewed-by: Bryce Harrington -Reviewed-by: Derek Foreman - -Upstream-Status: Backport -Backported from Weston git: -http://cgit.freedesktop.org/wayland/weston/commit/?id=5eb025 - -Signed-off-by: Joshua Lock - -diff --git a/configure.ac b/configure.ac -index 045291c..a9cd429 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -380,14 +380,23 @@ AC_ARG_ENABLE(resize-optimization, - AS_IF([test "x$enable_resize_optimization" = "xyes"], - [AC_DEFINE([USE_RESIZE_POOL], [1], [Use resize memory pool as a performance optimization])]) - --PKG_CHECK_MODULES(SYSTEMD_LOGIN, [libsystemd-login >= 198], -- [have_systemd_login=yes], [have_systemd_login=no]) -+PKG_CHECK_MODULES(SYSTEMD_LOGIN, -+ [libsystemd >= 209], -+ [have_systemd_login_209=yes;have_systemd_login=yes], -+ [have_systemd_login_209=no;have_systemd_login=no]) -+ -+# Older versions of systemd package systemd-login separately. Fall back on that -+AS_IF([test x$have_systemd_login != xyes],[ -+ PKG_CHECK_MODULES(SYSTEMD_LOGIN, -+ [libsystemd-login >= 198], -+ [have_systemd_login=yes], -+ [have_systemd_login=no]) -+ ]) -+ - AS_IF([test "x$have_systemd_login" = "xyes"], - [AC_DEFINE([HAVE_SYSTEMD_LOGIN], [1], [Have systemd-login])]) - AM_CONDITIONAL(HAVE_SYSTEMD_LOGIN, test "x$have_systemd_login" = "xyes") - --PKG_CHECK_MODULES(SYSTEMD_LOGIN_209, [libsystemd-login >= 209], -- [have_systemd_login_209=yes], [have_systemd_login_209=no]) - AS_IF([test "x$have_systemd_login_209" = "xyes"], - [AC_DEFINE([HAVE_SYSTEMD_LOGIN_209], [1], [Have systemd-login >= 209])]) - --- -cgit v0.10.2 - diff --git a/meta-nvidia-extras/recipes/weston/weston/make-lcms-explicitly-configurable.patch b/meta-nvidia-extras/recipes/weston/weston/make-lcms-explicitly-configurable.patch deleted file mode 100644 index 35e6d6f..0000000 --- a/meta-nvidia-extras/recipes/weston/weston/make-lcms-explicitly-configurable.patch +++ /dev/null @@ -1,43 +0,0 @@ -weston-1.5.0/configure.ac: make lcms explicitly configurable - -The lcms package is outside of openembedded-core, so make it -explicitly configurable. Make it deterministic, so that if lcms -dependencies are missing, autoconf throws a fatal error. Follow -upstream style to make it more likely to be merged. - -Upstream-Status: Pending - -Index: weston-1.5.0/configure.ac -=================================================================== ---- weston-1.5.0.orig/configure.ac -+++ weston-1.5.0/configure.ac -@@ -491,12 +491,24 @@ AC_ARG_ENABLE(demo-clients-install, - enable_demo_clients_install=no) - AM_CONDITIONAL(INSTALL_DEMO_CLIENTS, [test "x$enable_demo_clients_install" = "xyes"]) - --PKG_CHECK_MODULES(LCMS, lcms2, -- [have_lcms=yes], [have_lcms=no]) --if test "x$have_lcms" = xyes; then -- AC_DEFINE(HAVE_LCMS, 1, [Have lcms support]) -+AC_ARG_ENABLE(lcms, -+ AS_HELP_STRING([--disable-lcms], -+ [Disable lcms support]),, -+ enable_lcms=auto) -+AM_CONDITIONAL(HAVE_LCMS, [test "x$enable_lcms" = xyes]) -+if test "x$enable_lcms" != "xno"; then -+ PKG_CHECK_MODULES(LCMS, -+ lcms2, -+ [have_lcms=yes], -+ [have_lcms=no]) -+ if test "x$have_lcms" = "xno" -a "x$enable_lcms" = "xyes"; then -+ AC_MSG_ERROR([lcms support explicitly requested, but lcms couldn't be found]) -+ fi -+ if test "x$have_lcms" = "xyes"; then -+ enable_lcms=yes -+ AC_DEFINE(HAVE_LCMS, 1, [Have lcms support]) -+ fi - fi --AM_CONDITIONAL(HAVE_LCMS, [test "x$have_lcms" = xyes]) - - AC_PATH_PROG([wayland_scanner], [wayland-scanner]) - if test x$wayland_scanner = x; then diff --git a/meta-nvidia-extras/recipes/weston/weston/make-libwebp-explicitly-configurable.patch b/meta-nvidia-extras/recipes/weston/weston/make-libwebp-explicitly-configurable.patch deleted file mode 100644 index ad07d4f..0000000 --- a/meta-nvidia-extras/recipes/weston/weston/make-libwebp-explicitly-configurable.patch +++ /dev/null @@ -1,37 +0,0 @@ - -The libwebp package is outside of openembedded-core, so make it -explicitly configurable. Make it deterministic, so that if libwebp -dependencies are missing, autoconf throws a fatal error. - -Upstream-Status: Pending - -Index: weston-1.5.0/configure.ac -=================================================================== ---- weston-1.5.0.orig/configure.ac -+++ weston-1.5.0/configure.ac -@@ -268,9 +268,22 @@ fi - - PKG_CHECK_MODULES(PIXMAN, [pixman-1]) - PKG_CHECK_MODULES(PNG, [libpng]) --PKG_CHECK_MODULES(WEBP, [libwebp], [have_webp=yes], [have_webp=no]) --AS_IF([test "x$have_webp" = "xyes"], -- [AC_DEFINE([HAVE_WEBP], [1], [Have webp])]) -+AC_ARG_ENABLE(webp, -+ AS_HELP_STRING([--disable-webp], -+ [Disable libwebp support]),, -+ enable_webp=auto) -+AM_CONDITIONAL(HAVE_WEBP, [test "x$enable_webp" = xyes]) -+AS_IF([test "x$enable_webp" != "xno"], -+ PKG_CHECK_MODULES(WEBP, -+ [libwebp], -+ [have_webp=yes], -+ [have_webp=no]) -+ AS_IF([test "x$have_webp" = "xno" -a "x$enable_webp" = "xyes"], -+ AC_MSG_ERROR([libwebp support explicitly request, but lipwebp could not be found])) -+ AS_IF([test "x$have_webp" = "xyes"], -+ [enable_webp=yes] -+ [AC_DEFINE([HAVE_WEBP], [1], [Have webp])]) -+) - - AC_ARG_ENABLE(vaapi-recorder, [ --enable-vaapi-recorder],, - enable_vaapi_recorder=auto) diff --git a/meta-nvidia-extras/recipes/weston/weston/weston.desktop b/meta-nvidia-extras/recipes/weston/weston/weston.desktop deleted file mode 100644 index 1086ae8..0000000 --- a/meta-nvidia-extras/recipes/weston/weston/weston.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Type=Application -Name=Weston -Comment=Wayland Compostitor -Exec=weston -Icon=weston -Terminal=false -Categories=Utility; diff --git a/meta-nvidia-extras/recipes/weston/weston/weston.png b/meta-nvidia-extras/recipes/weston/weston/weston.png deleted file mode 100644 index ea8b7e0..0000000 Binary files a/meta-nvidia-extras/recipes/weston/weston/weston.png and /dev/null differ diff --git a/meta-nvidia-extras/recipes/weston/weston/xwayland.weston-start b/meta-nvidia-extras/recipes/weston/weston/xwayland.weston-start deleted file mode 100644 index b483c97..0000000 --- a/meta-nvidia-extras/recipes/weston/weston/xwayland.weston-start +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -if type Xwayland >/dev/null 2>/dev/null; then - mkdir -p /tmp/.X11-unix - - add_weston_argument "--modules=xwayland.so" -fi diff --git a/meta-nvidia-extras/recipes/weston/weston_%.bbappend b/meta-nvidia-extras/recipes/weston/weston_%.bbappend index e9a2154..c58b81b 100644 --- a/meta-nvidia-extras/recipes/weston/weston_%.bbappend +++ b/meta-nvidia-extras/recipes/weston/weston_%.bbappend @@ -1,33 +1,72 @@ -############################################################################ -## -## Copyright (C) 2017 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the Boot to Qt meta layer. -## -## $QT_BEGIN_LICENSE:GPL$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 or (at your option) any later version -## approved by the KDE Free Qt Foundation. The licenses are as published by -## the Free Software Foundation and appearing in the file LICENSE.GPL3 -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################ - -PACKAGECONFIG_remove = "kms" -DEPENDS += "drm" - -TARGET_CFLAGS += "-DWIN_INTERFACE_CUSTOM" +# Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms and conditions of the GNU General Public License, +# version 2, as published by the Free Software Foundation. +# +# This program is distributed in the hope it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for +# more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +LIC_FILES_CHKSUM = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70 \ + file://src/compositor.c;endline=24;md5=70efe6a96837805b300f0317a6306837" + +SRC_URI = "file://${LNX_TOPDIR}/samples/wayland/weston \ + file://NVIDIA-weston-configure.patch" + +FILESEXTRAPATHS_prepend := "${THISDIR}/../${PN}:" +PV = "1.11.0" + +S = "${WORKDIR}/${LNX_TOPDIR}/samples/wayland/weston" +B = "${S}" + +DEPENDS += "wayland-egl tegra-drivers" + +PACKAGECONFIG = "egl kms libinput" + +# Fix warnings by removing redundant configure flags passed to weston +EXTRA_OECONF_remove = "--enable-libinput-backend --disable-webp --disable-lcms" + +# +# Compositor choices +# +# Weston with EGL support +PACKAGECONFIG[egl] = "--enable-egl,--disable-egl,virtual/egl" +# Weston on egloutput +PACKAGECONFIG[kms] = "--enable-drm-compositor,--disable-drm-compositor,drm udev mtdev" + +CFLAGS += " -DWAYLAND=1 " + +LDFLAGS += " -lnvidia-egl-wayland " + +do_configure_prepend() { + cd ${S} + NOCONFIGURE=1 ./autogen.sh + cd ${B} +} + +do_install_append() { + # create dir + install -d ${D}/${ROOT_HOME}/.config + + sed -i 's/\/usr\/local\/bin\/weston-ivi-shell-user-interface/\/usr\/lib\/weston\/weston-ivi-shell-user-interface/g' ${S}/tools/weston.ini + sed -i 's/\/usr\/local\/share\/weston\/background.png/\/usr\/share\/weston\/background.png/g' ${S}/tools/weston.ini + sed -i 's/\/usr\/local\/share\/weston\/panel.png/\/usr\/share\/weston\/panel.png/g' ${S}/tools/weston.ini + sed -i 's/\/usr\/local\/share\/weston\/tiling.png/\/usr\/share\/weston\/tiling.png/g' ${S}/tools/weston.ini + sed -i 's/\/usr\/local\/share\/weston\/sidebyside.png/\/usr\/share\/weston\/sidebyside.png/g' ${S}/tools/weston.ini + sed -i 's/\/usr\/local\/share\/weston\/fullscreen.png/\/usr\/share\/weston\/fullscreen.png/g' ${S}/tools/weston.ini + sed -i 's/\/usr\/local\/share\/weston\/home.png/\/usr\/share\/weston\/home.png/g' ${S}/tools/weston.ini + sed -i 's/\/usr\/local\/share\/weston\/random.png/\/usr\/share\/weston\/random.png/g' ${S}/tools/weston.ini + + # weston.ini + install -m 0775 ${S}/tools/weston.ini ${D}/${ROOT_HOME}/.config + sed -i 's/\/include/\/include\/weston/g' ${D}/usr/lib/pkgconfig/weston.pc +} + +FILES_${PN} += " ${ROOT_HOME}/* ${ROOT_HOME}/.config " + +ALLOW_EMPTY_${PN}-examples = "1" diff --git a/meta-nvidia-extras/recipes/weston/weston_1.9.0.bb b/meta-nvidia-extras/recipes/weston/weston_1.9.0.bb deleted file mode 100644 index 3fdfbab..0000000 --- a/meta-nvidia-extras/recipes/weston/weston_1.9.0.bb +++ /dev/null @@ -1,104 +0,0 @@ -SUMMARY = "Weston, a Wayland compositor" -DESCRIPTION = "Weston is the reference implementation of a Wayland compositor" -HOMEPAGE = "http://wayland.freedesktop.org" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70 \ - file://src/compositor.c;endline=23;md5=1d535fed266cf39f6d8c0647f52ac331" - -SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ - file://weston.png \ - file://weston.desktop \ - file://make-lcms-explicitly-configurable.patch \ - file://make-libwebp-explicitly-configurable.patch \ - file://0001-make-error-portable.patch \ - file://libsystemd.patch \ - file://explicit-enable-disable-systemd.patch \ - file://add-config-option-for-no-input-device.patch \ -" -SRC_URI[md5sum] = "66bbba12f546570b4d97f676bc79a28e" -SRC_URI[sha256sum] = "9c1b03f3184fa0b0dfdf67e215048085156e1a2ca344af6613fed36794ac48cf" - -inherit autotools pkgconfig useradd distro_features_check -# depends on virtual/egl -REQUIRED_DISTRO_FEATURES = "opengl" - -DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0 jpeg" -DEPENDS += "wayland libinput virtual/egl pango wayland-native" - -EXTRA_OECONF = "--enable-setuid-install \ - --enable-simple-clients \ - --enable-clients \ - --enable-demo-clients-install \ - --disable-rpi-compositor \ - --disable-rdp-compositor \ - " - -EXTRA_OECONF_append_qemux86 = "\ - WESTON_NATIVE_BACKEND=fbdev-backend.so \ - " -EXTRA_OECONF_append_qemux86-64 = "\ - WESTON_NATIVE_BACKEND=fbdev-backend.so \ - " -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'launch', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ - " -# -# Compositor choices -# -# Weston on KMS -PACKAGECONFIG[kms] = "--enable-drm-compositor,--disable-drm-compositor,drm udev virtual/mesa mtdev" -# Weston on Wayland (nested Weston) -PACKAGECONFIG[wayland] = "--enable-wayland-compositor,--disable-wayland-compositor,virtual/mesa" -# Weston on X11 -PACKAGECONFIG[x11] = "--enable-x11-compositor,--disable-x11-compositor,virtual/libx11 libxcb libxcb libxcursor cairo" -# Headless Weston -PACKAGECONFIG[headless] = "--enable-headless-compositor,--disable-headless-compositor" -# Weston on framebuffer -PACKAGECONFIG[fbdev] = "--enable-fbdev-compositor,--disable-fbdev-compositor,udev mtdev" -# weston-launch -PACKAGECONFIG[launch] = "--enable-weston-launch,--disable-weston-launch,libpam drm" -# VA-API desktop recorder -PACKAGECONFIG[vaapi] = "--enable-vaapi-recorder,--disable-vaapi-recorder,libva" -# Weston with EGL support -PACKAGECONFIG[egl] = "--enable-egl --enable-simple-egl-clients,--disable-egl --disable-simple-egl-clients,virtual/egl" -# Weston with cairo glesv2 support -PACKAGECONFIG[cairo-glesv2] = "--with-cairo-glesv2,--with-cairo=image,cairo" -# Weston with lcms support -PACKAGECONFIG[lcms] = "--enable-lcms,--disable-lcms,lcms" -# Weston with webp support -PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp" -# Weston with unwinding support -PACKAGECONFIG[libunwind] = "--enable-libunwind,--disable-libunwind,libunwind" -# Weston with systemd-login support -PACKAGECONFIG[systemd] = "--enable-systemd-login,--disable-systemd-login,systemd dbus" -# Weston with Xwayland support -PACKAGECONFIG[xwayland] = "--enable-xwayland,--disable-xwayland,libxcb libxcursor cairo" -# colord CMS support -PACKAGECONFIG[colord] = "--enable-colord,--disable-colord,colord" - -do_install_append() { - # Weston doesn't need the .la files to load modules, so wipe them - rm -f ${D}/${libdir}/weston/*.la - - # If X11, ship a desktop file to launch it - if [ "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" = "x11" ]; then - install -d ${D}${datadir}/applications - install ${WORKDIR}/weston.desktop ${D}${datadir}/applications - - install -d ${D}${datadir}/icons/hicolor/48x48/apps - install ${WORKDIR}/weston.png ${D}${datadir}/icons/hicolor/48x48/apps - fi -} - -PACKAGES += "${PN}-examples" - -FILES_${PN} = "${bindir}/weston ${bindir}/weston-terminal ${bindir}/weston-info ${bindir}/weston-launch ${bindir}/wcap-decode ${libexecdir} ${libdir}/${BPN}/*.so ${datadir}" -FILES_${PN}-examples = "${bindir}/*" - -RDEPENDS_${PN} += "xkeyboard-config" -RRECOMMENDS_${PN} = "liberation-fonts" - -USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "--system weston-launch" -- cgit v1.2.3-54-g00ecf