diff options
88 files changed, 206 insertions, 292 deletions
diff --git a/recipes/xorg-proto/applewmproto_1.0.3.bb b/recipes/xorg-proto/applewmproto_1.0.3.bb index 5e64abd394..82100e3209 100644 --- a/recipes/xorg-proto/applewmproto_1.0.3.bb +++ b/recipes/xorg-proto/applewmproto_1.0.3.bb @@ -1,7 +1,6 @@ require xorg-proto-common.inc - PE = "1" +PR = "${INC_PR}.0" 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 8f531a92ce..b178abd5d3 100644 --- a/recipes/xorg-proto/applewmproto_1.2.0.bb +++ b/recipes/xorg-proto/applewmproto_1.2.0.bb @@ -1,7 +1,6 @@ require xorg-proto-common.inc - PE = "1" +PR = "${INC_PR}.0" 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 424886cc4d..d9bc201caa 100644 --- a/recipes/xorg-proto/applewmproto_1.4.1.bb +++ b/recipes/xorg-proto/applewmproto_1.4.1.bb @@ -1,7 +1,6 @@ require xorg-proto-common.inc - PE = "1" +PR = "${INC_PR}.0" 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 b2a9c9c451..f817bca6fb 100644 --- a/recipes/xorg-proto/bigreqsproto_1.0.2.bb +++ b/recipes/xorg-proto/bigreqsproto_1.0.2.bb @@ -1,10 +1,8 @@ require xorg-proto-common.inc - PE = "1" - - -BBCLASSEXTEND = "native nativesdk sdk" +PR = "${INC_PR}.0" SRC_URI[archive.md5sum] = "95c29d9d10bf2868996c0c47a3b9a8dc" SRC_URI[archive.sha256sum] = "30da0098a24578e645193464526cc4d5c2c7fecaf476d1b9dabe68118850adee" -PR = "${INC_PR}.0" + +BBCLASSEXTEND = "native nativesdk sdk" diff --git a/recipes/xorg-proto/bigreqsproto_1.1.0.bb b/recipes/xorg-proto/bigreqsproto_1.1.0.bb index 60bff60993..e9a1732c24 100644 --- a/recipes/xorg-proto/bigreqsproto_1.1.0.bb +++ b/recipes/xorg-proto/bigreqsproto_1.1.0.bb @@ -1,10 +1,8 @@ require xorg-proto-common.inc - PE = "1" - - -BBCLASSEXTEND = "native nativesdk sdk" +PR = "${INC_PR}.0" SRC_URI[archive.md5sum] = "d30c5dbf19ca6dffcd9788227ecff8c5" SRC_URI[archive.sha256sum] = "4864e12d3c5a99b0a9ee4704822455299345e6c65b23c688a4e4bf11481107bd" -PR = "${INC_PR}.0" + +BBCLASSEXTEND = "native nativesdk sdk" diff --git a/recipes/xorg-proto/calibrateproto_git.bb b/recipes/xorg-proto/calibrateproto_git.bb index d1f47c6763..4e3c642e0a 100644 --- a/recipes/xorg-proto/calibrateproto_git.bb +++ b/recipes/xorg-proto/calibrateproto_git.bb @@ -1,17 +1,16 @@ require xorg-proto-common.inc - DESCRIPTION = "Touchscreen calibration protocol" - -SRCREV = "1da6fd1e2c7a49648245c98481fabea8b9690a8c" -PV = "0.0+${PR}+gitr${SRCPV}" PE = "3" +PV = "0.0+${PR}+gitr${SRCPV}" +PR = "${INC_PR}.0" SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/calibrateproto;protocol=git" + +SRCREV = "1da6fd1e2c7a49648245c98481fabea8b9690a8c" S = "${WORKDIR}/git" do_stage() { - autotools_stage_all - #make it compatible with the old package from cvs - ln -sf ${PKG_CONFIG_DIR}/xcalibrateproto.pc ${PKG_CONFIG_DIR}/xcalibrateext.pc + autotools_stage_all + #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 a3b3b48c8b..8239f8df9f 100644 --- a/recipes/xorg-proto/compositeproto_0.4.1.bb +++ b/recipes/xorg-proto/compositeproto_0.4.1.bb @@ -1,9 +1,8 @@ require xorg-proto-common.inc - -CONFLICTS = "compositeext" PE = "1" - +PR = "${INC_PR}.0" SRC_URI[archive.md5sum] = "3692f3f8b2ea10dff3d2cede8dc65e79" SRC_URI[archive.sha256sum] = "e2744576731e1416503aade0d58a7861d0260f70b993351473a9f38ced606984" -PR = "${INC_PR}.0" + +CONFLICTS = "compositeext" diff --git a/recipes/xorg-proto/compositeproto_0.4.bb b/recipes/xorg-proto/compositeproto_0.4.bb index 1745abc5be..aebc61b7af 100644 --- a/recipes/xorg-proto/compositeproto_0.4.bb +++ b/recipes/xorg-proto/compositeproto_0.4.bb @@ -1,9 +1,8 @@ require xorg-proto-common.inc - -CONFLICTS = "compositeext" PE = "1" - +PR = "${INC_PR}.0" SRC_URI[archive.md5sum] = "6281344d656d4e0c8e9db4918efe3d1d" SRC_URI[archive.sha256sum] = "6013d1ca63b2b7540f6f99977090812b899852acfbd9df123b5ebaa911e30003" -PR = "${INC_PR}.0" + +CONFLICTS = "compositeext" diff --git a/recipes/xorg-proto/damageproto_1.1.0.bb b/recipes/xorg-proto/damageproto_1.1.0.bb index 84f00e626b..2daea83548 100644 --- a/recipes/xorg-proto/damageproto_1.1.0.bb +++ b/recipes/xorg-proto/damageproto_1.1.0.bb @@ -1,9 +1,8 @@ require xorg-proto-common.inc - -CONFLICTS = "damageext" PE = "1" - +PR = "${INC_PR}.0" SRC_URI[archive.md5sum] = "33ee591e0b1ca5ad7902934541db7d24" SRC_URI[archive.sha256sum] = "9d2684fac835e9cdf78befff2a58292f54db90094acbfb9f2ed5316fa30d641d" -PR = "${INC_PR}.0" + +CONFLICTS = "damageext" diff --git a/recipes/xorg-proto/damageproto_1.2.0.bb b/recipes/xorg-proto/damageproto_1.2.0.bb index b02cf227c9..d5228f8fa4 100644 --- a/recipes/xorg-proto/damageproto_1.2.0.bb +++ b/recipes/xorg-proto/damageproto_1.2.0.bb @@ -1,9 +1,8 @@ require xorg-proto-common.inc - -CONFLICTS = "damageext" PE = "1" - +PR = "${INC_PR}.0" SRC_URI[archive.md5sum] = "434b931b02bd83ed9fc44951df81cdac" SRC_URI[archive.sha256sum] = "a50250770a2eead9d6fd56577e3328d0a6a1c4d425b58faa0f5ca7683169ee8f" -PR = "${INC_PR}.0" + +CONFLICTS = "damageext" diff --git a/recipes/xorg-proto/dmxproto_2.2.2.bb b/recipes/xorg-proto/dmxproto_2.2.2.bb index b59ff2e450..999e47f8a2 100644 --- a/recipes/xorg-proto/dmxproto_2.2.2.bb +++ b/recipes/xorg-proto/dmxproto_2.2.2.bb @@ -1,7 +1,6 @@ require xorg-proto-common.inc - PE = "1" +PR = "${INC_PR}.0" 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 9fb21c03ca..0e40a5562d 100644 --- a/recipes/xorg-proto/dmxproto_2.3.bb +++ b/recipes/xorg-proto/dmxproto_2.3.bb @@ -1,7 +1,6 @@ require xorg-proto-common.inc - PE = "1" +PR = "${INC_PR}.0" 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 bb64f686b4..732997115a 100644 --- a/recipes/xorg-proto/dri2proto_1.1.bb +++ b/recipes/xorg-proto/dri2proto_1.1.bb @@ -1,7 +1,6 @@ -DESCRIPTION = "DRI2 extension headers" - require xorg-proto-common.inc +DESCRIPTION = "DRI2 extension headers" +PR = "${INC_PR}.0" 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 48ca0fa607..6df4e528d2 100644 --- a/recipes/xorg-proto/dri2proto_2.0.bb +++ b/recipes/xorg-proto/dri2proto_2.0.bb @@ -1,7 +1,6 @@ -DESCRIPTION = "DRI2 extension headers" - require xorg-proto-common.inc +DESCRIPTION = "DRI2 extension headers" +PR = "${INC_PR}.0" 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 a5e6bd4edd..55f793bb84 100644 --- a/recipes/xorg-proto/dri2proto_2.1.bb +++ b/recipes/xorg-proto/dri2proto_2.1.bb @@ -1,7 +1,6 @@ -DESCRIPTION = "DRI2 extension headers" - require xorg-proto-common.inc +DESCRIPTION = "DRI2 extension headers" +PR = "${INC_PR}.0" 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 4e9526a7e7..84467a3c76 100644 --- a/recipes/xorg-proto/dri2proto_2.2.bb +++ b/recipes/xorg-proto/dri2proto_2.2.bb @@ -1,7 +1,6 @@ -DESCRIPTION = "DRI2 extension headers" - require xorg-proto-common.inc +DESCRIPTION = "DRI2 extension headers" +PR = "${INC_PR}.0" 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 3d9354c863..8dba4aa78a 100644 --- a/recipes/xorg-proto/dri2proto_2.3.bb +++ b/recipes/xorg-proto/dri2proto_2.3.bb @@ -1,7 +1,6 @@ -DESCRIPTION = "DRI2 extension headers" - require xorg-proto-common.inc +DESCRIPTION = "DRI2 extension headers" +PR = "${INC_PR}.0" 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 38a6a63144..1a3bff2a90 100644 --- a/recipes/xorg-proto/evieext_1.0.2.bb +++ b/recipes/xorg-proto/evieext_1.0.2.bb @@ -1,7 +1,6 @@ require xorg-proto-common.inc - PE = "1" +PR = "${INC_PR}.0" 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 d84c4b4b24..a3630496ca 100644 --- a/recipes/xorg-proto/evieext_1.1.0.bb +++ b/recipes/xorg-proto/evieext_1.1.0.bb @@ -1,7 +1,6 @@ require xorg-proto-common.inc - PE = "1" +PR = "${INC_PR}.0" 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 a6733b8ff5..000462534b 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" PE = "1" - -BBCLASSEXTEND = "native" +PR = "${INC_PR}.0" |