[oe-commits] Michael Smith : xorg-xserver-common: pass --enable-glx-tls
git version control
git at git.openembedded.org
Mon Aug 24 16:30:24 UTC 2009
Module: openembedded.git
Branch: org.openembedded.dev
Commit: faac35c7aa18054c8d0eb4348ab252d249ba8bf4
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=faac35c7aa18054c8d0eb4348ab252d249ba8bf4
Author: Michael Smith <msmith at cbnco.com>
Date: Mon Jul 13 15:27:48 2009 -0400
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 at 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(-)
diff --git a/recipes/xorg-xserver/xorg-xserver-common.inc b/recipes/xorg-xserver/xorg-xserver-common.inc
index ec56515..cfd350e 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 61f73b3..50d182c 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 9d6dca4..1efea75 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 2c4f3d8..13cceb9 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 cb9ddcd..edd1ac0 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 d4b8caf..4c2efd5 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 74ea3c4..3969724 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 d8379eb..5218fde 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"
More information about the Openembedded-commits
mailing list