xorg-driver: remove the local copies of xorg-driver-*.inc

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>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

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 038c421dba77ca1ffa8a65bcdf3be5fbabd29c51..996a9c7f35742f27e6880abe53a6ea9051c659d7 100644 (file)
--- 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 (file)
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 (file)
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"
-