From 633ec62ae090e7bc9b5bd2c8bc0732fde4e9fdf8 Mon Sep 17 00:00:00 2001 From: Lauren Post Date: Thu, 2 Apr 2015 15:38:37 -0500 Subject: xf86-video-imxfb-vivante: Upgrade to 5.0.11.p4.4 version - Change version to align to same version used for imx-gpu-viv - Update rc.autohdmi to handle more error cases Change-Id: I26c3342f7f6ecffc4ca975bc83795ea38f5feb17 Signed-off-by: Lauren Post Signed-off-by: Otavio Salvador --- .../xf86-video-imxfb-vivante/rc.autohdmi | 24 +++++-- .../xf86-video-imxfb-vivante_3.10.53-1.1.0.bb | 82 ---------------------- .../xf86-video-imxfb-vivante_5.0.11.p4.4.bb | 82 ++++++++++++++++++++++ 3 files changed, 99 insertions(+), 89 deletions(-) delete mode 100644 recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_3.10.53-1.1.0.bb create mode 100644 recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_5.0.11.p4.4.bb diff --git a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/rc.autohdmi b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/rc.autohdmi index 3a49e22..8c16a1d 100644 --- a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/rc.autohdmi +++ b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/rc.autohdmi @@ -9,21 +9,31 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin -do_start() { - export DISPLAY=:0 - autohdmi & - exit 0 -} +# Source function library. +. /etc/init.d/functions case "$1" in start) - do_start + echo -n "Starting autohdmi: " + export DISPLAY=:0 + autohdmi & + echo + exit 0 ;; - restart|reload|force-reload) + reload|force-reload) echo "Error: argument '$1' not supported" >&2 exit 3 ;; stop) + echo -n "Shutting down autohdmi: " + killproc autohdmi + echo + ;; + restart) + echo -n "Restarting autohdmi: " + $0 stop + $0 start + echo ;; *) echo "Usage: $0 start|stop" >&2 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 deleted file mode 100644 index 5e1eec7..0000000 --- a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_3.10.53-1.1.0.bb +++ /dev/null @@ -1,82 +0,0 @@ -# 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 update-rc.d pkgconfig - -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 \ - file://rc.autohdmi" - -SRC_URI[md5sum] = "3ffa0f66bc0935a50cda9ebd5240ee2d" -SRC_URI[sha256sum] = "f5836d86944a667f9fd1789911cdb7d8c54f6158a7776d28124942c4a94ddff6" - -INITSCRIPT_PACKAGES = "xserver-xorg-extension-viv-autohdmi" -INITSCRIPT_NAME = "rc.autohdmi" -INITSCRIPT_PARAMS = "start 99 2 3 4 5 ." - -EXTRA_OEMAKE += "-C ${S} -d -f Makefile 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}/" - -PACKAGES =+ "xserver-xorg-extension-viv-autohdmi" - -# 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} - - 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-mx6 \ - 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)" diff --git a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_5.0.11.p4.4.bb b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_5.0.11.p4.4.bb new file mode 100644 index 0000000..5430f00 --- /dev/null +++ b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_5.0.11.p4.4.bb @@ -0,0 +1,82 @@ +# 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 update-rc.d pkgconfig + +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 \ + file://rc.autohdmi" + +SRC_URI[md5sum] = "6003295f7d586e5b6d4b5ffdb5d2f700" +SRC_URI[sha256sum] = "9ca2356ca35a734615a205cf307b3c41f6e22c171ff823b6d5422c5473a69947" + +INITSCRIPT_PACKAGES = "xserver-xorg-extension-viv-autohdmi" +INITSCRIPT_NAME = "rc.autohdmi" +INITSCRIPT_PARAMS = "start 99 2 3 4 5 ." + +EXTRA_OEMAKE += "-C ${S} -d -f Makefile 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}/" + +PACKAGES =+ "xserver-xorg-extension-viv-autohdmi" + +# 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} + + 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-mx6 \ + 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)" -- cgit v1.2.3-54-g00ecf