From 175897fd342126b673b19e596e8fca52a610955b Mon Sep 17 00:00:00 2001
From: Arturo Buzarra <arturo.buzarra@digi.com>
Date: Mon, 6 Apr 2020 17:57:35 +0200
Subject: [PATCH] zeus migration: xf86-video-imx-vivante: update recipe to
 v6.4.0.p0.0

https://jira.digi.com/browse/DEL-7013

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
---
 .../xorg-driver/xf86-video-imx-vivante.inc    | 68 -------------------
 .../xf86-video-imx-vivante_6.2.4.p1.8.bb      |  3 -
 .../xf86-video-imx-vivante_6.4.0.p0.0.bb      |  8 +++
 3 files changed, 8 insertions(+), 71 deletions(-)
 delete mode 100644 meta-digi-dey/recipes-graphics/xorg-driver/xf86-video-imx-vivante.inc
 delete mode 100644 meta-digi-dey/recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.2.4.p1.8.bb
 create mode 100644 meta-digi-dey/recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.4.0.p0.0.bb

diff --git a/meta-digi-dey/recipes-graphics/xorg-driver/xf86-video-imx-vivante.inc b/meta-digi-dey/recipes-graphics/xorg-driver/xf86-video-imx-vivante.inc
deleted file mode 100644
index 1db4d40ce..000000000
--- a/meta-digi-dey/recipes-graphics/xorg-driver/xf86-video-imx-vivante.inc
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright (C) 2012-2016 Freescale Semiconductor
-# Copyright (C) 2012-2018 O.S. Systems Software LTDA.
-# Copyright 2017-2018 NXP
-# Released under the MIT license (see COPYING.MIT for the terms)
-
-require recipes-graphics/xorg-driver/xorg-driver-video.inc
-
-PE = "3"
-
-inherit autotools-brokensep update-rc.d pkgconfig
-
-DEPENDS += "virtual/xserver virtual/libx11 libgal-imx imx-gpu-viv virtual/libg2d pixman"
-
-# Patch for MX8 DRM_VIV
-RDEPENDS_${PN}_append_mx8 = " kernel-module-vivante"
-
-LIC_FILES_CHKSUM = "file://COPYING-MIT;md5=b5e9d9f5c02ea831ab3ecf802bb7c4f3"
-
-SRCBRANCH = "imx_exa_viv6_g2d"
-XF86_VIDEO_IMX_VIVANTE_SRC ?= "git://source.codeaurora.org/external/imx/xf86-video-imx-vivante.git;protocol=https"
-SRC_URI  = "${XF86_VIDEO_IMX_VIVANTE_SRC};branch=${SRCBRANCH}"
-SRC_URI += "file://rc.autohdmi"
-
-S = "${WORKDIR}/git/"
-
-INITSCRIPT_PACKAGES = "xserver-xorg-extension-viv-autohdmi"
-INITSCRIPT_NAME = "rc.autohdmi"
-INITSCRIPT_PARAMS = "start 99 2 3 4 5 ."
-
-EXTRA_OEMAKE += "prefix=${exec_prefix} \
-                 sysroot=${STAGING_DIR_TARGET} \
-                 SDKTARGETSYSROOT=${STAGING_DIR_HOST} \
-                 BUSID_HAS_NUMBER=1 \
-                 BUILD_IN_YOCTO=1 \
-                 XSERVER_GREATER_THAN_13=1"
-TARGET_CC_ARCH += "${LDFLAGS}"
-
-PACKAGES =+ "xserver-xorg-extension-viv-autohdmi"
-
-do_install_append () {
-    install -d ${D}${includedir}
-    cp -axr ${S}/EXA/src/vivante_gal/vivante_priv.h ${D}${includedir}
-    cp -axr ${S}/EXA/src/vivante_gal/vivante_gal.h ${D}${includedir}
-
-    install -d ${D}/${sysconfdir}/init.d
-    install -m 755 ${WORKDIR}/rc.autohdmi ${D}/${sysconfdir}/init.d/rc.autohdmi
-
-    find ${D}${includedir} -type f -exec chmod 660 {} \;
-}
-
-RDEPENDS_${PN} += "libvivante-dri-imx \
-                   xserver-xorg-module-exa \
-                   mesa-driver-swrast \
-                   xserver-xorg-extension-dri \
-                   xserver-xorg-extension-dri2 \
-                   xserver-xorg-extension-glx"
-
-REALSOLIBS := "${SOLIBS}"
-SOLIBS = "${SOLIBSDEV}"
-
-FILES_${PN} = "${libdir}/*/*/*/vivante_drv${SOLIBS}"
-FILES_${PN}-dev = "${includedir} /usr/src ${libdir}/libfsl_x11_ext${SOLIBSDEV}"
-FILES_${PN}-dbg = "${libdir}/*/*/*/.debug ${libdir}/.debug/libfsl_x11_ext${SOLIBS} ${exec_prefix}/bin/.debug/autohdmi"
-
-FILES_xserver-xorg-extension-viv-autohdmi = " ${libdir}/libfsl_x11_ext${SOLIBS} ${exec_prefix}/bin/autohdmi ${sysconfdir}/init.d/rc.autohdmi"
-
-PACKAGE_ARCH = "${MACHINE_SOCARCH}"
-COMPATIBLE_MACHINE = "(mx6|mx8|mx7ulp)"
diff --git a/meta-digi-dey/recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.2.4.p1.8.bb b/meta-digi-dey/recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.2.4.p1.8.bb
deleted file mode 100644
index c169884d8..000000000
--- a/meta-digi-dey/recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.2.4.p1.8.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require recipes-graphics/xorg-driver/xf86-video-imx-vivante.inc
-
-SRCREV = "b765c3ffc0dcc4246afa659aa0d59f78a6736b08" 
diff --git a/meta-digi-dey/recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.4.0.p0.0.bb b/meta-digi-dey/recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.4.0.p0.0.bb
new file mode 100644
index 000000000..1ffa47136
--- /dev/null
+++ b/meta-digi-dey/recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.4.0.p0.0.bb
@@ -0,0 +1,8 @@
+require recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.2.4.p4.0.bb
+
+XF86_VIDEO_IMX_VIVANTE_SRC ?= "git://source.codeaurora.org/external/imx/xf86-video-imx-vivante.git;protocol=https"
+SRC_URI = " \
+    ${XF86_VIDEO_IMX_VIVANTE_SRC};branch=${SRCBRANCH} \
+    file://rc.autohdmi \
+"
+SRCREV = "c828e8a7c38743e960967e7bb78c134cec31c102"