8 files changed, 16 insertions, 8 deletions

diff --git a/meta/packages/xorg-proto/fontcacheproto-native_0.1.2.bb b/meta/packages/xorg-proto/fontcacheproto-native_0.1.2.bb
index 46ce311621..2c3970734e 100644
--- a/meta/packages/xorg-proto/fontcacheproto-native_0.1.2.bb
+++ b/meta/packages/xorg-proto/fontcacheproto-native_0.1.2.bb
@@ -1,9 +1,10 @@
+require xorg-proto-common.inc
 DESCRIPTION = "X protocol headers"
 SECTION = "x11/libs"
 LICENSE = "MIT-X"
 PE = "1"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/fontcacheproto-${PV}.tar.bz2"
+XORG_PN = "fontcacheproto"
 S = "${WORKDIR}/fontcacheproto-${PV}"
 
 inherit native autotools pkgconfig
diff --git a/meta/packages/xorg-proto/fontsproto-native_2.0.2.bb b/meta/packages/xorg-proto/fontsproto-native_2.0.2.bb
index 8a8795623d..a6467301b7 100644
--- a/meta/packages/xorg-proto/fontsproto-native_2.0.2.bb
+++ b/meta/packages/xorg-proto/fontsproto-native_2.0.2.bb
@@ -1,9 +1,10 @@
+require xorg-proto-common.inc
 DESCRIPTION = "X protocol headers"
 SECTION = "x11/libs"
 LICENSE = "MIT-X"
 PE = "1"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/fontsproto-${PV}.tar.bz2"
+XORG_PN = "fontsproto"
 S = "${WORKDIR}/fontsproto-${PV}"
 
 inherit native autotools pkgconfig
diff --git a/meta/packages/xorg-proto/inputproto-native_1.3.2.bb b/meta/packages/xorg-proto/inputproto-native_1.3.2.bb
index ae9be32d39..bac45673e9 100644
--- a/meta/packages/xorg-proto/inputproto-native_1.3.2.bb
+++ b/meta/packages/xorg-proto/inputproto-native_1.3.2.bb
@@ -1,9 +1,10 @@
+require xorg-proto-common.inc
 DESCRIPTION = "X protocol headers"
 SECTION = "x11/libs"
 LICENSE = "MIT-X"
 PE = "1"
 
-SRC_URI = "${XORG_MIRROR}/individual/proto/inputproto-${PV}.tar.bz2"
+XORG_PN = "inputproto"
 S = "${WORKDIR}/inputproto-${PV}"
 
 inherit native autotools pkgconfig
diff --git a/meta/packages/xorg-proto/inputproto-native_1.4.1.bb b/meta/packages/xorg-proto/inputproto-native_1.4.1.bb
index 6d5444c977..3a9ea4492f 100644
--- a/meta/packages/xorg-proto/inputproto-native_1.4.1.bb
+++ b/meta/packages/xorg-proto/inputproto-native_1.4.1.bb
@@ -1,9 +1,10 @@
+require xorg-proto-common.inc
 DESCRIPTION = "X protocol headers"
 SECTION = "x11/libs"
 LICENSE= "MIT-X"
 PE = "1"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/inputproto-${PV}.tar.bz2"
+XORG_PN = "inputproto"
 S = "${WORKDIR}/inputproto-${PV}"
 
 inherit native autotools pkgconfig
diff --git a/meta/packages/xorg-proto/xcmiscproto-native_1.1.2.bb b/meta/packages/xorg-proto/xcmiscproto-native_1.1.2.bb
index 5f1e669acd..6fc828826e 100644
--- a/meta/packages/xorg-proto/xcmiscproto-native_1.1.2.bb
+++ b/meta/packages/xorg-proto/xcmiscproto-native_1.1.2.bb
@@ -1,9 +1,10 @@
+require xorg-proto-common.inc
 DESCRIPTION = "X protocol headers"
 SECTION = "x11/libs"
 LICENSE = "MIT-X"
 PE = "1"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/xcmiscproto-${PV}.tar.bz2"
+XORG_PN = "xcmiscproto"
 S = "${WORKDIR}/xcmiscproto-${PV}"
 
 inherit native autotools pkgconfig
diff --git a/meta/packages/xorg-proto/xextproto-native_7.0.2.bb b/meta/packages/xorg-proto/xextproto-native_7.0.2.bb
index 0a5534a1b1..5707aac5d1 100644
--- a/meta/packages/xorg-proto/xextproto-native_7.0.2.bb
+++ b/meta/packages/xorg-proto/xextproto-native_7.0.2.bb
@@ -1,9 +1,10 @@
+require xorg-proto-common.inc
 DESCRIPTION = "X protocol headers"
 SECTION = "x11/libs"
 LICENSE = "MIT-X"
 PE = "1"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/protto/xextproto-${PV}.tar.bz2"
+XORG_PN = "xextproto"
 S = "${WORKDIR}/xextproto-${PV}"
 
 inherit native autotools pkgconfig
diff --git a/meta/packages/xorg-proto/xf86bigfontproto-native_1.1.2.bb b/meta/packages/xorg-proto/xf86bigfontproto-native_1.1.2.bb
index 1b545fd205..d221b4eed8 100644
--- a/meta/packages/xorg-proto/xf86bigfontproto-native_1.1.2.bb
+++ b/meta/packages/xorg-proto/xf86bigfontproto-native_1.1.2.bb
@@ -1,9 +1,10 @@
+require xorg-proto-common.inc
 DESCRIPTION = "X protocol headers"
 SECTION = "x11/libs"
 LICENSE = "MIT-X"
 PE = "1"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/xf86bigfontproto-${PV}.tar.bz2"
+XORG_PN = "xf86bigfontproto"
 S = "${WORKDIR}/xf86bigfontproto-${PV}"
 
 inherit native autotools pkgconfig
diff --git a/meta/packages/xorg-proto/xproto-native_7.0.10.bb b/meta/packages/xorg-proto/xproto-native_7.0.10.bb
index 12a58b5a0a..0af3130ae2 100644
--- a/meta/packages/xorg-proto/xproto-native_7.0.10.bb
+++ b/meta/packages/xorg-proto/xproto-native_7.0.10.bb
@@ -1,9 +1,10 @@
+require xorg-proto-common.inc
 DESCRIPTION = "X protocol headers"
 SECTION = "x11/libs"
 LICENSE= "MIT-X"
 PE = "1"
 
-SRC_URI = "${XORG_MIRROR}/individual/proto/xproto-${PV}.tar.bz2"
+XORG_PN = "xproto"
 S = "${WORKDIR}/xproto-${PV}"
 
 inherit native autotools pkgconfig