From 927b31771dabe686a2eaa002b4e4c66c1f1a20b9 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Wed, 20 Jun 2018 17:15:47 -0500 Subject: xf86-video-imx-vivante: Remove fb from name The driver is no longer only for framebuffer, so remove the designation from the name. Signed-off-by: Tom Hochstein Signed-off-by: Otavio Salvador --- conf/machine/include/imx-base.inc | 2 +- recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc | 2 +- .../xorg-driver/xf86-video-imx-vivante/rc.autohdmi | 42 ++++++++++++++ .../xf86-video-imx-vivante_6.2.4.p1.2.bb | 65 ++++++++++++++++++++++ .../xf86-video-imxfb-vivante/rc.autohdmi | 42 -------------- .../xf86-video-imxfb-vivante_6.2.4.p1.2.bb | 65 ---------------------- 6 files changed, 109 insertions(+), 109 deletions(-) create mode 100644 recipes-graphics/xorg-driver/xf86-video-imx-vivante/rc.autohdmi create mode 100644 recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.2.4.p1.2.bb delete mode 100644 recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/rc.autohdmi delete mode 100644 recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_6.2.4.p1.2.bb diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 472bcde71..916e16bdc 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc @@ -31,7 +31,7 @@ UBOOT_ENTRYPOINT_vf = "0x80008000" PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" XSERVER_DRIVER = "xf86-video-fbdev" -XSERVER_DRIVER_imxgpu2d = "xf86-video-imxfb-vivante" +XSERVER_DRIVER_imxgpu2d = "xf86-video-imx-vivante" XSERVER_DRIVER_vf = "xf86-video-modesetting" XSERVER_DRIVER_use-mainline-bsp = "xf86-video-armada" XSERVER = "xserver-xorg \ diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc index f47bd9738..b97d7c353 100644 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc @@ -331,7 +331,7 @@ RDEPENDS_libvivante-dri-imx = "libdrm" INSANE_SKIP_libwayland-viv-imx += "dev-so" FILES_libwayland-viv-imx = "${libdir}/libwayland-viv${REALSOLIBS} ${libdir}/libwayland-viv${SOLIBS}" FILES_libwayland-viv-imx-dev = "${includedir}/wayland-viv ${libdir})/libwayland-viv${SOLIBSDEV} ${libdir}/pkgconfig/wayland-viv.pc" -RPROVIDES_libwayland-viv-imx += "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'xf86-video-imxfb-vivante', '', d)}" +RPROVIDES_libwayland-viv-imx += "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'xf86-video-imx-vivante', '', d)}" INSANE_SKIP_libgc-wayland-protocol-imx += "dev-so" FILES_libgc-wayland-protocol-imx = "${libdir}/libgc_wayland_protocol${REALSOLIBS} ${libdir}/libgc_wayland_protocol${SOLIBS}" diff --git a/recipes-graphics/xorg-driver/xf86-video-imx-vivante/rc.autohdmi b/recipes-graphics/xorg-driver/xf86-video-imx-vivante/rc.autohdmi new file mode 100644 index 000000000..8c16a1d7f --- /dev/null +++ b/recipes-graphics/xorg-driver/xf86-video-imx-vivante/rc.autohdmi @@ -0,0 +1,42 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: rc.autohdmi +# Required-Start: $all +# Required-Stop: +# Default-Start: 2 3 4 5 +# Default-Stop: +### END INIT INFO + +PATH=/sbin:/usr/sbin:/bin:/usr/bin + +# Source function library. +. /etc/init.d/functions + +case "$1" in + start) + echo -n "Starting autohdmi: " + export DISPLAY=:0 + autohdmi & + echo + exit 0 + ;; + 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 + exit 3 + ;; +esac diff --git a/recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.2.4.p1.2.bb b/recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.2.4.p1.2.bb new file mode 100644 index 000000000..04ae36cf1 --- /dev/null +++ b/recipes-graphics/xorg-driver/xf86-video-imx-vivante_6.2.4.p1.2.bb @@ -0,0 +1,65 @@ +# 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 virtual/libgal-x11 imx-gpu-viv virtual/libg2d pixman" + +LIC_FILES_CHKSUM = "file://COPYING-MIT;md5=b5e9d9f5c02ea831ab3ecf802bb7c4f3" + +SRCREV = "946e8603ed9a52f36d305405dbb2ab8ff90943d0" +SRCBRANCH = "imx_exa_viv6_g2d" +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" +INITSCRIPT_PARAMS = "start 99 2 3 4 5 ." + +EXTRA_OEMAKE += "prefix=${exec_prefix} \ + sysroot=${STAGING_DIR_TARGET} \ + SDKTARGETSYSROOT=${STAGING_DIR_HOST} \ + LFLAGS="${LDFLAGS}" \ + BUSID_HAS_NUMBER=1 \ + BUILD_IN_YOCTO=1 \ + XSERVER_GREATER_THAN_13=1" + +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|mx7ulp)" diff --git a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/rc.autohdmi b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/rc.autohdmi deleted file mode 100644 index 8c16a1d7f..000000000 --- a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/rc.autohdmi +++ /dev/null @@ -1,42 +0,0 @@ -#! /bin/sh -### BEGIN INIT INFO -# Provides: rc.autohdmi -# Required-Start: $all -# Required-Stop: -# Default-Start: 2 3 4 5 -# Default-Stop: -### END INIT INFO - -PATH=/sbin:/usr/sbin:/bin:/usr/bin - -# Source function library. -. /etc/init.d/functions - -case "$1" in - start) - echo -n "Starting autohdmi: " - export DISPLAY=:0 - autohdmi & - echo - exit 0 - ;; - 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 - exit 3 - ;; -esac diff --git a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_6.2.4.p1.2.bb b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_6.2.4.p1.2.bb deleted file mode 100644 index 04ae36cf1..000000000 --- a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_6.2.4.p1.2.bb +++ /dev/null @@ -1,65 +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 virtual/libgal-x11 imx-gpu-viv virtual/libg2d pixman" - -LIC_FILES_CHKSUM = "file://COPYING-MIT;md5=b5e9d9f5c02ea831ab3ecf802bb7c4f3" - -SRCREV = "946e8603ed9a52f36d305405dbb2ab8ff90943d0" -SRCBRANCH = "imx_exa_viv6_g2d" -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" -INITSCRIPT_PARAMS = "start 99 2 3 4 5 ." - -EXTRA_OEMAKE += "prefix=${exec_prefix} \ - sysroot=${STAGING_DIR_TARGET} \ - SDKTARGETSYSROOT=${STAGING_DIR_HOST} \ - LFLAGS="${LDFLAGS}" \ - BUSID_HAS_NUMBER=1 \ - BUILD_IN_YOCTO=1 \ - XSERVER_GREATER_THAN_13=1" - -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|mx7ulp)" -- cgit v1.2.3-54-g00ecf