[oe-commits] org.oe.dev xorg-xserver/xserver-* : sgml path fix from OM mtn

[xora commit]

xorg-xserver/xserver-* : sgml path fix from OM mtn

Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: 89645b0448b3fa9cb06cb627daa90e01ea04eb77
ViewMTN: http://monotone.openembedded.org/revision/info/89645b0448b3fa9cb06cb627daa90e01ea04eb77
Files:
1
packages/xorg-xserver/xserver-kdrive-common.inc
packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb
packages/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb
packages/xorg-xserver/xserver-kdrive_1.1.0.bb
packages/xorg-xserver/xserver-xorg_1.2.0.bb
packages/xorg-xserver/xserver-xorg_1.3.0.0.bb
packages/xorg-xserver/xserver-xorg_1.4.bb
Diffs:

#
# mt diff -r7c77214562812b7de4280c53ab07dc8c275267aa -r89645b0448b3fa9cb06cb627daa90e01ea04eb77
#
#
#
# patch "packages/xorg-xserver/xserver-kdrive-common.inc"
#  from [41111959110e4d02e8cbcb965b17cd1d2494d5b9]
#    to [77ad25b09ec5d7afb286d85075768e69fe9d566e]
# 
# patch "packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb"
#  from [d9999335a38fb49bae5419528a518ebff7e010b6]
#    to [6ba65398f17e685fcfadd21c36980528ac5cc775]
# 
# patch "packages/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb"
#  from [0e72a73ed8c431c237be94d012f71e1c0ba17de4]
#    to [9e22e57d519a3db6506a03abb3832a698dd2580f]
# 
# patch "packages/xorg-xserver/xserver-kdrive_1.1.0.bb"
#  from [e614149bd894aaa2aceaf26e5d46fb2ffaca4e3a]
#    to [025fb5ef7bbba8e693cf91a7f19966b41a61b6ac]
# 
# patch "packages/xorg-xserver/xserver-xorg_1.2.0.bb"
#  from [c73bffb1e3641cde21223b8fe821232c15036b4d]
#    to [851bb3b6b25a7e03953ef2c03063779bdcc0ec9f]
# 
# patch "packages/xorg-xserver/xserver-xorg_1.3.0.0.bb"
#  from [90ab10be4b7894e29fabbe78fccead9685ff87ac]
#    to [228af28a9592f1bb445ca5ffd4054533d0a5498e]
# 
# patch "packages/xorg-xserver/xserver-xorg_1.4.bb"
#  from [b205054696412235974c4bc8ba8c5ab1d7eb3104]
#    to [aa88c8fb589cdbefddf67d5801f17ec2980d02e9]
#
============================================================
--- packages/xorg-xserver/xserver-kdrive-common.inc	41111959110e4d02e8cbcb965b17cd1d2494d5b9
+++ packages/xorg-xserver/xserver-kdrive-common.inc	77ad25b09ec5d7afb286d85075768e69fe9d566e
@@ -117,7 +117,7 @@ EXTRA_OECONF = "--enable-composite --ena
                 --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
============================================================
--- packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb	d9999335a38fb49bae5419528a518ebff7e010b6
+++ packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb	6ba65398f17e685fcfadd21c36980528ac5cc775
@@ -9,11 +9,10 @@ PE = "1"
 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 --ena
                 --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
============================================================
--- packages/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb	0e72a73ed8c431c237be94d012f71e1c0ba17de4
+++ packages/xorg-xserver/xserver-kdrive-xomap_1.1.99.3.bb	9e22e57d519a3db6506a03abb3832a698dd2580f
@@ -45,7 +45,7 @@ EXTRA_OECONF = "--enable-composite --ena
 		--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() {
============================================================
--- packages/xorg-xserver/xserver-kdrive_1.1.0.bb	e614149bd894aaa2aceaf26e5d46fb2ffaca4e3a
+++ packages/xorg-xserver/xserver-kdrive_1.1.0.bb	025fb5ef7bbba8e693cf91a7f19966b41a61b6ac
@@ -52,7 +52,7 @@ EXTRA_OECONF = "--enable-composite --ena
 		--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
============================================================
--- packages/xorg-xserver/xserver-xorg_1.2.0.bb	c73bffb1e3641cde21223b8fe821232c15036b4d
+++ packages/xorg-xserver/xserver-xorg_1.2.0.bb	851bb3b6b25a7e03953ef2c03063779bdcc0ec9f
@@ -3,7 +3,7 @@ PE = "1"
 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 "
 
============================================================
--- packages/xorg-xserver/xserver-xorg_1.3.0.0.bb	90ab10be4b7894e29fabbe78fccead9685ff87ac
+++ packages/xorg-xserver/xserver-xorg_1.3.0.0.bb	228af28a9592f1bb445ca5ffd4054533d0a5498e
@@ -6,7 +6,7 @@ SRC_URI += "file://drmfix.patch;patch=1"
 
 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 "
 
============================================================
--- packages/xorg-xserver/xserver-xorg_1.4.bb	b205054696412235974c4bc8ba8c5ab1d7eb3104
+++ packages/xorg-xserver/xserver-xorg_1.4.bb	aa88c8fb589cdbefddf67d5801f17ec2980d02e9
@@ -11,6 +11,6 @@ MESA_VER = "7.0.2"
 
 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 "