From faac35c7aa18054c8d0eb4348ab252d249ba8bf4 Mon Sep 17 00:00:00 2001
From: Michael Smith <msmith@cbnco.com>
Date: Mon, 13 Jul 2009 15:27:48 -0400
Subject: xorg-xserver-common: pass --enable-glx-tls

Uses the same inherit as mesa-dri, so they both get the same answer.

Also switch to INC_PR.

Signed-off-by: Michael Smith <msmith@cbnco.com>
---
 recipes/xorg-xserver/xorg-xserver-common.inc | 4 +++-
 recipes/xorg-xserver/xserver-xorg_1.2.0.bb   | 2 +-
 recipes/xorg-xserver/xserver-xorg_1.3.0.0.bb | 2 +-
 recipes/xorg-xserver/xserver-xorg_1.4.2.bb   | 2 +-
 recipes/xorg-xserver/xserver-xorg_1.4.bb     | 2 +-
 recipes/xorg-xserver/xserver-xorg_1.5.1.bb   | 2 +-
 recipes/xorg-xserver/xserver-xorg_1.5.3.bb   | 2 +-
 recipes/xorg-xserver/xserver-xorg_1.6.1.bb   | 2 +-
 8 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'recipes/xorg-xserver')

diff --git a/recipes/xorg-xserver/xorg-xserver-common.inc b/recipes/xorg-xserver/xorg-xserver-common.inc
index ec565154b1..cfd350e886 100644
--- a/recipes/xorg-xserver/xorg-xserver-common.inc
+++ b/recipes/xorg-xserver/xorg-xserver-common.inc
@@ -2,6 +2,8 @@ HOMEPAGE = "http://www.x.org"
 SECTION = "x11/base"
 LICENSE = "MIT-X"
 
+INC_PR = "r12"
+
 PROVIDES = "virtual/xserver"
 
 DEPENDS = "hal fontconfig freetype flex-native lbxutil kbproto \ 
@@ -21,7 +23,7 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2"
 
 S = "${WORKDIR}/${XORG_PN}-${PV}"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig glx-use-tls
 
 EXTRA_OECONF += " --enable-xcalibrate \
                   --enable-kdrive \
diff --git a/recipes/xorg-xserver/xserver-xorg_1.2.0.bb b/recipes/xorg-xserver/xserver-xorg_1.2.0.bb
index 61f73b3454..50d182c2ea 100644
--- a/recipes/xorg-xserver/xserver-xorg_1.2.0.bb
+++ b/recipes/xorg-xserver/xserver-xorg_1.2.0.bb
@@ -2,7 +2,7 @@ MESA_VER = "6.5.2"
 
 require xorg-xserver-common.inc
 PE = "1"
-PR = "r4"
+PR = "${INC_PR}.0"
 
 export LDFLAGS += " -ldl "
 
diff --git a/recipes/xorg-xserver/xserver-xorg_1.3.0.0.bb b/recipes/xorg-xserver/xserver-xorg_1.3.0.0.bb
index 9d6dca4489..1efea750a5 100644
--- a/recipes/xorg-xserver/xserver-xorg_1.3.0.0.bb
+++ b/recipes/xorg-xserver/xserver-xorg_1.3.0.0.bb
@@ -2,7 +2,7 @@ MESA_VER = "6.5.2"
 
 require xorg-xserver-common.inc
 PE = "1"
-PR = "r8"
+PR = "${INC_PR}.0"
 
 SRC_URI += "file://drmfix.patch;patch=1 \
             file://glyphstr.patch;patch=1"
diff --git a/recipes/xorg-xserver/xserver-xorg_1.4.2.bb b/recipes/xorg-xserver/xserver-xorg_1.4.2.bb
index 2c4f3d8716..13cceb96fd 100644
--- a/recipes/xorg-xserver/xserver-xorg_1.4.2.bb
+++ b/recipes/xorg-xserver/xserver-xorg_1.4.2.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "the X.Org X server"
 DEPENDS += "pixman"
 RDEPENDS += "hal"
 PE = "1"
-PR = "r11"
+PR = "${INC_PR}.0"
 
 SRC_URI += "file://drmfix.patch;patch=1 \
             file://pkgconfig_fix.patch;patch=1 \
diff --git a/recipes/xorg-xserver/xserver-xorg_1.4.bb b/recipes/xorg-xserver/xserver-xorg_1.4.bb
index cb9ddcd9d3..edd1ac0865 100644
--- a/recipes/xorg-xserver/xserver-xorg_1.4.bb
+++ b/recipes/xorg-xserver/xserver-xorg_1.4.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "the X.Org X server"
 DEPENDS += "pixman"
 RDEPENDS += "hal"
 PE = "1"
-PR = "r9"
+PR = "${INC_PR}.0"
 
 SRC_URI += "file://drmfix.patch;patch=1 \
             file://pkgconfig_fix.patch;patch=1 \
diff --git a/recipes/xorg-xserver/xserver-xorg_1.5.1.bb b/recipes/xorg-xserver/xserver-xorg_1.5.1.bb
index d4b8caffa0..4c2efd55fc 100644
--- a/recipes/xorg-xserver/xserver-xorg_1.5.1.bb
+++ b/recipes/xorg-xserver/xserver-xorg_1.5.1.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "the X.Org X server"
 DEPENDS += "pixman libpciaccess openssl"
 RDEPENDS += "hal"
 PE = "1"
-PR = "r3"
+PR = "${INC_PR}.0"
 
 SRC_URI += "file://drmfix.patch;patch=1 \
             file://sysroot_fix.patch;patch=1"
diff --git a/recipes/xorg-xserver/xserver-xorg_1.5.3.bb b/recipes/xorg-xserver/xserver-xorg_1.5.3.bb
index 74ea3c41e5..39697246e3 100644
--- a/recipes/xorg-xserver/xserver-xorg_1.5.3.bb
+++ b/recipes/xorg-xserver/xserver-xorg_1.5.3.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "the X.Org X server"
 DEPENDS += "pixman libpciaccess openssl"
 RDEPENDS += "hal"
 PE = "2"
-PR = "r5"
+PR = "${INC_PR}.0"
 
 SRC_URI += "file://drmfix.patch;patch=1 \
             file://sysroot_fix.patch;patch=1 \
diff --git a/recipes/xorg-xserver/xserver-xorg_1.6.1.bb b/recipes/xorg-xserver/xserver-xorg_1.6.1.bb
index d8379eb396..5218fde00e 100644
--- a/recipes/xorg-xserver/xserver-xorg_1.6.1.bb
+++ b/recipes/xorg-xserver/xserver-xorg_1.6.1.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "the X.Org X server"
 DEPENDS += "pixman libpciaccess openssl xineramaproto libxinerama"
 RDEPENDS += "hal"
 PE = "2"
-PR = "r1"
+PR = "${INC_PR}.0"
 
 SRC_URI += "file://sysroot_fix.patch;patch=1 \
 	    file://dolt-fix.patch;patch=1"
-- 
cgit v1.2.3