xorg-lib: use INC_PR

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

134 files changed, 134 insertions, 93 deletions

diff --git a/recipes/xorg-lib/libapplewm_1.0.0.bb b/recipes/xorg-lib/libapplewm_1.0.0.bb
index f21a1f829d..ad64db00c4 100644
--- a/recipes/xorg-lib/libapplewm_1.0.0.bb
+++ b/recipes/xorg-lib/libapplewm_1.0.0.bb
@@ -1,10 +1,10 @@
 require xorg-lib-common.inc
 
 DEPENDS += "libxext applewmproto"
-PR = "r1"
 PE = "1"
 
 XORG_PN = "libAppleWM"
 
 SRC_URI[archive.md5sum] = "48a403c45be2206ee900729ced3a0e62"
 SRC_URI[archive.sha256sum] = "ecd2ff407a418eb4ac673f48b4d0a9c5b6860a13cef7211a32fe8f3d3db0407e"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libapplewm_1.4.0.bb b/recipes/xorg-lib/libapplewm_1.4.0.bb
index 47aefb515a..08d480d9ee 100644
--- a/recipes/xorg-lib/libapplewm_1.4.0.bb
+++ b/recipes/xorg-lib/libapplewm_1.4.0.bb
@@ -1,10 +1,10 @@
 require xorg-lib-common.inc
 
 DEPENDS += "libxext applewmproto"
-PR = "r1"
 PE = "1"
 
 XORG_PN = "libAppleWM"
 
 SRC_URI[archive.md5sum] = "75e27245bc15aed845fe0505f4f21ca6"
 SRC_URI[archive.sha256sum] = "c8e92616ad465ce2ae86360ff216a9711bdd1156dbb06af6d86009c6773e1c82"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libdmx_1.0.2.bb b/recipes/xorg-lib/libdmx_1.0.2.bb
index add5046455..a013b86140 100644
--- a/recipes/xorg-lib/libdmx_1.0.2.bb
+++ b/recipes/xorg-lib/libdmx_1.0.2.bb
@@ -2,8 +2,8 @@ require xorg-lib-common.inc
 
 DESCRIPTION = "X11 Distributed Multihead extension library"
 DEPENDS += "libxext dmxproto"
-PR = "r1"
 PE = "1"
 
 SRC_URI[archive.md5sum] = "4d866967210d06098fc9f302ed4c79b1"
 SRC_URI[archive.sha256sum] = "fa3ff31a543f7cea04762c08f48b418e75230de8b4dfdf9d2d3ae9e2af26b9c4"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libdmx_1.1.0.bb b/recipes/xorg-lib/libdmx_1.1.0.bb
index 60183fe5e8..224f90fb5d 100644
--- a/recipes/xorg-lib/libdmx_1.1.0.bb
+++ b/recipes/xorg-lib/libdmx_1.1.0.bb
@@ -2,8 +2,8 @@ require xorg-lib-common.inc
 
 DESCRIPTION = "X11 Distributed Multihead extension library"
 DEPENDS += "libxext dmxproto"
-PR = "r3"
 PE = "1"
 
 SRC_URI[archive.md5sum] = "a2fcf0382837888d3781b714489a8999"
 SRC_URI[archive.sha256sum] = "1904a8f848cc5d76105cb07707890aca095540a37fb0a63d359f71da51d3e2d5"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libfontenc_1.0.4.bb b/recipes/xorg-lib/libfontenc_1.0.4.bb
index efe5e7562f..77e11f0ddf 100644
--- a/recipes/xorg-lib/libfontenc_1.0.4.bb
+++ b/recipes/xorg-lib/libfontenc_1.0.4.bb
@@ -4,8 +4,8 @@ DESCRIPTION = "X11 font encoding library"
 LICENSE = "BSD-X"
 DEPENDS += "zlib xproto"
 BBCLASSEXTEND = "native"
-PR = "r1"
 PE = "1"
 
 SRC_URI[archive.md5sum] = "5cd16a2e51ca7b96a3081c7486ff98b9"
 SRC_URI[archive.sha256sum] = "b993aa3d17e845a12a49160b5d96993059ce919c7ba902005b910b867b6258c8"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libfontenc_1.0.5.bb b/recipes/xorg-lib/libfontenc_1.0.5.bb
index 81d8fb2c28..4a54d3ad8e 100644
--- a/recipes/xorg-lib/libfontenc_1.0.5.bb
+++ b/recipes/xorg-lib/libfontenc_1.0.5.bb
@@ -4,8 +4,8 @@ DESCRIPTION = "X11 font encoding library"
 LICENSE = "BSD-X"
 DEPENDS += "zlib xproto"
 BBCLASSEXTEND = "native"
-PR = "r1"
 PE = "1"
 
 SRC_URI[archive.md5sum] = "4f0d8191819be9f2bdf9dad49a65e43b"
 SRC_URI[archive.sha256sum] = "7f3cde0331e9ad3da720b1a8255e121673701199df0802b62380436e74222700"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libfs_1.0.0.bb b/recipes/xorg-lib/libfs_1.0.0.bb
index ec22f646ec..a7f4d25dce 100644
--- a/recipes/xorg-lib/libfs_1.0.0.bb
+++ b/recipes/xorg-lib/libfs_1.0.0.bb
@@ -2,10 +2,10 @@ require xorg-lib-common.inc
 
 DESCRIPTION = "X11 Font Services library"
 DEPENDS += "xproto fontsproto xtrans"
-PR = "r1"
 PE = "1"
 
 XORG_PN = "libFS"
 
 SRC_URI[archive.md5sum] = "dfd5de47e232db0891410bec8ee6707b"
 SRC_URI[archive.sha256sum] = "2f18f9fa0e18a3eab3c154ba820ad64b5c6ee364e147524055a553a130ccfdde"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libfs_1.0.1.bb b/recipes/xorg-lib/libfs_1.0.1.bb
index ce5752c64c..8814dc17a3 100644
--- a/recipes/xorg-lib/libfs_1.0.1.bb
+++ b/recipes/xorg-lib/libfs_1.0.1.bb
@@ -8,3 +8,4 @@ XORG_PN = "libFS"
 
 SRC_URI[archive.md5sum] = "81521249353fa33be7a4bb0062c2fbb9"
 SRC_URI[archive.sha256sum] = "9bf92ffdb51e69e07682cd1a6c0101f2a833b16b9bfa5d601491ff46a35a2cf5"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libfs_1.0.2.bb b/recipes/xorg-lib/libfs_1.0.2.bb
index f5a3390c26..2258500af0 100644
--- a/recipes/xorg-lib/libfs_1.0.2.bb
+++ b/recipes/xorg-lib/libfs_1.0.2.bb
@@ -8,3 +8,4 @@ XORG_PN = "libFS"
 
 SRC_URI[archive.md5sum] = "ecf2d6a27da053500283e803efa2a808"
 SRC_URI[archive.sha256sum] = "af2a5fe5eaa2b026e10bddb4e3f39976dc13deb5dbdc714abe1f016435ce3049"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libice_1.0.3.bb b/recipes/xorg-lib/libice_1.0.3.bb
index 5384b34feb..6ebe14c4f8 100644
--- a/recipes/xorg-lib/libice_1.0.3.bb
+++ b/recipes/xorg-lib/libice_1.0.3.bb
@@ -3,10 +3,10 @@ require xorg-lib-common.inc
 DESCRIPTION = "X11 Inter-Client Exchange library"
 DEPENDS += "xproto xtrans"
 BBCLASSEXTEND = "native"
-PR = "r1"
 PE = "1"
 
 XORG_PN = "libICE"
 
 SRC_URI[archive.md5sum] = "071f96648ac25c8e87a3de11a7de2d8a"
 SRC_URI[archive.sha256sum] = "ffd46270dae30cad147d73559142a701a8ff8d0658f4abfb2341edefabb8161d"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libice_1.0.4.bb b/recipes/xorg-lib/libice_1.0.4.bb
index 0c325a8ac0..34dee06b80 100644
--- a/recipes/xorg-lib/libice_1.0.4.bb
+++ b/recipes/xorg-lib/libice_1.0.4.bb
@@ -3,10 +3,10 @@ require xorg-lib-common.inc
 DESCRIPTION = "X11 Inter-Client Exchange library"
 DEPENDS += "xproto xtrans"
 BBCLASSEXTEND = "native"
-PR = "r1"
 PE = "1"
 
 XORG_PN = "libICE"
 
 SRC_URI[archive.md5sum] = "4ab4e67e0b8845aa201e984153087f4a"
 SRC_URI[archive.sha256sum] = "13055e2f4c645cbd135ce97a7974a5866f9ba3ed8988e686b552f55c30514f04"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libice_1.0.6.bb b/recipes/xorg-lib/libice_1.0.6.bb
index 1e95abdb8d..2987848372 100644
--- a/recipes/xorg-lib/libice_1.0.6.bb
+++ b/recipes/xorg-lib/libice_1.0.6.bb
@@ -3,10 +3,10 @@ require xorg-lib-common.inc
 DESCRIPTION = "X11 Inter-Client Exchange library"
 DEPENDS += "xproto xtrans"
 BBCLASSEXTEND = "native"
-PR = "r1"
 PE = "1"
 
 XORG_PN = "libICE"
 
 SRC_URI[archive.md5sum] = "2d39bc924af24325dae589e9a849180c"
 SRC_URI[archive.sha256sum] = "a8346859505d2aa27ecc4531f1c86d72801936d96c31c5beaeff4587441b568b"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/liblbxutil_1.0.1.bb b/recipes/xorg-lib/liblbxutil_1.0.1.bb
index 84657b3267..5614e563b8 100644
--- a/recipes/xorg-lib/liblbxutil_1.0.1.bb
+++ b/recipes/xorg-lib/liblbxutil_1.0.1.bb
@@ -10,3 +10,4 @@ export CC_FOR_BUILD = "gcc"
 
 SRC_URI[archive.md5sum] = "b73cbd5bc3cd268722a624a5f1318fde"
 SRC_URI[archive.sha256sum] = "94c31c7090106d3a95e2a7c083961efca1321b970118fe103ab06e5d927b7258"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/liblbxutil_1.1.0.bb b/recipes/xorg-lib/liblbxutil_1.1.0.bb
index dda79bd022..214f0d106f 100644
--- a/recipes/xorg-lib/liblbxutil_1.1.0.bb
+++ b/recipes/xorg-lib/liblbxutil_1.1.0.bb
@@ -10,3 +10,4 @@ export CC_FOR_BUILD = "gcc"
 
 SRC_URI[archive.md5sum] = "273329a78c2e9ea189ac416c7fde94a1"
 SRC_URI[archive.sha256sum] = "c6b6ff7858ec619cafa8205debca6bf78c5610a2844a782ed643c7fd017cf8ae"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/liboldx_1.0.1.bb b/recipes/xorg-lib/liboldx_1.0.1.bb
index c8e2cc7bee..e833b9ad7c 100644
--- a/recipes/xorg-lib/liboldx_1.0.1.bb
+++ b/recipes/xorg-lib/liboldx_1.0.1.bb
@@ -7,3 +7,4 @@ XORG_PN = "liboldX"
 
 SRC_URI[archive.md5sum] = "6b81ffe486d76c380d08f92285758d84"
 SRC_URI[archive.sha256sum] = "1091d301f5e28f84e5d755a5cde9d2f7edb82b799d051522751874571e10340f"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libpciaccess_0.10.3.bb b/recipes/xorg-lib/libpciaccess_0.10.3.bb
index 826397101b..9b84dfa893 100644
--- a/recipes/xorg-lib/libpciaccess_0.10.3.bb
+++ b/recipes/xorg-lib/libpciaccess_0.10.3.bb
@@ -6,3 +6,4 @@ SRC_URI += "file://fix-mtrr-check.patch"
 
 SRC_URI[archive.md5sum] = "6d5468debf76fac84576ca26c9535821"
 SRC_URI[archive.sha256sum] = "2f609ad3b5688ae66dcd18d7cdd1fc6b68531a2a85f89798f6cfb5eda6d680dc"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libpciaccess_0.10.9.bb b/recipes/xorg-lib/libpciaccess_0.10.9.bb
index 3c410ca5aa..9ec646fc20 100644
--- a/recipes/xorg-lib/libpciaccess_0.10.9.bb
+++ b/recipes/xorg-lib/libpciaccess_0.10.9.bb
@@ -2,7 +2,6 @@ require xorg-lib-common.inc
 
 DEPENDS += "xproto virtual/libx11"
 
-PR="r1"
-
 SRC_URI[archive.md5sum] = "685cb20e7a6165bc010972f1183addbd"
 SRC_URI[archive.sha256sum] = "5ccb9683b8be76edfceab4bf006e1cce9018e0d3dea5e54aa72e82798213fead"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libpciaccess_0.11.0.bb b/recipes/xorg-lib/libpciaccess_0.11.0.bb
index 6d6bf11f3a..faa246b48c 100644
--- a/recipes/xorg-lib/libpciaccess_0.11.0.bb
+++ b/recipes/xorg-lib/libpciaccess_0.11.0.bb
@@ -2,7 +2,6 @@ require xorg-lib-common.inc
 
 DEPENDS += "xproto virtual/libx11"
 
-PR="r1"
-
 SRC_URI[archive.md5sum] = "686320dcec98daad0bdfb8894d4f2a2b"
 SRC_URI[archive.sha256sum] = "6e38be12b656c83c66a6fd8ba56c041d8188218278219c88ee635242ec1c7dab"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libsm_1.0.2.bb b/recipes/xorg-lib/libsm_1.0.2.bb
index 74759f2ce2..aa35de0d6a 100644
--- a/recipes/xorg-lib/libsm_1.0.2.bb
+++ b/recipes/xorg-lib/libsm_1.0.2.bb
@@ -10,3 +10,4 @@ XORG_PN = "libSM"
 
 SRC_URI[archive.md5sum] = "a254771550c01db372e88d1a1dc2e13a"
 SRC_URI[archive.sha256sum] = "e290614797bd626c1b92bac8f83e8954b99bd66e6ecdaa1e935e176df099eba8"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libsm_1.0.3.bb b/recipes/xorg-lib/libsm_1.0.3.bb
index 92efd3f4fe..f7280bd77c 100644
--- a/recipes/xorg-lib/libsm_1.0.3.bb
+++ b/recipes/xorg-lib/libsm_1.0.3.bb
@@ -3,10 +3,10 @@ require xorg-lib-common.inc
 DESCRIPTION = "X11 Session management library"
 DEPENDS += "libice xproto xtrans"
 BBCLASSEXTEND = "native"
-PR = "r1"
 PE = "1"
 
 XORG_PN = "libSM"
 
 SRC_URI[archive.md5sum] = "184cbf502b3cd5d7ba5f9d1290a99606"
 SRC_URI[archive.sha256sum] = "57f42d3557effe452cd348362977ff90fa61009885c23b3aca8cb0219b5dec04"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libsm_1.1.0.bb b/recipes/xorg-lib/libsm_1.1.0.bb
index deb0eef65d..27d2593927 100644
--- a/recipes/xorg-lib/libsm_1.1.0.bb
+++ b/recipes/xorg-lib/libsm_1.1.0.bb
@@ -9,3 +9,4 @@ XORG_PN = "libSM"
 
 SRC_URI[archive.md5sum] = "05a04c2b6382fb0054f6c70494e22733"
 SRC_URI[archive.sha256sum] = "7536ac382e1ff82014d3a0defba0c61b3a30984f4e5bc7707960d6debcb92a82"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libsm_1.1.1.bb b/recipes/xorg-lib/libsm_1.1.1.bb
index c9a1fd8cc1..06dd47906e 100644
--- a/recipes/xorg-lib/libsm_1.1.1.bb
+++ b/recipes/xorg-lib/libsm_1.1.1.bb
@@ -9,3 +9,4 @@ XORG_PN = "libSM"
 
 SRC_URI[archive.md5sum] = "6889a455496aaaa65b1fa05fc518d179"
 SRC_URI[archive.sha256sum] = "f50d184d8c6a031b3ff4f0d52efcfd4ffa811b0362b166a9ff9ba4c2e9aa7ce0"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libwindowswm_1.0.0.bb b/recipes/xorg-lib/libwindowswm_1.0.0.bb
index 570adb1f4c..a1f9cd9262 100644
--- a/recipes/xorg-lib/libwindowswm_1.0.0.bb
+++ b/recipes/xorg-lib/libwindowswm_1.0.0.bb
@@ -7,3 +7,4 @@ XORG_PN = "libWindowsWM"
 
 SRC_URI[archive.md5sum] = "337b379fd00a67345b083100c4e6ba95"
 SRC_URI[archive.sha256sum] = "6ad87266173d21ba7e0e4506db0c094769fd58c3f0b741b37f30c297deec166a"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libwindowswm_1.0.1.bb b/recipes/xorg-lib/libwindowswm_1.0.1.bb
index 12ede8695c..b4263a66d0 100644
--- a/recipes/xorg-lib/libwindowswm_1.0.1.bb
+++ b/recipes/xorg-lib/libwindowswm_1.0.1.bb
@@ -7,3 +7,4 @@ XORG_PN = "libWindowsWM"
 
 SRC_URI[archive.md5sum] = "274b2b5620a524fd7bb739edb97317f5"
 SRC_URI[archive.sha256sum] = "25f07cf847cbe91d36c20f348b4b9494c4504fe02966e8cdf65cf56316a70edc"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxau_1.0.3.bb b/recipes/xorg-lib/libxau_1.0.3.bb
index d54d6e3006..1c5990e308 100644
--- a/recipes/xorg-lib/libxau_1.0.3.bb
+++ b/recipes/xorg-lib/libxau_1.0.3.bb
@@ -9,3 +9,4 @@ XORG_PN = "libXau"
 
 SRC_URI[archive.md5sum] = "75a9f2b85cd1617b5ca98c9095323853"
 SRC_URI[archive.sha256sum] = "d6c30a88770a720e96e0bd7e13e0334f9ef60f1b475a92556764828005c19e3b"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxau_1.0.4.bb b/recipes/xorg-lib/libxau_1.0.4.bb
index 4aef9a5bb9..2d2740e374 100644
--- a/recipes/xorg-lib/libxau_1.0.4.bb
+++ b/recipes/xorg-lib/libxau_1.0.4.bb
@@ -9,3 +9,4 @@ XORG_PN = "libXau"
 
 SRC_URI[archive.md5sum] = "0f2b88d857e0a3f5898e4759c541af46"
 SRC_URI[archive.sha256sum] = "10d3ffa5f00d0c0a4083309ba68bdfa01dfdf912ef4cf2141e3f260b2edeb22c"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxau_1.0.5.bb b/recipes/xorg-lib/libxau_1.0.5.bb
index 23b5a4e268..58c11e80fb 100644
--- a/recipes/xorg-lib/libxau_1.0.5.bb
+++ b/recipes/xorg-lib/libxau_1.0.5.bb
@@ -9,3 +9,4 @@ XORG_PN = "libXau"
 
 SRC_URI[archive.md5sum] = "993b3185c629e4b89401fca072dcb663"
 SRC_URI[archive.sha256sum] = "a503b3e88d29fa9c45cce1b2d1af54106c2ce21491348c394e251a071d8108ee"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxaw_1.0.3.bb b/recipes/xorg-lib/libxaw_1.0.3.bb
index 2e9b0e2ab1..a7da07a905 100644
--- a/recipes/xorg-lib/libxaw_1.0.3.bb
+++ b/recipes/xorg-lib/libxaw_1.0.3.bb
@@ -2,7 +2,6 @@ require xorg-lib-common.inc
 
 DESCRIPTION = "X Athena Widget Set"
 DEPENDS += "xproto virtual/libx11 libxext xextproto libxt libxmu libxpm libxp printproto libxau"
-PR = "r1"
 PE = "1"
 
 XORG_PN = "libXaw"
@@ -21,3 +20,4 @@ FILES_libxaw8 = "${libdir}/libXaw8.so.8*"
 
 SRC_URI[archive.md5sum] = "ee215536ea78798268ab3a444d10135a"
 SRC_URI[archive.sha256sum] = "45ca55bdac904a07b8118618c65ddb5bf8826e626c4c927e3c2508c58e231514"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxaw_1.0.4.bb b/recipes/xorg-lib/libxaw_1.0.4.bb
index db2b119b02..4b742ad45e 100644
--- a/recipes/xorg-lib/libxaw_1.0.4.bb
+++ b/recipes/xorg-lib/libxaw_1.0.4.bb
@@ -2,7 +2,6 @@ require xorg-lib-common.inc
 
 DESCRIPTION = "X Athena Widget Set"
 DEPENDS += "xproto virtual/libx11 libxext xextproto libxt libxmu libxpm libxp printproto libxau"
-PR = "r1"
 PE = "1"
 
 XORG_PN = "libXaw"
@@ -21,3 +20,4 @@ FILES_libxaw8 = "${libdir}/libXaw8.so.8*"
 
 SRC_URI[archive.md5sum] = "73671d8f1cf36fdd81395328cc3539c9"
 SRC_URI[archive.sha256sum] = "11f4ab184fb8dc853fd95238d4de7b251427dd036643d11fd2a669232fa35af9"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxaw_1.0.7.bb b/recipes/xorg-lib/libxaw_1.0.7.bb
index f7f60074ac..dd4f6be19a 100644
--- a/recipes/xorg-lib/libxaw_1.0.7.bb
+++ b/recipes/xorg-lib/libxaw_1.0.7.bb
@@ -2,7 +2,6 @@ require xorg-lib-common.inc
 
 DESCRIPTION = "X Athena Widget Set"
 DEPENDS += "xproto virtual/libx11 libxext xextproto libxt libxmu libxpm libxp printproto libxau"
-PR = "r2"
 PE = "1"
 
 XORG_PN = "libXaw"
@@ -24,3 +23,4 @@ FILES_libxaw8 = "${libdir}/libXaw8.so.8*"
 
 SRC_URI[archive.md5sum] = "815e74de989ccda684e2baf8d12cf519"
 SRC_URI[archive.sha256sum] = "740aaee9b09586b1c80f80890381c5ee70ea11efa4b6159f707c0f3684c6f328"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxcalibrate_git.bb b/recipes/xorg-lib/libxcalibrate_git.bb
index 01201ba833..097ea20201 100644
--- a/recipes/xorg-lib/libxcalibrate_git.bb
+++ b/recipes/xorg-lib/libxcalibrate_git.bb
@@ -5,7 +5,6 @@ LICENSE = "BSD-X"
 DEPENDS = "virtual/libx11 calibrateproto libxext"
 
 SRCREV = "209d83af61ed38a002c8096377deac292b3e396c"
-PR = "r1"
 PV = "0.0+${PR}+gitr${SRCPV}"
 PE = "3"
 
@@ -14,3 +13,4 @@ SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libXCalibrate;protocol=git
 S = "${WORKDIR}/git"
 
 FILES_${PN}-locale += "${datadir}/X11/locale"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxcomposite_0.3.1.bb b/recipes/xorg-lib/libxcomposite_0.3.1.bb
index e7c830d831..b32b6dee7e 100644
--- a/recipes/xorg-lib/libxcomposite_0.3.1.bb
+++ b/recipes/xorg-lib/libxcomposite_0.3.1.bb
@@ -12,3 +12,4 @@ SRC_URI += " file://change-include-order.patch"
 
 SRC_URI[archive.md5sum] = "a80650d660486ea7bb2e5fd84a83799a"
 SRC_URI[archive.sha256sum] = "d42b59d3c38dae5e4fec375d12e56e7a5764ba10e8b8ec70f9ce951fc9cec72b"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxcomposite_0.4.0.bb b/recipes/xorg-lib/libxcomposite_0.4.0.bb
index 572a07fbe4..87d0b6499b 100644
--- a/recipes/xorg-lib/libxcomposite_0.4.0.bb
+++ b/recipes/xorg-lib/libxcomposite_0.4.0.bb
@@ -11,3 +11,4 @@ SRC_URI += " file://change-include-order.patch"
 
 SRC_URI[archive.md5sum] = "7e95395dea89be21bae929b9b7f16641"
 SRC_URI[archive.sha256sum] = "7db759e82dd1f68094e4c4d257025f7893dafb2913ed249e00cbe18fa13c7510"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxcomposite_0.4.1.bb b/recipes/xorg-lib/libxcomposite_0.4.1.bb
index fc3c042d19..142452a239 100644
--- a/recipes/xorg-lib/libxcomposite_0.4.1.bb
+++ b/recipes/xorg-lib/libxcomposite_0.4.1.bb
@@ -9,3 +9,4 @@ XORG_PN = "libXcomposite"
 
 SRC_URI[archive.md5sum] = "0f1367f57fdf5df17a8dd71d0fa68248"
 SRC_URI[archive.sha256sum] = "3715a25565222d8eb0468805db1113b514128ee5e9bc6908400f189f680d7a13"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxcomposite_0.4.2.bb b/recipes/xorg-lib/libxcomposite_0.4.2.bb
index c1659d4f04..d3679149ec 100644
--- a/recipes/xorg-lib/libxcomposite_0.4.2.bb
+++ b/recipes/xorg-lib/libxcomposite_0.4.2.bb
@@ -9,3 +9,4 @@ XORG_PN = "libXcomposite"
 
 SRC_URI[archive.md5sum] = "e38dc98509149083f6c31b49b484e63c"
 SRC_URI[archive.sha256sum] = "442bde0bf7684330d6f5e4dd5a6faa46f1950512ff4e7bb6c01b36702166f800"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxcursor_1.1.10.bb b/recipes/xorg-lib/libxcursor_1.1.10.bb
index 5ca754b671..bea7fe66e4 100644
--- a/recipes/xorg-lib/libxcursor_1.1.10.bb
+++ b/recipes/xorg-lib/libxcursor_1.1.10.bb
@@ -4,10 +4,10 @@ DESCRIPTION = "X cursor management library"
 LICENSE= "BSD-X"
 DEPENDS += "libxrender libxfixes"
 BBCLASSEXTEND = "native"
-PR = "r2"
 PE = "1"
 
 XORG_PN = "libXcursor"
 
 SRC_URI[archive.md5sum] = "7dcdad1c10daea872cb3355af414b2ca"
 SRC_URI[archive.sha256sum] = "b9446df62203f2c3204b6bcc0057dc909d0dc792f0dd97bc491581b08be36cbd"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxcursor_1.1.8.bb b/recipes/xorg-lib/libxcursor_1.1.8.bb
index 1d08b8641e..2bac654446 100644
--- a/recipes/xorg-lib/libxcursor_1.1.8.bb
+++ b/recipes/xorg-lib/libxcursor_1.1.8.bb
@@ -4,10 +4,10 @@ DESCRIPTION = "X cursor management library"
 LICENSE= "BSD-X"
 DEPENDS += "libxrender libxfixes"
 BBCLASSEXTEND = "native"
-PR = "r2"
 PE = "1"
 
 XORG_PN = "libXcursor"
 
 SRC_URI[archive.md5sum] = "ec2acd10a7736a85dd1e1ed9ea5bec96"
 SRC_URI[archive.sha256sum] = "8f039f81af52c88d583fba48b878abd074542221cb0030638ad52336b4ae1377"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxcursor_1.1.9.bb b/recipes/xorg-lib/libxcursor_1.1.9.bb
index 013a3136b4..fb6ee72fc6 100644
--- a/recipes/xorg-lib/libxcursor_1.1.9.bb
+++ b/recipes/xorg-lib/libxcursor_1.1.9.bb
@@ -4,10 +4,10 @@ DESCRIPTION = "X cursor management library"
 LICENSE= "BSD-X"
 DEPENDS += "libxrender libxfixes"
 BBCLASSEXTEND = "native"
-PR = "r2"
 PE = "1"
 
 XORG_PN = "libXcursor"
 
 SRC_URI[archive.md5sum] = "99b7554037a92b260891091e81815a0a"
 SRC_URI[archive.sha256sum] = "1dffb3542271c8ce964066d561474caec5b639d6588b257b21cfb8225a15d2b4"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxdamage_1.0.4.bb b/recipes/xorg-lib/libxdamage_1.0.4.bb
index ccab459452..79108e1aba 100644
--- a/recipes/xorg-lib/libxdamage_1.0.4.bb
+++ b/recipes/xorg-lib/libxdamage_1.0.4.bb
@@ -11,3 +11,4 @@ XORG_PN = "libXdamage"
 
 SRC_URI[archive.md5sum] = "4d0eece7a8372a7754db1de08c2be324"
 SRC_URI[archive.sha256sum] = "5df90f0efa77e1d6f9e1768a2b0adfc896d09c7a3d8680ed0980511b3625c636"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxdamage_1.1.1.bb b/recipes/xorg-lib/libxdamage_1.1.1.bb
index 53d4cf0913..cde7d4a1f0 100644
--- a/recipes/xorg-lib/libxdamage_1.1.1.bb
+++ b/recipes/xorg-lib/libxdamage_1.1.1.bb
@@ -3,10 +3,10 @@ require xorg-lib-common.inc
 DESCRIPTION = "X11 damaged region extension library"
 LICENSE= "BSD-X"
 DEPENDS += "damageproto libxfixes"
-PR = "r1"
 PE = "1"
 
 XORG_PN = "libXdamage"
 
 SRC_URI[archive.md5sum] = "ac0ce6b0063a9858c8f24ddb4c60487d"
 SRC_URI[archive.sha256sum] = "0102754db23952a1c3adf7881bbf191f91ca3e3d183e1b0179452bce932fae2e"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxdamage_1.1.2.bb b/recipes/xorg-lib/libxdamage_1.1.2.bb
index 542fac83f2..c74d7a9a91 100644
--- a/recipes/xorg-lib/libxdamage_1.1.2.bb
+++ b/recipes/xorg-lib/libxdamage_1.1.2.bb
@@ -3,10 +3,10 @@ require xorg-lib-common.inc
 DESCRIPTION = "X11 damaged region extension library"
 LICENSE= "BSD-X"
 DEPENDS += "damageproto libxfixes"
-PR = "r1"
 PE = "1"
 
 XORG_PN = "libXdamage"
 
 SRC_URI[archive.md5sum] = "b42780bce703ec202a33e5693991c09d"
 SRC_URI[archive.sha256sum] = "a56a10acb34827c4d1a0ee282a338cbb04baa03d7fc7bc69e5690915c8fc7c0a"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxdamage_1.1.3.bb b/recipes/xorg-lib/libxdamage_1.1.3.bb
index 326b0e0a33..e616336121 100644
--- a/recipes/xorg-lib/libxdamage_1.1.3.bb
+++ b/recipes/xorg-lib/libxdamage_1.1.3.bb
@@ -3,10 +3,10 @@ require xorg-lib-common.inc
 DESCRIPTION = "X11 damaged region extension library"
 LICENSE= "BSD-X"
 DEPENDS += "damageproto libxfixes"
-PR = "r1"
 PE = "1"
 
 XORG_PN = "libXdamage"
 
 SRC_URI[archive.md5sum] = "44774e1a065158b52f1a0da5100cebec"
 SRC_URI[archive.sha256sum] = "bc6169c826d3cb17435ca84e1b479d65e4b51df1e48bbc3ec39a9cabf842c7a8"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxdmcp_1.0.2.bb b/recipes/xorg-lib/libxdmcp_1.0.2.bb
index 664074b52c..4cea62d04c 100644
--- a/recipes/xorg-lib/libxdmcp_1.0.2.bb
+++ b/recipes/xorg-lib/libxdmcp_1.0.2.bb
@@ -3,10 +3,10 @@ require xorg-lib-common.inc
 DESCRIPTION = "X Display Manager Control Protocol library"
 DEPENDS += "xproto"
 BBCLASSEXTEND = "native sdk"
-PR = "r1"
 PE = "1"
 
 XORG_PN = "libXdmcp"
 
 SRC_URI[archive.md5sum] = "10facf2bc7cbd5e5c1a698b8a210a582"
 SRC_URI[archive.sha256sum] = "f3e50c1847599145c22784a2f15818821960652ee91d21d905817fb7c10f96a8"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxdmcp_1.0.3.bb b/recipes/xorg-lib/libxdmcp_1.0.3.bb
index 426768ed9e..a8852ff695 100644
--- a/recipes/xorg-lib/libxdmcp_1.0.3.bb
+++ b/recipes/xorg-lib/libxdmcp_1.0.3.bb
@@ -3,10 +3,10 @@ require xorg-lib-common.inc
 DESCRIPTION = "X Display Manager Control Protocol library"
 DEPENDS += "xproto"
 BBCLASSEXTEND = "native sdk"
-PR = "r1"
 PE = "1"
 
 XORG_PN = "libXdmcp"
 
 SRC_URI[archive.md5sum] = "d60941d471800f41a3f19b24bea855a7"
 SRC_URI[archive.sha256sum] = "d8033a2fae20fed6de4f16b73ad69ca1c511e7da31c88e9bc6e75976187378cb"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxevie_1.0.2.bb b/recipes/xorg-lib/libxevie_1.0.2.bb
index bd697a429c..a66907964e 100644
--- a/recipes/xorg-lib/libxevie_1.0.2.bb
+++ b/recipes/xorg-lib/libxevie_1.0.2.bb
@@ -2,10 +2,10 @@ require xorg-lib-common.inc
 
 DESCRIPTION = "X11 EvIE extension library"
 DEPENDS += "libxext evieext"
-PR = "r1"
 PE = "1"
 
 XORG_PN = "libXevie"
 
 SRC_URI[archive.md5sum] = "88e9bf535364e7c821ef4014fb1ca2dd"
 SRC_URI[archive.sha256sum] = "ff70b81ad145932db2d206735cefcb698dadad241001df7ba6b97e8081d174da"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxext_1.0.2.bb b/recipes/xorg-lib/libxext_1.0.2.bb
index f063b3b07b..24f29a4132 100644
--- a/recipes/xorg-lib/libxext_1.0.2.bb
+++ b/recipes/xorg-lib/libxext_1.0.2.bb
@@ -12,3 +12,4 @@ XORG_PN = "libXext"
 
 SRC_URI[archive.md5sum] = "cce89c5b941a493512b534f4847c6111"
 SRC_URI[archive.sha256sum] = "368e4cf5117febd998e6fc40d096b3af19a571adccc5ed49b9d16e482b3a8f8e"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxext_1.0.3.bb b/recipes/xorg-lib/libxext_1.0.3.bb
index 04da7c37be..89849574a3 100644
--- a/recipes/xorg-lib/libxext_1.0.3.bb
+++ b/recipes/xorg-lib/libxext_1.0.3.bb
@@ -3,10 +3,10 @@ require xorg-lib-common.inc
 DESCRIPTION = "X11 miscellaneous extension library"
 DEPENDS += "xproto virtual/libx11 xextproto libxau"
 BBCLASSEXTEND = "native sdk"
-PR = "r1"
 PE = "1"
 
 XORG_PN = "libXext"
 
 SRC_URI[archive.md5sum] = "1bf6fa1c26f9957d7cc0bd90b038dfa6"
 SRC_URI[archive.sha256sum] = "2d706baf206d1cb422c8e0ceb6c5a8546bc3f0587cf090eba51e75a295d9c3f0"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxext_1.0.4.bb b/recipes/xorg-lib/libxext_1.0.4.bb
index fc8e876b39..ce80d6a38d 100644
--- a/recipes/xorg-lib/libxext_1.0.4.bb
+++ b/recipes/xorg-lib/libxext_1.0.4.bb
@@ -3,10 +3,10 @@ require xorg-lib-common.inc
 DESCRIPTION = "X11 miscellaneous extension library"
 DEPENDS += "xproto virtual/libx11 xextproto libxau"
 BBCLASSEXTEND = "native sdk"
-PR = "r1"
 PE = "1"
 
 XORG_PN = "libXext"
 
 SRC_URI[archive.md5sum] = "a91f1f722ac80c597cf0b75dcb8b48c0"
 SRC_URI[archive.sha256sum] = "2dfd8eace1cafacc87b4055c57efeb771a740e24141d3f113de58c2a9eebd21f"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxext_1.0.5.bb b/recipes/xorg-lib/libxext_1.0.5.bb
index 9a1c5c122a..e92fde5391 100644
--- a/recipes/xorg-lib/libxext_1.0.5.bb
+++ b/recipes/xorg-lib/libxext_1.0.5.bb
@@ -9,3 +9,4 @@ XORG_PN = "libXext"
 
 SRC_URI[archive.md5sum] = "aa11d859cc8e9a0bad3bb55e1666547b"
 SRC_URI[archive.sha256sum] = "1280af98466cb4484a89858ede3347ba9d7785baeb80b11f2066142dc2317d97"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxext_1.1.1.bb b/recipes/xorg-lib/libxext_1.1.1.bb
index 3c8099e493..a9b8ba73fd 100644
--- a/recipes/xorg-lib/libxext_1.1.1.bb
+++ b/recipes/xorg-lib/libxext_1.1.1.bb
@@ -3,10 +3,10 @@ require xorg-lib-common.inc
 DESCRIPTION = "X11 miscellaneous extension library"
 DEPENDS += "xproto virtual/libx11 xextproto libxau"
 BBCLASSEXTEND = "native sdk"
-PR = "r1"
 PE = "1"
 
 XORG_PN = "libXext"
 
 SRC_URI[archive.md5sum] = "c417c0e8df39a067f90a2a2e7133637d"
 SRC_URI[archive.sha256sum] = "110ce3bc7fb3a86659556994d0801c74bedcbd8ba8d1f90ee33d4c47a91e9bb3"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxext_1.1.2.bb b/recipes/xorg-lib/libxext_1.1.2.bb
index 109843c7b5..507b5efca0 100644
--- a/recipes/xorg-lib/libxext_1.1.2.bb
+++ b/recipes/xorg-lib/libxext_1.1.2.bb
@@ -3,10 +3,10 @@ require xorg-lib-common.inc
 DESCRIPTION = "X11 miscellaneous extension library"
 DEPENDS += "xproto virtual/libx11 xextproto libxau"
 BBCLASSEXTEND = "native sdk"
-PR = "r1"
 PE = "1"
 
 XORG_PN = "libXext"
 
 SRC_URI[archive.md5sum] = "9e51f9cb7e0a38c7099ac1c0de1a1add"
 SRC_URI[archive.sha256sum] = "ac6a0ff69c52c9b6e2096e5f74e22c8b5eef11ade4e30411cffeb7df32fe4f74"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxfixes_4.0.3.bb b/recipes/xorg-lib/libxfixes_4.0.3.bb
index 516de67ced..50a2505396 100644
--- a/recipes/xorg-lib/libxfixes_4.0.3.bb
+++ b/recipes/xorg-lib/libxfixes_4.0.3.bb
@@ -10,3 +10,4 @@ XORG_PN = "libXfixes"
 
 SRC_URI[archive.md5sum] = "1990d19725a3c7f32290037f02d3737f"
 SRC_URI[archive.sha256sum] = "547e093c5037c4b85ce653ce26f5bd70a97b177f9b582f5351a626d8e0a829dd"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxfixes_4.0.4.bb b/recipes/xorg-lib/libxfixes_4.0.4.bb
index c61d33c24c..c801aafebf 100644
--- a/recipes/xorg-lib/libxfixes_4.0.4.bb
+++ b/recipes/xorg-lib/libxfixes_4.0.4.bb
@@ -10,3 +10,4 @@ XORG_PN = "libXfixes"
 
 SRC_URI[archive.md5sum] = "7f2c40852eb337b237ad944ca5c30d49"
 SRC_URI[archive.sha256sum] = "ba31d7e5c5c1907c30cba50bfd669aa7fe860555287c29f6e786612e4be33b48"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxfixes_4.0.5.bb b/recipes/xorg-lib/libxfixes_4.0.5.bb
index f2f7d78af0..4777c9dcaa 100644
--- a/recipes/xorg-lib/libxfixes_4.0.5.bb
+++ b/recipes/xorg-lib/libxfixes_4.0.5.bb
@@ -10,3 +10,4 @@ XORG_PN = "libXfixes"
 
 SRC_URI[archive.md5sum] = "1b4b8386bd5d1751b2c7177223ad4629"
 SRC_URI[archive.sha256sum] = "2e6cd020460e4ef5d5a1d9b5d21143e9f5e580036a79c7de26ae539d7bcb8d74"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxfont_1.2.7.bb b/recipes/xorg-lib/libxfont_1.2.7.bb
index 0d82d1778c..b385f4e826 100644
--- a/recipes/xorg-lib/libxfont_1.2.7.bb
+++ b/recipes/xorg-lib/libxfont_1.2.7.bb
@@ -15,3 +15,4 @@ XORG_PN = "libXfont"
 
 SRC_URI[archive.md5sum] = "2f2085310f75900044d9dcd469637d26"
 SRC_URI[archive.sha256sum] = "2f8c004c0b914d460e6fd2b48d8b425cf4778d415467fc1f1d938b200462d18b"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxfont_1.2.8.bb b/recipes/xorg-lib/libxfont_1.2.8.bb
index b37c713b15..41aa04e2a7 100644
--- a/recipes/xorg-lib/libxfont_1.2.8.bb
+++ b/recipes/xorg-lib/libxfont_1.2.8.bb
@@ -15,3 +15,4 @@ XORG_PN = "libXfont"
 
 SRC_URI[archive.md5sum] = "83b8e21f6ee22512a8f72ba51e2d74f6"
 SRC_URI[archive.sha256sum] = "374a2ca12f62a4d9f09a17a34765a5289cefa9db7f9f0913e1c3731b4088aad8"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxfont_1.3.0.bb b/recipes/xorg-lib/libxfont_1.3.0.bb
index c7068820b7..f269a6f392 100644
--- a/recipes/xorg-lib/libxfont_1.3.0.bb
+++ b/recipes/xorg-lib/libxfont_1.3.0.bb
@@ -4,7 +4,6 @@ DESCRIPTION = "X11 font rasterisation library"
 LICENSE= "BSD-X"
 DEPENDS += "freetype fontcacheproto xtrans fontsproto libfontenc"
 BBCLASSEXTEND = "native"
-PR = "r2"
 PE = "1"
 
 SRC_URI += "file://no-scalable-crash.patch \
@@ -14,3 +13,4 @@ XORG_PN = "libXfont"
 
 SRC_URI[archive.md5sum] = "d1d3fa170d74b066f1f23ca8574e7c90"
 SRC_URI[archive.sha256sum] = "07567b9880f28d1a404389c024a185419bfe81136aef3d9eda52407f34c3d3dd"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxfont_1.3.1.bb b/recipes/xorg-lib/libxfont_1.3.1.bb
index e93fda5659..0a635042cb 100644
--- a/recipes/xorg-lib/libxfont_1.3.1.bb
+++ b/recipes/xorg-lib/libxfont_1.3.1.bb
@@ -12,3 +12,4 @@ XORG_PN = "libXfont"
 
 SRC_URI[archive.md5sum] = "b2f396b62633819bbdd9748383876e21"
 SRC_URI[archive.sha256sum] = "dcfb7dc980a16ad98ac984b98321148864ea8b4637d3dd3773e483a14158a9b1"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxfont_1.3.2.bb b/recipes/xorg-lib/libxfont_1.3.2.bb
index f1ad7f8f17..a826dbe328 100644
--- a/recipes/xorg-lib/libxfont_1.3.2.bb
+++ b/recipes/xorg-lib/libxfont_1.3.2.bb
@@ -12,3 +12,4 @@ XORG_PN = "libXfont"
 
 SRC_URI[archive.md5sum] = "64f510ebf9679f3a97a3d633cbee4f50"
 SRC_URI[archive.sha256sum] = "c167cfd529b7c67f496ee0bed3c0b43e0107de0f689d387c1c0e23ef7cf3d2f2"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxfont_1.3.3.bb b/recipes/xorg-lib/libxfont_1.3.3.bb
index a0e35436e4..407ecd3095 100644
--- a/recipes/xorg-lib/libxfont_1.3.3.bb
+++ b/recipes/xorg-lib/libxfont_1.3.3.bb
@@ -10,3 +10,4 @@ XORG_PN = "libXfont"
 
 SRC_URI[archive.md5sum] = "4f174b9613f87cf00d731da428a1b194"
 SRC_URI[archive.sha256sum] = "6171e6bca4bd6333611bd9c63cccc8e8e412d876c72097f0dddc490a9df51d5a"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxfont_1.4.1.bb b/recipes/xorg-lib/libxfont_1.4.1.bb
index d436d78a26..8278bbfbb0 100644
--- a/recipes/xorg-lib/libxfont_1.4.1.bb
+++ b/recipes/xorg-lib/libxfont_1.4.1.bb
@@ -13,3 +13,4 @@ XORG_PN = "libXfont"
 
 SRC_URI[archive.md5sum] = "4f2bed2a2be82e90a51a24bb3a22cdf0"
 SRC_URI[archive.sha256sum] = "112bfc30820b98deec4c9914536c5aa2f8b5162bd2b0bdb342343168e06f7679"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxfontcache_1.0.4.bb b/recipes/xorg-lib/libxfontcache_1.0.4.bb
index c876e3b8f5..4ae747e010 100644
--- a/recipes/xorg-lib/libxfontcache_1.0.4.bb
+++ b/recipes/xorg-lib/libxfontcache_1.0.4.bb
@@ -2,10 +2,10 @@ require xorg-lib-common.inc
 
 DESCRIPTION = "X-TrueType font cache extension client library"
 DEPENDS += "libxext fontcacheproto"
-PR = "r1"
 PE = "1"
 
 XORG_PN = "libXfontcache"
 
 SRC_URI[archive.md5sum] = "1adca018aa7bf2d215f20a69c10828ad"
 SRC_URI[archive.sha256sum] = "ffe747cfbf81cdd862af1b05d021ad1ab83b623eab5b32b0a618efb4c0f3e01c"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxfontcache_1.0.5.bb b/recipes/xorg-lib/libxfontcache_1.0.5.bb
index 3684b0503c..99da348698 100644
--- a/recipes/xorg-lib/libxfontcache_1.0.5.bb
+++ b/recipes/xorg-lib/libxfontcache_1.0.5.bb
@@ -2,10 +2,10 @@ require xorg-lib-common.inc
 
 DESCRIPTION = "X-TrueType font cache extension client library"
 DEPENDS += "libxext fontcacheproto"
-PR = "r1"
 PE = "1"
 
 XORG_PN = "libXfontcache"
 
 SRC_URI[archive.md5sum] = "bbd37768c87f63cf2eb845b2c0f56515"
 SRC_URI[archive.sha256sum] = "0d639219549f51fa0e6b4414383f5d13e6c1638e66b3434f4626eb989ffacbce"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxft_2.1.12.bb b/recipes/xorg-lib/libxft_2.1.12.bb
index 64d0d044b1..4dae48d4a7 100644
--- a/recipes/xorg-lib/libxft_2.1.12.bb
+++ b/recipes/xorg-lib/libxft_2.1.12.bb
@@ -2,7 +2,6 @@ require xorg-lib-common.inc
 
 DESCRIPTION = "FreeType-based font drawing library for X"
 DEPENDS += "libxrender freetype fontconfig"
-PR = "r1"
 PE = "1"
 
 XORG_PN = "libXft"
@@ -20,3 +19,4 @@ FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \
 
 SRC_URI[archive.md5sum] = "1309301e2d979bd475dc58325cb8c056"
 SRC_URI[archive.sha256sum] = "68b46f85caaf0b30c876bd983abe144c25755bee7532e8738ab7ebe29a428986"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxft_2.1.13.bb b/recipes/xorg-lib/libxft_2.1.13.bb
index a071ca5ede..1276637de0 100644
--- a/recipes/xorg-lib/libxft_2.1.13.bb
+++ b/recipes/xorg-lib/libxft_2.1.13.bb
@@ -2,7 +2,6 @@ require xorg-lib-common.inc
 
 DESCRIPTION = "FreeType-based font drawing library for X"
 DEPENDS += "libxrender freetype fontconfig"
-PR = "r0"
 PE = "1"
 
 XORG_PN = "libXft"
@@ -20,3 +19,4 @@ FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \
 
 SRC_URI[archive.md5sum] = "bc8881851f3bd8dcc625fac37350a1c6"
 SRC_URI[archive.sha256sum] = "ce7688258af34c14af421bcfb306d4310245b727d2417ac968b7f6b2facfde8c"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxft_2.1.14.bb b/recipes/xorg-lib/libxft_2.1.14.bb
index 1157dd174c..c378eae325 100644
--- a/recipes/xorg-lib/libxft_2.1.14.bb
+++ b/recipes/xorg-lib/libxft_2.1.14.bb
@@ -2,7 +2,6 @@ require xorg-lib-common.inc
 
 DESCRIPTION = "FreeType-based font drawing library for X"
 DEPENDS += "libxrender freetype fontconfig"
-PR = "r1"
 PE = "1"
 
 SRC_URI += "file://autotools.patch"
@@ -22,3 +21,4 @@ FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \
 
 SRC_URI[archive.md5sum] = "254e62a233491e0e1251636536163e20"
 SRC_URI[archive.sha256sum] = "700e9d594b81cad3dfd5fac4a5cfd0c4cf7780c812507ef04eb40139ebf5175e"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxi_1.0.2.bb b/recipes/xorg-lib/libxi_1.0.2.bb
index ccee4b511c..a461210eb1 100644
--- a/recipes/xorg-lib/libxi_1.0.2.bb
+++ b/recipes/xorg-lib/libxi_1.0.2.bb
@@ -10,3 +10,4 @@ XORG_PN = "libXi"
 
 SRC_URI[archive.md5sum] = "4a5207a29a6b220e5462129854689844"
 SRC_URI[archive.sha256sum] = "7e6339539d3d0a4fc95cc23ca2b13ae67dd783e011b3cc5ca76040e376bff57f"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxi_1.1.0.bb b/recipes/xorg-lib/libxi_1.1.0.bb
index d41c25e576..451ea98aa2 100644
--- a/recipes/xorg-lib/libxi_1.1.0.bb
+++ b/recipes/xorg-lib/libxi_1.1.0.bb
@@ -10,3 +10,4 @@ XORG_PN = "libXi"
 
 SRC_URI[archive.md5sum] = "c25abbe604029855eb11a3a75fb1f386"
 SRC_URI[archive.sha256sum] = "0f90d7e27d8a7d6bccf9350b6283ffe122e5347fa51d4ea9055653b297339989"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxi_1.1.2.bb b/recipes/xorg-lib/libxi_1.1.2.bb
index 6961e8ae00..34904cb157 100644
--- a/recipes/xorg-lib/libxi_1.1.2.bb
+++ b/recipes/xorg-lib/libxi_1.1.2.bb
@@ -2,10 +2,10 @@ require xorg-lib-common.inc
 
 DESCRIPTION = "X11 Input extension library"
 DEPENDS += "libxext inputproto"
-PR = "r1"
 PE = "1"
 
 XORG_PN = "libXi"
 
 SRC_URI[archive.md5sum] = "9c4dd85f3e2a75bfb60bd288502bc288"
 SRC_URI[archive.sha256sum] = "4deda13613f03e4524d3cf0ac14b9e20be5044d415cb8478713ecbe47f4de862"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxi_1.1.3.bb b/recipes/xorg-lib/libxi_1.1.3.bb
index 3afe545eaa..3175ba219c 100644
--- a/recipes/xorg-lib/libxi_1.1.3.bb
+++ b/recipes/xorg-lib/libxi_1.1.3.bb
@@ -2,10 +2,10 @@ require xorg-lib-common.inc
 
 DESCRIPTION = "X11 Input extension library"
 DEPENDS += "libxext inputproto"
-PR = "r1"
 PE = "1"
 
 XORG_PN = "libXi"
 
 SRC_URI[archive.md5sum] = "7c510abb0cad8dc20493fb27ff7859d8"
 SRC_URI[archive.sha256sum] = "c77a5bbe97d0d0a6493adefcf1bd57aca91bc33279633b3f6cf1d2bb8812153f"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxi_1.2.0.bb b/recipes/xorg-lib/libxi_1.2.0.bb
index 67a772b4f6..f1a5c4d19c 100644
--- a/recipes/xorg-lib/libxi_1.2.0.bb
+++ b/recipes/xorg-lib/libxi_1.2.0.bb
@@ -2,10 +2,10 @@ require xorg-lib-common.inc
 
 DESCRIPTION = "X11 Input extension library"
 DEPENDS += "libxext inputproto"
-PR = "r1"
 PE = "1"
 
 XORG_PN = "libXi"
 
 SRC_URI[archive.md5sum] = "4b88e07d7dd77ca1e786f09066b58c02"
 SRC_URI[archive.sha256sum] = "7c0125ffb864e121ebfb5a20b1cfdff60562c2f2dfbb4e77c5eac81f36e15f3a"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxi_1.3.bb b/recipes/xorg-lib/libxi_1.3.bb
index a8eadbb8dd..f74221c55b 100644
--- a/recipes/xorg-lib/libxi_1.3.bb
+++ b/recipes/xorg-lib/libxi_1.3.bb
@@ -2,10 +2,10 @@ require xorg-lib-common.inc
 
 DESCRIPTION = "X11 Input extension library"
 DEPENDS += "libxext inputproto"
-PR = "r1"
 PE = "1"
 
 XORG_PN = "libXi"
 
 SRC_URI[archive.md5sum] = "8df4ece9bd1efb02c28acb2b6f485e09"
 SRC_URI[archive.sha256sum] = "362b8c0c60386841063bd7e01afa72e37eb87ada6e64e539d960f88c780a944b"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxinerama_1.0.2.bb b/recipes/xorg-lib/libxinerama_1.0.2.bb
index 6b818d5cfe..aab22d7d2c 100644
--- a/recipes/xorg-lib/libxinerama_1.0.2.bb
+++ b/recipes/xorg-lib/libxinerama_1.0.2.bb
@@ -2,10 +2,10 @@ require xorg-lib-common.inc
 
 DESCRIPTION = "X11 Xinerama extension library"
 DEPENDS += "libxext xineramaproto"
-PR = "r3"
 PE = "1"
 
 XORG_PN = "libXinerama"
 
 SRC_URI[archive.md5sum] = "f6fb08eafd3c2909d515f1a07bfca8fd"
 SRC_URI[archive.sha256sum] = "d245d7ae4c766ecbc4e5cc2666e2e78198d8386dbaa06b35c3d1b1457ee5d03d"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxinerama_1.0.3.bb b/recipes/xorg-lib/libxinerama_1.0.3.bb
index 6f2a71fd74..d2bfcf941b 100644
--- a/recipes/xorg-lib/libxinerama_1.0.3.bb
+++ b/recipes/xorg-lib/libxinerama_1.0.3.bb
@@ -2,10 +2,10 @@ require xorg-lib-common.inc
 
 DESCRIPTION = "X11 Xinerama extension library"
 DEPENDS += "libxext xineramaproto"
-PR = "r3"
 PE = "1"
 
 XORG_PN = "libXinerama"
 
 SRC_URI[archive.md5sum] = "cd9f7c46439ac40e0517a302d2434d2c"
 SRC_URI[archive.sha256sum] = "07b3564cd56154c20580b56230b7a95d74fe6582c80cedf0550d8d7955181219"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxinerama_1.1.bb b/recipes/xorg-lib/libxinerama_1.1.bb
index b9d584a583..6b192b814d 100644
--- a/recipes/xorg-lib/libxinerama_1.1.bb
+++ b/recipes/xorg-lib/libxinerama_1.1.bb
@@ -2,10 +2,10 @@ require xorg-lib-common.inc
 
 DESCRIPTION = "X11 Xinerama extension library"
 DEPENDS += "libxext xineramaproto"
-PR = "r3"
 PE = "1"
 
 XORG_PN = "libXinerama"
 
 SRC_URI[archive.md5sum] = "a2ac01fc0426cdbb713c5d59cf9955ed"
 SRC_URI[archive.sha256sum] = "e0d39e74c2e131b44cc98dd4910165c9b8d937df93be58e6afb7c2a56772bf34"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxkbfile_1.0.4.bb b/recipes/xorg-lib/libxkbfile_1.0.4.bb
index a7b66633f1..53209497f9 100644
--- a/recipes/xorg-lib/libxkbfile_1.0.4.bb
+++ b/recipes/xorg-lib/libxkbfile_1.0.4.bb
@@ -4,8 +4,8 @@ DESCRIPTION = "X11 keyboard file manipulation library"
 LICENSE= "GPL"
 DEPENDS += "virtual/libx11 kbproto"
 BBCLASSEXTEND = "native"
-PR = "r1"
 PE = "1"
 
 SRC_URI[archive.md5sum] = "12b4ceb5d42b520228b5fb40a96ae6c5"
 SRC_URI[archive.sha256sum] = "468ade4eaa3951a7c34b6ae1c290ab1a1d364ee36c5c455ef0df15550825b8ae"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxkbfile_1.0.5.bb b/recipes/xorg-lib/libxkbfile_1.0.5.bb
index cbc4d50562..5edbf5d80e 100644
--- a/recipes/xorg-lib/libxkbfile_1.0.5.bb
+++ b/recipes/xorg-lib/libxkbfile_1.0.5.bb
@@ -4,8 +4,8 @@ DESCRIPTION = "X11 keyboard file manipulation library"
 LICENSE= "GPL"
 DEPENDS += "virtual/libx11 kbproto"
 BBCLASSEXTEND = "native"
-PR = "r1"
 PE = "1"
 
 SRC_URI[archive.md5sum] = "0726a845fe5a56551de2718c9f6b0e35"
 SRC_URI[archive.sha256sum] = "0ab628271fc9cb6d05f861d9823573088d81d510aca95b87ac0504b2e558965f"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxkbfile_1.0.6.bb b/recipes/xorg-lib/libxkbfile_1.0.6.bb
index 711a42060e..0e2e6fa072 100644
--- a/recipes/xorg-lib/libxkbfile_1.0.6.bb
+++ b/recipes/xorg-lib/libxkbfile_1.0.6.bb
@@ -4,8 +4,8 @@ DESCRIPTION = "X11 keyboard file manipulation library"
 LICENSE= "GPL"
 DEPENDS += "virtual/libx11 kbproto"
 BBCLASSEXTEND = "native"
-PR = "r1"
 PE = "1"
 
 SRC_URI[archive.md5sum] = "b01156e263eca8177e6b7f10441951c4"
 SRC_URI[archive.sha256sum] = "2ca43c1f6b2782994167a328471aa859d366cd7303c6dcbc8bda951a84a06039"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxkbui_1.0.2.bb b/recipes/xorg-lib/libxkbui_1.0.2.bb
index 9f05bcacbf..882752c242 100644
--- a/recipes/xorg-lib/libxkbui_1.0.2.bb
+++ b/recipes/xorg-lib/libxkbui_1.0.2.bb
@@ -3,8 +3,8 @@ require xorg-lib-common.inc
 DESCRIPTION = "X11 keyboard UI presentation library"
 LICENSE= "GPL"
 DEPENDS += "virtual/libx11 libxt libxkbfile"
-PR = "r1"
 PE = "1"
 
 SRC_URI[archive.md5sum] = "1143e456f7429e18e88f2eadb2f2b6b1"
 SRC_URI[archive.sha256sum] = "20c23101d63234ee5f6d696dfa069b29c6c58e39eff433bcd7705b50b3ffa214"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxmu_1.0.3.bb b/recipes/xorg-lib/libxmu_1.0.3.bb
index 9ed7cd9cca..2026c61a42 100644
--- a/recipes/xorg-lib/libxmu_1.0.3.bb
+++ b/recipes/xorg-lib/libxmu_1.0.3.bb
@@ -2,7 +2,6 @@ require xorg-lib-common.inc
 
 DESCRIPTION = "X11 miscellaneous utility library"
 DEPENDS += "libxt libxext"
-PR = "r1"
 PE = "1"
 
 XORG_PN = "libXmu"
@@ -16,3 +15,4 @@ FILES_libxmuu-dev = "${libdir}/libXmuu.so"
 
 SRC_URI[archive.md5sum] = "b926b95b811ece3e19cd590db85ee615"
 SRC_URI[archive.sha256sum] = "b56e308e36da8d9cb48433ddb81fd04e26b4f1c695586ac8106ac48a35466d66"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxmu_1.0.4.bb b/recipes/xorg-lib/libxmu_1.0.4.bb
index dd2dd83fbb..f545f907ff 100644
--- a/recipes/xorg-lib/libxmu_1.0.4.bb
+++ b/recipes/xorg-lib/libxmu_1.0.4.bb
@@ -2,7 +2,6 @@ require xorg-lib-common.inc
 
 DESCRIPTION = "X11 miscellaneous utility library"
 DEPENDS += "libxt libxext"
-PR = "r1"
 PE = "1"
 
 XORG_PN = "libXmu"
@@ -16,3 +15,4 @@ FILES_libxmuu-dev = "${libdir}/libXmuu.so"
 
 SRC_URI[archive.md5sum] = "fb372a5f3ab42b5ba16d7af4d833a0cb"
 SRC_URI[archive.sha256sum] = "f83c00d6ed8f4c08effa9dcc2d7f1ff6f5a753f2b9fe1babda16618c2afa18f0"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxmu_1.0.5.bb b/recipes/xorg-lib/libxmu_1.0.5.bb
index 33f092b24f..39c15a04bd 100644
--- a/recipes/xorg-lib/libxmu_1.0.5.bb
+++ b/recipes/xorg-lib/libxmu_1.0.5.bb
@@ -2,7 +2,6 @@ require xorg-lib-common.inc
 
 DESCRIPTION = "X11 miscellaneous utility library"
 DEPENDS += "libxt libxext"
-PR = "r1"
 PE = "1"
 
 XORG_PN = "libXmu"
@@ -16,3 +15,4 @@ FILES_libxmuu-dev = "${libdir}/libXmuu.so"
 
 SRC_URI[archive.md5sum] = "fc4d66be7a1a1eb474954728415e46d6"
 SRC_URI[archive.sha256sum] = "0692b6b0ec1019cfaa8418020b1127bfb0975f5a579a0b1f9eb7fd8f2f7126d7"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxp_1.0.0.bb b/recipes/xorg-lib/libxp_1.0.0.bb
index 7ddfbd8875..947f987444 100644
--- a/recipes/xorg-lib/libxp_1.0.0.bb
+++ b/recipes/xorg-lib/libxp_1.0.0.bb
@@ -2,7 +2,6 @@ require xorg-lib-common.inc
 
 DESCRIPTION = "X Printing Extension (Xprint) client library"
 DEPENDS += "libxext libxau printproto"
-PR = "r1"
 PE = "1"
 
 XORG_PN = "libXp"
@@ -11,3 +10,4 @@ CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions
 
 SRC_URI[archive.md5sum] = "0f4ac39108c1ae8c443cdfac259b58fa"
 SRC_URI[archive.sha256sum] = "7e64b1550ce85b05762e960459ac676a0406c786756b200ff29c57f84bce9cae"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxpm_3.5.6.bb b/recipes/xorg-lib/libxpm_3.5.6.bb
index ddb49af574..d753340d52 100644
--- a/recipes/xorg-lib/libxpm_3.5.6.bb
+++ b/recipes/xorg-lib/libxpm_3.5.6.bb
@@ -3,7 +3,6 @@ require xorg-lib-common.inc
 DESCRIPTION = "X11 Pixmap library"
 LICENSE = "X-BSD"
 DEPENDS += "libxext libsm libxt"
-PR = "r3"
 PE = "1"
 
 XORG_PN = "libXpm"
@@ -14,3 +13,4 @@ FILES_sxpm = "${bindir}/sxpm"
 
 SRC_URI[archive.md5sum] = "37b7d1826c6a02107269632a93b8791f"
 SRC_URI[archive.sha256sum] = "2d5c5242b8417db6aa758e5be387de33385d9960ff21c801af7d6a4730b4fd0d"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxpm_3.5.7.bb b/recipes/xorg-lib/libxpm_3.5.7.bb
index 29c5f32999..42219be853 100644
--- a/recipes/xorg-lib/libxpm_3.5.7.bb
+++ b/recipes/xorg-lib/libxpm_3.5.7.bb
@@ -3,7 +3,6 @@ require xorg-lib-common.inc
 DESCRIPTION = "X11 Pixmap library"
 LICENSE = "X-BSD"
 DEPENDS += "libxext libsm libxt"
-PR = "r3"
 PE = "1"
 
 XORG_PN = "libXpm"
@@ -14,3 +13,4 @@ FILES_sxpm = "${bindir}/sxpm"
 
 SRC_URI[archive.md5sum] = "cd15ee542d9f515538b4462a6f79d977"
 SRC_URI[archive.sha256sum] = "64701ae67ce5b0797307b75d8255bec3a0d371d0c50715ea618f5a68bcc92baa"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxpm_3.5.8.bb b/recipes/xorg-lib/libxpm_3.5.8.bb
index fb9c55c786..6afaa0573a 100644
--- a/recipes/xorg-lib/libxpm_3.5.8.bb
+++ b/recipes/xorg-lib/libxpm_3.5.8.bb
@@ -3,7 +3,6 @@ require xorg-lib-common.inc
 DESCRIPTION = "X11 Pixmap library"
 LICENSE = "X-BSD"
 DEPENDS += "libxext libsm libxt"
-PR = "r3"
 PE = "1"
 
 XORG_PN = "libXpm"
@@ -14,3 +13,4 @@ FILES_sxpm = "${bindir}/sxpm"
 
 SRC_URI[archive.md5sum] = "38e58e72d476a74298a59052fde185a3"
 SRC_URI[archive.sha256sum] = "02a77aaa32e6e335e1ee04aeb9ad1008045d98274d64ed33bc5fc6c3a3542c4c"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxprintapputil_1.0.1.bb b/recipes/xorg-lib/libxprintapputil_1.0.1.bb
index 36d83b367f..fbbef65e9a 100644
--- a/recipes/xorg-lib/libxprintapputil_1.0.1.bb
+++ b/recipes/xorg-lib/libxprintapputil_1.0.1.bb
@@ -2,10 +2,10 @@ require xorg-lib-common.inc
 
 DESCRIPTION = "Xprint job utility client library"
 DEPENDS += "libxp libxt libxprintutil"
-PR = "r1"
 PE = "1"
 
 XORG_PN = "libXprintAppUtil"
 
 SRC_URI[archive.md5sum] = "d2de510570aa6714681109b2ba178365"
 SRC_URI[archive.sha256sum] = "24606446003379dbf499ef57e9294ce622c0f7f8a8f10834db61dc59ef690aa5"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxprintutil_1.0.1.bb b/recipes/xorg-lib/libxprintutil_1.0.1.bb
index eef50ac81b..ae8d92f929 100644
--- a/recipes/xorg-lib/libxprintutil_1.0.1.bb
+++ b/recipes/xorg-lib/libxprintutil_1.0.1.bb
@@ -2,10 +2,10 @@ require xorg-lib-common.inc
 
 DESCRIPTION = "Xprint printer utility client library"
 DEPENDS += "libxp libxt"
-PR = "r1"
 PE = "1"
 
 XORG_PN = "libXprintUtil"
 
 SRC_URI[archive.md5sum] = "22584f1aab1deba253949b562d1f0f45"
 SRC_URI[archive.sha256sum] = "72b6ae0420b9601f55be147e8d068f670b951ae73a81423ba25be5875d826e6c"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxrandr_1.1.2.bb b/recipes/xorg-lib/libxrandr_1.1.2.bb
index 35c8f40703..c9fe9e919b 100644
--- a/recipes/xorg-lib/libxrandr_1.1.2.bb
+++ b/recipes/xorg-lib/libxrandr_1.1.2.bb
@@ -12,3 +12,4 @@ XORG_PN = "libXrandr"
 
 SRC_URI[archive.md5sum] = "962946952a01650bb43206043a3c0e12"
 SRC_URI[archive.sha256sum] = "ba5adedc37da835a5c9e5a5d457dce13feead64fc364bc4719c41720ca0a3c50"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxrandr_1.2.1.bb b/recipes/xorg-lib/libxrandr_1.2.1.bb
index 547684f0e2..2e683fe1ea 100644
--- a/recipes/xorg-lib/libxrandr_1.2.1.bb
+++ b/recipes/xorg-lib/libxrandr_1.2.1.bb
@@ -4,10 +4,10 @@ DESCRIPTION = "X11 Resize and Rotate extension library"
 LICENSE = "BSD-X"
 DEPENDS += "randrproto libxrender libxext"
 BBCLASSEXTEND = "sdk"
-PR = "r1"
 PE = "1"
 
 XORG_PN = "libXrandr"
 
 SRC_URI[archive.md5sum] = "5860360f5b038cc728f388f875ce525d"
 SRC_URI[archive.sha256sum] = "2d2df642eb8e0527936cdf4ed1c096f69df53e9b95e2532c8ed0cabd06a45407"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxrandr_1.2.2.bb b/recipes/xorg-lib/libxrandr_1.2.2.bb
index 8a230f89a1..5e4ed648fa 100644
--- a/recipes/xorg-lib/libxrandr_1.2.2.bb
+++ b/recipes/xorg-lib/libxrandr_1.2.2.bb
@@ -4,10 +4,10 @@ DESCRIPTION = "X11 Resize and Rotate extension library"
 LICENSE = "BSD-X"
 DEPENDS += "randrproto libxrender libxext"
 BBCLASSEXTEND = "sdk"
-PR = "r1"
 PE = "1"
 
 XORG_PN = "libXrandr"
 
 SRC_URI[archive.md5sum] = "1b244b5d19f0ccab01d7083436cd3558"
 SRC_URI[archive.sha256sum] = "206f8dc850f12b1213fb73dbef09fafa1bb8fb8c3ddfe4d39721c1e2dec12a98"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxrandr_1.2.3.bb b/recipes/xorg-lib/libxrandr_1.2.3.bb
index 9ce4ae280a..b5a1aef511 100644
--- a/recipes/xorg-lib/libxrandr_1.2.3.bb
+++ b/recipes/xorg-lib/libxrandr_1.2.3.bb
@@ -4,10 +4,10 @@ DESCRIPTION = "X11 Resize and Rotate extension library"
 LICENSE = "BSD-X"
 DEPENDS += "randrproto libxrender libxext"
 BBCLASSEXTEND = "sdk"
-PR = "r0"
 PE = "1"
 
 XORG_PN = "libXrandr"
 
 SRC_URI[archive.md5sum] = "5cd67cc02a50c9644ba0a1846ea3b08e"
 SRC_URI[archive.sha256sum] = "f8edfe26b8c4c3677a3a949f81a8b09a5fad62972020bfd230401e11cc0ed267"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxrandr_1.3.0.bb b/recipes/xorg-lib/libxrandr_1.3.0.bb
index a881f446e9..3f01e10119 100644
--- a/recipes/xorg-lib/libxrandr_1.3.0.bb
+++ b/recipes/xorg-lib/libxrandr_1.3.0.bb
@@ -4,10 +4,10 @@ DESCRIPTION = "X11 Resize and Rotate extension library"
 LICENSE = "BSD-X"
 DEPENDS += "randrproto libxrender libxext"
 BBCLASSEXTEND = "sdk"
-PR = "r0"
 PE = "1"
 
 XORG_PN = "libXrandr"
 
 SRC_URI[archive.md5sum] = "68eb59c3b7524db6ffd78746ee893d1d"
 SRC_URI[archive.sha256sum] = "5961ce0f77c5173a8208b3ed669ac01719f2bf4a10517ffa6c33a5e064802e78"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxrender_0.9.2.bb b/recipes/xorg-lib/libxrender_0.9.2.bb
index baa5a16d77..1c9e336176 100644
--- a/recipes/xorg-lib/libxrender_0.9.2.bb
+++ b/recipes/xorg-lib/libxrender_0.9.2.bb
@@ -4,10 +4,10 @@ DESCRIPTION = "X11 Rendering Extension client library"
 LICENSE = "BSD-X"
 DEPENDS += "virtual/libx11 renderproto xproto"
 BBCLASSEXTEND = "native sdk"
-PR = "r1"
 PE = "1"
 
 XORG_PN = "libXrender"
 
 SRC_URI[archive.md5sum] = "2f1b2c6e8dcbcb6d760e59f445abd92c"
 SRC_URI[archive.sha256sum] = "0f749183ab1a0ece14d33c3299b3f70893122349c0bfa9d7bd0e66ce19d1802a"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxrender_0.9.3.bb b/recipes/xorg-lib/libxrender_0.9.3.bb
index aef2f23f78..2a654918a4 100644
--- a/recipes/xorg-lib/libxrender_0.9.3.bb
+++ b/recipes/xorg-lib/libxrender_0.9.3.bb
@@ -4,10 +4,10 @@ DESCRIPTION = "X11 Rendering Extension client library"
 LICENSE = "BSD-X"
 DEPENDS += "virtual/libx11 renderproto xproto"
 BBCLASSEXTEND = "native sdk"
-PR = "r0"
 PE = "1"
 
 XORG_PN = "libXrender"
 
 SRC_URI[archive.md5sum] = "307132fce2e551ad2c641bddf8480f16"
 SRC_URI[archive.sha256sum] = "9882ba2d74e9ca5cfd0c2231ac8eba14d8fc59d538c787fa639f8d77c996bbef"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxrender_0.9.4.bb b/recipes/xorg-lib/libxrender_0.9.4.bb
index 6497e331a8..99105eec6e 100644
--- a/recipes/xorg-lib/libxrender_0.9.4.bb
+++ b/recipes/xorg-lib/libxrender_0.9.4.bb
@@ -4,10 +4,10 @@ DESCRIPTION = "X11 Rendering Extension client library"
 LICENSE = "BSD-X"
 DEPENDS += "virtual/libx11 renderproto xproto xdmcp"
 BBCLASSEXTEND = "native sdk"
-PR = "r1"
 PE = "1"
 
 XORG_PN = "libXrender"
 
 SRC_URI[archive.md5sum] = "dc266e850c51368f964e0d67bf5fb5e6"
 SRC_URI[archive.sha256sum] = "5682d343dd4e7ef291a6577e956c331946ce5801d8fa076284a01b41de3017ec"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxrender_0.9.5.bb b/recipes/xorg-lib/libxrender_0.9.5.bb
index db738ffcf4..ae2a842f3d 100644
--- a/recipes/xorg-lib/libxrender_0.9.5.bb
+++ b/recipes/xorg-lib/libxrender_0.9.5.bb
@@ -4,10 +4,10 @@ DESCRIPTION = "X11 Rendering Extension client library"
 LICENSE = "BSD-X"
 DEPENDS += "virtual/libx11 renderproto xproto xdmcp"
 BBCLASSEXTEND = "native sdk"
-PR = "r1"
 PE = "1"
 
 XORG_PN = "libXrender"
 
 SRC_URI[archive.md5sum] = "276dd9e85daf0680616cd9f132b354c9"
 SRC_URI[archive.sha256sum] = "bc0590438a4be2b674cbac6f4ad46e5a89acd02aa94817da0fa8eb3ef05ed5d5"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxrender_0.9.6.bb b/recipes/xorg-lib/libxrender_0.9.6.bb
index 9da85ded7c..67830e4236 100644
--- a/recipes/xorg-lib/libxrender_0.9.6.bb
+++ b/recipes/xorg-lib/libxrender_0.9.6.bb
@@ -10,3 +10,4 @@ XORG_PN = "libXrender"
 
 SRC_URI[archive.md5sum] = "3b3b7d076c2384b6c600c0b5f4ba971f"
 SRC_URI[archive.sha256sum] = "7f58b1e263109e0a873eef8423aa14733a5499befbe645053aa622ed1f3ea668"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxres_1.0.3.bb b/recipes/xorg-lib/libxres_1.0.3.bb
index e959a9a7c7..0fecfc8a49 100644
--- a/recipes/xorg-lib/libxres_1.0.3.bb
+++ b/recipes/xorg-lib/libxres_1.0.3.bb
@@ -2,10 +2,10 @@ require xorg-lib-common.inc
 
 DESCRIPTION = "X11 Resource extension library"
 DEPENDS += "libxext resourceproto"
-PR = "r1"
 PE = "1"
 
 XORG_PN = "libXres"
 
 SRC_URI[archive.md5sum] = "de66ffb657aba64c9d6dbdeabb757f3e"
 SRC_URI[archive.sha256sum] = "a6d5ba7573f5ec0f091095f01b51d1e671dd0f14acb5b8559cdf366e398a0230"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxres_1.0.4.bb b/recipes/xorg-lib/libxres_1.0.4.bb
index 00a81e6470..8c787421dc 100644
--- a/recipes/xorg-lib/libxres_1.0.4.bb
+++ b/recipes/xorg-lib/libxres_1.0.4.bb
@@ -2,10 +2,10 @@ require xorg-lib-common.inc
 
 DESCRIPTION = "X11 Resource extension library"
 DEPENDS += "libxext resourceproto"
-PR = "r1"
 PE = "1"
 
 XORG_PN = "libXres"
 
 SRC_URI[archive.md5sum] = "4daf91f93d924e693f6f6ed276791be2"
 SRC_URI[archive.sha256sum] = "457f567a70ef8798cfb32f897ffa52c3f010923b07414b3a42277f56877572df"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxscrnsaver_1.1.2.bb b/recipes/xorg-lib/libxscrnsaver_1.1.2.bb
index c6dace7787..fd2ff3f266 100644
--- a/recipes/xorg-lib/libxscrnsaver_1.1.2.bb
+++ b/recipes/xorg-lib/libxscrnsaver_1.1.2.bb
@@ -4,10 +4,10 @@ DESCRIPTION = "X Screen Saver extension library"
 LICENSE = "GPL"
 DEPENDS += "libxext scrnsaverproto"
 RREPLACES_${PN} = "libxss"
-PR = "r2"
 PE = "1"
 
 XORG_PN = "libXScrnSaver"
 
 SRC_URI[archive.md5sum] = "ac2d697dd02f51e5c15f7104f4be5328"
 SRC_URI[archive.sha256sum] = "6c75debca746060e0c2408a6ca119613ae02d1054adebd4b26ff8beee79bcc67"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxscrnsaver_1.1.3.bb b/recipes/xorg-lib/libxscrnsaver_1.1.3.bb
index 073d07182a..f201834247 100644
--- a/recipes/xorg-lib/libxscrnsaver_1.1.3.bb
+++ b/recipes/xorg-lib/libxscrnsaver_1.1.3.bb
@@ -4,10 +4,10 @@ DESCRIPTION = "X Screen Saver extension library"
 LICENSE = "GPL"
 DEPENDS += "libxext scrnsaverproto"
 RREPLACES_${PN} = "libxss"
-PR = "r2"
 PE = "1"
 
 XORG_PN = "libXScrnSaver"
 
 SRC_URI[archive.md5sum] = "93f84b6797f2f29cae1ce23b0355d00d"
 SRC_URI[archive.sha256sum] = "4b90245093c15a24aaaf2fc6e09f075137aad994f72043e098597997d9b2c988"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxscrnsaver_1.2.0.bb b/recipes/xorg-lib/libxscrnsaver_1.2.0.bb
index 6b2a5c7a33..4ad71ddaba 100644
--- a/recipes/xorg-lib/libxscrnsaver_1.2.0.bb
+++ b/recipes/xorg-lib/libxscrnsaver_1.2.0.bb
@@ -4,10 +4,10 @@ DESCRIPTION = "X Screen Saver extension library"
 LICENSE = "GPL"
 DEPENDS += "libxext scrnsaverproto"
 RREPLACES_${PN} = "libxss"
-PR = "r2"
 PE = "1"
 
 XORG_PN = "libXScrnSaver"
 
 SRC_URI[archive.md5sum] = "33e54f64b55f22d8bbe822a5b62568cb"
 SRC_URI[archive.sha256sum] = "5b067bec0f2eb6405226bde5f20ca107eb0e5c11f5e5e24b455930c450487f85"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxt_1.0.4.bb b/recipes/xorg-lib/libxt_1.0.4.bb
index 0437fbb96d..75df5d91e9 100644
--- a/recipes/xorg-lib/libxt_1.0.4.bb
+++ b/recipes/xorg-lib/libxt_1.0.4.bb
@@ -11,7 +11,6 @@ XORG_PN = "libXt"
 
 SRC_URI += "file://pr10970-header-fix.patch"
 
-PR = "r1"
 
 EXTRA_OECONF="--enable-malloc0returnsnull --disable-install-makestrs --disable-xkb"
 
@@ -25,3 +24,4 @@ do_compile() {
 
 SRC_URI[archive.md5sum] = "937735f342c046db239852fec0413f6c"
 SRC_URI[archive.sha256sum] = "ec7088b2ffe8f56c177525283601fb048decaf6f175d9ee5db01e12810a4d345"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxt_1.0.5.bb b/recipes/xorg-lib/libxt_1.0.5.bb
index f7af7dce71..1824ec6561 100644
--- a/recipes/xorg-lib/libxt_1.0.5.bb
+++ b/recipes/xorg-lib/libxt_1.0.5.bb
@@ -3,7 +3,6 @@ require xorg-lib-common.inc
 DESCRIPTION = "X11 toolkit intrinsics library"
 DEPENDS += "libsm virtual/libx11 kbproto"
 BBCLASSEXTEND = "native"
-PR = "r2"
 PE = "1"
 
 XORG_PN = "libXt"
@@ -22,3 +21,4 @@ do_compile() {
 
 SRC_URI[archive.md5sum] = "f3bdd67785ace8cd0b23249e9d8c9975"
 SRC_URI[archive.sha256sum] = "43c472ada59a04428a463225cd4cd42cb81bc43eb687cc1890f2f1c81a3e9cf4"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxt_1.0.7.bb b/recipes/xorg-lib/libxt_1.0.7.bb
index 599ce1f36a..a0695f980d 100644
--- a/recipes/xorg-lib/libxt_1.0.7.bb
+++ b/recipes/xorg-lib/libxt_1.0.7.bb
@@ -3,7 +3,6 @@ require xorg-lib-common.inc
 DESCRIPTION = "X11 toolkit intrinsics library"
 DEPENDS += "libsm virtual/libx11 kbproto"
 BBCLASSEXTEND = "native"
-PR = "r1"
 PE = "1"
 
 XORG_PN = "libXt"
@@ -20,3 +19,4 @@ do_compile() {
 
 SRC_URI[archive.md5sum] = "96f3c93434a93186d178b60d4a262496"
 SRC_URI[archive.sha256sum] = "706d5248b061c8455f74ce5269ecc5ef59c27d0f52d22b07138f781928dda9ec"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxt_1.0.8.bb b/recipes/xorg-lib/libxt_1.0.8.bb
index 17130f4fa6..4ad4293820 100644
--- a/recipes/xorg-lib/libxt_1.0.8.bb
+++ b/recipes/xorg-lib/libxt_1.0.8.bb
@@ -18,3 +18,4 @@ do_compile() {
 }
 SRC_URI[archive.md5sum] = "fb7d2aa5b24cd5fe9b238a26d88030e7"
 SRC_URI[archive.sha256sum] = "70f52c81258661811c8eae86a7a6dc910d0bf84cd48aeeed85ba430ad6b2037c"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxtrap_1.0.0.bb b/recipes/xorg-lib/libxtrap_1.0.0.bb
index f120457145..95ed521954 100644
--- a/recipes/xorg-lib/libxtrap_1.0.0.bb
+++ b/recipes/xorg-lib/libxtrap_1.0.0.bb
@@ -2,10 +2,10 @@ require xorg-lib-common.inc
 
 DESCRIPTION = "X11 event trapping extension library"
 DEPENDS += "libxt trapproto libxext"
-PR = "r1"
 PE = "1"
 
 XORG_PN = "libXTrap"
 
 SRC_URI[archive.md5sum] = "1e2d966b5b2b89910e418bb0f78e10de"
 SRC_URI[archive.sha256sum] = "cfd12ce675bd5cdeac3720582741fe81a99343bef475d440cb34a7f2cdfe34ba"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxtst_1.0.2.bb b/recipes/xorg-lib/libxtst_1.0.2.bb
index fe98bdaea2..a8d4e4727c 100644
--- a/recipes/xorg-lib/libxtst_1.0.2.bb
+++ b/recipes/xorg-lib/libxtst_1.0.2.bb
@@ -2,10 +2,10 @@ require xorg-lib-common.inc
 
 DESCRIPTION = "X Test Extension: client side library"
 DEPENDS += "libxext recordproto inputproto"
-PR = "r1"
 PE = "1"
 
 XORG_PN = "libXtst"
 
 SRC_URI[archive.md5sum] = "032d5c1d3914fc0224837328c88aef96"
 SRC_URI[archive.sha256sum] = "eef98ad3d35254384c3714cd63826fc2009f9b394f2b489718aba9be7be0a10b"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxtst_1.0.3.bb b/recipes/xorg-lib/libxtst_1.0.3.bb
index 768af2a5f4..8ce8d905ff 100644
--- a/recipes/xorg-lib/libxtst_1.0.3.bb
+++ b/recipes/xorg-lib/libxtst_1.0.3.bb
@@ -2,10 +2,10 @@ require xorg-lib-common.inc
 
 DESCRIPTION = "X Test Extension: client side library"
 DEPENDS += "libxext recordproto inputproto"
-PR = "r1"
 PE = "1"
 
 XORG_PN = "libXtst"
 
 SRC_URI[archive.md5sum] = "090c1ad04e34982eada5cf3b1a0792fd"
 SRC_URI[archive.sha256sum] = "b4a8dd3d9ceb04cd7322c1f7e5d2320d6ccf85ba8c81d736fd6d6c83c658c905"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxtst_1.1.0.bb b/recipes/xorg-lib/libxtst_1.1.0.bb
index 5214b7dbd2..158707f416 100644
--- a/recipes/xorg-lib/libxtst_1.1.0.bb
+++ b/recipes/xorg-lib/libxtst_1.1.0.bb
@@ -2,10 +2,10 @@ require xorg-lib-common.inc
 
 DESCRIPTION = "X Test Extension: client side library"
 DEPENDS += "libxext recordproto inputproto libxi"
-PR = "r1"
 PE = "1"
 
 XORG_PN = "libXtst"
 
 SRC_URI[archive.md5sum] = "dd6f3e20b87310187121539f9605d977"
 SRC_URI[archive.sha256sum] = "bd440f4779e06957211ba83782a5a1cfbf1d42b14fd3510a6dce440489a4eb26"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxv_1.0.3.bb b/recipes/xorg-lib/libxv_1.0.3.bb
index bb7981e43f..5e953725ba 100644
--- a/recipes/xorg-lib/libxv_1.0.3.bb
+++ b/recipes/xorg-lib/libxv_1.0.3.bb
@@ -3,9 +3,9 @@ require xorg-lib-common.inc
 DESCRIPTION = "X11 Video extension library"
 LICENSE = "GPL"
 DEPENDS += "libxext videoproto"
-PR = "r1"
 
 XORG_PN = "libXv"
 
 SRC_URI[archive.md5sum] = "f1c4109fa804aeaf7188b66c5cdd9f57"
 SRC_URI[archive.sha256sum] = "f87ae65be39a3c26dc3c87159d9126daf2af1b8c5e7f2ffc38b9f72b9236261b"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxv_1.0.4.bb b/recipes/xorg-lib/libxv_1.0.4.bb
index c1b9f30f59..68c15bc4eb 100644
--- a/recipes/xorg-lib/libxv_1.0.4.bb
+++ b/recipes/xorg-lib/libxv_1.0.4.bb
@@ -3,9 +3,9 @@ require xorg-lib-common.inc
 DESCRIPTION = "X11 Video extension library"
 LICENSE = "GPL"
 DEPENDS += "libxext videoproto"
-PR = "r1"
 
 XORG_PN = "libXv"
 
 SRC_URI[archive.md5sum] = "723a0275227165383e967a1ca8899b52"
 SRC_URI[archive.sha256sum] = "4d3cc49b6f4da6d396196054eca23a91df1a41001c736dcfd22fec5a5c7428c8"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxv_1.0.5.bb b/recipes/xorg-lib/libxv_1.0.5.bb
index aa2367664a..89fb603b6b 100644
--- a/recipes/xorg-lib/libxv_1.0.5.bb
+++ b/recipes/xorg-lib/libxv_1.0.5.bb
@@ -3,9 +3,9 @@ require xorg-lib-common.inc
 DESCRIPTION = "X11 Video extension library"
 LICENSE = "GPL"
 DEPENDS += "libxext videoproto"
-PR = "r1"
 
 XORG_PN = "libXv"
 
 SRC_URI[archive.md5sum] = "1d97798b1d8bbf8d9085e1b223a0738f"
 SRC_URI[archive.sha256sum] = "d549afdf22feefb97cca85dee12242af9f08c4d2435255dc7c30bd17d1d96010"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxvmc_1.0.4.bb b/recipes/xorg-lib/libxvmc_1.0.4.bb
index 3e8e385185..d8a81312b6 100644
--- a/recipes/xorg-lib/libxvmc_1.0.4.bb
+++ b/recipes/xorg-lib/libxvmc_1.0.4.bb
@@ -2,10 +2,10 @@ require xorg-lib-common.inc
 
 DESCRIPTION = "X Video Motion Compensation extension library"
 DEPENDS += "libxext libxv videoproto"
-PR = "r1"
 PE = "1"
 
 XORG_PN = "libXvMC"
 
 SRC_URI[archive.md5sum] = "b54600573daf9d1a29b952e8d35b389e"
 SRC_URI[archive.sha256sum] = "1217825ba8d66198466ee8306d0d6d237d2dd80d0f0783c98701296791833abb"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxvmc_1.0.5.bb b/recipes/xorg-lib/libxvmc_1.0.5.bb
index d4bd7c9c9b..34f70afd19 100644
--- a/recipes/xorg-lib/libxvmc_1.0.5.bb
+++ b/recipes/xorg-lib/libxvmc_1.0.5.bb
@@ -2,10 +2,10 @@ require xorg-lib-common.inc
 
 DESCRIPTION = "X Video Motion Compensation extension library"
 DEPENDS += "libxext libxv videoproto"
-PR = "r1"
 PE = "1"
 
 XORG_PN = "libXvMC"
 
 SRC_URI[archive.md5sum] = "16c3a11add14979beb7510e44623cac6"
 SRC_URI[archive.sha256sum] = "0644c768d28343af0efe0cb09fc9e0220b8ad755642bb498a3038cee328fde7f"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxxf86dga_1.0.1.bb b/recipes/xorg-lib/libxxf86dga_1.0.1.bb
index fc58e1e1cf..8bd496b087 100644
--- a/recipes/xorg-lib/libxxf86dga_1.0.1.bb
+++ b/recipes/xorg-lib/libxxf86dga_1.0.1.bb
@@ -2,10 +2,10 @@ require xorg-lib-common.inc
 
 DESCRIPTION = "X11 Direct Graphics Access extension library"
 DEPENDS += "libxext xf86dgaproto"
-PR = "r1"
 PE = "1"
 
 XORG_PN = "libXxf86dga"
 
 SRC_URI[archive.md5sum] = "5b0e752c71a23e9d1290cad44a7c7c75"
 SRC_URI[archive.sha256sum] = "8c68f429942b1258cff0fb27505645a463690374ecf318ae660ff4cde7a03db9"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxxf86dga_1.0.2.bb b/recipes/xorg-lib/libxxf86dga_1.0.2.bb
index f42798d009..a36edf1eb7 100644
--- a/recipes/xorg-lib/libxxf86dga_1.0.2.bb
+++ b/recipes/xorg-lib/libxxf86dga_1.0.2.bb
@@ -2,10 +2,10 @@ require xorg-lib-common.inc
 
 DESCRIPTION = "X11 Direct Graphics Access extension library"
 DEPENDS += "libxext xf86dgaproto"
-PR = "r1"
 PE = "1"
 
 XORG_PN = "libXxf86dga"
 
 SRC_URI[archive.md5sum] = "6f5f621804ee652b6cc6f2025c517c78"
 SRC_URI[archive.sha256sum] = "59175230a00a1fb359148f36eadb50fc6cb080849379ccb0e43c6cbb97309a25"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxxf86dga_1.1.1.bb b/recipes/xorg-lib/libxxf86dga_1.1.1.bb
index 5a76f7c345..4b4a952753 100644
--- a/recipes/xorg-lib/libxxf86dga_1.1.1.bb
+++ b/recipes/xorg-lib/libxxf86dga_1.1.1.bb
@@ -2,10 +2,10 @@ require xorg-lib-common.inc
 
 DESCRIPTION = "X11 Direct Graphics Access extension library"
 DEPENDS += "libxext xf86dgaproto"
-PR = "r1"
 PE = "1"
 
 XORG_PN = "libXxf86dga"
 
 SRC_URI[archive.md5sum] = "368837d3d7a4d3b4f70be48383e3544e"
 SRC_URI[archive.sha256sum] = "8d37f8895ecff15cb821a3e77bd505598983a5c6eae546e77e2d3070a8de5616"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxxf86misc_1.0.1.bb b/recipes/xorg-lib/libxxf86misc_1.0.1.bb
index 806a1e7487..b16be67c76 100644
--- a/recipes/xorg-lib/libxxf86misc_1.0.1.bb
+++ b/recipes/xorg-lib/libxxf86misc_1.0.1.bb
@@ -2,10 +2,10 @@ require xorg-lib-common.inc
 
 DESCRIPTION = "X11 XFree86 miscellaneous extension library"
 DEPENDS += "libxext xf86miscproto"
-PR = "r1"
 PE = "1"
 
 XORG_PN = "libXxf86misc"
 
 SRC_URI[archive.md5sum] = "7cee0df63903cef7f7a3fb68cdd99eef"
 SRC_URI[archive.sha256sum] = "2122d67d49aaa06eeaeb3db173ea8a7048f3b52665e5135874bc5cadada91289"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxxf86misc_1.0.2.bb b/recipes/xorg-lib/libxxf86misc_1.0.2.bb
index e884b686f0..c6918ec707 100644
--- a/recipes/xorg-lib/libxxf86misc_1.0.2.bb
+++ b/recipes/xorg-lib/libxxf86misc_1.0.2.bb
@@ -2,10 +2,10 @@ require xorg-lib-common.inc
 
 DESCRIPTION = "X11 XFree86 miscellaneous extension library"
 DEPENDS += "libxext xf86miscproto"
-PR = "r1"
 PE = "1"
 
 XORG_PN = "libXxf86misc"
 
 SRC_URI[archive.md5sum] = "51fed53e8de067d4b8666f75a0212400"
 SRC_URI[archive.sha256sum] = "8e64b6b1bf34fcd112b1fd866d77e110b47794e825a996e4492c0ee408957cb3"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxxf86vm_1.0.1.bb b/recipes/xorg-lib/libxxf86vm_1.0.1.bb
index 80b70972c0..6632fab511 100644
--- a/recipes/xorg-lib/libxxf86vm_1.0.1.bb
+++ b/recipes/xorg-lib/libxxf86vm_1.0.1.bb
@@ -2,10 +2,10 @@ require xorg-lib-common.inc
 
 DESCRIPTION = "X11 XFree86 video mode extension library"
 DEPENDS += "libxext xf86vidmodeproto"
-PR = "r1"
 PE = "1"
 
 XORG_PN = "libXxf86vm"
 
 SRC_URI[archive.md5sum] = "8de1ca6c55aaad7d8cae19b4f0b3da32"
 SRC_URI[archive.sha256sum] = "e08fc2c1611c422f751ed02810491b45bf7faa4207d762a11f11815263c9285a"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxxf86vm_1.0.2.bb b/recipes/xorg-lib/libxxf86vm_1.0.2.bb
index 000d69f6f4..9e0645433e 100644
--- a/recipes/xorg-lib/libxxf86vm_1.0.2.bb
+++ b/recipes/xorg-lib/libxxf86vm_1.0.2.bb
@@ -2,10 +2,10 @@ require xorg-lib-common.inc
 
 DESCRIPTION = "X11 XFree86 video mode extension library"
 DEPENDS += "libxext xf86vidmodeproto"
-PR = "r0"
 PE = "1"
 
 XORG_PN = "libXxf86vm"
 
 SRC_URI[archive.md5sum] = "304d37bd0a10d9b58aa9b64469ad73e5"
 SRC_URI[archive.sha256sum] = "3cb3c3c6552a4fbc686ba6c2dbeb6e4ba2a27103279908831d56363de73951de"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/libxxf86vm_1.1.0.bb b/recipes/xorg-lib/libxxf86vm_1.1.0.bb
index 570c006e4b..d33d1c4f6f 100644
--- a/recipes/xorg-lib/libxxf86vm_1.1.0.bb
+++ b/recipes/xorg-lib/libxxf86vm_1.1.0.bb
@@ -2,10 +2,10 @@ require xorg-lib-common.inc
 
 DESCRIPTION = "X11 XFree86 video mode extension library"
 DEPENDS += "libxext xf86vidmodeproto"
-PR = "r0"
 PE = "1"
 
 XORG_PN = "libXxf86vm"
 
 SRC_URI[archive.md5sum] = "b431ad7084e1055fef99a9115237edd8"
 SRC_URI[archive.sha256sum] = "7cc5e577b337c5267f4e65741f27229111ada8cb833e24b47713a683e8838de8"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/pixman_0.9.4.bb b/recipes/xorg-lib/pixman_0.9.4.bb
index c08a9b96b2..fed095dd96 100644
--- a/recipes/xorg-lib/pixman_0.9.4.bb
+++ b/recipes/xorg-lib/pixman_0.9.4.bb
@@ -1,9 +1,8 @@
 require xorg-lib-common.inc
+PR = "${INC_PR}.0"
 
 DESCRIPTION = "Library for lowlevel pixel operations"
 DEPENDS = "virtual/libx11"
-PR = "r0"
-
 
 SRC_URI[archive.md5sum] = "c354ab5b0da10227226d3ef604254875"
 SRC_URI[archive.sha256sum] = "261d239e9e3070a0a81e5b3eab92e6236c6295979bdae0a1ded05cbef93f67aa"
diff --git a/recipes/xorg-lib/pixman_0.9.5.bb b/recipes/xorg-lib/pixman_0.9.5.bb
index e538113877..1602c3de43 100644
--- a/recipes/xorg-lib/pixman_0.9.5.bb
+++ b/recipes/xorg-lib/pixman_0.9.5.bb
@@ -1,4 +1,5 @@
 require xorg-lib-common.inc
+PR = "${INC_PR}.0"
 
 DESCRIPTION = "Library for lowlevel pixel operations"
 DEPENDS = "virtual/libx11"
diff --git a/recipes/xorg-lib/xorg-lib-common.inc b/recipes/xorg-lib/xorg-lib-common.inc
index 0c8e7bc81f..9da51dbe84 100644
--- a/recipes/xorg-lib/xorg-lib-common.inc
+++ b/recipes/xorg-lib/xorg-lib-common.inc
@@ -4,6 +4,7 @@ LICENSE = "MIT-X"
 DEPENDS = "util-macros xorg-headers-native"
 
 XORG_PN = "${BPN}"
+INC_PR = "r8"
 
 SRC_URI = "${XORG_MIRROR}/individual/lib/${XORG_PN}-${PV}.tar.bz2;name=archive"
 
diff --git a/recipes/xorg-lib/xtrans_1.0.3.bb b/recipes/xorg-lib/xtrans_1.0.3.bb
index 74af98bb1e..f9f1b32e03 100644
--- a/recipes/xorg-lib/xtrans_1.0.3.bb
+++ b/recipes/xorg-lib/xtrans_1.0.3.bb
@@ -12,3 +12,4 @@ SRC_URI += "file://fix-missing-includepath.patch"
 
 SRC_URI[archive.md5sum] = "bb196907ea1e182dcb396eb22f7d2c1a"
 SRC_URI[archive.sha256sum] = "e1a3c4986f16a5fbca611d0547cc7499a1fa47ca2096593644037e2609363085"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/xtrans_1.0.4.bb b/recipes/xorg-lib/xtrans_1.0.4.bb
index 325ecdc182..2f688b2864 100644
--- a/recipes/xorg-lib/xtrans_1.0.4.bb
+++ b/recipes/xorg-lib/xtrans_1.0.4.bb
@@ -12,3 +12,4 @@ SRC_URI += "file://fix-missing-includepath.patch"
 
 SRC_URI[archive.md5sum] = "8b36cdf08df12be96615e3d550236626"
 SRC_URI[archive.sha256sum] = "765219fa822edeffb0650e93458e4ebf63c23176e58fce06806fb251fbfe7d8c"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/xtrans_1.1.bb b/recipes/xorg-lib/xtrans_1.1.bb
index d277ac157a..fb89e2d060 100644
--- a/recipes/xorg-lib/xtrans_1.1.bb
+++ b/recipes/xorg-lib/xtrans_1.1.bb
@@ -12,3 +12,4 @@ SRC_URI += "file://fix-missing-includepath.patch"
 
 SRC_URI[archive.md5sum] = "8546e3a060aefb42c889eaa4b5db33af"
 SRC_URI[archive.sha256sum] = "16bc4646f105efd3d0dd105899ac19035d67acf50950ca8c70cf68772508272d"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/xtrans_1.2.1.bb b/recipes/xorg-lib/xtrans_1.2.1.bb
index a27931b4f7..27be328c9b 100644
--- a/recipes/xorg-lib/xtrans_1.2.1.bb
+++ b/recipes/xorg-lib/xtrans_1.2.1.bb
@@ -12,3 +12,4 @@ RDEPENDS_${PN}-dev = ""
 
 SRC_URI[archive.md5sum] = "96e142331edd498a9364887b2548f1bb"
 SRC_URI[archive.sha256sum] = "9ff21a8d9ea524ca9b7cb6d6b4d522b4cb20b1c35edeb8995a9e9265a0df64bd"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/xtrans_1.2.3.bb b/recipes/xorg-lib/xtrans_1.2.3.bb
index 9a5ffbc63a..615b3ebaab 100644
--- a/recipes/xorg-lib/xtrans_1.2.3.bb
+++ b/recipes/xorg-lib/xtrans_1.2.3.bb
@@ -12,3 +12,4 @@ RDEPENDS_${PN}-dev = ""
 
 SRC_URI[archive.md5sum] = "f9cf791dfad59cf044e276aab3a71e1d"
 SRC_URI[archive.sha256sum] = "a67a8b09d9530021e2bd4b93136f385e72a8d8e4f2c26a99aeb169bee88facf0"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/xtrans_1.2.5.bb b/recipes/xorg-lib/xtrans_1.2.5.bb
index 011aad9902..3db86ec4f2 100644
--- a/recipes/xorg-lib/xtrans_1.2.5.bb
+++ b/recipes/xorg-lib/xtrans_1.2.5.bb
@@ -12,3 +12,4 @@ RDEPENDS_${PN}-dev = ""
 
 SRC_URI[archive.md5sum] = "2d1e57e82acc5f21797e92341415af2f"
 SRC_URI[archive.sha256sum] = "cc71a391f4da8176e5daeeac1ddf5137ba5e8d2263cb93a49f9e2a9976b90899"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-lib/xtrans_1.2.bb b/recipes/xorg-lib/xtrans_1.2.bb
index a27532ed6f..553ae1a37e 100644
--- a/recipes/xorg-lib/xtrans_1.2.bb
+++ b/recipes/xorg-lib/xtrans_1.2.bb
@@ -12,3 +12,4 @@ SRC_URI += "file://fix-missing-includepath.patch"
 
 SRC_URI[archive.md5sum] = "a91fef8b932b21992af7dfff7b2643f3"
 SRC_URI[archive.sha256sum] = "d6c3cabd5ecd0183a8a9bc6b3471545df8e2c78956b4c4cfd48f0c545a88c9a4"
+PR = "${INC_PR}.0"