xf86-video-imxfb-vivante: Add xf86-video-imxfb-vivante.inc file

Add xf86-video-imxfb-vivante.inc file to avoid duplication for
new releases.

Signed-off-by: Neena Busireddy <neena.busireddy@freescale.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

diff --git a/meta-fsl-arm/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante.inc b/meta-fsl-arm/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante.inc
new file mode 100644 (file)
index 0000000..684cdb4
--- /dev/null
+++ b/meta-fsl-arm/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante.inc
@@ -0,0 +1,79 @@
+# 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"
+
+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/meta-fsl-arm/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_5.0.11.p4.4.bb b/meta-fsl-arm/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_5.0.11.p4.4.bb
index 5430f008b10a08127305eb7cf4ec9f83e28e05d3..669846f1b14dff9162cb97325c177a53bb0f4ee1 100644 (file)
--- a/meta-fsl-arm/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_5.0.11.p4.4.bb
+++ b/meta-fsl-arm/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_5.0.11.p4.4.bb
@@ -2,81 +2,7 @@
 # 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"
+require xf86-video-imxfb-vivante.inc
 
 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)"