[PATCH v2 1/2] xorg-driver: remove the local copies of xorg-driver-*.inc

[PATCH v2 1/2] xorg-driver: remove the local copies of xorg-driver-*.inc

[Max Krummenacher]

recipes-graphics/xorg-driver/xorg-driver-common.inc is identical to the copy
in openembedded-core.
xorg-driver-video.inc lacks the automatic addition of xorg-driver-abi-<ABI>
to RDEPENDS. (and constructs DEPENDS differently but with the same effect)

xf86-video-fbdev must now provide the full relative path for its include file.

fixes:
WARNING: xf86-video-imxfb-vivante-3_5.0.11.p8.6-r0 do_package_qa: QA Issue:
  Package xf86-video-imxfb-vivante contains Xorg driver (vivante_drv.so)
  but no xorg-abi- dependencies [xorg-driver-abi]

and likely but not tested fixes the same warning for xf86-video-fbdev used
for PPC devices.

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
---
 .../xorg-driver/xf86-video-fbdev_0.4.2.bb          |  2 +-
 .../xorg-driver/xorg-driver-common.inc             | 40 ----------------------
 recipes-graphics/xorg-driver/xorg-driver-video.inc |  4 ---
 3 files changed, 1 insertion(+), 45 deletions(-)
 delete mode 100644 recipes-graphics/xorg-driver/xorg-driver-common.inc
 delete mode 100644 recipes-graphics/xorg-driver/xorg-driver-video.inc

diff --git a/recipes-graphics/xorg-driver/xf86-video-fbdev_0.4.2.bb b/recipes-graphics/xorg-driver/xf86-video-fbdev_0.4.2.bb
index 038c421..996a9c7 100644
--- a/recipes-graphics/xorg-driver/xf86-video-fbdev_0.4.2.bb
+++ b/recipes-graphics/xorg-driver/xf86-video-fbdev_0.4.2.bb
@@ -1,4 +1,4 @@
-require xorg-driver-video.inc
+require recipes-graphics/xorg-driver/xorg-driver-video.inc
 LIC_FILES_CHKSUM = "file://COPYING;md5=d8cbd99fff773f92e844948f74ef0df8"
 
 DESCRIPTION = "X.Org X server -- fbdev display driver"
diff --git a/recipes-graphics/xorg-driver/xorg-driver-common.inc b/recipes-graphics/xorg-driver/xorg-driver-common.inc
deleted file mode 100644
index c0f4a15..0000000
--- a/recipes-graphics/xorg-driver/xorg-driver-common.inc
+++ /dev/null
@@ -1,40 +0,0 @@
-DESCRIPTION = "X driver"
-HOMEPAGE = "http://www.x.org"
-SECTION = "x11/drivers"
-LICENSE = "MIT-X"
-INC_PR = "r15"
-
-DEPENDS = "randrproto virtual/xserver-xf86 xproto"
-
-SRC_URI = "${XORG_MIRROR}/individual/driver/${BPN}-${PV}.tar.bz2"
-
-S = "${WORKDIR}/${BPN}-${PV}"
-
-FILES_${PN} += " ${libdir}/xorg/modules"
-FILES_${PN}-dbg +=  "${libdir}/xorg/modules/*/.debug"
-
-inherit autotools pkgconfig
-
-TARGET_CPPFLAGS += "-I${STAGING_DIR_HOST}/usr/include/xorg"
-
-# Another sucky behavor from Xorg configure scripts.
-# They use AC_CHECK_FILE to check for DRI headers. Yuck!
-# Of course this will blow up when cross compiling.
-
-do_configure_prepend() {
-	incdir=${layout_includedir}/xorg
-	for f in dri.h sarea.h dristruct.h exa.h damage.h xf86Module.h; do
-		path="$incdir/$f"
-		if [ -f "${STAGING_DIR_HOST}/$path" ]; then
-			p=`echo "$path" | sed 'y%*+%pp%;s%[^_[:alnum:]]%_%g'`
-			eval "export ac_cv_file_$p=yes"
-		fi
-	done
-}
-
-# FIXME: We don't want to include the libtool archives (*.la) from modules
-# directory, as they serve no useful purpose. Upstream should fix Makefile.am
-do_install_append() {
-	find ${D}${libdir}/xorg/modules -regex ".*\.la$" | xargs rm -f --
-}
-
diff --git a/recipes-graphics/xorg-driver/xorg-driver-video.inc b/recipes-graphics/xorg-driver/xorg-driver-video.inc
deleted file mode 100644
index bce8c9a..0000000
--- a/recipes-graphics/xorg-driver/xorg-driver-video.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-include xorg-driver-common.inc
-
-DEPENDS = "randrproto renderproto videoproto xextproto fontsproto xproto"
-
-- 
2.6.6

[PATCH v2 2/2] xf86-video-imxfb-vivante: cleanup

[Max Krummenacher]

The build starts since commit meta-fsl-arm da0581341a58dfe393a829b3c402330c73589963
with the make file in ${S} which is actually named Makefile, thus there is no
need to override base.do_compile or pass the directory and name of the
make file in EXTRA_OEMAKE.

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
---
 recipes-graphics/xorg-driver/xf86-video-imxfb-vivante.inc | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante.inc b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante.inc
index 8bac151..e284fbc 100644
--- a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante.inc
+++ b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante.inc
@@ -19,7 +19,7 @@ INITSCRIPT_PACKAGES = "xserver-xorg-extension-viv-autohdmi"
 INITSCRIPT_NAME = "rc.autohdmi"
 INITSCRIPT_PARAMS = "start 99 2 3 4 5 ."
 
-EXTRA_OEMAKE += "-C ${S} -f Makefile prefix=${D}/usr \
+EXTRA_OEMAKE += "prefix=${D}/usr \
                  sysroot=${STAGING_DIR_TARGET} \
                  LFLAGS="${LDFLAGS}" \
                  BUSID_HAS_NUMBER=1 \
@@ -42,13 +42,6 @@ do_configure_prepend () {
             ${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}
-- 
2.6.6