Revert "tegra: update to latest vibrante pdk"

Problems with eglfs, so revert back to previous PDK.

This reverts commit 323408406d9133a5462a24fea4ec86e649088180.

Change-Id: I3ee36809cb823aefdc03f8a24d052c2a76f308db
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>

10 files changed, 85 insertions, 131 deletions

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
new file mode 100644
index 0000000..629ccf4
--- /dev/null
+++ b/meta-vib4-extras/recipes/systemd/systemd/tegra-t18x/0001-Disable-LTO-in-LDFLAGS-and-CFLAGS.patch
@@ -0,0 +1,18 @@
+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 53ea1e4..dbeb030 100644
--- a/meta-vib4-extras/recipes/systemd/systemd_%.bbappend
+++ b/meta-vib4-extras/recipes/systemd/systemd_%.bbappend
@@ -27,4 +27,4 @@
 ##
 ############################################################################
 
-SRC_URI_remove = "file://0001-Disable-LTO-in-LDFLAGS-and-CFLAGS.patch"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-vib4-extras/recipes/weston/weston_%.bbappend b/meta-vib4-extras/recipes/wayland-nv/wayland-nv.bbappend
index cfc286f..f892961 100644
--- a/meta-vib4-extras/recipes/weston/weston_%.bbappend
+++ b/meta-vib4-extras/recipes/wayland-nv/wayland-nv.bbappend
@@ -27,10 +27,23 @@
 ##
 ############################################################################
 
-FILESEXTRAPATHS_append := ":${THISDIR}/${PN}"
-S = "${WORKDIR}/${LNX_TOPDIR}/samples/wayland/weston"
+FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
 
-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
+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
new file mode 100644
index 0000000..e639768
--- /dev/null
+++ b/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-client.pc
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 0000000..36538ad
--- /dev/null
+++ b/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-cursor.pc
@@ -0,0 +1,10 @@
+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
new file mode 100644
index 0000000..dc8393f
--- /dev/null
+++ b/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-egl.pc
@@ -0,0 +1,11 @@
+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
new file mode 100644
index 0000000..dab87b9
--- /dev/null
+++ b/meta-vib4-extras/recipes/wayland-nv/wayland-nv/wayland-server.pc
@@ -0,0 +1,12 @@
+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
deleted file mode 100644
index 5e0e6bf..0000000
--- a/meta-vib4-extras/recipes/wayland/wayland/always-build-scanner.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-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 <ross.burton@intel.com>
-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 <time.h>]])
- 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=<dir>    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/weston/weston-nv.bbappend
index 463d5a1..31b1ad1 100644
--- a/meta-vib4-extras/recipes/wayland/wayland_%.bbappend
+++ b/meta-vib4-extras/recipes/weston/weston-nv.bbappend
@@ -27,10 +27,6 @@
 ##
 ############################################################################
 
-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 \
-    "
+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
deleted file mode 100644
index 062da5c..0000000
--- a/meta-vib4-extras/recipes/weston/weston/disable-wayland-scanner-pkg-check.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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])
-