Signed-off-by: Tom Hochstein <tom.hochst...@nxp.com> --- recipes-graphics/xorg-driver/xf86-video-imxfb-vivante.inc | 8 +++----- .../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, 12 insertions(+), 15 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 a6d722b..c16da67 100644 --- a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante.inc +++ b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante.inc @@ -8,7 +8,7 @@ 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" @@ -32,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 @@ -55,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 \ @@ -72,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 a15033e..0000000 --- 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" - -SRCBRANCH = "nxp/imx_4.9.11_1.0.0_ga" -SRCREV = "07ef065dfe09f1c05a1a188c371577faa3677a17" 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 0000000..5514962 --- /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" -- 1.9.1 -- _______________________________________________ meta-freescale mailing list meta-freescale@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-freescale