summaryrefslogtreecommitdiff
path: root/packages/xproto
diff options
context:
space:
mode:
authorGraeme Gregory <dp@xora.org.uk>2006-06-12 12:32:44 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-06-12 12:32:44 +0000
commitf1ab5d1610175c155e1de6ce40500ced5cdcd83b (patch)
tree878d21b2fd1ac7629bbaba49a5cf156dffb88419 /packages/xproto
parentdffddd7000a55a3420bbc1025c6acd63a8817d6f (diff)
parentfde62dc6e3a4eed3b138f07db46c0aeeba6608bf (diff)
merge of 1b2e21b185da17a194d778853f848c2e86a2d31a
and 649d3cf23ceed3a98c61de4cfc356bb3848b9cf3
Diffstat (limited to 'packages/xproto')
-rw-r--r--packages/xproto/compositeproto_0.3.1.bb3
-rw-r--r--packages/xproto/fixesproto_4.0.bb3
-rw-r--r--packages/xproto/glproto_1.4.7.bb2
-rw-r--r--packages/xproto/proto-common.inc6
-rw-r--r--packages/xproto/scrnsaverproto_1.1.0.bb2
-rw-r--r--packages/xproto/xproto_7.0.5.bb2
6 files changed, 16 insertions, 2 deletions
diff --git a/packages/xproto/compositeproto_0.3.1.bb b/packages/xproto/compositeproto_0.3.1.bb
new file mode 100644
index 0000000000..bb55a2022e
--- /dev/null
+++ b/packages/xproto/compositeproto_0.3.1.bb
@@ -0,0 +1,3 @@
+include proto-common.inc
+XORG_RELEASE = "X11R7.1"
+CONFLICTS = "compositeext"
diff --git a/packages/xproto/fixesproto_4.0.bb b/packages/xproto/fixesproto_4.0.bb
new file mode 100644
index 0000000000..8e552e6bc5
--- /dev/null
+++ b/packages/xproto/fixesproto_4.0.bb
@@ -0,0 +1,3 @@
+include proto-common.inc
+XORG_RELEASE = "X11R7.1"
+CONFLICTS = "fixesext"
diff --git a/packages/xproto/glproto_1.4.7.bb b/packages/xproto/glproto_1.4.7.bb
new file mode 100644
index 0000000000..67c086e764
--- /dev/null
+++ b/packages/xproto/glproto_1.4.7.bb
@@ -0,0 +1,2 @@
+include proto-common.inc
+XORG_RELEASE = "X11R7.1"
diff --git a/packages/xproto/proto-common.inc b/packages/xproto/proto-common.inc
index f35a791171..65dfd4207a 100644
--- a/packages/xproto/proto-common.inc
+++ b/packages/xproto/proto-common.inc
@@ -3,9 +3,11 @@ SECTION = "x11/libs"
LICENSE= "MIT-X"
#MAINTAINER = ""
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/proto/${PN}-X11R7.0-${PV}.tar.bz2"
+SRC_URI = "${XORG_MIRROR}/${XORG_RELEASE}/src/proto/${PN}-${XORG_RELEASE}-${PV}.tar.bz2"
-S = "${WORKDIR}/${PN}-X11R7.0-${PV}"
+S = "${WORKDIR}/${PN}-${XORG_RELEASE}-${PV}"
+
+XORG_RELEASE ?= "X11R7.0"
inherit autotools pkgconfig
diff --git a/packages/xproto/scrnsaverproto_1.1.0.bb b/packages/xproto/scrnsaverproto_1.1.0.bb
new file mode 100644
index 0000000000..67c086e764
--- /dev/null
+++ b/packages/xproto/scrnsaverproto_1.1.0.bb
@@ -0,0 +1,2 @@
+include proto-common.inc
+XORG_RELEASE = "X11R7.1"
diff --git a/packages/xproto/xproto_7.0.5.bb b/packages/xproto/xproto_7.0.5.bb
new file mode 100644
index 0000000000..67c086e764
--- /dev/null
+++ b/packages/xproto/xproto_7.0.5.bb
@@ -0,0 +1,2 @@
+include proto-common.inc
+XORG_RELEASE = "X11R7.1"