]> git.openpandora.org Git - openembedded.git/commitdiff
xorg-xserver/xserver-* : sgml path fix from OM mtn
authorGraeme Gregory <dp@xora.org.uk>
Fri, 9 May 2008 14:27:36 +0000 (14:27 +0000)
committerGraeme Gregory <dp@xora.org.uk>
Fri, 9 May 2008 14:27:36 +0000 (14:27 +0000)
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

index b0d5e39813212cf1910caa555f9d71ff890a9f8a..bfa43809cd02c642eeb11f68867250ae1c938cca 100644 (file)
@@ -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
index f6b17c413e687ad6095cc8505d36a2a9576831ec..65ff03cc168cabd9fa258639baa9ffecff306c44 100644 (file)
@@ -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
index 9a8db266b6f4e602dbe9d8c1a8156a6e68c90d31..c87f4abaa403e2434b665c04d93d55811bcfa3b7 100644 (file)
@@ -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() {
index 2c7e1d5f4891672d9b8e2ec57e7fc1f0b77d1d89..5fdf7c4943b995b2c601a1d655bcc226aca5e8d6 100644 (file)
@@ -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
index 78fdc01b461cb300b846252c16da4e15df8e8cc2..421e04497078f265ad776c77b94b5172afc71b2f 100644 (file)
@@ -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 "
 
index c8a3c42ed571638c6fa9fd8d1092ab2a7ecc0be2..0a37ab39fdcf710e492b12ef522933efc0c8cfcb 100644 (file)
@@ -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 "
 
index ee84cac779975b310b3b9517b947bc2c00c0bb36..6e643a91381b1b80aff81b6fe39ad1978cbf3c26 100644 (file)
@@ -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 "