xorg-proto: use INC_PR

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

89 files changed, 90 insertions, 71 deletions

diff --git a/recipes/xorg-proto/applewmproto_1.0.3.bb b/recipes/xorg-proto/applewmproto_1.0.3.bb
index 2d05387165..5e64abd394 100644
--- a/recipes/xorg-proto/applewmproto_1.0.3.bb
+++ b/recipes/xorg-proto/applewmproto_1.0.3.bb
@@ -1,7 +1,7 @@
 require xorg-proto-common.inc
 
-PR = "r1"
 PE = "1"
 
 SRC_URI[archive.md5sum] = "d5d7c69837cc7dcbf2aa181ff423ab20"
 SRC_URI[archive.sha256sum] = "a938c07ea331359f379802c50c33aa0307b913f742ad74087d45e7fb2a1f4d50"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/applewmproto_1.2.0.bb b/recipes/xorg-proto/applewmproto_1.2.0.bb
index b2719e492b..8f531a92ce 100644
--- a/recipes/xorg-proto/applewmproto_1.2.0.bb
+++ b/recipes/xorg-proto/applewmproto_1.2.0.bb
@@ -1,7 +1,7 @@
 require xorg-proto-common.inc
 
-PR = "r1"
 PE = "1"
 
 SRC_URI[archive.md5sum] = "44e18d01857f9dfeb8628e317e786f31"
 SRC_URI[archive.sha256sum] = "4f549083df9db85e61d0b272645e3dc71bacde9b9156ca20a57440e794b71042"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/applewmproto_1.4.1.bb b/recipes/xorg-proto/applewmproto_1.4.1.bb
index a0e4bde571..424886cc4d 100644
--- a/recipes/xorg-proto/applewmproto_1.4.1.bb
+++ b/recipes/xorg-proto/applewmproto_1.4.1.bb
@@ -1,7 +1,7 @@
 require xorg-proto-common.inc
 
-PR = "r1"
 PE = "1"
 
 SRC_URI[archive.md5sum] = "76ca1c6e1d8904d2d885f81f7332eba6"
 SRC_URI[archive.sha256sum] = "08069e1b7dd0e357c1ac7fa63aadcae094dc131d2a578eb1600a9bd16b8fde19"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/bigreqsproto_1.0.2.bb b/recipes/xorg-proto/bigreqsproto_1.0.2.bb
index 25b256c903..b2a9c9c451 100644
--- a/recipes/xorg-proto/bigreqsproto_1.0.2.bb
+++ b/recipes/xorg-proto/bigreqsproto_1.0.2.bb
@@ -1,6 +1,5 @@
 require xorg-proto-common.inc
 
-PR = "r1"
 PE = "1"
 
 
@@ -8,3 +7,4 @@ BBCLASSEXTEND = "native nativesdk sdk"
 
 SRC_URI[archive.md5sum] = "95c29d9d10bf2868996c0c47a3b9a8dc"
 SRC_URI[archive.sha256sum] = "30da0098a24578e645193464526cc4d5c2c7fecaf476d1b9dabe68118850adee"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/bigreqsproto_1.1.0.bb b/recipes/xorg-proto/bigreqsproto_1.1.0.bb
index f7ec09e8b6..60bff60993 100644
--- a/recipes/xorg-proto/bigreqsproto_1.1.0.bb
+++ b/recipes/xorg-proto/bigreqsproto_1.1.0.bb
@@ -1,6 +1,5 @@
 require xorg-proto-common.inc
 
-PR = "r1"
 PE = "1"
 
 
@@ -8,3 +7,4 @@ BBCLASSEXTEND = "native nativesdk sdk"
 
 SRC_URI[archive.md5sum] = "d30c5dbf19ca6dffcd9788227ecff8c5"
 SRC_URI[archive.sha256sum] = "4864e12d3c5a99b0a9ee4704822455299345e6c65b23c688a4e4bf11481107bd"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/calibrateproto_git.bb b/recipes/xorg-proto/calibrateproto_git.bb
index 740c9e6daf..d1f47c6763 100644
--- a/recipes/xorg-proto/calibrateproto_git.bb
+++ b/recipes/xorg-proto/calibrateproto_git.bb
@@ -3,7 +3,6 @@ require xorg-proto-common.inc
 DESCRIPTION = "Touchscreen calibration protocol"
 
 SRCREV = "1da6fd1e2c7a49648245c98481fabea8b9690a8c"
-PR = "r0"
 PV = "0.0+${PR}+gitr${SRCPV}"
 PE = "3"
 
@@ -15,3 +14,4 @@ do_stage() {
 	#make it compatible with the old package from cvs
 	ln -sf ${PKG_CONFIG_DIR}/xcalibrateproto.pc ${PKG_CONFIG_DIR}/xcalibrateext.pc
 }
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/compositeproto_0.4.1.bb b/recipes/xorg-proto/compositeproto_0.4.1.bb
index 77b0f2fe12..a3b3b48c8b 100644
--- a/recipes/xorg-proto/compositeproto_0.4.1.bb
+++ b/recipes/xorg-proto/compositeproto_0.4.1.bb
@@ -6,3 +6,4 @@ PE = "1"
 
 SRC_URI[archive.md5sum] = "3692f3f8b2ea10dff3d2cede8dc65e79"
 SRC_URI[archive.sha256sum] = "e2744576731e1416503aade0d58a7861d0260f70b993351473a9f38ced606984"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/compositeproto_0.4.bb b/recipes/xorg-proto/compositeproto_0.4.bb
index c337bb8878..1745abc5be 100644
--- a/recipes/xorg-proto/compositeproto_0.4.bb
+++ b/recipes/xorg-proto/compositeproto_0.4.bb
@@ -6,3 +6,4 @@ PE = "1"
 
 SRC_URI[archive.md5sum] = "6281344d656d4e0c8e9db4918efe3d1d"
 SRC_URI[archive.sha256sum] = "6013d1ca63b2b7540f6f99977090812b899852acfbd9df123b5ebaa911e30003"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/damageproto_1.1.0.bb b/recipes/xorg-proto/damageproto_1.1.0.bb
index a8ec279973..84f00e626b 100644
--- a/recipes/xorg-proto/damageproto_1.1.0.bb
+++ b/recipes/xorg-proto/damageproto_1.1.0.bb
@@ -1,9 +1,9 @@
 require xorg-proto-common.inc
 
 CONFLICTS = "damageext"
-PR = "r1"
 PE = "1"
 
 
 SRC_URI[archive.md5sum] = "33ee591e0b1ca5ad7902934541db7d24"
 SRC_URI[archive.sha256sum] = "9d2684fac835e9cdf78befff2a58292f54db90094acbfb9f2ed5316fa30d641d"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/damageproto_1.2.0.bb b/recipes/xorg-proto/damageproto_1.2.0.bb
index 82ca80a2d8..b02cf227c9 100644
--- a/recipes/xorg-proto/damageproto_1.2.0.bb
+++ b/recipes/xorg-proto/damageproto_1.2.0.bb
@@ -1,9 +1,9 @@
 require xorg-proto-common.inc
 
 CONFLICTS = "damageext"
-PR = "r1"
 PE = "1"
 
 
 SRC_URI[archive.md5sum] = "434b931b02bd83ed9fc44951df81cdac"
 SRC_URI[archive.sha256sum] = "a50250770a2eead9d6fd56577e3328d0a6a1c4d425b58faa0f5ca7683169ee8f"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/dmxproto_2.2.2.bb b/recipes/xorg-proto/dmxproto_2.2.2.bb
index 9cc44c60c4..b59ff2e450 100644
--- a/recipes/xorg-proto/dmxproto_2.2.2.bb
+++ b/recipes/xorg-proto/dmxproto_2.2.2.bb
@@ -1,7 +1,7 @@
 require xorg-proto-common.inc
 
-PR = "r1"
 PE = "1"
 
 SRC_URI[archive.md5sum] = "d80acad88411e7944b9b085463d53302"
 SRC_URI[archive.sha256sum] = "aaa6d9c9d5ec58f733ca4d7413c541413482bce666217267e5bf88442e35fce2"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/dmxproto_2.3.bb b/recipes/xorg-proto/dmxproto_2.3.bb
index cd5bb393c1..9fb21c03ca 100644
--- a/recipes/xorg-proto/dmxproto_2.3.bb
+++ b/recipes/xorg-proto/dmxproto_2.3.bb
@@ -1,7 +1,7 @@
 require xorg-proto-common.inc
 
-PR = "r1"
 PE = "1"
 
 SRC_URI[archive.md5sum] = "880a41720b2937e2660dcdc0d34a8791"
 SRC_URI[archive.sha256sum] = "3a882ca43a1f359e3489468e6c407fd7d56d559f8895cf096a2ec877d6c403b0"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/dri2proto_1.1.bb b/recipes/xorg-proto/dri2proto_1.1.bb
index cbb4f56464..bb64f686b4 100644
--- a/recipes/xorg-proto/dri2proto_1.1.bb
+++ b/recipes/xorg-proto/dri2proto_1.1.bb
@@ -4,3 +4,4 @@ require xorg-proto-common.inc
 
 SRC_URI[archive.md5sum] = "1d70f0653b0b3a837853262dc5d34da4"
 SRC_URI[archive.sha256sum] = "69def6d1f64b3699ec9c729596d8b096623a62bdda6bbea78ed690421d174c11"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/dri2proto_2.0.bb b/recipes/xorg-proto/dri2proto_2.0.bb
index 52f2ad5fe8..48ca0fa607 100644
--- a/recipes/xorg-proto/dri2proto_2.0.bb
+++ b/recipes/xorg-proto/dri2proto_2.0.bb
@@ -4,3 +4,4 @@ require xorg-proto-common.inc
 
 SRC_URI[archive.md5sum] = "26f6515322ec50691584ac74291b4254"
 SRC_URI[archive.sha256sum] = "1954a7e96d7fe70611c483836ed143e84a069eed6d3dab22c05a531bfb6da9e4"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/dri2proto_2.1.bb b/recipes/xorg-proto/dri2proto_2.1.bb
index 7cf6f1fe03..a5e6bd4edd 100644
--- a/recipes/xorg-proto/dri2proto_2.1.bb
+++ b/recipes/xorg-proto/dri2proto_2.1.bb
@@ -4,3 +4,4 @@ require xorg-proto-common.inc
 
 SRC_URI[archive.md5sum] = "5cb7987d29db068153bdc8f23c767c43"
 SRC_URI[archive.sha256sum] = "2b33f7c7658fb8f004c3aaf2717711262baeb5d77cf3fd24e9b6cc263895122d"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/dri2proto_2.2.bb b/recipes/xorg-proto/dri2proto_2.2.bb
index a5f530fbf9..4e9526a7e7 100644
--- a/recipes/xorg-proto/dri2proto_2.2.bb
+++ b/recipes/xorg-proto/dri2proto_2.2.bb
@@ -4,3 +4,4 @@ require xorg-proto-common.inc
 
 SRC_URI[archive.md5sum] = "3ca8ddb42cd4ee31b8690031303221af"
 SRC_URI[archive.sha256sum] = "f352950ffee4437d9da3e216d9a348ba0c7cf80c8c0fb30385c77ce3b780b2a1"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/dri2proto_2.3.bb b/recipes/xorg-proto/dri2proto_2.3.bb
index 1c0e85fda5..3d9354c863 100644
--- a/recipes/xorg-proto/dri2proto_2.3.bb
+++ b/recipes/xorg-proto/dri2proto_2.3.bb
@@ -4,3 +4,4 @@ require xorg-proto-common.inc
 
 SRC_URI[archive.md5sum] = "3407b494d5e90d584c9af52aa8f9f028"
 SRC_URI[archive.sha256sum] = "b2141892a0db35feffa5e952ff5e1d2727c4436b07d7e2e9dd2ed89c8bb3e677"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/evieext_1.0.2.bb b/recipes/xorg-proto/evieext_1.0.2.bb
index aa52c54f71..38a6a63144 100644
--- a/recipes/xorg-proto/evieext_1.0.2.bb
+++ b/recipes/xorg-proto/evieext_1.0.2.bb
@@ -1,7 +1,7 @@
 require xorg-proto-common.inc
 
-PR = "r1"
 PE = "1"
 
 SRC_URI[archive.md5sum] = "2507b5d0f4b2848147fbddd155aa6cfe"
 SRC_URI[archive.sha256sum] = "0b85113a9770083715927f9c7a7d0ab354c8a508a91cb6e8e11130851494d125"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/evieext_1.1.0.bb b/recipes/xorg-proto/evieext_1.1.0.bb
index 4e3a1e359e..d84c4b4b24 100644
--- a/recipes/xorg-proto/evieext_1.1.0.bb
+++ b/recipes/xorg-proto/evieext_1.1.0.bb
@@ -1,7 +1,7 @@
 require xorg-proto-common.inc
 
-PR = "r1"
 PE = "1"
 
 SRC_URI[archive.md5sum] = "5c74f61d6f77b2e6a083b2b31000be42"
 SRC_URI[archive.sha256sum] = "47881a52a8d9da1e41e4f028ed32a8b44f738afbead819c0a07253fdc1641885"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/fixesproto_4.0.bb b/recipes/xorg-proto/fixesproto_4.0.bb
index 8728d6d779..a6733b8ff5 100644
--- a/recipes/xorg-proto/fixesproto_4.0.bb
+++ b/recipes/xorg-proto/fixesproto_4.0.bb
@@ -1,10 +1,10 @@
 require xorg-proto-common.inc
 
 CONFLICTS = "fixesext"
-PR = "r1"
 PE = "1"
 
 BBCLASSEXTEND = "native"
 
 SRC_URI[archive.md5sum] = "8b298cc3424597f8138c7faf7763dce9"
 SRC_URI[archive.sha256sum] = "b3fe971ccc8152db6c78da7117c31fc4cd2fcb2b6a4df3db0f8fed13d4ceb08f"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/fixesproto_4.1.1.bb b/recipes/xorg-proto/fixesproto_4.1.1.bb
index 18aed94b94..ad26565736 100644
--- a/recipes/xorg-proto/fixesproto_4.1.1.bb
+++ b/recipes/xorg-proto/fixesproto_4.1.1.bb
@@ -1,10 +1,10 @@
 require xorg-proto-common.inc
 
 CONFLICTS = "fixesext"
-PR = "r1"
 PE = "1"
 
 BBCLASSEXTEND = "native"
 
 SRC_URI[archive.md5sum] = "4c1cb4f2ed9f34de59f2f04783ca9483"
 SRC_URI[archive.sha256sum] = "e72a32916ad4bbd03847f8945c55582bdbafc039d286ded7365d402a7ff164ef"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/fontcacheproto_0.1.2.bb b/recipes/xorg-proto/fontcacheproto_0.1.2.bb
index 595ec5fa30..075f6513ac 100644
--- a/recipes/xorg-proto/fontcacheproto_0.1.2.bb
+++ b/recipes/xorg-proto/fontcacheproto_0.1.2.bb
@@ -1,9 +1,9 @@
 require xorg-proto-common.inc
 
-PR = "r1"
 PE = "1"
 
 SRC_URI[archive.md5sum] = "60df6b625074a9790e28543dcea71651"
 SRC_URI[archive.sha256sum] = "48063ed49b200927376645f9ffe65faa39af84d59ba6f60f2abb2f9c6fa3d9f9"
 
 BBCLASSEXTEND = "native"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/fontcacheproto_0.1.3.bb b/recipes/xorg-proto/fontcacheproto_0.1.3.bb
index 77f37938b8..d3fdcaae05 100644
--- a/recipes/xorg-proto/fontcacheproto_0.1.3.bb
+++ b/recipes/xorg-proto/fontcacheproto_0.1.3.bb
@@ -1,9 +1,9 @@
 require xorg-proto-common.inc
 
-PR = "r1"
 PE = "1"
 
 SRC_URI[archive.md5sum] = "a8a50e5e995bfacb0359575faf7f6906"
 SRC_URI[archive.sha256sum] = "1dcaa659d416272ff68e567d1910ccc1e369768f13b983cffcccd6c563dbe3cb"
 
 BBCLASSEXTEND = "native"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/fontsproto_2.0.2.bb b/recipes/xorg-proto/fontsproto_2.0.2.bb
index 620e9612d5..673f6840c1 100644
--- a/recipes/xorg-proto/fontsproto_2.0.2.bb
+++ b/recipes/xorg-proto/fontsproto_2.0.2.bb
@@ -1,9 +1,9 @@
 require xorg-proto-common.inc
 
-PR = "r1"
 PE = "1"
 
 SRC_URI[archive.md5sum] = "c946f166107b016a21cc7a02e1132724"
 SRC_URI[archive.sha256sum] = "83bd547131aa11a232717a0f06d3c6cd58a0b2f6d541660bbe9ebf43073a8b7b"
 
 BBCLASSEXTEND = "native"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/fontsproto_2.1.0.bb b/recipes/xorg-proto/fontsproto_2.1.0.bb
index d6ae43966e..fd60eb8d86 100644
--- a/recipes/xorg-proto/fontsproto_2.1.0.bb
+++ b/recipes/xorg-proto/fontsproto_2.1.0.bb
@@ -1,9 +1,9 @@
 require xorg-proto-common.inc
 
-PR = "r1"
 PE = "1"
 
 SRC_URI[archive.md5sum] = "f3a857deadca3144fba041af1dbf7603"
 SRC_URI[archive.sha256sum] = "5a9af61dc9142488c9ba6e4ae30a9d970ea0f889a1ab7f59de1c1898c83aeb35"
 
 BBCLASSEXTEND = "native"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/glproto_1.4.10.bb b/recipes/xorg-proto/glproto_1.4.10.bb
index 25eed04e30..c5217c6299 100644
--- a/recipes/xorg-proto/glproto_1.4.10.bb
+++ b/recipes/xorg-proto/glproto_1.4.10.bb
@@ -1,7 +1,7 @@
 require xorg-proto-common.inc
 
-PR = "r1"
 PE = "1"
 
 SRC_URI[archive.md5sum] = "c9f8cebfba72bfab674bc0170551fb8d"
 SRC_URI[archive.sha256sum] = "7fb83a28ae24d4f56eca88bc48f0fe414faee1afb2574bfb6257b52e8c716fcf"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/glproto_1.4.11.bb b/recipes/xorg-proto/glproto_1.4.11.bb
index 6f2d70be9c..7f666325ea 100644
--- a/recipes/xorg-proto/glproto_1.4.11.bb
+++ b/recipes/xorg-proto/glproto_1.4.11.bb
@@ -1,7 +1,7 @@
 require xorg-proto-common.inc
 
-PR = "r1"
 PE = "1"
 
 SRC_URI[archive.md5sum] = "78e7c4dc7dcb74b1869fee7897e00f59"
 SRC_URI[archive.sha256sum] = "fe481d89d74f01db4f3a671ef1f29df29da74dff5b678517ee659a6f9d819451"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/glproto_1.4.8.bb b/recipes/xorg-proto/glproto_1.4.8.bb
index 691b61ed9a..1b396c7cee 100644
--- a/recipes/xorg-proto/glproto_1.4.8.bb
+++ b/recipes/xorg-proto/glproto_1.4.8.bb
@@ -1,7 +1,7 @@
 require xorg-proto-common.inc
 
-PR = "r1"
 PE = "1"
 
 SRC_URI[archive.md5sum] = "3dfbd17203c0c88b94b6f579f24c11cc"
 SRC_URI[archive.sha256sum] = "2f5d84413853b688b7bb46c66fee108a499190e1f7810afffb775910778f053c"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/glproto_1.4.9.bb b/recipes/xorg-proto/glproto_1.4.9.bb
index 5cea657cef..609edd01ae 100644
--- a/recipes/xorg-proto/glproto_1.4.9.bb
+++ b/recipes/xorg-proto/glproto_1.4.9.bb
@@ -1,7 +1,7 @@
 require xorg-proto-common.inc
 
-PR = "r1"
 PE = "1"
 
 SRC_URI[archive.md5sum] = "e60951628422663e60faeb400f27bac1"
 SRC_URI[archive.sha256sum] = "69d7fb7be4f0f56bd3a67b6c8c88dc677892eb99fd1b13e166b43b39d64764a3"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/inputproto_1.4.1.bb b/recipes/xorg-proto/inputproto_1.4.1.bb
index 6ee652e610..b7d4c53c82 100644
--- a/recipes/xorg-proto/inputproto_1.4.1.bb
+++ b/recipes/xorg-proto/inputproto_1.4.1.bb
@@ -5,3 +5,4 @@ BBCLASSEXTEND = "native nativesdk sdk"
 
 SRC_URI[archive.md5sum] = "563cc41eeb590cf5eb2127807b838dfc"
 SRC_URI[archive.sha256sum] = "913ff534aa777e3c36f3e9fe3e8638c3ccfe398daeb7532fa917e7bcd6fed07d"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/inputproto_1.4.2.1.bb b/recipes/xorg-proto/inputproto_1.4.2.1.bb
index 835de74357..dc9f31aa85 100644
--- a/recipes/xorg-proto/inputproto_1.4.2.1.bb
+++ b/recipes/xorg-proto/inputproto_1.4.2.1.bb
@@ -6,3 +6,4 @@ BBCLASSEXTEND = "native nativesdk sdk"
 
 SRC_URI[archive.md5sum] = "aa948a7469168ddd9c33f11c5dff55ac"
 SRC_URI[archive.sha256sum] = "9b6db77037de7c52b9a17862b99bc435bd5c20e5d3faf5aec943b206cdaff3ed"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/inputproto_1.4.2.bb b/recipes/xorg-proto/inputproto_1.4.2.bb
index ca751873f7..7e1068852d 100644
--- a/recipes/xorg-proto/inputproto_1.4.2.bb
+++ b/recipes/xorg-proto/inputproto_1.4.2.bb
@@ -1,9 +1,9 @@
 require xorg-proto-common.inc
 
-PR = "r1"
 PE = "1"
 
 BBCLASSEXTEND = "native nativesdk sdk"
 
 SRC_URI[archive.md5sum] = "e2c4cf4c2ad59d1e27f09381f6b4a3c3"
 SRC_URI[archive.sha256sum] = "62ba68a056daa89f5b21a02b27f6a4c858933e1c5547c9d16985d9ed182014e6"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/inputproto_1.4.3.bb b/recipes/xorg-proto/inputproto_1.4.3.bb
index 0b11e2940b..d245225408 100644
--- a/recipes/xorg-proto/inputproto_1.4.3.bb
+++ b/recipes/xorg-proto/inputproto_1.4.3.bb
@@ -6,3 +6,4 @@ BBCLASSEXTEND = "native nativesdk sdk"
 
 SRC_URI[archive.md5sum] = "a0f0d8cf6fbf0db8ba3937d0cc16138d"
 SRC_URI[archive.sha256sum] = "627119ff21391314b88e5f34da837473151a54ab980d2f76d7f3c6bd3d560d4a"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/inputproto_1.4.4.bb b/recipes/xorg-proto/inputproto_1.4.4.bb
index 85314e68dc..7e6b0a228b 100644
--- a/recipes/xorg-proto/inputproto_1.4.4.bb
+++ b/recipes/xorg-proto/inputproto_1.4.4.bb
@@ -1,6 +1,5 @@
 require xorg-proto-common.inc
 
-PR = "r1"
 PE = "1"
 
 
@@ -8,3 +7,4 @@ BBCLASSEXTEND = "native nativesdk sdk"
 
 SRC_URI[archive.md5sum] = "3a532379f226c34b36a5c585999f75e4"
 SRC_URI[archive.sha256sum] = "63278ef492d6babb9e3efaef84a67a982e5362c51623714c9428f0384007dfe5"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/inputproto_1.5.0.bb b/recipes/xorg-proto/inputproto_1.5.0.bb
index d8b9ca8494..d070d58184 100644
--- a/recipes/xorg-proto/inputproto_1.5.0.bb
+++ b/recipes/xorg-proto/inputproto_1.5.0.bb
@@ -1,6 +1,5 @@
 require xorg-proto-common.inc
 
-PR = "r1"
 PE = "1"
 
 
@@ -8,3 +7,4 @@ BBCLASSEXTEND = "native nativesdk sdk"
 
 SRC_URI[archive.md5sum] = "dcc36554aea1338b3813943daf1e9988"
 SRC_URI[archive.sha256sum] = "ef90f7e4c151095cc75a573acd86355aa65c5bc7fd1dcce4a1483b64788e1461"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/inputproto_2.0.bb b/recipes/xorg-proto/inputproto_2.0.bb
index bb7ad83ab9..11168507b0 100644
--- a/recipes/xorg-proto/inputproto_2.0.bb
+++ b/recipes/xorg-proto/inputproto_2.0.bb
@@ -1,6 +1,5 @@
 require xorg-proto-common.inc
 
-PR = "r1"
 PE = "1"
 
 
@@ -8,3 +7,4 @@ BBCLASSEXTEND = "native nativesdk sdk"
 
 SRC_URI[archive.md5sum] = "0f7acbc14a082f9ae03744396527d23d"
 SRC_URI[archive.sha256sum] = "472f57f7928ab20a1303a25982c4091db9674c2729bbd692c9a7204e23ea1af4"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/kbproto_1.0.3.bb b/recipes/xorg-proto/kbproto_1.0.3.bb
index baa266faa4..64310c24af 100644
--- a/recipes/xorg-proto/kbproto_1.0.3.bb
+++ b/recipes/xorg-proto/kbproto_1.0.3.bb
@@ -1,9 +1,9 @@
 require xorg-proto-common.inc
 
-PR = "r1"
 PE = "1"
 
 BBCLASSEXTEND = "native nativesdk sdk"
 
 SRC_URI[archive.md5sum] = "6092cdb0a1225f95356ddbe6c2abaad5"
 SRC_URI[archive.sha256sum] = "7000005ebbd07a28a71477d72bcb76c47064e043a4ead26fcf4d5af394ce19df"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/kbproto_1.0.4.bb b/recipes/xorg-proto/kbproto_1.0.4.bb
index d500259ba8..2a8cb91447 100644
--- a/recipes/xorg-proto/kbproto_1.0.4.bb
+++ b/recipes/xorg-proto/kbproto_1.0.4.bb
@@ -1,9 +1,9 @@
 require xorg-proto-common.inc
 
-PR = "r1"
 PE = "1"
 
 BBCLASSEXTEND = "native nativesdk sdk"
 
 SRC_URI[archive.md5sum] = "7f439166a9b2bf81471a33951883019f"
 SRC_URI[archive.sha256sum] = "1baa29931313d0c3eb81dffd42662768cc76ce49ce94024d5fe32ef5a4e8603c"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/printproto_1.0.3.bb b/recipes/xorg-proto/printproto_1.0.3.bb
index 1399049d58..139644dd0f 100644
--- a/recipes/xorg-proto/printproto_1.0.3.bb
+++ b/recipes/xorg-proto/printproto_1.0.3.bb
@@ -1,7 +1,7 @@
 require xorg-proto-common.inc
 
-PR = "r1"
 PE = "1"
 
 SRC_URI[archive.md5sum] = "0f4e7982c6d4ec3b2cf38502dd1293a3"
 SRC_URI[archive.sha256sum] = "8b375f8cda83dfc7d84be44af41eedd484d0e2499acbd19bdca5b4056dec7235"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/printproto_1.0.4.bb b/recipes/xorg-proto/printproto_1.0.4.bb
index 01ea9496dc..7331fd9f26 100644
--- a/recipes/xorg-proto/printproto_1.0.4.bb
+++ b/recipes/xorg-proto/printproto_1.0.4.bb
@@ -1,7 +1,7 @@
 require xorg-proto-common.inc
 
-PR = "r1"
 PE = "1"
 
 SRC_URI[archive.md5sum] = "7321847a60748b4d2f1fa16db4b6ede8"
 SRC_URI[archive.sha256sum] = "f059a93188e7143dbb6cc55e31ccf81b976776aa3023bfa57f47501fd1bfd3be"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/randrproto_1.2.1.bb b/recipes/xorg-proto/randrproto_1.2.1.bb
index 4a018d4eb1..16b4d0140d 100644
--- a/recipes/xorg-proto/randrproto_1.2.1.bb
+++ b/recipes/xorg-proto/randrproto_1.2.1.bb
@@ -1,7 +1,6 @@
 require xorg-proto-common.inc
 
 CONFLICTS = "randrext"
-PR = "r1"
 PE = "1"
 
 
@@ -9,3 +8,4 @@ SRC_URI[archive.md5sum] = "e2e45564f8ce22e00e1360e79c8ccdeb"
 SRC_URI[archive.sha256sum] = "102fd42f8f2562450f4e45c28bfb0390c2d30ffa6a805eead15d67018930f654"
 
 BBCLASSEXTEND = "nativesdk sdk"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/randrproto_1.3.0.bb b/recipes/xorg-proto/randrproto_1.3.0.bb
index e2e9544e0b..56d1837681 100644
--- a/recipes/xorg-proto/randrproto_1.3.0.bb
+++ b/recipes/xorg-proto/randrproto_1.3.0.bb
@@ -1,7 +1,6 @@
 require xorg-proto-common.inc
 
 CONFLICTS = "randrext"
-PR = "r1"
 PE = "1"
 
 
@@ -9,3 +8,4 @@ SRC_URI[archive.md5sum] = "a49416013fff33c853efb32f1926551e"
 SRC_URI[archive.sha256sum] = "cfeb1429465e3c24debde1bf53ec35ef738fde5e80d2eed14f33e315e747bb8d"
 
 BBCLASSEXTEND = "nativesdk sdk"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/randrproto_1.3.1.bb b/recipes/xorg-proto/randrproto_1.3.1.bb
index 6cde1f483f..c8788b00a9 100644
--- a/recipes/xorg-proto/randrproto_1.3.1.bb
+++ b/recipes/xorg-proto/randrproto_1.3.1.bb
@@ -1,7 +1,6 @@
 require xorg-proto-common.inc
 
 CONFLICTS = "randrext"
-PR = "r1"
 PE = "1"
 
 
@@ -9,3 +8,4 @@ SRC_URI[archive.md5sum] = "a5c244c36382b0de39b2828cea4b651d"
 SRC_URI[archive.sha256sum] = "d93ca3c0ae710a45da6a27e1eeadfb3c9d4aee47f23657c996e1124c0d9985ca"
 
 BBCLASSEXTEND = "nativesdk sdk"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/recordproto_1.13.2.bb b/recipes/xorg-proto/recordproto_1.13.2.bb
index 7853b1c54f..48b42042e3 100644
--- a/recipes/xorg-proto/recordproto_1.13.2.bb
+++ b/recipes/xorg-proto/recordproto_1.13.2.bb
@@ -1,8 +1,8 @@
 require xorg-proto-common.inc
 
 CONFLICTS = "recordext"
-PR = "r1"
 PE = "1"
 
 SRC_URI[archive.md5sum] = "0ed4706564a34fc2aff724aa16d3ff00"
 SRC_URI[archive.sha256sum] = "04e77a8b14f373a1825bbe0116cd0db8b2c5dee17b34ba9bddd27e576609cff9"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/recordproto_1.14.bb b/recipes/xorg-proto/recordproto_1.14.bb
index 80cf61e93e..1376ac4856 100644
--- a/recipes/xorg-proto/recordproto_1.14.bb
+++ b/recipes/xorg-proto/recordproto_1.14.bb
@@ -1,8 +1,8 @@
 require xorg-proto-common.inc
 
 CONFLICTS = "recordext"
-PR = "r1"
 PE = "1"
 
 SRC_URI[archive.md5sum] = "70f5998c673aa510e2acd6d8fb3799de"
 SRC_URI[archive.sha256sum] = "1bd2375bd2bdaa3ea90aa0a70cf1657a2d61877b6eb7e3fe3e6f1d289e69d067"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/renderproto_0.11.bb b/recipes/xorg-proto/renderproto_0.11.bb
index 5f0bec8418..55a1ca85db 100644
--- a/recipes/xorg-proto/renderproto_0.11.bb
+++ b/recipes/xorg-proto/renderproto_0.11.bb
@@ -7,3 +7,4 @@ SRC_URI[archive.md5sum] = "b160a9733fe91b666e74fca284333148"
 SRC_URI[archive.sha256sum] = "c4d1d6d9b0b6ed9a328a94890c171d534f62708f0982d071ccd443322bedffc2"
 
 BBCLASSEXTEND = "native nativesdk sdk"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/renderproto_0.9.2.bb b/recipes/xorg-proto/renderproto_0.9.2.bb
index 5f4b3f45ec..5e72b7d490 100644
--- a/recipes/xorg-proto/renderproto_0.9.2.bb
+++ b/recipes/xorg-proto/renderproto_0.9.2.bb
@@ -1,7 +1,6 @@
 require xorg-proto-common.inc
 
 CONFLICTS = "renderext"
-PR = "r1"
 PE = "1"
 
 
@@ -9,3 +8,4 @@ SRC_URI[archive.md5sum] = "28fbe8a59ebd31f098b90ec64f3d133a"
 SRC_URI[archive.sha256sum] = "7754dfbbb1e3818f28720fa9647b8a593e9d54626a7896771c2bfac7f75e2726"
 
 BBCLASSEXTEND = "native nativesdk sdk"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/renderproto_0.9.3.bb b/recipes/xorg-proto/renderproto_0.9.3.bb
index aecbc8efa9..2e18d8d207 100644
--- a/recipes/xorg-proto/renderproto_0.9.3.bb
+++ b/recipes/xorg-proto/renderproto_0.9.3.bb
@@ -7,3 +7,4 @@ SRC_URI[archive.md5sum] = "598bc9a493deee2e48e4434e94467189"
 SRC_URI[archive.sha256sum] = "c98a08b877e98a8fa7daa04be472de7e0cb38a99593faca8b987effcea2dd45b"
 
 BBCLASSEXTEND = "native nativesdk sdk"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/resourceproto_1.0.2.bb b/recipes/xorg-proto/resourceproto_1.0.2.bb
index f3f333158f..25a23621cd 100644
--- a/recipes/xorg-proto/resourceproto_1.0.2.bb
+++ b/recipes/xorg-proto/resourceproto_1.0.2.bb
@@ -1,8 +1,8 @@
 require xorg-proto-common.inc
 
 CONFLICTS = "resourceext"
-PR = "r1"
 PE = "1"
 
 SRC_URI[archive.md5sum] = "b823b314e37eb19dae1f297951d2e933"
 SRC_URI[archive.sha256sum] = "0c33d6fceef5483001459bdc934b5831502250b27f1f4ad370ab044f8ab53487"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/resourceproto_1.1.0.bb b/recipes/xorg-proto/resourceproto_1.1.0.bb
index 542d3b1359..6a7e0958df 100644
--- a/recipes/xorg-proto/resourceproto_1.1.0.bb
+++ b/recipes/xorg-proto/resourceproto_1.1.0.bb
@@ -1,8 +1,8 @@
 require xorg-proto-common.inc
 
 CONFLICTS = "resourceext"
-PR = "r1"
 PE = "1"
 
 SRC_URI[archive.md5sum] = "84795594b3ebd2ee2570cf93340d152c"
 SRC_URI[archive.sha256sum] = "408d9ab067e4141d1bb844d2d0d7d26ad177567384190c32a913131cf549b36b"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/scrnsaverproto_1.1.0.bb b/recipes/xorg-proto/scrnsaverproto_1.1.0.bb
index 0a1bb92e12..7ac61d817a 100644
--- a/recipes/xorg-proto/scrnsaverproto_1.1.0.bb
+++ b/recipes/xorg-proto/scrnsaverproto_1.1.0.bb
@@ -1,7 +1,7 @@
 require xorg-proto-common.inc
 
-PR = "r1"
 PE = "1"
 
 SRC_URI[archive.md5sum] = "5d551850e6f4acdf49a13f4eb3a5bbfa"
 SRC_URI[archive.sha256sum] = "db09abf73cc339c05c0488639731794372a4770cfca76c2645f503f9fccd478f"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/scrnsaverproto_1.2.0.bb b/recipes/xorg-proto/scrnsaverproto_1.2.0.bb
index d10ce28740..6db86008b7 100644
--- a/recipes/xorg-proto/scrnsaverproto_1.2.0.bb
+++ b/recipes/xorg-proto/scrnsaverproto_1.2.0.bb
@@ -1,7 +1,7 @@
 require xorg-proto-common.inc
 
-PR = "r1"
 PE = "1"
 
 SRC_URI[archive.md5sum] = "9040c991a56ee9b5976936f8c65d5c8a"
 SRC_URI[archive.sha256sum] = "deaf0a3212617e0dab353a3c3a66e0a1f2398306eca0fd882ac15996b0e44d99"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/trapproto_3.4.3.bb b/recipes/xorg-proto/trapproto_3.4.3.bb
index 10b6d880db..f01e108258 100644
--- a/recipes/xorg-proto/trapproto_3.4.3.bb
+++ b/recipes/xorg-proto/trapproto_3.4.3.bb
@@ -1,7 +1,7 @@
 require xorg-proto-common.inc
 
-PR = "r1"
 PE = "1"
 
 SRC_URI[archive.md5sum] = "3b713239e5e6b269b31cb665563358df"
 SRC_URI[archive.sha256sum] = "ff32a0d3bc696cadc3457be9c85e9818af2b6daa2f159188bb01aad7e932a0e1"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/videoproto_2.2.2.bb b/recipes/xorg-proto/videoproto_2.2.2.bb
index 655621b01d..f822036f01 100644
--- a/recipes/xorg-proto/videoproto_2.2.2.bb
+++ b/recipes/xorg-proto/videoproto_2.2.2.bb
@@ -1,7 +1,7 @@
 require xorg-proto-common.inc
 
-PR = "r1"
 PE = "1"
 
 SRC_URI[archive.md5sum] = "44292d74a9a3c94b1ecb9d77a0da83e8"
 SRC_URI[archive.sha256sum] = "ab088478830cd30c2fe34fb7f44ffd4d177af7711c225c24676d3e9e9f24780c"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/videoproto_2.3.0.bb b/recipes/xorg-proto/videoproto_2.3.0.bb
index 5830a31401..a0a85f652d 100644
--- a/recipes/xorg-proto/videoproto_2.3.0.bb
+++ b/recipes/xorg-proto/videoproto_2.3.0.bb
@@ -1,7 +1,7 @@
 require xorg-proto-common.inc
 
-PR = "r1"
 PE = "1"
 
 SRC_URI[archive.md5sum] = "fb762146a18207a1e8bc9f299dfc7ac0"
 SRC_URI[archive.sha256sum] = "4f2bc94e5a1b60d6f35a9a2589ca98949e8841997f6a9acf4e85f46c1f34045f"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/windowswmproto_1.0.3.bb b/recipes/xorg-proto/windowswmproto_1.0.3.bb
index 3f96a712a7..e79902a203 100644
--- a/recipes/xorg-proto/windowswmproto_1.0.3.bb
+++ b/recipes/xorg-proto/windowswmproto_1.0.3.bb
@@ -1,7 +1,7 @@
 require xorg-proto-common.inc
 
-PR = "r1"
 PE = "1"
 
 SRC_URI[archive.md5sum] = "ed5416cf7e2ba6e66641c88f12768c0c"
 SRC_URI[archive.sha256sum] = "780d249696bb2de7acabded90a465a62cd6cbda3b7f0ccff6ebfdf0d8180f151"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/windowswmproto_1.0.4.bb b/recipes/xorg-proto/windowswmproto_1.0.4.bb
index 8a4e5af906..7f27b6c86d 100644
--- a/recipes/xorg-proto/windowswmproto_1.0.4.bb
+++ b/recipes/xorg-proto/windowswmproto_1.0.4.bb
@@ -1,7 +1,7 @@
 require xorg-proto-common.inc
 
-PR = "r1"
 PE = "1"
 
 SRC_URI[archive.md5sum] = "e74b2ff3172a6117f2a62b655ef99064"
 SRC_URI[archive.sha256sum] = "c05bb0edb627554fe97aa1516aed44accf6566b1db0e50332689a24afcebd26b"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/xcmiscproto_1.1.2.bb b/recipes/xorg-proto/xcmiscproto_1.1.2.bb
index 893bec52c5..caf621c13d 100644
--- a/recipes/xorg-proto/xcmiscproto_1.1.2.bb
+++ b/recipes/xorg-proto/xcmiscproto_1.1.2.bb
@@ -1,6 +1,5 @@
 require xorg-proto-common.inc
 
-PR = "r1"
 PE = "1"
 
 
@@ -8,3 +7,4 @@ BBCLASSEXTEND = "native nativesdk sdk"
 
 SRC_URI[archive.md5sum] = "fde0b050901f024b19159cdacdcfbd20"
 SRC_URI[archive.sha256sum] = "b2807e96a9d632b7bbf1782a43095de51f3feae3d2e25374d3df00c6c68792ab"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/xcmiscproto_1.2.0.bb b/recipes/xorg-proto/xcmiscproto_1.2.0.bb
index 552ad90a5d..93a0f76790 100644
--- a/recipes/xorg-proto/xcmiscproto_1.2.0.bb
+++ b/recipes/xorg-proto/xcmiscproto_1.2.0.bb
@@ -1,6 +1,5 @@
 require xorg-proto-common.inc
 
-PR = "r1"
 PE = "1"
 
 
@@ -8,3 +7,4 @@ BBCLASSEXTEND = "native nativesdk sdk"
 
 SRC_URI[archive.md5sum] = "7b83e4a7e9f4edc9c6cfb0500f4a7196"
 SRC_URI[archive.sha256sum] = "de17c06b7005c5e9ab469e324e76c5c3b8baa2dfc3c1dc7e93438c197facf68e"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/xextproto-70-includes_7.0.5.bb b/recipes/xorg-proto/xextproto-70-includes_7.0.5.bb
index 0e8df10615..8efdd635c6 100644
--- a/recipes/xorg-proto/xextproto-70-includes_7.0.5.bb
+++ b/recipes/xorg-proto/xextproto-70-includes_7.0.5.bb
@@ -1,7 +1,5 @@
 # Build of xserver-kdrive is not possible with xextproto >= 7.1.
 # This package allows to install old 7.0 includes in parallel.
-PR_append = ".1"
-
 BPN = "xextproto"
 
 require xextproto_7.0.5.bb
@@ -18,3 +16,4 @@ do_stage() {
 # No, we really do not want to install .pc file and overwrite newer one:
 pkgconfig_sysroot_preprocess() {
 }
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/xextproto_7.0.2.bb b/recipes/xorg-proto/xextproto_7.0.2.bb
index 63172149d9..1c0e160743 100644
--- a/recipes/xorg-proto/xextproto_7.0.2.bb
+++ b/recipes/xorg-proto/xextproto_7.0.2.bb
@@ -1,6 +1,5 @@
 require xorg-proto-common.inc
 
-PR = "r1"
 PE = "1"
 
 
@@ -8,3 +7,4 @@ BBCLASSEXTEND = "native nativesdk sdk"
 
 SRC_URI[archive.md5sum] = "242388ab65dde3a3dd313eeee265e429"
 SRC_URI[archive.sha256sum] = "53f3039ae769b08bd139d4474a7debe0b6f24048e7c514c835c8a1880f11e0d9"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/xextproto_7.0.3.bb b/recipes/xorg-proto/xextproto_7.0.3.bb
index c62700801c..a1e4eefb26 100644
--- a/recipes/xorg-proto/xextproto_7.0.3.bb
+++ b/recipes/xorg-proto/xextproto_7.0.3.bb
@@ -6,3 +6,4 @@ BBCLASSEXTEND = "native nativesdk sdk"
 
 SRC_URI[archive.md5sum] = "3a2e0252e853ab30b3bff05ac92ec61c"
 SRC_URI[archive.sha256sum] = "3972428e3651c9159aff655c9c794728520c3ce3d66ac219ec5243d5d73d4db4"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/xextproto_7.0.5.bb b/recipes/xorg-proto/xextproto_7.0.5.bb
index 1623e250e6..6748f00cf5 100644
--- a/recipes/xorg-proto/xextproto_7.0.5.bb
+++ b/recipes/xorg-proto/xextproto_7.0.5.bb
@@ -6,3 +6,4 @@ BBCLASSEXTEND = "native nativesdk sdk"
 
 SRC_URI[archive.md5sum] = "e6841018a7c64983b0954aa2c564d115"
 SRC_URI[archive.sha256sum] = "d33e1f3c96daad78667b2dfc14a1ce2ee3bdce19409f82cd5ede6c696ca5b042"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/xextproto_7.1.1.bb b/recipes/xorg-proto/xextproto_7.1.1.bb
index 14bbc733ca..7a60fffa78 100644
--- a/recipes/xorg-proto/xextproto_7.1.1.bb
+++ b/recipes/xorg-proto/xextproto_7.1.1.bb
@@ -6,3 +6,4 @@ BBCLASSEXTEND = "native nativesdk sdk"
 
 SRC_URI[archive.md5sum] = "fb6ccaae76db7a35e49b12aea60ca6ff"
 SRC_URI[archive.sha256sum] = "6d0abd31ddd57c2cb24cecf5fd90b4c29a276e20e3e03ca3c2c57d074f964d99"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/xf86bigfontproto_1.1.2.bb b/recipes/xorg-proto/xf86bigfontproto_1.1.2.bb
index b679d249ad..5534271f84 100644
--- a/recipes/xorg-proto/xf86bigfontproto_1.1.2.bb
+++ b/recipes/xorg-proto/xf86bigfontproto_1.1.2.bb
@@ -1,6 +1,5 @@
 require xorg-proto-common.inc
 
-PR = "r1"
 PE = "1"
 
 
@@ -8,3 +7,4 @@ BBCLASSEXTEND = "native nativesdk sdk"
 
 SRC_URI[archive.md5sum] = "a318c1e86123832d7b0c95fc7d47ef35"
 SRC_URI[archive.sha256sum] = "01b475b5b27709a738db6f94ce2ded37f5db0792e8d9318069ecf1690a15f124"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/xf86bigfontproto_1.2.0.bb b/recipes/xorg-proto/xf86bigfontproto_1.2.0.bb
index 4df9cda3bd..9a91257c77 100644
--- a/recipes/xorg-proto/xf86bigfontproto_1.2.0.bb
+++ b/recipes/xorg-proto/xf86bigfontproto_1.2.0.bb
@@ -1,6 +1,5 @@
 require xorg-proto-common.inc
 
-PR = "r1"
 PE = "1"
 
 
@@ -8,3 +7,4 @@ BBCLASSEXTEND = "native nativesdk sdk"
 
 SRC_URI[archive.md5sum] = "120e226ede5a4687b25dd357cc9b8efe"
 SRC_URI[archive.sha256sum] = "ba9220e2c4475f5ed2ddaa7287426b30089e4d29bd58d35fad57ba5ea43e1648"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/xf86dgaproto_2.0.2.bb b/recipes/xorg-proto/xf86dgaproto_2.0.2.bb
index 7ce9806561..6e442f1584 100644
--- a/recipes/xorg-proto/xf86dgaproto_2.0.2.bb
+++ b/recipes/xorg-proto/xf86dgaproto_2.0.2.bb
@@ -1,8 +1,8 @@
 require xorg-proto-common.inc
 
 CONFLICTS = "xxf86dgaext"
-PR = "r1"
 PE = "1"
 
 SRC_URI[archive.md5sum] = "461aa291a23e8cf387b70f3efa71b05c"
 SRC_URI[archive.sha256sum] = "3ee1db2481ea222269bd201eef4d0e5d8ca4dbdb5eeb4852cf1efc42d4269b60"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/xf86dgaproto_2.0.3.bb b/recipes/xorg-proto/xf86dgaproto_2.0.3.bb
index 623c6cca3d..6684f27198 100644
--- a/recipes/xorg-proto/xf86dgaproto_2.0.3.bb
+++ b/recipes/xorg-proto/xf86dgaproto_2.0.3.bb
@@ -1,8 +1,8 @@
 require xorg-proto-common.inc
 
 CONFLICTS = "xxf86dgaext"
-PR = "r1"
 PE = "1"
 
 SRC_URI[archive.md5sum] = "42fdcebc66efac02ab4beec2b1b0ad6e"
 SRC_URI[archive.sha256sum] = "5ac4d4a308b032727c61fd56db5a2eaadaedfbce5bc9dc504320bff9d696b002"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/xf86dgaproto_2.1.bb b/recipes/xorg-proto/xf86dgaproto_2.1.bb
index ddd72bdd76..37169942c0 100644
--- a/recipes/xorg-proto/xf86dgaproto_2.1.bb
+++ b/recipes/xorg-proto/xf86dgaproto_2.1.bb
@@ -1,8 +1,8 @@
 require xorg-proto-common.inc
 
 CONFLICTS = "xxf86dgaext"
-PR = "r1"
 PE = "1"
 
 SRC_URI[archive.md5sum] = "a036dc2fcbf052ec10621fd48b68dbb1"
 SRC_URI[archive.sha256sum] = "ac5ef65108e1f2146286e53080975683dae49fc94680042e04bd1e2010e99050"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/xf86driproto_2.0.3.bb b/recipes/xorg-proto/xf86driproto_2.0.3.bb
index 371347a0b0..ed4ee71eb7 100644
--- a/recipes/xorg-proto/xf86driproto_2.0.3.bb
+++ b/recipes/xorg-proto/xf86driproto_2.0.3.bb
@@ -1,7 +1,7 @@
 require xorg-proto-common.inc
 
-PR = "r1"
 PE = "1"
 
 SRC_URI[archive.md5sum] = "e4a282cfd708b8892fca4425fee9cd7b"
 SRC_URI[archive.sha256sum] = "111c469a24374803b08104c725d8318760b226cedccd12b199c83d1b2756b8d6"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/xf86driproto_2.0.4.bb b/recipes/xorg-proto/xf86driproto_2.0.4.bb
index 68e96a92d8..aa3e1b9343 100644
--- a/recipes/xorg-proto/xf86driproto_2.0.4.bb
+++ b/recipes/xorg-proto/xf86driproto_2.0.4.bb
@@ -4,3 +4,4 @@ PE = "1"
 
 SRC_URI[archive.md5sum] = "01470d088da3a8a3deefa8e1f45d69cb"
 SRC_URI[archive.sha256sum] = "f57da66bec8563502fe95c0e3f6ed297d9985862f5b64a5c9d3039719ac7f9da"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/xf86driproto_2.1.0.bb b/recipes/xorg-proto/xf86driproto_2.1.0.bb
index 3a0080ac9b..b4691e503f 100644
--- a/recipes/xorg-proto/xf86driproto_2.1.0.bb
+++ b/recipes/xorg-proto/xf86driproto_2.1.0.bb
@@ -4,3 +4,4 @@ PE = "1"
 
 SRC_URI[archive.md5sum] = "309d552732666c3333d7dc63e80d042f"
 SRC_URI[archive.sha256sum] = "d23f12deffd03e582e897ed6a7df3ea7f66ee8577f0f61374dcdf2ebffdce1be"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/xf86miscproto_0.9.2.bb b/recipes/xorg-proto/xf86miscproto_0.9.2.bb
index 99b6409b5b..1af815f005 100644
--- a/recipes/xorg-proto/xf86miscproto_0.9.2.bb
+++ b/recipes/xorg-proto/xf86miscproto_0.9.2.bb
@@ -1,7 +1,7 @@
 require xorg-proto-common.inc
 
-PR = "r1"
 PE = "1"
 
 SRC_URI[archive.md5sum] = "acae8edeb05a406f7f60bcbb218a8f1d"
 SRC_URI[archive.sha256sum] = "aaab4cbf19c73ded4785ba69cdd7ae23aaf103c7040559283f85fc1237dad6e6"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/xf86miscproto_0.9.3.bb b/recipes/xorg-proto/xf86miscproto_0.9.3.bb
index 2991200530..e5dfa955eb 100644
--- a/recipes/xorg-proto/xf86miscproto_0.9.3.bb
+++ b/recipes/xorg-proto/xf86miscproto_0.9.3.bb
@@ -1,7 +1,7 @@
 require xorg-proto-common.inc
 
-PR = "r1"
 PE = "1"
 
 SRC_URI[archive.md5sum] = "ca63bbb31cf5b7f37b2237e923ff257a"
 SRC_URI[archive.sha256sum] = "45b8ec6a4a8ca21066dce117e09dcc88539862e616e60fb391de05b36f63b095"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/xf86rushproto_1.1.2.bb b/recipes/xorg-proto/xf86rushproto_1.1.2.bb
index 08f262cca2..29aa6a5b72 100644
--- a/recipes/xorg-proto/xf86rushproto_1.1.2.bb
+++ b/recipes/xorg-proto/xf86rushproto_1.1.2.bb
@@ -1,7 +1,7 @@
 require xorg-proto-common.inc
 
-PR = "r1"
 PE = "1"
 
 SRC_URI[archive.md5sum] = "b6a96ffdae084e27487a58314008b000"
 SRC_URI[archive.sha256sum] = "07d9b237541f2d6313b5b28f5335d987a766b36c87b133f77cc48f31d969a3ae"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/xf86vidmodeproto_2.2.2.bb b/recipes/xorg-proto/xf86vidmodeproto_2.2.2.bb
index 4ab2a8c881..d583763f0a 100644
--- a/recipes/xorg-proto/xf86vidmodeproto_2.2.2.bb
+++ b/recipes/xorg-proto/xf86vidmodeproto_2.2.2.bb
@@ -1,8 +1,8 @@
 require xorg-proto-common.inc
 
 CONFLICTS = "xxf86vmext"
-PR = "r1"
 PE = "1"
 
 SRC_URI[archive.md5sum] = "f00844a63d6e76b69eb0eb5e41eed843"
 SRC_URI[archive.sha256sum] = "07152f990cc79ec5931989decc4a90b1919147e98ff6fcfe39507a9d3fc4d96e"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/xf86vidmodeproto_2.3.bb b/recipes/xorg-proto/xf86vidmodeproto_2.3.bb
index 3228d33961..a0abbbaaa5 100644
--- a/recipes/xorg-proto/xf86vidmodeproto_2.3.bb
+++ b/recipes/xorg-proto/xf86vidmodeproto_2.3.bb
@@ -1,8 +1,8 @@
 require xorg-proto-common.inc
 
 CONFLICTS = "xxf86vmext"
-PR = "r1"
 PE = "1"
 
 SRC_URI[archive.md5sum] = "4434894fc7d4eeb4a22e6b876d56fdaa"
 SRC_URI[archive.sha256sum] = "8f704613a5407b31c594d05cf8e053f2b05777172a44e7cd2abd8090bd2ac247"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/xineramaproto_1.1.2.bb b/recipes/xorg-proto/xineramaproto_1.1.2.bb
index 5c71116a83..268bcc503e 100644
--- a/recipes/xorg-proto/xineramaproto_1.1.2.bb
+++ b/recipes/xorg-proto/xineramaproto_1.1.2.bb
@@ -1,7 +1,7 @@
 require xorg-proto-common.inc
 
-PR = "r1"
 PE = "1"
 
 SRC_URI[archive.md5sum] = "1cc292c562962ad0ad3a253cae68c632"
 SRC_URI[archive.sha256sum] = "e8a62b1cafbcfc3b9fed147612ed4320233d0c9d6de30c991c2cd0c691c40910"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/xineramaproto_1.2.bb b/recipes/xorg-proto/xineramaproto_1.2.bb
index f1ab355a0d..8f3cac9d4a 100644
--- a/recipes/xorg-proto/xineramaproto_1.2.bb
+++ b/recipes/xorg-proto/xineramaproto_1.2.bb
@@ -1,7 +1,7 @@
 require xorg-proto-common.inc
 
-PR = "r1"
 PE = "1"
 
 SRC_URI[archive.md5sum] = "a8aadcb281b9c11a91303e24cdea45f5"
 SRC_URI[archive.sha256sum] = "58e88087ceec7201d918f94d6b1247325adca2a9903fed11291b412427a7ba64"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/xorg-proto-common.inc b/recipes/xorg-proto/xorg-proto-common.inc
index 947909d7a1..3e7c701c79 100644
--- a/recipes/xorg-proto/xorg-proto-common.inc
+++ b/recipes/xorg-proto/xorg-proto-common.inc
@@ -7,6 +7,8 @@ DEPENDS = "util-macros"
 
 ALLOW_EMPTY = "1"
 
+INC_PR = "r2"
+
 SRC_URI = "${XORG_MIRROR}/individual/proto/${BPN}-${PV}.tar.bz2;name=archive"
 
 S = "${WORKDIR}/${BPN}-${PV}"
diff --git a/recipes/xorg-proto/xproto_7.0.10.bb b/recipes/xorg-proto/xproto_7.0.10.bb
index a723dd8d63..2a5f05fa4c 100644
--- a/recipes/xorg-proto/xproto_7.0.10.bb
+++ b/recipes/xorg-proto/xproto_7.0.10.bb
@@ -1,9 +1,9 @@
 require xorg-proto-common.inc
 
-PR = "r1"
 PE = "1"
 
 BBCLASSEXTEND = "native nativesdk sdk"
 
 SRC_URI[archive.md5sum] = "2ed80e90992e7455eaac4c3e977ebd01"
 SRC_URI[archive.sha256sum] = "6d659920262d41e48714184f94ff9cd2608515e0f3d2f074892fe0c048784df4"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/xproto_7.0.11.bb b/recipes/xorg-proto/xproto_7.0.11.bb
index cd9f6f9462..83d0bad736 100644
--- a/recipes/xorg-proto/xproto_7.0.11.bb
+++ b/recipes/xorg-proto/xproto_7.0.11.bb
@@ -6,3 +6,4 @@ BBCLASSEXTEND = "native nativesdk sdk"
 
 SRC_URI[archive.md5sum] = "6b6c266576d81c505aa4a1828151f7f8"
 SRC_URI[archive.sha256sum] = "4ba69b7ef195c1a4e2e8ea9a1101f5079ada1f060c66968226754687685e9e53"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/xproto_7.0.12.bb b/recipes/xorg-proto/xproto_7.0.12.bb
index e2637933b6..a72d403119 100644
--- a/recipes/xorg-proto/xproto_7.0.12.bb
+++ b/recipes/xorg-proto/xproto_7.0.12.bb
@@ -1,6 +1,5 @@
 require xorg-proto-common.inc
 
-PR = "r1"
 PE = "1"
 
 
@@ -8,3 +7,4 @@ BBCLASSEXTEND = "native nativesdk sdk"
 
 SRC_URI[archive.md5sum] = "388234421add6c1760b4fc99fcdc76b0"
 SRC_URI[archive.sha256sum] = "bec5a98bbea56da069785784116261ec956df039fb07d0cdca53ae1ed03ebc0f"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/xproto_7.0.13.bb b/recipes/xorg-proto/xproto_7.0.13.bb
index da27a951e8..92c7589791 100644
--- a/recipes/xorg-proto/xproto_7.0.13.bb
+++ b/recipes/xorg-proto/xproto_7.0.13.bb
@@ -1,6 +1,5 @@
 require xorg-proto-common.inc
 
-PR = "r0"
 PE = "1"
 
 
@@ -8,3 +7,4 @@ BBCLASSEXTEND = "native nativesdk sdk"
 
 SRC_URI[archive.md5sum] = "7d26f45dca52632712a696e0631dc17b"
 SRC_URI[archive.sha256sum] = "6f6328922d69f5de29513a5baf1d010db2a7a54cb58a7a6cbbb1b25097ecd592"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/xproto_7.0.15.bb b/recipes/xorg-proto/xproto_7.0.15.bb
index 94e499003a..94f0fb907d 100644
--- a/recipes/xorg-proto/xproto_7.0.15.bb
+++ b/recipes/xorg-proto/xproto_7.0.15.bb
@@ -1,6 +1,5 @@
 require xorg-proto-common.inc
 
-PR = "r0"
 PE = "1"
 
 
@@ -8,3 +7,4 @@ BBCLASSEXTEND = "native nativesdk sdk"
 
 SRC_URI[archive.md5sum] = "1a2b31430d04340be2e49e8b6445e076"
 SRC_URI[archive.sha256sum] = "fd8cd0bc3e94d7416e6af9eddfa909b0e64246e0d2bb41c00f4e02bd85c76bee"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/xproto_7.0.16.bb b/recipes/xorg-proto/xproto_7.0.16.bb
index 56d710b54f..1a97b0435a 100644
--- a/recipes/xorg-proto/xproto_7.0.16.bb
+++ b/recipes/xorg-proto/xproto_7.0.16.bb
@@ -1,6 +1,5 @@
 require xorg-proto-common.inc
 
-PR = "r0"
 PE = "1"
 
 
@@ -8,3 +7,4 @@ BBCLASSEXTEND = "native nativesdk sdk"
 
 SRC_URI[archive.md5sum] = "75c9edff1f3823e5ab6bb9e66821a901"
 SRC_URI[archive.sha256sum] = "8224da1ce19c0ded4e07a325f3ed62bb4453782db97fd175cb3ffd1acaeb9672"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/xproto_7.0.17.bb b/recipes/xorg-proto/xproto_7.0.17.bb
index 6f5e1e94d0..e581d3869d 100644
--- a/recipes/xorg-proto/xproto_7.0.17.bb
+++ b/recipes/xorg-proto/xproto_7.0.17.bb
@@ -1,6 +1,5 @@
 require xorg-proto-common.inc
 
-PR = "r0"
 PE = "1"
 
 
@@ -8,3 +7,4 @@ BBCLASSEXTEND = "native nativesdk sdk"
 
 SRC_URI[archive.md5sum] = "74abb8fb91af66f35873b1f444731220"
 SRC_URI[archive.sha256sum] = "9b2c1fdc5b3780cedc9f5d9caf8f1364f26d07f8502b0eccdde74319157f9d01"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/xproxymanagementprotocol_1.0.2.bb b/recipes/xorg-proto/xproxymanagementprotocol_1.0.2.bb
index e86f9ee125..dd36e27351 100644
--- a/recipes/xorg-proto/xproxymanagementprotocol_1.0.2.bb
+++ b/recipes/xorg-proto/xproxymanagementprotocol_1.0.2.bb
@@ -1,8 +1,8 @@
 require xorg-proto-common.inc
 
 PROVIDES="xproxymngproto"
-PR = "r1"
 PE = "1"
 
 SRC_URI[archive.md5sum] = "d28007a50976204960fc1fc07b4ca093"
 SRC_URI[archive.sha256sum] = "c45176d002c85c142ac52774680f5325d330c5ecc32d4d6a056d85ee039a0cbc"
+PR = "${INC_PR}.0"
diff --git a/recipes/xorg-proto/xproxymanagementprotocol_1.0.3.bb b/recipes/xorg-proto/xproxymanagementprotocol_1.0.3.bb
index af1da764c6..a160ba805b 100644
--- a/recipes/xorg-proto/xproxymanagementprotocol_1.0.3.bb
+++ b/recipes/xorg-proto/xproxymanagementprotocol_1.0.3.bb
@@ -1,8 +1,8 @@
 require xorg-proto-common.inc
 
 PROVIDES="xproxymngproto"
-PR = "r1"
 PE = "1"
 
 SRC_URI[archive.md5sum] = "9de22ca1522008c28fb03dfc41ba2d30"
 SRC_URI[archive.sha256sum] = "7382acd8c76fa577beb622cab86cc07fafdcecbbd9b4f209bfa72976c4fd26c2"
+PR = "${INC_PR}.0"