9 files changed, 11 insertions, 63 deletions

diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib_0.0.6.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib_0.0.6.bb
index d5d11ce15..fa590361f 100644
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib_0.0.6.bb
+++ b/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib_0.0.6.bb
@@ -1,4 +1,4 @@
-require xorg-driver-input.inc
+require recipes-graphics/xorg-driver/xf86-input-common.inc
 DESCRIPTION = "X.Org X server -- tslib input driver"
 DEPENDS += "tslib"
 RRECOMMENDS_${PN} += "tslib-calibrate"
@@ -8,7 +8,7 @@ RSUGGESTS_${PN} += "hal"
 LIC_FILES_CHKSUM = "file://src/tslib.c;endline=28;md5=bd62eaef222dcf5cd59e490a12bd795e \
                     file://COPYING;md5=4641deddaa80fe7ca88e944e1fd94a94"
 
-PR = "${INC_PR}.1"
+PR = "r16"
 
 SRC_URI = "http://www.pengutronix.de/software/xf86-input-tslib/download/xf86-input-tslib-${PV}.tar.bz2;name=archive \
            file://double-free-crash.patch \
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-input-void_1.4.0.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-input-void_1.4.0.bb
index 32ebbeb5f..71b7cbc9d 100644
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-input-void_1.4.0.bb
+++ b/meta-oe/recipes-graphics/xorg-driver/xf86-input-void_1.4.0.bb
@@ -1,6 +1,6 @@
-require xorg-driver-input.inc
+require recipes-graphics/xorg-driver/xf86-input-common.inc
 DESCRIPTION = "X.Org X server -- void input driver"
-PR = "${INC_PR}.0"
+PR = "r16"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=4be6a915bfbf111cd88706fc6a6f141b"
 
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-fbdev_0.4.2.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-fbdev_0.4.2.bb
index d555fbc4b..4c8570447 100644
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-fbdev_0.4.2.bb
+++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-fbdev_0.4.2.bb
@@ -1,9 +1,8 @@
-require xorg-driver-video.inc
+require recipes-graphics/xorg-driver/xf86-video-common.inc
 LIC_FILES_CHKSUM = "file://COPYING;md5=d8cbd99fff773f92e844948f74ef0df8"
 
 DESCRIPTION = "X.Org X server -- fbdev display driver"
-PE = "1"
-PR = "${INC_PR}.1"
+PR = "r16"
 
 SRC_URI[md5sum] = "53a533d9e0c2da50962282526bace074"
 SRC_URI[sha256sum] = "93b271b4b41d7e5ca108849a583b9523e96c51813d046282285355b7001f82d5"
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-geode_2.11.12.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-geode_2.11.12.bb
index 595ebee13..e44cf49c6 100644
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-geode_2.11.12.bb
+++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-geode_2.11.12.bb
@@ -1,8 +1,8 @@
-require xorg-driver-video.inc
+require recipes-graphics/xorg-driver/xf86-video-common.inc
 LIC_FILES_CHKSUM = "file://COPYING;md5=f8ad89d9d9a024f19d7dcc5acb044a42"
 
 DESCRIPTION = "X.org server -- Geode GX2/LX display driver"
-PR = "${INC_PR}.0"
+PR = "r16"
 
 SRC_URI[md5sum] = "a99c521db731c2f1df309057a8465e4c"
 SRC_URI[sha256sum] = "28d845d727d99bfa4d4b93c5486ec01b72eb222e0910a766089db1103b1c2d92"
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb
index b1030d910..3608fb205 100644
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb
+++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb
@@ -1,4 +1,4 @@
-require xorg-driver-video.inc
+require recipes-graphics/xorg-driver/xf86-video-common.inc
 DESCRIPTION = "X.Org X server -- Glamo display driver with KMS support"
 DEPENDS += "libdrm"
 
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d8cbd99fff773f92e844948f74ef0df8"
 RDEPENDS_${PN} = "xserver-xorg-extension-dri xserver-xorg-extension-dri2 xserver-xorg-extension-glx"
 PE = "2"
 PV = "1.0.0+gitr${SRCPV}"
-PR = "${INC_PR}.6"
+PR = "r16"
 
 SRC_URI = "git://git.openmoko.org/git/xf86-video-glamo.git;protocol=git;branch=master \
            file://0001-glamo-kms-driver-drop-unused-xf86_config.patch \
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
index 2cc744f41..e30972c9f 100644
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
+++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
@@ -1,11 +1,8 @@
 require recipes-graphics/xorg-driver/xf86-driver-common.inc
 
-INC_PR ?= "r15"
-
 DESCRIPTION = "X.Org X server -- OMAP display driver"
-PE = "1"
 PV = "0.1.1+${PR}+gitr${SRCREV}"
-PR = "${INC_PR}.4"
+PR = "r16"
 
 LICENSE = "MIT-X"
 LIC_FILES_CHKSUM = "file://src/omapfb-driver.c;beginline=1;endline=30;md5=a44c2a37e04d1c2c5f0313afb493f833"
diff --git a/meta-oe/recipes-graphics/xorg-driver/xorg-driver-common.inc b/meta-oe/recipes-graphics/xorg-driver/xorg-driver-common.inc
deleted file mode 100644
index c0f4a15ad..000000000
--- a/meta-oe/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/meta-oe/recipes-graphics/xorg-driver/xorg-driver-input.inc b/meta-oe/recipes-graphics/xorg-driver/xorg-driver-input.inc
deleted file mode 100644
index e44dbd58f..000000000
--- a/meta-oe/recipes-graphics/xorg-driver/xorg-driver-input.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-include xorg-driver-common.inc
-
-DEPENDS = "randrproto inputproto xserver-xorg xproto"
-
diff --git a/meta-oe/recipes-graphics/xorg-driver/xorg-driver-video.inc b/meta-oe/recipes-graphics/xorg-driver/xorg-driver-video.inc
deleted file mode 100644
index 36b5b7595..000000000
--- a/meta-oe/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 xserver-xorg xproto"
-