From f0440193ddb3eafa1b00aed294ed6dbd3e4d604d Mon Sep 17 00:00:00 2001 From: Neena Busireddy Date: Fri, 23 Jan 2015 22:44:02 -0600 Subject: xf86-video-imxfb-vivante: Upgrade to 3.10.53-1.1.0 GA release Signed-off-by: Neena Busireddy Signed-off-by: Otavio Salvador --- ...R00333447-Fix-EXA-driver-for-Xserver-1.16.patch | 82 ---------------------- .../xf86-video-imxfb-vivante_3.10.31-1.1.0.bb | 62 ---------------- .../xf86-video-imxfb-vivante_3.10.53-1.1.0.bb | 61 ++++++++++++++++ 3 files changed, 61 insertions(+), 144 deletions(-) delete mode 100644 recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/ENGR00333447-Fix-EXA-driver-for-Xserver-1.16.patch delete mode 100644 recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_3.10.31-1.1.0.bb create mode 100644 recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_3.10.53-1.1.0.bb diff --git a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/ENGR00333447-Fix-EXA-driver-for-Xserver-1.16.patch b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/ENGR00333447-Fix-EXA-driver-for-Xserver-1.16.patch deleted file mode 100644 index 0010123..0000000 --- a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/ENGR00333447-Fix-EXA-driver-for-Xserver-1.16.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 1bfebbaf840d987aa0e5d4143b6658bad5a21a0b Mon Sep 17 00:00:00 2001 -From: Prabhu Sundararaj -Date: Tue, 30 Sep 2014 12:09:54 -0500 -Subject: [PATCH] ENGR00333447 : Fix EXA driver for Xserver 1.16 - -Fix const char error occurs with Xserver 1.16 and loadextension change - -Upstream-Status: Pending - -Signed-off-by: Prabhu Sundararaj ---- - EXA/src/vivante_fbdev/imx_display.c | 2 +- - EXA/src/vivante_fbdev/vivante_fbdev_driver.c | 18 +++++++++++++++--- - 2 files changed, 16 insertions(+), 4 deletions(-) - -diff --git a/EXA/src/vivante_fbdev/imx_display.c b/EXA/src/vivante_fbdev/imx_display.c -index 94f561a..d5303f9 100644 ---- a/EXA/src/vivante_fbdev/imx_display.c -+++ b/EXA/src/vivante_fbdev/imx_display.c -@@ -956,7 +956,7 @@ imxDisplayDeleteModes(DisplayModePtr modesList) - } - - if (NULL != mode->name) { -- free(mode->name); -+ free((char*)mode->name); - } - free(mode); - } -diff --git a/EXA/src/vivante_fbdev/vivante_fbdev_driver.c b/EXA/src/vivante_fbdev/vivante_fbdev_driver.c -index 63996b1..3e289ce 100644 ---- a/EXA/src/vivante_fbdev/vivante_fbdev_driver.c -+++ b/EXA/src/vivante_fbdev/vivante_fbdev_driver.c -@@ -120,8 +120,9 @@ static Bool tearingWrapSurfaces(ScrnInfoPtr pScrn); - - static Bool noVIVExtension; - --static ExtensionModule VIVExt = -+static ExtensionModule VIVExt[] = - { -+ { - VIVExtensionInit, - VIVEXTNAME, - &noVIVExtension -@@ -130,6 +131,7 @@ static ExtensionModule VIVExt = - NULL, - NULL - #endif -+ } - }; - - Bool vivEnableCacheMemory = TRUE; -@@ -266,7 +268,17 @@ FBDevSetup(pointer module, pointer opts, int *errmaj, int *errmin) - setupDone = TRUE; - xf86AddDriver(&FBDEV, module, HaveDriverFuncs); - if(gVivFb) -- LoadExtension(&VIVExt, FALSE); -+ { -+#if XORG_VERSION_CURRENT < (((1) * 10000000) + ((16) * 100000) + ((0) * 1000) + 0) -+ int i; -+ for(i=0; icurrentMode) -- modeName = pScrn->currentMode->name; -+ modeName = (char*)pScrn->currentMode->name; - - if(!imxLoadSyncFlags(pScrn, modeName, &fbSync)) { - xf86DrvMsg(pScrn->scrnIndex, X_WARNING, --- -2.1.1 - diff --git a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_3.10.31-1.1.0.bb b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_3.10.31-1.1.0.bb deleted file mode 100644 index 9fc41cd..0000000 --- a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_3.10.31-1.1.0.bb +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright (C) 2012-2014 Freescale Semiconductor -# Copyright (C) 2012-2014 O.S. Systems Software LTDA. -# 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 - -DEPENDS += "virtual/xserver virtual/libx11 virtual/libgal-x11 gpu-viv-bin-mx6q pixman" - -LIC_FILES_CHKSUM = "file://EXA/src/vivante_fbdev/vivante.h;endline=19;md5=95cf961a2ceacdf7cf43caef25766779" - -SRC_URI = "${FSL_MIRROR}/xserver-xorg-video-imx-viv-${PV}-beta.tar.gz \ - file://ENGR00333447-Fix-EXA-driver-for-Xserver-1.16.patch" -SRC_URI[md5sum] = "5695e9a3ddc37da0e783862e4108fbae" -SRC_URI[sha256sum] = "c08def7fb98c11cba08bc21522bfb2785576b77db4b36954b15926401ac31c0e" - -EXTRA_OEMAKE += "-C EXA/src -f makefile.linux prefix=${D}/usr \ - sysroot=${STAGING_DIR_TARGET} \ - BUSID_HAS_NUMBER=1 \ - BUILD_IN_YOCTO=1 \ - XSERVER_GREATER_THAN_13=1" - -CFLAGS += "-I${STAGING_INCDIR}/xorg \ - -I${STAGING_INCDIR}/drm \ - -I../../DRI_1.10.4/src" - -S = "${WORKDIR}/xserver-xorg-video-imx-viv-${PV}-beta/" - -# FIXME: The Freescale provided Makefile has hardcodec include paths -# and this does not work in case prefix is different than /usr, -# sed it. -do_configure_prepend () { - sed -i 's,$(sysroot)/usr/include,${STAGING_INCDIR},g' \ - ${S}EXA/src/makefile.linux -} - -# FIXME: This is need as Freescale didn't use standard Makefile filename -# thus oe_runmame thinks nothing is need to be done, use ln to -# workaround it. -base_do_compile () { - oe_runmake || die "make failed" -} - -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} - find ${D}${includedir} -type f -exec chmod 660 {} \; -} - -RDEPENDS_${PN} += "libvivante-dri-mx6 \ - xserver-xorg-module-exa \ - mesa-driver-swrast \ - xserver-xorg-extension-dri \ - xserver-xorg-extension-dri2 \ - xserver-xorg-extension-glx" - -PACKAGE_ARCH = "${MACHINE_SOCARCH}" -COMPATIBLE_MACHINE = "(mx6)" diff --git a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_3.10.53-1.1.0.bb b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_3.10.53-1.1.0.bb new file mode 100644 index 0000000..0b5e9ff --- /dev/null +++ b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_3.10.53-1.1.0.bb @@ -0,0 +1,61 @@ +# Copyright (C) 2012-2015 Freescale Semiconductor +# Copyright (C) 2012-2014 O.S. Systems Software LTDA. +# 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 + +DEPENDS += "virtual/xserver virtual/libx11 virtual/libgal-x11 imx-gpu-viv pixman" + +LIC_FILES_CHKSUM = "file://EXA/src/vivante_fbdev/vivante.h;endline=19;md5=95cf961a2ceacdf7cf43caef25766779" + +SRC_URI = "${FSL_MIRROR}/xserver-xorg-video-imx-viv-${PV}.tar.gz" +SRC_URI[md5sum] = "3ffa0f66bc0935a50cda9ebd5240ee2d" +SRC_URI[sha256sum] = "f5836d86944a667f9fd1789911cdb7d8c54f6158a7776d28124942c4a94ddff6" + +EXTRA_OEMAKE += "-C EXA/src -f makefile.linux prefix=${D}/usr \ + sysroot=${STAGING_DIR_TARGET} \ + BUSID_HAS_NUMBER=1 \ + BUILD_IN_YOCTO=1 \ + XSERVER_GREATER_THAN_13=1" + +CFLAGS += "-I${STAGING_INCDIR}/xorg \ + -I${STAGING_INCDIR}/drm \ + -I../../DRI_1.10.4/src" + +S = "${WORKDIR}/xserver-xorg-video-imx-viv-${PV}/" + +# FIXME: The Freescale provided Makefile has hardcodec include paths +# and this does not work in case prefix is different than /usr, +# sed it. +do_configure_prepend () { + sed -i 's,$(sysroot)/usr/include,${STAGING_INCDIR},g' \ + ${S}EXA/src/makefile.linux +} + +# FIXME: This is need as Freescale didn't use standard Makefile filename +# thus oe_runmame thinks nothing is need to be done, use ln to +# workaround it. +base_do_compile () { + oe_runmake || die "make failed" +} + +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} + find ${D}${includedir} -type f -exec chmod 660 {} \; +} + +RDEPENDS_${PN} += "libvivante-dri-mx6 \ + xserver-xorg-module-exa \ + mesa-driver-swrast \ + xserver-xorg-extension-dri \ + xserver-xorg-extension-dri2 \ + xserver-xorg-extension-glx" + +PACKAGE_ARCH = "${MACHINE_SOCARCH}" +COMPATIBLE_MACHINE = "(mx6)" -- cgit v1.2.3-54-g00ecf