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>

diff --git a/recipes/xorg-xserver/xorg-xserver-common.inc b/recipes/xorg-xserver/xorg-xserver-common.inc
index ec565154b13df27d98a24b30054ae85410a44a16..cfd350e8866f3bd3112d5bc0a6a3d15ffd3f5ec4 100644 (file)
--- 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 61f73b34549e7a9f8f22f774ec86a180e73f0f2a..50d182c2eab5e1ec6cd4bf50957641b9c6732eda 100644 (file)
--- 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 9d6dca4489ffabd3ad3b1109939844a5b14318eb..1efea750a568a9c5590ed274a8bf9494e570f9eb 100644 (file)
--- 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 2c4f3d87166e14f123aa651aced4dffc374ef288..13cceb96fd7f822c1290f875746be33fa77ec59b 100644 (file)
--- 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 cb9ddcd9d39769d83d31abc325b99378313ba80a..edd1ac0865a058126a3bf0c281f620fd6e5054a0 100644 (file)
--- 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 d4b8caffa06f5f8495f46d9b5740f381ad69fc78..4c2efd55fc4dac0eccb2f9e5045aae16626d27e3 100644 (file)
--- 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 74ea3c41e535cec81e77ef390ed69a3e57441c63..39697246e334429f3faf8abdfcc6accbca3c851a 100644 (file)
--- 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 d8379eb3968da43a4b2b1f64e4f78518014d07b4..5218fde00e1e225ec902a46579e16950a42bbb2b 100644 (file)
--- 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"