From b6d3702140176f3fa78222ef33282c0d948faa50 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Thu, 7 Dec 2017 11:30:59 -0600 Subject: xf86-video-imxfb-vivante: Upgrade to 6.2.2.p0 Signed-off-by: Tom Hochstein Signed-off-by: Otavio Salvador --- recipes-graphics/xorg-driver/xf86-video-imxfb-vivante.inc | 14 +++++++------- .../xorg-driver/xf86-video-imxfb-vivante_5.0.11.p8.6.bb | 10 ---------- .../xorg-driver/xf86-video-imxfb-vivante_6.2.2.p0.bb | 9 +++++++++ 3 files changed, 16 insertions(+), 17 deletions(-) delete mode 100644 recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_5.0.11.p8.6.bb create mode 100644 recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_6.2.2.p0.bb diff --git a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante.inc b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante.inc index e284fbce..c16da671 100644 --- a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante.inc +++ b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante.inc @@ -8,12 +8,14 @@ PE = "3" inherit autotools-brokensep update-rc.d pkgconfig -DEPENDS += "virtual/xserver virtual/libx11 virtual/libgal-x11 imx-gpu-viv pixman" +DEPENDS += "virtual/xserver virtual/libx11 virtual/libgal-x11 imx-gpu-viv virtual/libg2d pixman" LIC_FILES_CHKSUM = "file://COPYING-MIT;md5=b5e9d9f5c02ea831ab3ecf802bb7c4f3" -SRC_URI = "${FSL_MIRROR}/xserver-xorg-video-imx-viv-${PV}.tar.gz \ - file://rc.autohdmi" +SRC_URI = "git://source.codeaurora.org/external/imx/xf86-video-imx-vivante.git;protocol=https;branch=${SRCBRANCH} \ + file://rc.autohdmi" + +S = "${WORKDIR}/git/" INITSCRIPT_PACKAGES = "xserver-xorg-extension-viv-autohdmi" INITSCRIPT_NAME = "rc.autohdmi" @@ -30,8 +32,6 @@ CFLAGS += "-I${STAGING_INCDIR}/xorg \ -I${STAGING_INCDIR}/drm \ -I../../DRI_1.10.4/src" -S = "${WORKDIR}/xserver-xorg-video-imx-viv-${PV}/" - PACKAGES =+ "xserver-xorg-extension-viv-autohdmi" # FIXME: The Freescale provided Makefile has hardcodec include paths @@ -53,7 +53,7 @@ do_install_append () { find ${D}${includedir} -type f -exec chmod 660 {} \; } -RDEPENDS_${PN} += "libvivante-dri-mx6 \ +RDEPENDS_${PN} += "libvivante-dri-imx \ xserver-xorg-module-exa \ mesa-driver-swrast \ xserver-xorg-extension-dri \ @@ -70,4 +70,4 @@ FILES_${PN}-dbg = "${libdir}/*/*/*/.debug ${libdir}/.debug/libfsl_x11_ext${SOLIB 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)" +COMPATIBLE_MACHINE = "(mx6|mx7ulp)" diff --git a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_5.0.11.p8.6.bb b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_5.0.11.p8.6.bb deleted file mode 100644 index 91456f22..00000000 --- a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_5.0.11.p8.6.bb +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright (C) 2012-2016 Freescale Semiconductor -# Copyright (C) 2012-2014 O.S. Systems Software LTDA. -# Released under the MIT license (see COPYING.MIT for the terms) - -require xf86-video-imxfb-vivante.inc - -SRC_URI += "file://Stop-using-Git-to-write-local-version.patch" - -SRC_URI[md5sum] = "8acbdddd51c9b1b0fd25137eeabd786d" -SRC_URI[sha256sum] = "3eed38193e31bb5ba8d2c817bd9b4f6e2fe7540d2cab36de9098cb4f11946a9f" diff --git a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_6.2.2.p0.bb b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_6.2.2.p0.bb new file mode 100644 index 00000000..5514962f --- /dev/null +++ b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_6.2.2.p0.bb @@ -0,0 +1,9 @@ +# Copyright (C) 2012-2016 Freescale Semiconductor +# Copyright (C) 2012-2014 O.S. Systems Software LTDA. +# Copyright 2017 NXP +# Released under the MIT license (see COPYING.MIT for the terms) + +require xf86-video-imxfb-vivante.inc + +SRCBRANCH = "nxp/imx_4.9.11_1.0.0_ga" +SRCREV = "07ef065dfe09f1c05a1a188c371577faa3677a17" -- cgit v1.2.3-54-g00ecf