imx graphics: revert out of tree updates

meta-freescale master (for zeus) now updates to these recipes versions.
Drop these here.

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>

14 files changed, 0 insertions, 408 deletions

diff --git a/recipes-graphics/drm/libdrm_2.4.91.imx.bbappend b/recipes-graphics/drm/libdrm_2.4.91.imx.bbappend
index 810f3a5..0589710 100644
--- a/recipes-graphics/drm/libdrm_2.4.91.imx.bbappend
+++ b/recipes-graphics/drm/libdrm_2.4.91.imx.bbappend
@@ -1,2 +1 @@
-SRCREV = "95645843f59495387a072d48374718f22e69d7a4"
 RDEPENDS_${PN}_append_imxgpu = " ${PN}-etnaviv ${PN}-vivante"
diff --git a/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.4.8.bbappend b/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.4.8.bbappend
deleted file mode 100644
index 32ce0ea..0000000
--- a/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.4.8.bbappend
+++ /dev/null
@@ -1,5 +0,0 @@
-# update to 1.7.0
-PV = "1.7.0"
-LIC_FILES_CHKSUM = "file://COPYING;md5=80c0478f4339af024519b3723023fe28"
-SRC_URI[md5sum] = "a47ae6db002b47031e44d8402c40604e"
-SRC_URI[sha256sum] = "5a2785ba1f4e4ea6f61ab98f8408600adca9decd66511e6665023325184bf7e9"
diff --git a/recipes-graphics/imx-gpu-g2d/imx-gpu-g2d_6.2.4.p1.8.bbappend b/recipes-graphics/imx-gpu-g2d/imx-gpu-g2d_6.2.4.p1.8.bbappend
deleted file mode 100644
index 92ce045..0000000
--- a/recipes-graphics/imx-gpu-g2d/imx-gpu-g2d_6.2.4.p1.8.bbappend
+++ /dev/null
@@ -1,12 +0,0 @@
-PV = "6.2.4.p4.0"
-SRC_URI[aarch64.md5sum] = "ec8d8662ac31b96122a1af7736831482"
-SRC_URI[aarch64.sha256sum] = "362265b9c6c6ce05b1fafb412efe6617cf142669eb21302beec5e87ebbfe6a25"
-SRC_URI[arm.md5sum] = "bb1ef2e365b5d72e2a03c3b39d2016cc"
-SRC_URI[arm.sha256sum] = "27557094f4b5e7bef87c73131959503f3d0c3a6ea1c4f010d86c1668078f7f22"
-LIC_FILES_CHKSUM = "file://COPYING;md5=80c0478f4339af024519b3723023fe28"
-FSLBIN_NAME_arm = "${PN}-${PV}-arm"
-# implement that this is not for COMPATIBLE_MACHINE_imxdpu
-COMPATIBLE_MACHINE_2D          = "(^$)"
-COMPATIBLE_MACHINE_2D_imxgpu2d = "${MACHINE}"
-COMPATIBLE_MACHINE             = "${COMPATIBLE_MACHINE_2D}"
-COMPATIBLE_MACHINE_imxdpu      = "(^$)"
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_%.bbappend b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_%.bbappend
deleted file mode 100644
index 225dc4a..0000000
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_%.bbappend
+++ /dev/null
@@ -1,17 +0,0 @@
-#update to 6.2.4.p4.0
-PV = "6.2.4.p4.0-aarch32"
-PV_aarch64 = "6.2.4.p4.0-aarch64"
-LIC_FILES_CHKSUM = "file://COPYING;md5=80c0478f4339af024519b3723023fe28"
-SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true"
-MD5SUM_arm = "83c40f63358dd3bd9bbc1cd7521bf8fe"
-SHA256SUM_arm = "5abfc3b24c1f9d02970064898fb30da705b67bc7e967dbfbf0525c1cc60f2491"
-MD5SUM_aarch64 = "a937571f6ecf85bdff1dfb3b6c834ed0"
-SHA256SUM_aarch64 = "1eb4ebe2fa11d8fb7beb8fc7046bb57093fd416d0a401608d78cd48b65624fcd"
-SRC_URI[md5sum] = "${MD5SUM}"
-SRC_URI[sha256sum] = "${SHA256SUM}"
-
-# prevent pulling *-dev by packaging needed *.so in regular packages, not
-# in imx-gpu-viv-dev.
-INSANE_SKIP_libclc-imx += "dev-so"
-FILES_libclc-imx = "${libdir}/libCLC${SOLIBS} ${libdir}/libLLVM_viv${SOLIBS}"
-FILES_libvulkan-imx = "${libdir}/vulkan/libvulkan_VSI${SOLIBS} ${libdir}/libSPIRV_viv${SOLIBS}"
diff --git a/recipes-graphics/wayland/weston/0001-make-error-portable.patch b/recipes-graphics/wayland/weston/0001-make-error-portable.patch
deleted file mode 100644
index dc6fbaa..0000000
--- a/recipes-graphics/wayland/weston/0001-make-error-portable.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 6ef33e86557c59b31c9b731c0360ec1d404cc801 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 29 May 2015 20:56:00 -0700
-Subject: [PATCH] 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 <raj.khem@gmail.com>
-Upstream-Status: Submitted
-
----
- configure.ac              |  2 ++
- libweston/weston-error.h  | 20 ++++++++++++++++++++
- libweston/weston-launch.c |  2 +-
- 3 files changed, 23 insertions(+), 1 deletion(-)
- create mode 100644 libweston/weston-error.h
-
-diff --git a/configure.ac b/configure.ac
-index 9d98e84..8f6b80d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -109,6 +109,8 @@ AC_CHECK_DECL(CLOCK_MONOTONIC,[],
- 	      [[#include <time.h>]])
- AC_CHECK_HEADERS([execinfo.h])
- 
-+AC_CHECK_HEADERS([error.h])
-+
- AC_CHECK_FUNCS([mkostemp strchrnul initgroups posix_fallocate])
- 
- # check for libdrm as a build-time dependency only
-diff --git a/libweston/weston-error.h b/libweston/weston-error.h
-new file mode 100644
-index 0000000..2089d02
---- /dev/null
-+++ b/libweston/weston-error.h
-@@ -0,0 +1,20 @@
-+#ifndef _WESTON_ERROR_H
-+#define _WESTON_ERROR_H
-+
-+#if defined(HAVE_ERROR_H)
-+#include <error.h>
-+#else
-+#include <err.h>
-+#include <string.h>
-+#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/libweston/weston-launch.c b/libweston/weston-launch.c
-index bf73e0d..9064439 100644
---- a/libweston/weston-launch.c
-+++ b/libweston/weston-launch.c
-@@ -33,7 +33,6 @@
- #include <poll.h>
- #include <errno.h>
- 
--#include <error.h>
- #include <getopt.h>
- 
- #include <sys/types.h>
-@@ -59,6 +58,7 @@
- #endif
- 
- #include "weston-launch.h"
-+#include "weston-error.h"
- 
- #define DRM_MAJOR 226
- 
diff --git a/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch b/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch
deleted file mode 100644
index cbb1c32..0000000
--- a/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch
+++ /dev/null
@@ -1,173 +0,0 @@
-From d5fb8567868866665502106def90017243a968a8 Mon Sep 17 00:00:00 2001
-From: Tom Hochstein <tom.hochstein@nxp.com>
-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 <tom.hochstein@nxp.com>
-Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
-
----
- configure.ac              |  9 +++++++--
- libweston/weston-launch.c | 20 ++++++++++++++++++++
- 2 files changed, 27 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 8f6b80d..603fcb3 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -494,13 +494,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")
-@@ -748,6 +752,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 9064439..c6abe92 100644
---- a/libweston/weston-launch.c
-+++ b/libweston/weston-launch.c
-@@ -51,7 +51,9 @@
- 
- #include <pwd.h>
- #include <grp.h>
-+#ifdef HAVE_PAM
- #include <security/pam_appl.h>
-+#endif
- 
- #ifdef HAVE_SYSTEMD_LOGIN
- #include <systemd/sd-login.h>
-@@ -101,8 +103,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];
-@@ -191,6 +195,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,
-@@ -231,6 +236,7 @@ setup_pam(struct weston_launch *wl)
- 
- 	return 0;
- }
-+#endif
- 
- static int
- setup_launcher_socket(struct weston_launch *wl)
-@@ -424,6 +430,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)
-@@ -431,6 +438,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))
-@@ -610,6 +618,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) {
-@@ -618,6 +627,7 @@ setup_session(struct weston_launch *wl, char **child_argv)
- 		}
- 		free(env);
- 	}
-+#endif
- 
- 	/*
- 	 * We open a new session, so it makes sense
-@@ -685,8 +695,10 @@ 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"
- 			"                  e.g. -u joe, requires root.\n");
-+#endif
- 	fprintf(stderr, "  -t, --tty       Start session on alternative tty,\n"
- 			"                  e.g. -t /dev/tty4, requires -u option.\n");
- 	fprintf(stderr, "  -v, --verbose   Be verbose\n");
-@@ -700,7 +712,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' },
-@@ -712,9 +726,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;
-@@ -755,8 +773,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);
diff --git a/recipes-graphics/wayland/weston/0001-weston.ini-using-argb8888-as-gbm-default-on-mscale-8.patch b/recipes-graphics/wayland/weston/0001-weston.ini-using-argb8888-as-gbm-default-on-mscale-8.patch
deleted file mode 100644
index 75589d3..0000000
--- a/recipes-graphics/wayland/weston/0001-weston.ini-using-argb8888-as-gbm-default-on-mscale-8.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 186ec0c80410b2120b8f31c211cb44a836c84522 Mon Sep 17 00:00:00 2001
-From: Haihua Hu <jared.hu@nxp.com>
-Date: Wed, 4 Jul 2018 16:05:20 +0800
-Subject: [PATCH] weston.ini: using argb8888 as gbm default on mscale 850D
-
-mscale 850D video playback need using pixel alpha for graphic layer
-
-upstream status: imx specific
-Signed-off-by: Haihua Hu <jared.hu@nxp.com>
-
----
- weston.ini.in | 1 +
- 1 file changed, 1 insertion(+)
-
-Index: git/weston.ini.in
-===================================================================
---- git.orig/weston.ini.in
-+++ git/weston.ini.in
-@@ -2,6 +2,7 @@
- # i.MX: Disable idle timeout
- idle-time=0
- #use-g2d=1
-+gbm-format=argb8888
- 
- [libinput]
- touchscreen_calibrator=true
diff --git a/recipes-graphics/wayland/weston/0002-weston.ini-configure-desktop-shell-size-in-weston-co.patch b/recipes-graphics/wayland/weston/0002-weston.ini-configure-desktop-shell-size-in-weston-co.patch
deleted file mode 100644
index 4aa3256..0000000
--- a/recipes-graphics/wayland/weston/0002-weston.ini-configure-desktop-shell-size-in-weston-co.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 3012798d7e9c9e624024fc962d749a960289ad8b Mon Sep 17 00:00:00 2001
-From: Haihua Hu <jared.hu@nxp.com>
-Date: Wed, 11 Jul 2018 17:47:47 +0800
-Subject: [PATCH] weston.ini: configure desktop shell size in weston configure
- file
-
-mscale 850D need set desktop shell to 1080p
-
-upstream status: imx specific
-Signed-off-by: Haihua Hu <jared.hu@nxp.com>
-
----
- weston.ini.in | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/weston.ini.in b/weston.ini.in
-index bd8abe4..077155b 100644
---- a/weston.ini.in
-+++ b/weston.ini.in
-@@ -8,6 +8,8 @@ gbm-format=argb8888
- #mode=1920x1080@60
- #transform=90
- 
-+[shell]
-+size=1920x1080
- 
- #[output]
- #name=HDMI-A-2
diff --git a/recipes-graphics/wayland/weston/0003-weston-touch-calibrator-Advertise-the-touchscreen-ca.patch b/recipes-graphics/wayland/weston/0003-weston-touch-calibrator-Advertise-the-touchscreen-ca.patch
deleted file mode 100644
index 7ea07ed..0000000
--- a/recipes-graphics/wayland/weston/0003-weston-touch-calibrator-Advertise-the-touchscreen-ca.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 46843c8681ddafbea6f491b7af4de6529e93f5bd Mon Sep 17 00:00:00 2001
-From: Jun Zhu <junzhu@nxp.com>
-Date: Sun, 30 Sep 2018 15:31:26 +0800
-Subject: [PATCH] weston-touch-calibrator: Advertise the touchscreen calibrator
- interface to all clients. [YOCIMX-2963]
-
-Set touchscreen_calibrator to true in the section "libinput" of the configure file
- /etc/xdg/weston/weston.ini.
-Otherwise, it will report that the new-added interface "weston-touch-calibration" cannot be found.
-
-Signed-off-by: Jun Zhu <junzhu@nxp.com>
-
----
- weston.ini.in | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/weston.ini.in b/weston.ini.in
-index 83dd56e..6e20e11 100644
---- a/weston.ini.in
-+++ b/weston.ini.in
-@@ -3,6 +3,9 @@
- idle-time=0
- #use-g2d=1
- 
-+[libinput]
-+touchscreen_calibrator=true
-+
- #[output]
- #name=HDMI-A-1
- #mode=1920x1080@60
diff --git a/recipes-graphics/wayland/weston/weston.desktop b/recipes-graphics/wayland/weston/weston.desktop
deleted file mode 100644
index 1086ae8..0000000
--- a/recipes-graphics/wayland/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/recipes-graphics/wayland/weston/weston.png b/recipes-graphics/wayland/weston/weston.png
deleted file mode 100644
index ea8b7e0..0000000
--- a/recipes-graphics/wayland/weston/weston.png
+++ /dev/null
diff --git a/recipes-graphics/wayland/weston/xwayland.weston-start b/recipes-graphics/wayland/weston/xwayland.weston-start
deleted file mode 100644
index b483c97..0000000
--- a/recipes-graphics/wayland/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/recipes-graphics/wayland/weston_4.0.0.imx.bbappend b/recipes-graphics/wayland/weston_4.0.0.imx.bbappend
deleted file mode 100644
index 7b99e14..0000000
--- a/recipes-graphics/wayland/weston_4.0.0.imx.bbappend
+++ /dev/null
@@ -1,21 +0,0 @@
-PV = "5.0.0.imx"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70 \
-                    file://libweston/compositor.c;endline=26;md5=f47553ae598090444273db00adfb5b66"
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/weston:"
-SRCBRANCH = "weston-imx-5.0"
-SRC_URI = "git://source.codeaurora.org/external/imx/weston-imx.git;protocol=https;branch=${SRCBRANCH} \
-           file://weston.png \
-           file://weston.desktop \
-           file://0001-make-error-portable.patch \
-           file://xwayland.weston-start \
-           file://0001-weston-launch-Provide-a-default-version-that-doesn-t.patch \
-           file://0003-weston-touch-calibrator-Advertise-the-touchscreen-ca.patch \
-           file://weston.ini \
-"
-
-# Use argb8888 as gbm-format for i.MX8MQ only
-SRC_URI_append_mx8mq = " file://0001-weston.ini-using-argb8888-as-gbm-default-on-mscale-8.patch \
-                         file://0002-weston.ini-configure-desktop-shell-size-in-weston-co.patch \
-"
-SRCREV = "fb563901657b296c7c7c86d26602a622429e334f"
diff --git a/recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.2.4.p1.8.bbappend b/recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.2.4.p1.8.bbappend
deleted file mode 100644
index 0ec725f..0000000
--- a/recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.2.4.p1.8.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-PV = "6.2.4.p4.0"
-SRCREV = "b765c3ffc0dcc4246afa659aa0d59f78a6736b08"
\ No newline at end of file