7 files changed, 10 insertions, 11 deletions
diff --git a/packages/xorg-xserver/xserver-kdrive-common.inc b/packages/xorg-xserver/xserver-kdrive-common.inc
index b0d5e39813..bfa43809cd 100644
--- a/packages/xorg-xserver/xserver-kdrive-common.inc
+++ b/packages/xorg-xserver/xserver-kdrive-common.inc
@@ -117,7 +117,7 @@ EXTRA_OECONF = "--enable-composite --enable-kdrive \
                 --disable-dmx ${W100_OECONF} \
                 --with-default-font-path=built-ins \
                 --enable-tslib --enable-xcalibrate \
-                ac_cv_file__usr_share_X11_sgml_defs_ent=no"
+                ac_cv_file__usr_share_sgml_X11_defs_ent=no"
 
 do_configure_prepend() {
     sed -i -e 's/tslib-0.0/tslib-1.0/' ${S}/configure.ac
diff --git a/packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb b/packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb
index f6b17c413e..65ff03cc16 100644
--- a/packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb
+++ b/packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb
@@ -9,11 +9,10 @@ DEPENDS += "libxkbfile libxcalibrate"
 RDEPENDS_${PN} = "xserver-kdrive"
 PROVIDES = "virtual/xserver"
 PE = "1"
-PR = "r5"
+PR = "r6"
+PV = "1.3.0.0+git${SRCREV}"
 
-XGLAMO_GIT_REV = "a51364e2f23d4b6331c5ed613ce3f7e15f8e540f"
-
-SRC_URI = "git://people.freedesktop.org/~dodji/xglamo;protocol=git;rev=${XGLAMO_GIT_REV} \
+SRC_URI = "git://people.freedesktop.org/~dodji/xglamo;protocol=git \
         file://kmode.patch;patch=1 \
         file://disable-apm.patch;patch=1 \
         file://no-serial-probing.patch;patch=1 \
@@ -53,7 +52,7 @@ EXTRA_OECONF = "--enable-composite --enable-kdrive \
                 --disable-dmx \
                 --with-default-font-path=built-ins \
                 --enable-tslib --enable-xcalibrate \
-                ac_cv_file__usr_share_X11_sgml_defs_ent=no"
+                ac_cv_file__usr_share_sgml_X11_defs_ent=no"
 
 do_configure_prepend() {
     sed -i -e 's/tslib-0.0/tslib-1.0/' ${S}/configure.ac
diff --git a/packages/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb b/packages/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb
index 9a8db266b6..c87f4abaa4 100644
--- a/packages/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb
+++ b/packages/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb
@@ -45,7 +45,7 @@ EXTRA_OECONF = "--enable-composite --enable-kdrive --enable-builtin-fonts \
 		--disable-xkb --disable-xnest --disable-xvfb \
 		--disable-xevie --disable-xprint --disable-xtrap \
 		--with-default-font-path=built-ins \
-		ac_cv_file__usr_share_X11_sgml_defs_ent=no \
+		ac_cv_file__usr_share_sgml_X11_defs_ent=no \
 		--enable-xomap"
 
 do_configure_prepend() {
diff --git a/packages/xorg-xserver/xserver-kdrive_1.1.0.bb b/packages/xorg-xserver/xserver-kdrive_1.1.0.bb
index 2c7e1d5f48..5fdf7c4943 100644
--- a/packages/xorg-xserver/xserver-kdrive_1.1.0.bb
+++ b/packages/xorg-xserver/xserver-kdrive_1.1.0.bb
@@ -52,7 +52,7 @@ EXTRA_OECONF = "--enable-composite --enable-kdrive \
 		--disable-xkb --disable-xnest --disable-xvfb \
 		--disable-xevie --disable-xprint --disable-xtrap \
 		--with-default-font-path=built-ins \
-		ac_cv_file__usr_share_X11_sgml_defs_ent=no"
+		ac_cv_file__usr_share_sgml_X11_defs_ent=no"
 
 do_configure_prepend() {
     sed -i -e 's/tslib-0.0/tslib-1.0/' ${S}/configure.ac
diff --git a/packages/xorg-xserver/xserver-xorg_1.2.0.bb b/packages/xorg-xserver/xserver-xorg_1.2.0.bb
index 78fdc01b46..421e044970 100644
--- a/packages/xorg-xserver/xserver-xorg_1.2.0.bb
+++ b/packages/xorg-xserver/xserver-xorg_1.2.0.bb
@@ -3,7 +3,7 @@ MESA_VER = "6.5.2"
 require xorg-xserver-common.inc
 PE = "1"
 
-EXTRA_OECONF += " ac_cv_file__usr_share_X11_sgml_defs_ent=no "
+EXTRA_OECONF += " ac_cv_file__usr_share_sgml_X11_defs_ent=no "
 
 export LDFLAGS += " -ldl "
 
diff --git a/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb b/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb
index c8a3c42ed5..0a37ab39fd 100644
--- a/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb
+++ b/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb
@@ -6,7 +6,7 @@ PR = "r4"
 
 SRC_URI += "file://drmfix.patch;patch=1"
 
-EXTRA_OECONF += " ac_cv_file__usr_share_X11_sgml_defs_ent=no "
+EXTRA_OECONF += " ac_cv_file__usr_share_sgml_X11_defs_ent=no "
 
 export LDFLAGS += " -ldl "
 
diff --git a/packages/xorg-xserver/xserver-xorg_1.4.bb b/packages/xorg-xserver/xserver-xorg_1.4.bb
index ee84cac779..6e643a9138 100644
--- a/packages/xorg-xserver/xserver-xorg_1.4.bb
+++ b/packages/xorg-xserver/xserver-xorg_1.4.bb
@@ -11,6 +11,6 @@ SRC_URI += "file://drmfix.patch;patch=1 \
 
 MESA_VER = "7.0.2"
 
-EXTRA_OECONF += " ac_cv_file__usr_share_X11_sgml_defs_ent=no "
+EXTRA_OECONF += " ac_cv_file__usr_share_sgml_X11_defs_ent=no "
 
 export LDFLAGS += " -ldl "