From 1f764ffe81de51f9c8ee1cbac33abfb2fb3bc722 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 10 Nov 2016 16:59:30 +0200 Subject: tegra: update to latest vibrante pdk [RC 2.5] 25.11.01 Vibrante 4.0 Linux Drive CX2 - PDK Drop support for nvidia-logan Change-Id: I9b2c55f213ff3eb01969a49ad64e596692fcee31 Reviewed-by: Mikko Gronoff Reviewed-by: Teemu Holappa --- .../0001-Disable-LTO-in-LDFLAGS-and-CFLAGS.patch | 18 ---- .../recipes/systemd/systemd_%.bbappend | 2 +- .../recipes/wayland-nv/wayland-nv.bbappend | 49 ---------- .../wayland-nv/wayland-nv/wayland-client.pc | 12 --- .../wayland-nv/wayland-nv/wayland-cursor.pc | 10 -- .../recipes/wayland-nv/wayland-nv/wayland-egl.pc | 11 --- .../wayland-nv/wayland-nv/wayland-server.pc | 12 --- .../wayland/wayland/always-build-scanner.patch | 105 +++++++++++++++++++++ .../recipes/wayland/wayland_%.bbappend | 36 +++++++ meta-vib4-extras/recipes/weston/weston-nv.bbappend | 32 ------- .../weston/disable-wayland-scanner-pkg-check.patch | 13 +++ meta-vib4-extras/recipes/weston/weston_%.bbappend | 36 +++++++ 12 files changed, 191 insertions(+), 145 deletions(-) delete mode 100644 meta-vib4-extras/recipes/systemd/systemd/tegra-t18x/0001-Disable-LTO-in-LDFLAGS-and-CFLAGS.patch delete mode 100644 meta-vib4-extras/recipes/wayland-nv/wayland-nv.bbappend delete mode 100644 meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-client.pc delete mode 100644 meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-cursor.pc delete mode 100644 meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-egl.pc delete mode 100644 meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-server.pc create mode 100644 meta-vib4-extras/recipes/wayland/wayland/always-build-scanner.patch create mode 100644 meta-vib4-extras/recipes/wayland/wayland_%.bbappend delete mode 100644 meta-vib4-extras/recipes/weston/weston-nv.bbappend create mode 100644 meta-vib4-extras/recipes/weston/weston/disable-wayland-scanner-pkg-check.patch create mode 100644 meta-vib4-extras/recipes/weston/weston_%.bbappend (limited to 'meta-vib4-extras') diff --git a/meta-vib4-extras/recipes/systemd/systemd/tegra-t18x/0001-Disable-LTO-in-LDFLAGS-and-CFLAGS.patch b/meta-vib4-extras/recipes/systemd/systemd/tegra-t18x/0001-Disable-LTO-in-LDFLAGS-and-CFLAGS.patch deleted file mode 100644 index 629ccf4..0000000 --- a/meta-vib4-extras/recipes/systemd/systemd/tegra-t18x/0001-Disable-LTO-in-LDFLAGS-and-CFLAGS.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 97a29d6..b0e4060 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -208,10 +208,6 @@ AS_CASE([$CC], [*clang*], - -Wno-gnu-variable-sized-type-not-at-end \ - ])]) - --AS_CASE([$CFLAGS], [*-O[[12345sz\ ]]*], -- [CC_CHECK_FLAGS_APPEND([with_cflags], [CFLAGS], [\ -- -flto -ffat-lto-objects])], -- [AC_MSG_RESULT([skipping -flto, optimization not enabled])]) - AC_SUBST([OUR_CFLAGS], "$with_cflags $sanitizer_cflags") - - AS_CASE([$CFLAGS], [*-O[[12345\ ]]*], --- -2.5.0 - diff --git a/meta-vib4-extras/recipes/systemd/systemd_%.bbappend b/meta-vib4-extras/recipes/systemd/systemd_%.bbappend index dbeb030..53ea1e4 100644 --- a/meta-vib4-extras/recipes/systemd/systemd_%.bbappend +++ b/meta-vib4-extras/recipes/systemd/systemd_%.bbappend @@ -27,4 +27,4 @@ ## ############################################################################ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +SRC_URI_remove = "file://0001-Disable-LTO-in-LDFLAGS-and-CFLAGS.patch" diff --git a/meta-vib4-extras/recipes/wayland-nv/wayland-nv.bbappend b/meta-vib4-extras/recipes/wayland-nv/wayland-nv.bbappend deleted file mode 100644 index f892961..0000000 --- a/meta-vib4-extras/recipes/wayland-nv/wayland-nv.bbappend +++ /dev/null @@ -1,49 +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_append := "${THISDIR}/${PN}:" - -SRC_URI += " \ - file://wayland-client.pc \ - file://wayland-cursor.pc \ - file://wayland-egl.pc \ - file://wayland-server.pc \ - file://${PLATFORM_TOPDIR}/include/wayland-egl-core.h \ - " - -FILES_${PN} += "${libdir}/pkgconfig" - -WAYLAND_PACKAGES += "wayland-dev" - -do_install_append() { - install -d ${D}${libdir}/pkgconfig - install -m 0776 ${WORKDIR}/*.pc ${D}${libdir}/pkgconfig - install -d ${D}${includedir} - install -m 0775 ${PLATFORM_TOPDIR}/include/wayland-egl-core.h ${D}${includedir} -} diff --git a/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-client.pc b/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-client.pc deleted file mode 100644 index e639768..0000000 --- a/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-client.pc +++ /dev/null @@ -1,12 +0,0 @@ -prefix=/usr -exec_prefix=/usr -datarootdir=${prefix}/share -pkgdatadir=/usr/share/wayland -libdir=/usr/lib -includedir=/usr/include - -Name: Wayland Client -Description: Wayland client side library -Version: 1.6.0 -Cflags: -I${includedir} -Libs: -L${libdir} -lwayland-client diff --git a/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-cursor.pc b/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-cursor.pc deleted file mode 100644 index 36538ad..0000000 --- a/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-cursor.pc +++ /dev/null @@ -1,10 +0,0 @@ -prefix=/usr -exec_prefix=/usr -libdir=/usr/lib -includedir=/usr/include - -Name: Wayland Cursor -Description: Wayland cursor helper library -Version: 1.6.0 -Cflags: -I${includedir} -Libs: -L${libdir} -lwayland-cursor diff --git a/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-egl.pc b/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-egl.pc deleted file mode 100644 index dc8393f..0000000 --- a/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-egl.pc +++ /dev/null @@ -1,11 +0,0 @@ -prefix=/usr -exec_prefix=/usr -libdir=/usr/lib -includedir=/usr/include - -Name: wayland-egl -Description: wayland-egl library -Version: 9.1.6 -Libs: -L${libdir} -lwayland-egl -Cflags: -I${includedir} - diff --git a/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-server.pc b/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-server.pc deleted file mode 100644 index dab87b9..0000000 --- a/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-server.pc +++ /dev/null @@ -1,12 +0,0 @@ -prefix=/usr -exec_prefix=/usr -datarootdir=${prefix}/share -pkgdatadir=/usr/share/wayland -libdir=/usr/lib -includedir=/usr/include - -Name: Wayland Server -Description: Server side implementation of the Wayland protocol -Version: 1.6.0 -Cflags: -I${includedir} -Libs: -L${libdir} -lwayland-server diff --git a/meta-vib4-extras/recipes/wayland/wayland/always-build-scanner.patch b/meta-vib4-extras/recipes/wayland/wayland/always-build-scanner.patch new file mode 100644 index 0000000..5e0e6bf --- /dev/null +++ b/meta-vib4-extras/recipes/wayland/wayland/always-build-scanner.patch @@ -0,0 +1,105 @@ +build: always build wayland-scanner + +The previous idiom for building a cross-compiled Wayland is to build once for +the build host (with --enable-scanner --disable-libraries) to get a +wayland-scanner binary that can then be used in a cross-compile (with +--disable-scanner). The problem with this is that the cross wayland is missing +a wayland-scanner binary, which means you then can't do any Wayland development +on the target. + +Instead, always build wayland-scanner for the target and change +--enable/disable-scanner to --with/without-host-scanner. Normal builds use the +default of --without-host-scanner and run the wayland-scanner it just built, and +cross-compiled builds pass --with-host-scanner to use a previously built host +scanner but still get a wayland-scanner to install. + +(a theoretically neater solution would be to build two scanners if required (one +to run and one to install), but automake makes this overly complicated) + +Signed-off-by: Ross Burton +Upstream-Status: Submitted + +diff --git a/Makefile.am b/Makefile.am +index c19494f..c2d929b 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -64,16 +64,17 @@ nodist_libwayland_client_la_SOURCES = \ + + pkgconfig_DATA += src/wayland-client.pc src/wayland-server.pc + +-if ENABLE_SCANNER +-wayland_scanner = $(top_builddir)/wayland-scanner + bin_PROGRAMS = wayland-scanner + wayland_scanner_SOURCES = src/scanner.c + wayland_scanner_CFLAGS = $(EXPAT_CFLAGS) $(AM_CFLAGS) + wayland_scanner_LDADD = $(EXPAT_LIBS) libwayland-util.la +-$(BUILT_SOURCES) : wayland-scanner + pkgconfig_DATA += src/wayland-scanner.pc +-else ++ ++if HOST_SCANNER + wayland_scanner = wayland-scanner ++else ++$(BUILT_SOURCES) : wayland-scanner ++wayland_scanner = $(top_builddir)/wayland-scanner + endif + + protocol/%-protocol.c : $(top_srcdir)/protocol/%.xml +diff --git a/configure.ac b/configure.ac +index c2a804e..de0b02f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -65,11 +65,11 @@ AC_CHECK_DECL(CLOCK_MONOTONIC,[], + [[#include ]]) + AC_CHECK_HEADERS([execinfo.h]) + +-AC_ARG_ENABLE([scanner], +- [AC_HELP_STRING([--disable-scanner], +- [Disable compilation of wayland-scanner])], +- [], +- [enable_scanner=yes]) ++AC_ARG_WITH([host-scanner], ++ [AC_HELP_STRING([--with-host-scanner], ++ [Use a host wayland-scanner])], ++ [], ++ [with_host_scanner=no]) + + AC_ARG_ENABLE([documentation], + [AC_HELP_STRING([--disable-documentation], +@@ -77,25 +77,23 @@ AC_ARG_ENABLE([documentation], + [], + [enable_documentation=yes]) + +-AM_CONDITIONAL(ENABLE_SCANNER, test "x$enable_scanner" = xyes) ++AM_CONDITIONAL(HOST_SCANNER, test "x$with_host_scanner" = xyes) + + AC_ARG_WITH(icondir, [ --with-icondir= Look for cursor icons here], + [ ICONDIR=$withval], + [ ICONDIR=${datadir}/icons]) + AC_SUBST([ICONDIR]) + +-if test "x$enable_scanner" = "xyes"; then +- PKG_CHECK_MODULES(EXPAT, [expat], [], +- [AC_CHECK_HEADERS(expat.h, [], +- [AC_MSG_ERROR([Can't find expat.h. Please install expat.])]) +- SAVE_LIBS="$LIBS" +- AC_SEARCH_LIBS(XML_ParserCreate, expat, [], +- [AC_MSG_ERROR([Can't find expat library. Please install expat.])]) +- EXPAT_LIBS="$LIBS" +- LIBS="$SAVE_LIBS" +- AC_SUBST(EXPAT_LIBS) +- ]) +-fi ++PKG_CHECK_MODULES(EXPAT, [expat], [], ++ [AC_CHECK_HEADERS(expat.h, [], ++ [AC_MSG_ERROR([Can't find expat.h. Please install expat.])]) ++ SAVE_LIBS="$LIBS" ++ AC_SEARCH_LIBS(XML_ParserCreate, expat, [], ++ [AC_MSG_ERROR([Can't find expat library. Please install expat.])]) ++ EXPAT_LIBS="$LIBS" ++ LIBS="$SAVE_LIBS" ++ AC_SUBST(EXPAT_LIBS) ++ ]) + + AC_PATH_PROG(XSLTPROC, xsltproc) + AM_CONDITIONAL([HAVE_XSLTPROC], [test "x$XSLTPROC" != "x"]) diff --git a/meta-vib4-extras/recipes/wayland/wayland_%.bbappend b/meta-vib4-extras/recipes/wayland/wayland_%.bbappend new file mode 100644 index 0000000..463d5a1 --- /dev/null +++ b/meta-vib4-extras/recipes/wayland/wayland_%.bbappend @@ -0,0 +1,36 @@ +############################################################################ +## +## 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_append := ":${NVLAYER_DIR}/packages:${LNX_TOPDIR}/${PN}:${THISDIR}/${PN}" + +SRC_URI_remove = "file://${NVLAYER_DIR}/packages/wayland-1.8.1-src.tar.gz" +SRC_URI = "\ + file://wayland-1.8.1-src.tar.gz \ + file://always-build-scanner.patch \ + " diff --git a/meta-vib4-extras/recipes/weston/weston-nv.bbappend b/meta-vib4-extras/recipes/weston/weston-nv.bbappend deleted file mode 100644 index 31b1ad1..0000000 --- a/meta-vib4-extras/recipes/weston/weston-nv.bbappend +++ /dev/null @@ -1,32 +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$ -## -############################################################################ - -do_install_prepend() { - mv ${WORKDIR}/prebuilt/* ${WORKDIR}/ -} diff --git a/meta-vib4-extras/recipes/weston/weston/disable-wayland-scanner-pkg-check.patch b/meta-vib4-extras/recipes/weston/weston/disable-wayland-scanner-pkg-check.patch new file mode 100644 index 0000000..062da5c --- /dev/null +++ b/meta-vib4-extras/recipes/weston/weston/disable-wayland-scanner-pkg-check.patch @@ -0,0 +1,13 @@ +Index: weston-1.5.0/configure.ac +=================================================================== +--- weston-1.5.0.orig/configure.ac ++++ weston-1.5.0/configure.ac +@@ -503,7 +503,7 @@ if test x$wayland_scanner = x; then + AC_MSG_ERROR([wayland-scanner is needed to compile weston]) + fi + +-PKG_CHECK_MODULES(WAYLAND_SCANNER, wayland-scanner) ++#PKG_CHECK_MODULES(WAYLAND_SCANNER, wayland-scanner) + + AC_CONFIG_FILES([Makefile src/version.h src/weston.pc]) + diff --git a/meta-vib4-extras/recipes/weston/weston_%.bbappend b/meta-vib4-extras/recipes/weston/weston_%.bbappend new file mode 100644 index 0000000..cfc286f --- /dev/null +++ b/meta-vib4-extras/recipes/weston/weston_%.bbappend @@ -0,0 +1,36 @@ +############################################################################ +## +## 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_append := ":${THISDIR}/${PN}" +S = "${WORKDIR}/${LNX_TOPDIR}/samples/wayland/weston" + +do_install_prepend() { + mkdir -p ${WORKDIR}/${LNX_TOPDIR}/samples/weston/tools + cp ${WORKDIR}/${LNX_TOPDIR}/samples/wayland/weston/tools/weston.ini ${WORKDIR}/${LNX_TOPDIR}/samples/weston/tools/weston.ini +} -- cgit v1.2.3-54-g00ecf