6 files changed, 11 insertions, 11 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 fa590361f..9ce509361 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 recipes-graphics/xorg-driver/xf86-input-common.inc
+require recipes-graphics/xorg-driver/xorg-driver-input.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 = "r16"
+PR = "${INC_PR}.0"
 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 71b7cbc9d..a6e49a51f 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 recipes-graphics/xorg-driver/xf86-input-common.inc
+require recipes-graphics/xorg-driver/xorg-driver-input.inc
 DESCRIPTION = "X.Org X server -- void input driver"
-PR = "r16"
+PR = "${INC_PR}.0"
 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 4c8570447..23da38686 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,8 +1,8 @@
-require recipes-graphics/xorg-driver/xf86-video-common.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"
-PR = "r16"
+PR = "${INC_PR}.0"
 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 e44cf49c6..2327054fa 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 recipes-graphics/xorg-driver/xf86-video-common.inc
+require recipes-graphics/xorg-driver/xorg-driver-video.inc
 LIC_FILES_CHKSUM = "file://COPYING;md5=f8ad89d9d9a024f19d7dcc5acb044a42"
 DESCRIPTION = "X.org server -- Geode GX2/LX display driver"
-PR = "r16"
+PR = "${INC_PR}.0"
 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 3608fb205..5d752dbf7 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 recipes-graphics/xorg-driver/xf86-video-common.inc
+require recipes-graphics/xorg-driver/xorg-driver-video.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 = "r16"
+PR = "${INC_PR}.0"
 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 e30972c9f..a73b5e662 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,4 +1,4 @@
-require recipes-graphics/xorg-driver/xf86-driver-common.inc
+require recipes-graphics/xorg-driver/xorg-driver-common.inc
 DESCRIPTION = "X.Org X server -- OMAP display driver"
 PV = "0.1.1+${PR}+gitr${SRCREV}"

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 fa590361f..9ce509361 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 @@
1	require recipes-graphics/xorg-driver/xf86-input-common.inc	1	require recipes-graphics/xorg-driver/xorg-driver-input.inc
2	DESCRIPTION = "X.Org X server -- tslib input driver"	2	DESCRIPTION = "X.Org X server -- tslib input driver"
3	DEPENDS += "tslib"	3	DEPENDS += "tslib"
4	RRECOMMENDS_${PN} += "tslib-calibrate"	4	RRECOMMENDS_${PN} += "tslib-calibrate"
@@ -8,7 +8,7 @@ RSUGGESTS_${PN} += "hal"
8	LIC_FILES_CHKSUM = "file://src/tslib.c;endline=28;md5=bd62eaef222dcf5cd59e490a12bd795e \	8	LIC_FILES_CHKSUM = "file://src/tslib.c;endline=28;md5=bd62eaef222dcf5cd59e490a12bd795e \
9	file://COPYING;md5=4641deddaa80fe7ca88e944e1fd94a94"	9	file://COPYING;md5=4641deddaa80fe7ca88e944e1fd94a94"
10		10
11	PR = "r16"	11	PR = "${INC_PR}.0"
12		12
13	SRC_URI = "http://www.pengutronix.de/software/xf86-input-tslib/download/xf86-input-tslib-${PV}.tar.bz2;name=archive \	13	SRC_URI = "http://www.pengutronix.de/software/xf86-input-tslib/download/xf86-input-tslib-${PV}.tar.bz2;name=archive \
14	file://double-free-crash.patch \	14	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 71b7cbc9d..a6e49a51f 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 @@
1	require recipes-graphics/xorg-driver/xf86-input-common.inc	1	require recipes-graphics/xorg-driver/xorg-driver-input.inc
2	DESCRIPTION = "X.Org X server -- void input driver"	2	DESCRIPTION = "X.Org X server -- void input driver"
3	PR = "r16"	3	PR = "${INC_PR}.0"
4		4
5	LIC_FILES_CHKSUM = "file://COPYING;md5=4be6a915bfbf111cd88706fc6a6f141b"	5	LIC_FILES_CHKSUM = "file://COPYING;md5=4be6a915bfbf111cd88706fc6a6f141b"
6		6


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 4c8570447..23da38686 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,8 +1,8 @@
1	require recipes-graphics/xorg-driver/xf86-video-common.inc	1	require recipes-graphics/xorg-driver/xorg-driver-video.inc
2	LIC_FILES_CHKSUM = "file://COPYING;md5=d8cbd99fff773f92e844948f74ef0df8"	2	LIC_FILES_CHKSUM = "file://COPYING;md5=d8cbd99fff773f92e844948f74ef0df8"
3		3
4	DESCRIPTION = "X.Org X server -- fbdev display driver"	4	DESCRIPTION = "X.Org X server -- fbdev display driver"
5	PR = "r16"	5	PR = "${INC_PR}.0"
6		6
7	SRC_URI[md5sum] = "53a533d9e0c2da50962282526bace074"	7	SRC_URI[md5sum] = "53a533d9e0c2da50962282526bace074"
8	SRC_URI[sha256sum] = "93b271b4b41d7e5ca108849a583b9523e96c51813d046282285355b7001f82d5"	8	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 e44cf49c6..2327054fa 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 @@
1	require recipes-graphics/xorg-driver/xf86-video-common.inc	1	require recipes-graphics/xorg-driver/xorg-driver-video.inc
2	LIC_FILES_CHKSUM = "file://COPYING;md5=f8ad89d9d9a024f19d7dcc5acb044a42"	2	LIC_FILES_CHKSUM = "file://COPYING;md5=f8ad89d9d9a024f19d7dcc5acb044a42"
3		3
4	DESCRIPTION = "X.org server -- Geode GX2/LX display driver"	4	DESCRIPTION = "X.org server -- Geode GX2/LX display driver"
5	PR = "r16"	5	PR = "${INC_PR}.0"
6		6
7	SRC_URI[md5sum] = "a99c521db731c2f1df309057a8465e4c"	7	SRC_URI[md5sum] = "a99c521db731c2f1df309057a8465e4c"
8	SRC_URI[sha256sum] = "28d845d727d99bfa4d4b93c5486ec01b72eb222e0910a766089db1103b1c2d92"	8	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 3608fb205..5d752dbf7 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 @@
1	require recipes-graphics/xorg-driver/xf86-video-common.inc	1	require recipes-graphics/xorg-driver/xorg-driver-video.inc
2	DESCRIPTION = "X.Org X server -- Glamo display driver with KMS support"	2	DESCRIPTION = "X.Org X server -- Glamo display driver with KMS support"
3	DEPENDS += "libdrm"	3	DEPENDS += "libdrm"
4		4
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d8cbd99fff773f92e844948f74ef0df8"
7	RDEPENDS_${PN} = "xserver-xorg-extension-dri xserver-xorg-extension-dri2 xserver-xorg-extension-glx"	7	RDEPENDS_${PN} = "xserver-xorg-extension-dri xserver-xorg-extension-dri2 xserver-xorg-extension-glx"
8	PE = "2"	8	PE = "2"
9	PV = "1.0.0+gitr${SRCPV}"	9	PV = "1.0.0+gitr${SRCPV}"
10	PR = "r16"	10	PR = "${INC_PR}.0"
11		11
12	SRC_URI = "git://git.openmoko.org/git/xf86-video-glamo.git;protocol=git;branch=master \	12	SRC_URI = "git://git.openmoko.org/git/xf86-video-glamo.git;protocol=git;branch=master \
13	file://0001-glamo-kms-driver-drop-unused-xf86_config.patch \	13	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 e30972c9f..a73b5e662 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,4 +1,4 @@
1	require recipes-graphics/xorg-driver/xf86-driver-common.inc	1	require recipes-graphics/xorg-driver/xorg-driver-common.inc
2		2
3	DESCRIPTION = "X.Org X server -- OMAP display driver"	3	DESCRIPTION = "X.Org X server -- OMAP display driver"
4	PV = "0.1.1+${PR}+gitr${SRCREV}"	4	PV = "0.1.1+${PR}+gitr${SRCREV}"